Index: branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php =================================================================== --- branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php (revision 21420) +++ branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php (revision 21514) @@ -150,5 +150,5 @@ foreach ($masterData as $key => $val) { $sqlVal = array($columns[1] => $val); - $this->objQuery->update($name, $sqlVal, $columns[0] . " = " . SC_Utils_Ex::sfQuoteSmart($key)); + $this->objQuery->update($name, $sqlVal, $columns[0] . ' = ' . SC_Utils_Ex::sfQuoteSmart($key)); $i++; } @@ -226,9 +226,9 @@ */ function clearCache($name) { - $masterDataFile = MASTER_DATA_REALDIR . $name . ".php"; + $masterDataFile = MASTER_DATA_REALDIR . $name . '.php'; if (is_file($masterDataFile)) { unlink($masterDataFile); } - $masterDataFile = MASTER_DATA_REALDIR . $name . ".serial"; + $masterDataFile = MASTER_DATA_REALDIR . $name . '.serial'; if (is_file($masterDataFile)) { unlink($masterDataFile); @@ -311,5 +311,5 @@ $this->objQuery->setOrder($columns[2]); } - $results = $this->objQuery->select($columns[0] . ", " . $columns[1], $name); + $results = $this->objQuery->select($columns[0] . ', ' . $columns[1], $name); // 結果を key => value 形式に格納 @@ -353,8 +353,8 @@ */ function getMasterDataAsDefine($masterData, $comments = array()) { - $data = ""; + $data = ''; foreach ($masterData as $key => $val) { if (!empty($comments[$key])) { - $data .= "/** " . $comments[$key] . " */\n"; + $data .= '/** ' . $comments[$key] . " */\n"; } $data .= "define('" . $key . "', " . $val . ");\n"; Index: branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php =================================================================== --- branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php (revision 21490) +++ branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php (revision 21514) @@ -62,10 +62,10 @@ * @return void|string データソース名 */ - function getDSN($dsn = "") { + function getDSN($dsn = '') { if (empty($dsn)) { if (defined('DEFAULT_DSN')) { $dsn = DEFAULT_DSN; } else { - return ""; + return ''; } } @@ -79,5 +79,5 @@ * @return string データベースのバージョン */ - function sfGetDBVersion($dsn = "") { return null; } + function sfGetDBVersion($dsn = '') { return null; } /** @@ -143,5 +143,5 @@ * @return array テーブル名の配列 */ - function findTableNames($expression = "") { return array(); } + function findTableNames($expression = '') { return array(); } /** Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (revision 21514) @@ -44,8 +44,8 @@ * @return string データベースのバージョン */ - function sfGetDBVersion($dsn = "") { + function sfGetDBVersion($dsn = '') { $objQuery =& SC_Query_Ex::getSingletonInstance($dsn); - $val = $objQuery->getOne("select version()"); - return "MySQL " . $val; + $val = $objQuery->getOne('select version()'); + return 'MySQL ' . $val; } @@ -89,8 +89,8 @@ */ function getOrderYesterdaySql($method) { - return "SELECT ".$method."(total) FROM dtb_order " - . "WHERE del_flg = 0 " - . "AND cast(create_date as date) = DATE_ADD(current_date, interval -1 day) " - . "AND status <> " . ORDER_CANCEL; + return 'SELECT '.$method.'(total) FROM dtb_order ' + . 'WHERE del_flg = 0 ' + . 'AND cast(create_date as date) = DATE_ADD(current_date, interval -1 day) ' + . 'AND status <> ' . ORDER_CANCEL; } @@ -102,9 +102,9 @@ */ function getOrderMonthSql($method) { - return "SELECT ".$method."(total) FROM dtb_order " - . "WHERE del_flg = 0 " + return 'SELECT '.$method.'(total) FROM dtb_order ' + . 'WHERE del_flg = 0 ' . "AND date_format(create_date, '%Y/%m') = ? " . "AND date_format(create_date, '%Y/%m/%d') <> date_format(CURRENT_TIMESTAMP, '%Y/%m/%d') " - . "AND status <> " . ORDER_CANCEL; + . 'AND status <> ' . ORDER_CANCEL; } @@ -115,11 +115,11 @@ */ function getReviewYesterdaySql() { - return "SELECT COUNT(*) FROM dtb_review AS A " - . "LEFT JOIN dtb_products AS B " - . "ON A.product_id = B.product_id " - . "WHERE A.del_flg = 0 " - . "AND B.del_flg = 0 " - . "AND cast(A.create_date as date) = DATE_ADD(current_date, interval -1 day) " - . "AND cast(A.create_date as date) != current_date"; + return 'SELECT COUNT(*) FROM dtb_review AS A ' + . 'LEFT JOIN dtb_products AS B ' + . 'ON A.product_id = B.product_id ' + . 'WHERE A.del_flg = 0 ' + . 'AND B.del_flg = 0 ' + . 'AND cast(A.create_date as date) = DATE_ADD(current_date, interval -1 day) ' + . 'AND cast(A.create_date as date) != current_date'; } @@ -130,5 +130,5 @@ */ function getSendHistoryWhereStartdateSql() { - return "start_date BETWEEN date_add(CURRENT_TIMESTAMP,INTERVAL -5 minute) AND date_add(CURRENT_TIMESTAMP,INTERVAL 5 minute)"; + return 'start_date BETWEEN date_add(CURRENT_TIMESTAMP,INTERVAL -5 minute) AND date_add(CURRENT_TIMESTAMP,INTERVAL 5 minute)'; } @@ -140,5 +140,5 @@ */ function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') { - return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD(" . $dtb_order_alias . ".payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))"; + return '(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD(' . $dtb_order_alias . '.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))'; } @@ -196,5 +196,5 @@ */ function concatColumn($columns) { - $sql = "concat("; + $sql = 'concat('; $i = 0; $total = count($columns); @@ -202,9 +202,9 @@ $sql .= $column; if ($i < $total -1) { - $sql .= ", "; + $sql .= ', '; } $i++; } - $sql .= ")"; + $sql .= ')'; return $sql; } @@ -218,7 +218,7 @@ * @return array テーブル名の配列 */ - function findTableNames($expression = "") { + function findTableNames($expression = '') { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $sql = "SHOW TABLES LIKE ". $objQuery->quote("%" . $expression . "%"); + $sql = 'SHOW TABLES LIKE '. $objQuery->quote('%' . $expression . "%"); $arrColList = $objQuery->getAll($sql); $arrColList = SC_Utils_Ex::sfSwapArray($arrColList, false); Index: branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php =================================================================== --- branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php (revision 21490) +++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php (revision 21514) @@ -41,9 +41,9 @@ * @return string データベースのバージョン */ - function sfGetDBVersion($dsn = "") { + function sfGetDBVersion($dsn = '') { $objQuery =& SC_Query_Ex::getSingletonInstance($dsn); - $val = $objQuery->getOne("select version()"); - $arrLine = explode(" " , $val); - return $arrLine[0] . " " . str_replace(",", "", $arrLine[1]); + $val = $objQuery->getOne('select version()'); + $arrLine = explode(' ' , $val); + return $arrLine[0] . ' ' . str_replace(',', "", $arrLine[1]); } @@ -68,8 +68,8 @@ */ function getOrderYesterdaySql($method) { - return "SELECT ".$method."(total) FROM dtb_order " - . "WHERE del_flg = 0 " + return 'SELECT '.$method.'(total) FROM dtb_order ' + . 'WHERE del_flg = 0 ' . "AND to_char(create_date,'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') " - . "AND status <> " . ORDER_CANCEL; + . 'AND status <> ' . ORDER_CANCEL; } @@ -81,9 +81,9 @@ */ function getOrderMonthSql($method) { - return "SELECT ".$method."(total) FROM dtb_order " - . "WHERE del_flg = 0 " + return 'SELECT '.$method.'(total) FROM dtb_order ' + . 'WHERE del_flg = 0 ' . "AND to_char(create_date,'YYYY/MM') = ? " . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD') " - . "AND status <> " . ORDER_CANCEL; + . 'AND status <> ' . ORDER_CANCEL; } @@ -94,9 +94,9 @@ */ function getReviewYesterdaySql() { - return "SELECT COUNT(*) FROM dtb_review AS A " - . "LEFT JOIN dtb_products AS B " - . "ON A.product_id = B.product_id " - . "WHERE A.del_flg=0 " - . "AND B.del_flg = 0 " + return 'SELECT COUNT(*) FROM dtb_review AS A ' + . 'LEFT JOIN dtb_products AS B ' + . 'ON A.product_id = B.product_id ' + . 'WHERE A.del_flg=0 ' + . 'AND B.del_flg = 0 ' . "AND to_char(A.create_date, 'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') " . "AND to_char(A.create_date,'YYYY/MM/DD') != to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD')"; @@ -122,6 +122,6 @@ //downloadable_daysにNULLが入っている場合(無期限ダウンロード可能時)もあるので、NULLの場合は0日に補正 $downloadable_days = $baseinfo['downloadable_days']; - if($downloadable_days ==null || $downloadable_days == "")$downloadable_days=0; - return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND " . $dtb_order_alias . ".payment_date IS NOT NULL THEN 1 WHEN DATE(CURRENT_TIMESTAMP) <= DATE(" . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)"; + if($downloadable_days ==null || $downloadable_days == '')$downloadable_days=0; + return '(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND ' . $dtb_order_alias . '.payment_date IS NOT NULL THEN 1 WHEN DATE(CURRENT_TIMESTAMP) <= DATE(' . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)"; } @@ -179,5 +179,5 @@ */ function concatColumn($columns) { - $sql = ""; + $sql = ''; $i = 0; $total = count($columns); @@ -185,5 +185,5 @@ $sql .= $column; if ($i < $total -1) { - $sql .= " || "; + $sql .= ' || '; } $i++; @@ -201,19 +201,19 @@ * @return array テーブル名の配列 */ - function findTableNames($expression = "") { + function findTableNames($expression = '') { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $sql = " SELECT c.relname AS name, " - . " CASE c.relkind " + $sql = ' SELECT c.relname AS name, ' + . ' CASE c.relkind ' . " WHEN 'r' THEN 'table' " . " WHEN 'v' THEN 'view' END AS type " - . " FROM pg_catalog.pg_class c " - . "LEFT JOIN pg_catalog.pg_namespace n " - . " ON n.oid = c.relnamespace " + . ' FROM pg_catalog.pg_class c ' + . 'LEFT JOIN pg_catalog.pg_namespace n ' + . ' ON n.oid = c.relnamespace ' . " WHERE c.relkind IN ('r','v') " . " AND n.nspname NOT IN ('pg_catalog', 'pg_toast') " - . " AND pg_catalog.pg_table_is_visible(c.oid) " - . " AND c.relname LIKE ?" - . " ORDER BY 1,2;"; - $arrColList = $objQuery->getAll($sql, array("%" . $expression . "%")); + . ' AND pg_catalog.pg_table_is_visible(c.oid) ' + . ' AND c.relname LIKE ?' + . ' ORDER BY 1,2;'; + $arrColList = $objQuery->getAll($sql, array('%' . $expression . '%')); $arrColList = SC_Utils_Ex::sfSwapArray($arrColList, false); return $arrColList[0]; Index: branches/version-2_12-dev/data/class/SC_MobileImage.php =================================================================== --- branches/version-2_12-dev/data/class/SC_MobileImage.php (revision 21480) +++ branches/version-2_12-dev/data/class/SC_MobileImage.php (revision 21514) @@ -24,5 +24,5 @@ */ -define('MOBILE_IMAGE_INC_REALDIR', realpath(dirname( __FILE__)) . "/../include/"); +define('MOBILE_IMAGE_INC_REALDIR', realpath(dirname( __FILE__)) . '/../include/'); require_once MOBILE_IMAGE_INC_REALDIR . 'image_converter.inc'; @@ -57,5 +57,5 @@ return $buffer; } - while (($data = fgetcsv($fp, 1000, ",")) !== FALSE) { + while (($data = fgetcsv($fp, 1000, ',')) !== FALSE) { if ($data[1] == $model || $data[1] == '*') { $cacheSize = $data[2]; Index: branches/version-2_12-dev/data/class/SC_Batch.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Batch.php (revision 21490) +++ branches/version-2_12-dev/data/class/SC_Batch.php (revision 21514) @@ -40,4 +40,4 @@ * @return mixed バッチの実行結果 */ - function execute($argv = "") {} + function execute($argv = '') {} } Index: branches/version-2_12-dev/data/class/SC_Image.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Image.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_Image.php (revision 21514) @@ -30,5 +30,5 @@ // ヘッダファイル読込 if (!ereg("/$", $tmp_dir)) { - $this->tmp_dir = $tmp_dir . "/"; + $this->tmp_dir = $tmp_dir . '/'; } else { $this->tmp_dir = $tmp_dir; @@ -39,5 +39,5 @@ function makeTempImage($keyname, $max_width, $max_height) { // 一意なIDを取得する。 - $mainname = uniqid("")."."; + $mainname = uniqid('').'.'; // 拡張子以外を置き換える。 $newFileName = ereg_replace("^.*\.",$mainname, $_FILES[$keyname]['name']); @@ -51,5 +51,5 @@ // コピー元ファイル、コピー先ディレクトリが存在する場合にのみ実行する $from_path = $this->tmp_dir.$filename; - $to_path = $save_dir."/".$filename; + $to_path = $save_dir.'/'.$filename; if (file_exists($from_path) && file_exists($save_dir)) { if (copy($from_path , $to_path)) { @@ -57,5 +57,5 @@ } } else { - GC_Utils_Ex::gfDebugLog($from_path."->".$to_path."のcopyに失敗しました。"); + GC_Utils_Ex::gfDebugLog($from_path.'->'.$to_path.'のcopyに失敗しました。'); } } @@ -63,6 +63,6 @@ //---- 指定ファイルを削除 function deleteImage($filename, $dir) { - if (file_exists($dir."/".$filename)) { - unlink($dir."/".$filename); + if (file_exists($dir.'/'.$filename)) { + unlink($dir.'/'.$filename); } } @@ -90,5 +90,5 @@ //拡張子取得 if (!$ext) { - $array_ext = explode(".", $FromImgPath); + $array_ext = explode('.', $FromImgPath); $ext = $array_ext[count($array_ext) - 1]; } @@ -101,9 +101,9 @@ if (empty($FromImgPath) || empty($ToImgPath)) { - return array(0,"出力元画像パス、または出力先フォルダが指定されていません。"); + return array(0,'出力元画像パス、または出力先フォルダが指定されていません。'); } if (!file_exists($FromImgPath)) { - return array(0,"出力元画像が見つかりません。"); + return array(0,'出力元画像が見つかりません。'); } @@ -113,5 +113,5 @@ // 画像の種類が不明 or swf if (!$size[2] || $size[2] > 3) { - return array(0,"画像形式がサポートされていません。"); + return array(0,'画像形式がサポートされていません。'); } @@ -141,6 +141,6 @@ // サムネイル画像ファイル名作成処理 - $tmp = array_pop(explode("/",$FromImgPath)); // /の一番最後を切り出し - $FromFileName = array_shift(explode(".",$tmp)); // .で区切られた部分を切り出し + $tmp = array_pop(explode('/',$FromImgPath)); // /の一番最後を切り出し + $FromFileName = array_shift(explode('.',$tmp)); // .で区切られた部分を切り出し $ToFile = $PreWord.$FromFileName; // 拡張子以外の部分までを作成 @@ -153,10 +153,10 @@ $ToFile = $newFileName; } elseif ($ext) { - $ToFile .= "." . $ext; + $ToFile .= '.' . $ext; } else { - $ToFile .= ".gif"; + $ToFile .= '.gif'; } if (!@copy($FromImgPath , $ToImgPath.$ToFile)) { // エラー処理 - return array(0,"ファイルのコピーに失敗しました。"); + return array(0,'ファイルのコピーに失敗しました。'); } ImageDestroy($ImgNew); @@ -173,7 +173,7 @@ $ToFile = $newFileName; } elseif ($ext) { - $ToFile .= "." . $ext; - } else { - $ToFile .= ".png"; + $ToFile .= '.' . $ext; + } else { + $ToFile .= '.png'; } $TmpPath = $ToImgPath.$ToFile; @@ -181,5 +181,5 @@ // 画像が作成されていない場合 if (!@file_exists($TmpPath)) { - return array(0,"画像の出力に失敗しました。"); + return array(0,'画像の出力に失敗しました。'); } ImageDestroy($ImgNew); @@ -200,7 +200,7 @@ $ToFile = $newFileName; } elseif ($ext) { - $ToFile .= "." . $ext; - } else { - $ToFile .= ".jpg"; + $ToFile .= '.' . $ext; + } else { + $ToFile .= '.jpg'; } $TmpPath = $ToImgPath.$ToFile; @@ -221,7 +221,7 @@ $ToFile = $newFileName; } elseif ($ext) { - $ToFile .= "." . $ext; - } else { - $ToFile .= ".png"; + $ToFile .= '.' . $ext; + } else { + $ToFile .= '.png'; } $TmpPath = $ToImgPath.$ToFile; @@ -229,5 +229,5 @@ // 画像が作成されていない場合 if (!@file_exists($TmpPath)) { - return array(0,"画像の出力に失敗しました。"); + return array(0,'画像の出力に失敗しました。'); } $RetVal = $ToFile; Index: branches/version-2_12-dev/data/class/plugin/SC_Plugin_TemplateTransformer.php =================================================================== --- branches/version-2_12-dev/data/class/plugin/SC_Plugin_TemplateTransformer.php (revision 21512) +++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_TemplateTransformer.php (revision 21514) @@ -64,7 +64,7 @@ // 対象のパスが存在するかを検証する, if ($html === false) { - $err_msg = SMARTY_TEMPLATES_REALDIR . $tmpl. "は存在しないか、読み取れません"; + $err_msg = SMARTY_TEMPLATES_REALDIR . $tmpl. 'は存在しないか、読み取れません'; } elseif (!in_array(mb_detect_encoding($html), array('ASCII', 'UTF-8'))) { - $err_msg = $tmpl. "の文字コードがUTF-8ではありません"; + $err_msg = $tmpl. 'の文字コードがUTF-8ではありません'; } @@ -393,18 +393,18 @@ if (count($this->arrErr)) { // エラーメッセージ組み立て - $err_msg = ""; + $err_msg = ''; foreach ($this->arrErr as $arrErr) { if ($arrErr['err_msg']) { - $err_msg .= "
".$arrErr['err_msg']; + $err_msg .= '
'.$arrErr['err_msg']; } else { if ($arrErr['type'] == SC_Plugin_TemplateTransformList::ERR_TARGET_ELEMENT_NOT_FOUND) { $err_msg .= "
${arrErr['selector']} が存在しません"; } else { - $err_msg .= "
".print_r($arrErr, true); + $err_msg .= '
'.print_r($arrErr, true); } } } // TODO エラー処理 - // ECC_Plugin_Engine::dispError(FREE_ERROR_MSG, "テンプレートの操作に失敗しました。".$err_msg); + // ECC_Plugin_Engine::dispError(FREE_ERROR_MSG, 'テンプレートの操作に失敗しました。'.$err_msg); } elseif ($this->snip_count) { Index: branches/version-2_12-dev/data/class/SC_UploadFile.php =================================================================== --- branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21490) +++ branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21514) @@ -96,5 +96,5 @@ if (!($_FILES[$keyname]['size'] > 0)) { - $objErr->arrErr[$keyname] = "※ " . $this->disp_name[$arrKeyname[$keyname]] . "がアップロードされていません。
"; + $objErr->arrErr[$keyname] = '※ ' . $this->disp_name[$arrKeyname[$keyname]] . 'がアップロードされていません。
'; } else { foreach ($this->keyname as $val) { @@ -122,5 +122,5 @@ } if (move_uploaded_file($_FILES[$keyname]['tmp_name'], $this->temp_dir . $this->temp_file[$cnt])) { - GC_Utils_Ex::gfPrintLog($_FILES[$keyname]['name']." -> ". $this->temp_dir . $this->temp_file[$cnt]); + GC_Utils_Ex::gfPrintLog($_FILES[$keyname]['name'].' -> '. $this->temp_dir . $this->temp_file[$cnt]); } else { $objErr->arrErr[$keyname] = '※ ファイルのアップロードに失敗しました。
'; @@ -142,5 +142,5 @@ $arrKeyname = array_flip($this->keyname); if (!($_FILES[$keyname]['size'] > 0)) { - $objErr->arrErr[$keyname] = "※ " . $this->disp_name[$arrKeyname[$keyname]] . "がアップロードされていません。(ファイルがアップロードできない場合は、.htaccessファイルのphp_value upload_max_filesizeを調整してください)
"; + $objErr->arrErr[$keyname] = '※ ' . $this->disp_name[$arrKeyname[$keyname]] . 'がアップロードされていません。(ファイルがアップロードできない場合は、.htaccessファイルのphp_value upload_max_filesizeを調整してください)
'; } else { foreach ($this->keyname as $val) { @@ -158,5 +158,5 @@ set_time_limit(0); $result = copy($_FILES[$keyname]['tmp_name'], $this->temp_dir . $this->temp_file[$cnt]); - GC_Utils_Ex::gfPrintLog($result." -> ". $this->temp_dir . $this->temp_file[$cnt]); + GC_Utils_Ex::gfPrintLog($result.' -> '. $this->temp_dir . $this->temp_file[$cnt]); } } @@ -174,9 +174,9 @@ if ($val == $keyname) { // 一時ファイルの場合削除する。 - if ($this->temp_file[$cnt] != "") { + if ($this->temp_file[$cnt] != '') { $objImage->deleteImage($this->temp_file[$cnt], $this->temp_dir); } - $this->temp_file[$cnt] = ""; - $this->save_file[$cnt] = ""; + $this->temp_file[$cnt] = ''; + $this->save_file[$cnt] = ''; } $cnt++; @@ -191,9 +191,9 @@ if ($val == $keyname) { // 一時ファイルの場合削除する。 - if ($this->temp_file[$cnt] != "") { + if ($this->temp_file[$cnt] != '') { $objImage->deleteImage($this->temp_file[$cnt], $this->temp_dir); } - $this->temp_file[$cnt] = ""; - //$this->save_file[$cnt] = ""; + $this->temp_file[$cnt] = ''; + //$this->save_file[$cnt] = ''; } $cnt++; @@ -204,8 +204,8 @@ function getTempFilePath($keyname) { $cnt = 0; - $filepath = ""; + $filepath = ''; foreach ($this->keyname as $val) { if ($val == $keyname) { - if ($this->temp_file[$cnt] != "") { + if ($this->temp_file[$cnt] != '') { $filepath = $this->temp_dir . $this->temp_file[$cnt]; } @@ -222,5 +222,5 @@ foreach ($this->keyname as $val) { - if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') { $objImage->moveTempImage($this->temp_file[$cnt], $this->save_dir); @@ -228,6 +228,6 @@ // すでに保存ファイルがあった場合は削除する。 if(isset($this->save_file[$cnt]) - && $this->save_file[$cnt] != "" - && !ereg("^sub/", $this->save_file[$cnt])) { + && $this->save_file[$cnt] != '' + && !ereg('^sub/', $this->save_file[$cnt])) { $objImage->deleteImage($this->save_file[$cnt], $this->save_dir); @@ -243,10 +243,10 @@ $objImage = new SC_Image_Ex($this->temp_dir); foreach ($this->keyname as $val) { - if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') { $objImage->moveTempImage($this->temp_file[$cnt], $this->save_dir); // すでに保存ファイルがあった場合は削除する。 if(isset($this->save_file[$cnt]) - && $this->save_file[$cnt] != "" - && !ereg("^sub/", $this->save_file[$cnt])) + && $this->save_file[$cnt] != '' + && !ereg('^sub/', $this->save_file[$cnt])) { $objImage->deleteImage($this->save_file[$cnt], $this->save_dir); @@ -265,5 +265,5 @@ $arrRet['temp_' . $val] = $this->temp_file[$cnt]; } - if (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { + if (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != '') { $arrRet['save_' . $val] = $this->save_file[$cnt]; } @@ -309,18 +309,18 @@ $cnt = 0; foreach ($this->keyname as $val) { - if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') { // ファイルパスチェック(パスのスラッシュ/が連続しないようにする。) if (ereg("/$", $temp_url)) { $arrRet[$val]['filepath'] = $temp_url . $this->temp_file[$cnt]; } else { - $arrRet[$val]['filepath'] = $temp_url . "/" . $this->temp_file[$cnt]; + $arrRet[$val]['filepath'] = $temp_url . '/' . $this->temp_file[$cnt]; } $arrRet[$val]['real_filepath'] = $this->temp_dir . $this->temp_file[$cnt]; - } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { + } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != '') { // ファイルパスチェック(パスのスラッシュ/が連続しないようにする。) if (ereg("/$", $save_url)) { $arrRet[$val]['filepath'] = $save_url . $this->save_file[$cnt]; } else { - $arrRet[$val]['filepath'] = $save_url . "/" . $this->save_file[$cnt]; + $arrRet[$val]['filepath'] = $save_url . '/' . $this->save_file[$cnt]; } $arrRet[$val]['real_filepath'] = $this->save_dir . $this->save_file[$cnt]; @@ -351,10 +351,10 @@ // フォームに渡す用のダウンロードファイル情報を返す function getFormDownFile() { - $arrRet = ""; - $cnt = 0; - foreach ($this->keyname as $val) { - if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + $arrRet = ''; + $cnt = 0; + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') { $arrRet = $this->temp_file[$cnt]; - } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { + } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != '') { $arrRet = $this->save_file[$cnt]; } @@ -369,5 +369,5 @@ if (isset($this->temp_file[$cnt])) { $arrRet[$val] = $this->temp_file[$cnt]; - } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { + } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != '') { $arrRet[$val] = $this->save_file[$cnt]; } @@ -381,8 +381,8 @@ $cnt = 0; foreach ($this->keyname as $val) { - if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') { $arrRet[$val] = $this->temp_file[$cnt]; } else { - $arrRet[$val] = isset($this->save_file[$cnt]) ? $this->save_file[$cnt] : ""; + $arrRet[$val] = isset($this->save_file[$cnt]) ? $this->save_file[$cnt] : ''; } $cnt++; @@ -395,5 +395,5 @@ $cnt = 0; foreach ($this->keyname as $val) { - if (isset($arrVal[$val]) && $arrVal[$val] != "") { + if (isset($arrVal[$val]) && $arrVal[$val] != '') { $this->save_file[$cnt] = $arrVal[$val]; } @@ -424,5 +424,5 @@ $cnt = 0; foreach ($this->keyname as $val) { - if ($arrVal[$val] != "" && $val == 'tv_products_image') { + if ($arrVal[$val] != '' && $val == 'tv_products_image') { $this->save_file[$cnt] = $arrVal[$val]; } @@ -436,6 +436,6 @@ $cnt = 0; foreach ($this->keyname as $val) { - if ($arrVal[$val] != "") { - if ($this->save_file[$cnt] == "" && !ereg("^sub/", $arrVal[$val])) { + if ($arrVal[$val] != '') { + if ($this->save_file[$cnt] == '' && !ereg('^sub/', $arrVal[$val])) { $objImage->deleteImage($arrVal[$val], $this->save_dir); } @@ -449,6 +449,6 @@ $objImage = new SC_Image_Ex($this->temp_dir); $cnt = 0; - if ($arrVal['down_realfilename'] != "") { - if ($this->save_file[$cnt] == "" && !ereg("^sub/", $arrVal['down_realfilename'])) { + if ($arrVal['down_realfilename'] != '') { + if ($this->save_file[$cnt] == '' && !ereg('^sub/', $arrVal['down_realfilename'])) { $objImage->deleteImage($arrVal['down_realfilename'], $this->save_dir); } @@ -457,16 +457,16 @@ // 必須判定 - function checkEXISTS($keyname = "") { + function checkEXISTS($keyname = '') { $cnt = 0; $arrRet = array(); foreach ($this->keyname as $val) { - if ($val == $keyname || $keyname == "") { + if ($val == $keyname || $keyname == '') { // 必須であればエラーチェック if ($this->necessary[$cnt] == true) { - if (!isset($this->save_file[$cnt])) $this->save_file[$cnt] = ""; - if (!isset($this->temp_file[$cnt])) $this->temp_file[$cnt] = ""; - if($this->save_file[$cnt] == "" - && $this->temp_file[$cnt] == "") { - $arrRet[$val] = "※ " . $this->disp_name[$cnt] . "がアップロードされていません。
"; + if (!isset($this->save_file[$cnt])) $this->save_file[$cnt] = ''; + if (!isset($this->temp_file[$cnt])) $this->temp_file[$cnt] = ''; + if($this->save_file[$cnt] == '' + && $this->temp_file[$cnt] == '') { + $arrRet[$val] = '※ ' . $this->disp_name[$cnt] . 'がアップロードされていません。
'; } } @@ -479,5 +479,5 @@ // 拡大率を指定して画像保存 function saveResizeImage($keyname, $to_w, $to_h) { - $path = ""; + $path = ''; // keynameの添付ファイルを取得 @@ -499,5 +499,5 @@ * @return string */ - function lfGetTmpImageName($rename, $keyname = "", $uploadfile = "") { + function lfGetTmpImageName($rename, $keyname = '', $uploadfile = '') { if ($rename === true) { Index: branches/version-2_12-dev/data/class/SC_CheckError.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21514) @@ -32,6 +32,6 @@ // チェック対象の値が含まれる配列をセットする。 - function SC_CheckError($array = "") { - if ($array != "") { + function SC_CheckError($array = '') { + if ($array != '') { $this->arrParam = $array; } else { @@ -66,5 +66,5 @@ foreach ($value[2] as $tag) { $tag = preg_replace('/^\\//', '\/', $tag); - if (preg_match("/^" . $tag . "$/i", $val)) { + if (preg_match('/^' . $tag . "$/i", $val)) { $find = true; break; @@ -73,5 +73,5 @@ if (!$find) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "に許可されていないタグ[" . strtoupper($val) . "]が含まれています。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に許可されていないタグ[' . strtoupper($val) . "]が含まれています。
"; return; } @@ -92,7 +92,7 @@ $this->createParam($value); if (!is_array($this->arrParam[$value[1]]) && strlen($this->arrParam[$value[1]]) == 0) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が入力されていません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が入力されていません。
'; } else if (is_array($this->arrParam[$value[1]]) && count($this->arrParam[$value[1]]) == 0) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が選択されていません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が選択されていません。
'; } } @@ -111,5 +111,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[0]]) == 0) { - $this->arrErr[$value[0]] = "※ " . $value[0] . "が入力されていません。
"; + $this->arrErr[$value[0]] = '※ ' . $value[0] . 'が入力されていません。
'; } } @@ -128,5 +128,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) != 0 && preg_match("/^[ 　\t\r\n]+$/", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "にスペース、タブ、改行のみの入力はできません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'にスペース、タブ、改行のみの入力はできません。
'; } } @@ -145,5 +145,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) != 0 && preg_match("/[　 \t\r\n]+/u", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "にスペース、タブ、改行は含めないで下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'にスペース、タブ、改行は含めないで下さい。
'; } } @@ -156,5 +156,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) != 0 && preg_match("/^[0]+[0-9]+$/", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "に0で始まる数値が入力されています。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に0で始まる数値が入力されています。
'; } } @@ -173,5 +173,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) == 0) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が選択されていません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が選択されていません。
'; } } @@ -191,5 +191,5 @@ // 文字数の取得 if ($this->arrParam[$value[2]] !== $this->arrParam[$value[3]]) { - $this->arrErr[$value[2]] = "※ " . $value[0] . "と" . $value[1] . "が一致しません。
"; + $this->arrErr[$value[2]] = '※ ' . $value[0] . 'と' . $value[1] . "が一致しません。
"; } } @@ -209,5 +209,5 @@ // 文字数の取得 if ($this->arrParam[$value[2]] == $this->arrParam[$value[3]]) { - $this->arrErr[$value[2]] = "※ " . $value[0] . "と" . $value[1] . "は、同じ値を使用できません。
"; + $this->arrErr[$value[2]] = '※ ' . $value[0] . 'と' . $value[1] . "は、同じ値を使用できません。
"; } } @@ -226,6 +226,6 @@ $this->createParam($value); // 文字数の取得 - if ($this->arrParam[$value[2]] != "" && $this->arrParam[$value[3]] != "" && ($this->arrParam[$value[2]] > $this->arrParam[$value[3]])) { - $this->arrErr[$value[2]] = "※ " . $value[0] . "は" . $value[1] . "より大きい値を入力できません。
"; + if ($this->arrParam[$value[2]] != '' && $this->arrParam[$value[3]] != '' && ($this->arrParam[$value[2]] > $this->arrParam[$value[3]])) { + $this->arrErr[$value[2]] = '※ ' . $value[0] . 'は' . $value[1] . "より大きい値を入力できません。
"; } } @@ -245,5 +245,5 @@ // 文字数の取得 if (mb_strlen($this->arrParam[$value[1]]) > $value[2]) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "字以下で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は' . $value[2] . "字以下で入力してください。
"; } } @@ -263,5 +263,5 @@ // 文字数の取得 if (mb_strlen($this->arrParam[$value[1]]) < $value[2]) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "字以上で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は' . $value[2] . "字以上で入力してください。
"; } } @@ -281,5 +281,5 @@ // 文字数の取得 if ($this->arrParam[$value[1]] > $value[2]) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "以下で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は' . $value[2] . "以下で入力してください。
"; } } @@ -298,5 +298,5 @@ $this->createParam($value); if ($this->arrParam[$value[1]] < $value[2]) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "以上で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は' . $value[2] . "以上で入力してください。
"; } } @@ -315,5 +315,5 @@ $this->createParam($value); if ($this->numelicCheck($this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は数字で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は数字で入力してください。
'; } } @@ -332,5 +332,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !is_numeric($this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は数字で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は数字で入力してください。
'; } } @@ -342,5 +342,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !ctype_alpha($this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は半角英字で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は半角英字で入力してください。
'; } } @@ -377,5 +377,5 @@ // すべての項目が満たされていない場合を判定(一部だけ入力されている状態) if ($cnt > 0 && $cnt < 3) { - $this->arrErr[$value[1]] .= "※ " . $value[0] . "はすべての項目を入力してください。
"; + $this->arrErr[$value[1]] .= '※ ' . $value[0] . 'はすべての項目を入力してください。
'; } @@ -383,7 +383,7 @@ for ($i = 1; $i <= 3; $i++) { if (strlen($this->arrParam[$value[$i]]) > 0 && strlen($this->arrParam[$value[$i]]) > $telItemLen) { - $this->arrErr[$value[$i]] .= "※ " . $value[0] . $i . "は" . $telItemLen . "字以内で入力してください。
"; + $this->arrErr[$value[$i]] .= '※ ' . $value[0] . $i . 'は' . $telItemLen . "字以内で入力してください。
"; } else if ($this->numelicCheck($this->arrParam[$value[1]])) { - $this->arrErr[$value[$i]] .= "※ " . $value[0] . $i . "は数字で入力してください。
"; + $this->arrErr[$value[$i]] .= '※ ' . $value[0] . $i . 'は数字で入力してください。
'; } $total_count += strlen($this->arrParam[$value[$i]]); @@ -392,5 +392,5 @@ // 合計値チェック if ($total_count > $telLen) { - $this->arrErr[$value[3]] .= "※ " . $value[0] . "は" . $telLen . "文字以内で入力してください。
"; + $this->arrErr[$value[3]] .= '※ ' . $value[0] . 'は' . $telLen . "文字以内で入力してください。
"; } } @@ -420,5 +420,5 @@ if ($blank) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が入力されていません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が入力されていません。
'; } } @@ -451,5 +451,5 @@ if ($blank && $input) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'はすべての項目を入力して下さい。
'; } } @@ -479,5 +479,5 @@ if (!$input) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が入力されていません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が入力されていません。
'; } } @@ -513,5 +513,5 @@ if ($error) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は先頭の項目から順番に入力して下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は先頭の項目から順番に入力して下さい。
'; } } @@ -526,5 +526,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[ァ-ヶｦ-ﾟー]+$/u", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "はカタカナで入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'はカタカナで入力してください。
'; } } @@ -539,5 +539,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^([　 \t\r\n]|[ァ-ヶ]|[ー])+$/u", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "はカタカナで入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'はカタカナで入力してください。
'; } } @@ -552,5 +552,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !ctype_alnum($this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は英数字で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は英数字で入力してください。
'; } } @@ -565,5 +565,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:graph:]|[:space:]]+$/i", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は英数記号で入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は英数記号で入力してください。
'; } } @@ -575,5 +575,5 @@ $this->createParam($value); if ($this->arrParam[$value[1]] == '0') { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は1以上を入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は1以上を入力してください。
'; } } @@ -653,5 +653,5 @@ if (!preg_match($regexp, $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "の形式が不正です。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'の形式が不正です。
'; return; } @@ -672,5 +672,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[a-zA-Z0-9_\.@\+\?-]+$/i",$this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "に使用する文字を正しく入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に使用する文字を正しく入力してください。
'; } } @@ -684,5 +684,5 @@ } if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("@^https?://+($|[a-zA-Z0-9_~=:&\?\.\/-])+$@i", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "を正しく入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'を正しく入力してください。
'; } } @@ -704,5 +704,5 @@ $param = trim($param); if (long2ip(ip2long($param)) != trim($param) && !empty($param)) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "に正しい形式のIPアドレスを入力してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に正しい形式のIPアドレスを入力してください。
'; } } @@ -719,19 +719,19 @@ $this->createParam($value); - if ($_FILES[$value[1]]['name'] != "") { + if ($_FILES[$value[1]]['name'] != '') { $errFlag = 1; - $array_ext = explode(".", $_FILES[$value[1]]['name']); - - $strExt = ""; + $array_ext = explode('.', $_FILES[$value[1]]['name']); + + $strExt = ''; foreach ($value[2] as $checkExt) { - $ext = ""; + $ext = ''; // チェック拡張子のピリオドの数を取得('tar.gz'の場合1個、'jpg'のように通常は0個) - $count_period = substr_count($checkExt, "."); + $count_period = substr_count($checkExt, '.'); if ($count_period > 0) { for ($i = max(array_keys($array_ext)) - $count_period; $i < count($array_ext); $i++) { - $ext .= $array_ext[$i] . "."; + $ext .= $array_ext[$i] . '.'; } $ext = preg_replace("/.$/", "" ,$ext); @@ -746,5 +746,5 @@ } - if ($strExt == "") { + if ($strExt == '') { $strExt.= $checkExt; } else { @@ -754,5 +754,5 @@ } if ($errFlag == 1) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "で許可されている形式は、" . $strExt . "です。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'で許可されている形式は、' . $strExt . "です。
"; } } @@ -767,5 +767,5 @@ $this->createParam($value); - if ($value[2] != "") { + if ($value[2] != '') { $dir = $value[2]; } else { @@ -773,9 +773,9 @@ } - $path = $dir . "/" . $this->arrParam[$value[1]]; - $path = str_replace("//", "/", $path); - - if ($this->arrParam[$value[1]] != "" && !file_exists($path)) { - $this->arrErr[$value[1]] = "※ " . $path . "が見つかりません。
"; + $path = $dir . '/' . $this->arrParam[$value[1]]; + $path = str_replace('//', '/', $path); + + if ($this->arrParam[$value[1]] != '' && !file_exists($path)) { + $this->arrErr[$value[1]] = '※ ' . $path . 'が見つかりません。
'; } } @@ -789,6 +789,6 @@ } $this->createParam($value); - if (!($_FILES[$value[1]]['size'] != "" && $_FILES[$value[1]]['size'] > 0)) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "をアップロードして下さい。
"; + if (!($_FILES[$value[1]]['size'] != '' && $_FILES[$value[1]]['size'] > 0)) { + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'をアップロードして下さい。
'; } } @@ -808,10 +808,10 @@ $byte = 'MB'; } - $this->arrErr[$value[1]] = "※ " . $value[0] . "のファイルサイズは" . $value[2] . $byte . "以下のものを使用してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'のファイルサイズは' . $value[2] . $byte . "以下のものを使用してください。
"; } } /*　ファイル名の判定　*/ - // 入力文字が英数字,'_',"-"以外ならエラーを返す + // 入力文字が英数字,'_','-'以外ならエラーを返す // value[0] = 項目名 value[1] = 判定対象文字列 function FILE_NAME_CHECK($value) { @@ -821,10 +821,10 @@ $this->createParam($value); if (strlen($_FILES[$value[1]]['name']) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $_FILES[$value[1]]['name'])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "のファイル名に日本語やスペースは使用しないで下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'のファイル名に日本語やスペースは使用しないで下さい。
'; } } /*　ファイル名の判定(アップロード以外の時)　*/ - // 入力文字が英数字,'_',"-"以外ならエラーを返す + // 入力文字が英数字,'_','-'以外ならエラーを返す // value[0] = 項目名 value[1] = 判定対象文字列 function FILE_NAME_CHECK_BY_NOUPLOAD($value) { @@ -834,5 +834,5 @@ $this->createParam($value); if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $this->arrParam[$value[1]]) || preg_match("/[\\]/" ,$this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "のファイル名に日本語やスペースは使用しないで下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'のファイル名に日本語やスペースは使用しないで下さい。
'; } } @@ -852,7 +852,7 @@ // 年月日のどれかが入力されていない。 if (!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0)) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'はすべての項目を入力して下さい。
'; } else if (! checkdate($this->arrParam[$value[2]], $this->arrParam[$value[3]], $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が正しくありません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が正しくありません。
'; } } @@ -875,7 +875,7 @@ // 年月日時のどれかが入力されていない。 if (!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && strlen($this->arrParam[$value[4]]) > 0 && strlen($this->arrParam[$value[5]]) > 0)) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'はすべての項目を入力して下さい。
'; } else if (! checkdate($this->arrParam[$value[2]], $this->arrParam[$value[3]], $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が正しくありません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が正しくありません。
'; } } @@ -895,7 +895,7 @@ // 年月日時のどれかが入力されていない。 if (!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0)) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'はすべての項目を入力して下さい。
'; } else if (! checkdate($this->arrParam[$value[2]], 1, $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "が正しくありません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'が正しくありません。
'; } } @@ -961,16 +961,16 @@ $error = 0; if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]])) { - $this->arrErr[$value[2]] = "※ " . $value[0] . "を正しく指定してください。
"; + $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。
'; } if ((strlen($this->arrParam[$value[5]]) > 0 || strlen($this->arrParam[$value[6]]) > 0 || strlen($this->arrParam[$value[7]]) > 0) && ! checkdate($this->arrParam[$value[6]], $this->arrParam[$value[7]], $this->arrParam[$value[5]])) { - $this->arrErr[$value[5]] = "※ " . $value[1] . "を正しく指定してください。
"; + $this->arrErr[$value[5]] = '※ ' . $value[1] . 'を正しく指定してください。
'; } if ((strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && strlen($this->arrParam[$value[4]]) > 0) && (strlen($this->arrParam[$value[5]]) > 0 || strlen($this->arrParam[$value[6]]) > 0 || strlen($this->arrParam[$value[7]]) > 0)) { - $date1 = $this->arrParam[$value[2]] .sprintf("%02d", $this->arrParam[$value[3]]) .sprintf("%02d",$this->arrParam[$value[4]]) .'000000'; - $date2 = $this->arrParam[$value[5]] .sprintf("%02d", $this->arrParam[$value[6]]) .sprintf("%02d",$this->arrParam[$value[7]]) .'235959'; - - if (($this->arrErr[$value[2]] == "" && $this->arrErr[$value[5]] == "") && $date1 > $date2) { - $this->arrErr[$value[2]] = "※ " .$value[0]. "と" .$value[1]. "の期間指定が不正です。
"; + $date1 = $this->arrParam[$value[2]] .sprintf('%02d', $this->arrParam[$value[3]]) .sprintf('%02d',$this->arrParam[$value[4]]) .'000000'; + $date2 = $this->arrParam[$value[5]] .sprintf('%02d', $this->arrParam[$value[6]]) .sprintf('%02d',$this->arrParam[$value[7]]) .'235959'; + + if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[5]] == '') && $date1 > $date2) { + $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. "の期間指定が不正です。
"; } } @@ -1012,19 +1012,19 @@ $error = 0; if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]])) { - $this->arrErr[$value[2]] = "※ " . $value[0] . "を正しく指定してください。
"; + $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。
'; } if ((strlen($this->arrParam[$value[8]]) > 0 || strlen($this->arrParam[$value[9]]) > 0 || strlen($this->arrParam[$value[10]]) > 0 || strlen($this->arrParam[$value[11]]) > 0) && ! checkdate($this->arrParam[$value[9]], $this->arrParam[$value[10]], $this->arrParam[$value[8]])) { - $this->arrErr[$value[8]] = "※ " . $value[1] . "を正しく指定してください。
"; + $this->arrErr[$value[8]] = '※ ' . $value[1] . 'を正しく指定してください。
'; } if ((strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && strlen($this->arrParam[$value[4]]) > 0 && strlen($this->arrParam[$value[5]]) > 0) && (strlen($this->arrParam[$value[8]]) > 0 || strlen($this->arrParam[$value[9]]) > 0 || strlen($this->arrParam[$value[10]]) > 0 || strlen($this->arrParam[$value[11]]) > 0)) { - $date1 = $this->arrParam[$value[2]] .sprintf("%02d", $this->arrParam[$value[3]]) .sprintf("%02d",$this->arrParam[$value[4]]) .sprintf("%02d",$this->arrParam[$value[5]]).sprintf("%02d",$this->arrParam[$value[6]]).sprintf("%02d",$this->arrParam[$value[7]]); - $date2 = $this->arrParam[$value[8]] .sprintf("%02d", $this->arrParam[$value[9]]) .sprintf("%02d",$this->arrParam[$value[10]]) .sprintf("%02d",$this->arrParam[$value[11]]).sprintf("%02d",$this->arrParam[$value[12]]).sprintf("%02d",$this->arrParam[$value[13]]); - - if (($this->arrErr[$value[2]] == "" && $this->arrErr[$value[8]] == "") && $date1 > $date2) { - $this->arrErr[$value[2]] = "※ " .$value[0]. "と" .$value[1]. "の期間指定が不正です。
"; + $date1 = $this->arrParam[$value[2]] .sprintf('%02d', $this->arrParam[$value[3]]) .sprintf('%02d',$this->arrParam[$value[4]]) .sprintf("%02d",$this->arrParam[$value[5]]).sprintf("%02d",$this->arrParam[$value[6]]).sprintf("%02d",$this->arrParam[$value[7]]); + $date2 = $this->arrParam[$value[8]] .sprintf('%02d', $this->arrParam[$value[9]]) .sprintf('%02d',$this->arrParam[$value[10]]) .sprintf("%02d",$this->arrParam[$value[11]]).sprintf("%02d",$this->arrParam[$value[12]]).sprintf("%02d",$this->arrParam[$value[13]]); + + if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[8]] == '') && $date1 > $date2) { + $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. "の期間指定が不正です。
"; } if ($date1 == $date2) { - $this->arrErr[$value[2]] = "※ " .$value[0]. "と" .$value[1]. "の期間指定が不正です。
"; + $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. "の期間指定が不正です。
"; } @@ -1056,16 +1056,16 @@ $error = 0; if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0) && ! checkdate($this->arrParam[$value[3]], 1, $this->arrParam[$value[2]])) { - $this->arrErr[$value[2]] = "※ " . $value[0] . "を正しく指定してください。
"; + $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。
'; } if ((strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[5]], 1, $this->arrParam[$value[4]])) { - $this->arrErr[$value[4]] = "※ " . $value[1] . "を正しく指定してください。
"; + $this->arrErr[$value[4]] = '※ ' . $value[1] . 'を正しく指定してください。
'; } if ((strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && (strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0))) { - $date1 = $this->arrParam[$value[2]] .sprintf("%02d", $this->arrParam[$value[3]]); - $date2 = $this->arrParam[$value[4]] .sprintf("%02d", $this->arrParam[$value[5]]); - - if (($this->arrErr[$value[2]] == "" && $this->arrErr[$value[5]] == "") && $date1 > $date2) { - $this->arrErr[$value[2]] = "※ " .$value[0]. "と" .$value[1]. "の期間指定が不正です。
"; + $date1 = $this->arrParam[$value[2]] .sprintf('%02d', $this->arrParam[$value[3]]); + $date2 = $this->arrParam[$value[4]] .sprintf('%02d', $this->arrParam[$value[5]]); + + if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[5]] == '') && $date1 > $date2) { + $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. "の期間指定が不正です。
"; } } @@ -1079,5 +1079,5 @@ $this->createParam($value); if (!is_dir($this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ 指定した" . $value[0] . "は存在しません。
"; + $this->arrErr[$value[1]] = '※ 指定した' . $value[0] . 'は存在しません。
'; } } @@ -1089,5 +1089,5 @@ } if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^\.[^.]+\..+/i", $this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "の形式が不正です。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'の形式が不正です。
'; } } @@ -1103,5 +1103,5 @@ $objMobile = new SC_Helper_Mobile_Ex(); if (strlen($this->arrParam[$value[1]]) > 0 && !$objMobile->gfIsMobileMailAddress($this->arrParam[$value[1]])) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は携帯電話のものではありません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は携帯電話のものではありません。
'; } } @@ -1124,8 +1124,8 @@ switch ($register_user_flg) { case 1: - $this->arrErr[$value[1]] .= "※ すでに会員登録で使用されている" . $value[0] . "です。
"; + $this->arrErr[$value[1]] .= '※ すでに会員登録で使用されている' . $value[0] . 'です。
'; break; case 2: - $this->arrErr[$value[1]] .= "※ 退会から一定期間の間は、同じ" . $value[0] . "を使用することはできません。
"; + $this->arrErr[$value[1]] .= '※ 退会から一定期間の間は、同じ' . $value[0] . 'を使用することはできません。
'; break; default: @@ -1151,5 +1151,5 @@ $pattern = '/' . join('|', $prohibitedStr) . '/i'; if (preg_match_all($pattern, $this->arrParam[$value[1]], $matches)) { - $this->arrErr[$value[1]] = "※ " . $value[0] . "は入力できません。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は入力できません。
'; } } @@ -1168,5 +1168,5 @@ $this->createParam($value); if ($this->evalCheck($value[1]) === false) { - $this->arrErr[$value[0]] = "※ " . $value[0] . " の形式が不正です。
"; + $this->arrErr[$value[0]] = '※ ' . $value[0] . ' の形式が不正です。
'; } } @@ -1185,5 +1185,5 @@ return true; } - return @eval("return " . $value . ";"); + return @eval('return ' . $value . ';'); } @@ -1198,5 +1198,5 @@ foreach ($value as $key) { if (is_string($key) || is_int($key)) { - if (!isset($this->arrParam[$key])) $this->arrParam[$key] = ""; + if (!isset($this->arrParam[$key])) $this->arrParam[$key] = ''; } } Index: branches/version-2_12-dev/data/class/SC_Initial.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Initial.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_Initial.php (revision 21514) @@ -88,6 +88,6 @@ /** サイト用DB */ define ('DEFAULT_DSN', - DB_TYPE . "://" . DB_USER . ":" . DB_PASSWORD . "@" - . DB_SERVER . ":" .DB_PORT . "/" . DB_NAME); + DB_TYPE . '://' . DB_USER . ':' . DB_PASSWORD . "@" + . DB_SERVER . ':' .DB_PORT . '/' . DB_NAME); } } @@ -184,13 +184,13 @@ // 定数を設定 - if (is_file(CACHE_REALDIR . "mtb_constants.php")) { + if (is_file(CACHE_REALDIR . 'mtb_constants.php')) { require_once CACHE_REALDIR . 'mtb_constants.php'; // キャッシュが無ければ, 初期データからコピー - } elseif (is_file(CACHE_REALDIR . "../mtb_constants_init.php")) { - - $mtb_constants = file_get_contents(CACHE_REALDIR . "../mtb_constants_init.php"); + } elseif (is_file(CACHE_REALDIR . '../mtb_constants_init.php')) { + + $mtb_constants = file_get_contents(CACHE_REALDIR . '../mtb_constants_init.php'); if (is_writable(CACHE_REALDIR)) { - $handle = fopen(CACHE_REALDIR . "mtb_constants.php", 'w'); + $handle = fopen(CACHE_REALDIR . 'mtb_constants.php', 'w'); if (!$handle) { die($errorMessage); @@ -206,5 +206,5 @@ } } else { - die(CACHE_REALDIR . "../mtb_constants_init.php が存在しません"); + die(CACHE_REALDIR . '../mtb_constants_init.php が存在しません'); } } Index: branches/version-2_12-dev/data/class/SC_PageNavi.php =================================================================== --- branches/version-2_12-dev/data/class/SC_PageNavi.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_PageNavi.php (revision 21514) @@ -72,6 +72,6 @@ //「前へ」「次へ」の設定 - $before = ""; - $next = ""; + $before = ''; + $next = ''; if ($this->now_page > 1) { $this->arrPagenavi['before'] = $this->now_page - 1; @@ -93,5 +93,5 @@ // 表示する最大ナビ数を決める。 - if ($navi_max == "" || $navi_max > $this->max_page) { + if ($navi_max == '' || $navi_max > $this->max_page) { // 制限ナビ数の指定がない。ページ最大数が制限ナビ数より少ない。 $disp_max = $this->max_page; @@ -106,5 +106,5 @@ // 表示する最小ナビ数を決める。 - if ($navi_max == "" || $navi_max > $this->now_page) { + if ($navi_max == '' || $navi_max > $this->now_page) { // 制限ナビ数の指定がない。現在ページ番号が制限ナビ数より少ない。 $disp_min = 1; @@ -115,5 +115,5 @@ $this->arrPagenavi['arrPageno'] = array(); - $page_number = ""; + $page_number = ''; for ($i = $disp_min; $i <= $disp_max; $i++) { Index: branches/version-2_12-dev/data/class/SC_SendMail.php =================================================================== --- branches/version-2_12-dev/data/class/SC_SendMail.php (revision 21490) +++ branches/version-2_12-dev/data/class/SC_SendMail.php (revision 21514) @@ -37,11 +37,11 @@ function SC_SendMail() { $this->arrRecip = array(); - $this->to = ""; - $this->subject = ""; - $this->body = ""; - $this->cc = ""; - $this->bcc = ""; - $this->replay_to = ""; - $this->return_path = ""; + $this->to = ''; + $this->subject = ''; + $this->body = ''; + $this->cc = ''; + $this->bcc = ''; + $this->replay_to = ''; + $this->return_path = ''; $this->backend = MAIL_BACKEND; $this->host = SMTP_HOST; @@ -60,6 +60,6 @@ // 宛先の設定 - function setTo($to, $to_name = "") { - if ($to != "") { + function setTo($to, $to_name = '') { + if ($to != '') { $this->to = $this->getNameAddress($to_name, $to); $this->setRecip('To', $to); @@ -68,11 +68,11 @@ // 送信元の設定 - function setFrom($from, $from_name = "") { + function setFrom($from, $from_name = '') { $this->from = $this->getNameAddress($from_name, $from); } // CCの設定 - function setCc($cc, $cc_name = "") { - if ($cc != "") { + function setCc($cc, $cc_name = '') { + if ($cc != '') { $this->cc = $this->getNameAddress($cc_name, $cc); $this->setRecip('Cc', $cc); @@ -82,5 +82,5 @@ // BCCの設定 function setBCc($bcc) { - if ($bcc != "") { + if ($bcc != '') { $this->bcc = $bcc; $this->setRecip('Bcc', $bcc); @@ -90,5 +90,5 @@ // Reply-Toの設定 function setReplyTo($reply_to) { - if ($reply_to != "") { + if ($reply_to != '') { $this->reply_to = $reply_to; } @@ -138,9 +138,9 @@ // 名前<メールアドレス>の形式を生成 function getNameAddress($name, $mail_address) { - if ($name != "") { + if ($name != '') { // 制御文字を変換する。 $_name = $name; - $_name = ereg_replace("<","＜", $_name); - $_name = ereg_replace(">","＞", $_name); + $_name = ereg_replace('<','＜', $_name); + $_name = ereg_replace('>','＞', $_name); $_name = mb_encode_mimeheader($_name, 'JIS', 'B', "\n"); $name_address = "\"". $_name . "\"<" . $mail_address . ">"; @@ -151,9 +151,9 @@ } - function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to="", $return_path="", $errors_to="", $bcc="", $cc ="") { + function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to="", $bcc="", $cc ="") { $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc); } - function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to="", $return_path="", $errors_to="", $bcc="", $cc ="") { + function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to="", $bcc="", $cc ="") { $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc); } @@ -171,5 +171,5 @@ $bcc -> ブラインドカーボンコピー */ - function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to="", $return_path="", $errors_to="", $bcc="", $cc ="") { + function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to="", $bcc="", $cc ="") { // 宛先設定 $this->setTo($to); @@ -188,7 +188,7 @@ // Errors-Toは、ほとんどのSMTPで無視され、Return-Pathが優先されるためReturn_Pathに設定する。 - if ($errors_to != "") { + if ($errors_to != '') { $this->return_path = $errors_to; - } else if ($return_path != "") { + } else if ($return_path != '') { $this->return_path = $return_path; } else { @@ -205,14 +205,14 @@ $arrHeader['From'] = $this->from; $arrHeader['Return-Path'] = $this->return_path; - if ($this->reply_to != "") { + if ($this->reply_to != '') { $arrHeader['Reply-To'] = $this->reply_to; } - if ($this->cc != "") { + if ($this->cc != '') { $arrHeader['Cc'] = $this->cc; } - if ($this->bcc != "") { + if ($this->bcc != '') { $arrHeader['Bcc'] = $this->bcc; } - $arrHeader['Date'] = date("D, j M Y H:i:s O"); + $arrHeader['Date'] = date('D, j M Y H:i:s O'); return $arrHeader; } @@ -230,5 +230,5 @@ $arrHeader = $this->getBaseHeader(); $arrHeader['Content-Type'] = "text/html; charset=\"ISO-2022-JP\""; - $arrHeader['Content-Transfer-Encoding'] = "ISO-2022-JP"; + $arrHeader['Content-Transfer-Encoding'] = 'ISO-2022-JP'; return $arrHeader; } Index: branches/version-2_12-dev/data/class/SC_CartSession.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CartSession.php (revision 21510) +++ branches/version-2_12-dev/data/class/SC_CartSession.php (revision 21514) @@ -52,5 +52,5 @@ // 1世代古いコピー情報は、削除しておく foreach ($_SESSION as $k => $val) { - if ($k != $this->key_tmp && preg_match("/^savecart_/", $k)) { + if ($k != $this->key_tmp && preg_match('/^savecart_/', $k)) { unset($this->cartSession[$productTypeId][$k]); } @@ -61,5 +61,5 @@ function getCancelPurchase($productTypeId) { $ret = isset($this->cartSession[$productTypeId]['cancel_purchase']) - ? $this->cartSession[$productTypeId]['cancel_purchase'] : ""; + ? $this->cartSession[$productTypeId]['cancel_purchase'] : ''; $this->cartSession[$productTypeId]['cancel_purchase'] = false; return $ret; @@ -171,5 +171,5 @@ if (!isset($this->cartSession[$productTypeId][$i]['price'])) { - $this->cartSession[$productTypeId][$i]['price'] = ""; + $this->cartSession[$productTypeId][$i]['price'] = ''; } @@ -177,5 +177,5 @@ if (!isset($this->cartSession[$productTypeId][$i]['quantity'])) { - $this->cartSession[$productTypeId][$i]['quantity'] = ""; + $this->cartSession[$productTypeId][$i]['quantity'] = ''; } $quantity = $this->cartSession[$productTypeId][$i]['quantity']; @@ -212,10 +212,10 @@ if (!isset($this->cartSession[$productTypeId][$i]['point_rate'])) { - $this->cartSession[$productTypeId][$i]['point_rate'] = ""; + $this->cartSession[$productTypeId][$i]['point_rate'] = ''; } $point_rate = $this->cartSession[$productTypeId][$i]['point_rate']; if (!isset($this->cartSession[$productTypeId][$i]['id'][0])) { - $this->cartSession[$productTypeId][$i]['id'][0] = ""; + $this->cartSession[$productTypeId][$i]['id'][0] = ''; } $point = SC_Utils_Ex::sfPrePoint($price, $point_rate); @@ -254,5 +254,5 @@ // 前頁として記録しないページを指定する。 $arrExclude = array( - "/shopping/" + '/shopping/' ); $arrExclude = array_merge($arrExclude, $excludePaths); @@ -260,5 +260,5 @@ // ページチェックを行う。 foreach ($arrExclude as $val) { - if (preg_match("|" . preg_quote($val) . "|", $url)) { + if (preg_match('|' . preg_quote($val) . '|', $url)) { $exclude = true; break; @@ -337,5 +337,5 @@ for ($i = 0; $i <= $max; $i++) { if(isset($this->cartSession[$productTypeId][$i]['cart_no']) - && $this->cartSession[$productTypeId][$i]['cart_no'] != "") { + && $this->cartSession[$productTypeId][$i]['cart_no'] != '') { // 商品情報は常に取得 @@ -392,5 +392,5 @@ $max = $this->getMax($productTypeId); for ($i = 0; $i <= $max; $i++) { - if ($this->cartSession[$productTypeId][$i]['cart_no'] != "") { + if ($this->cartSession[$productTypeId][$i]['cart_no'] != '') { $arrRet[] = $this->cartSession[$productTypeId][$i]['id'][0]; } @@ -408,5 +408,5 @@ $max = $this->getMax($productTypeId); for ($i = 0; $i <= $max; $i++) { - if ($this->cartSession[$productTypeId][$i]['cart_no'] != "") { + if ($this->cartSession[$productTypeId][$i]['cart_no'] != '') { $arrRet[] = $this->cartSession[$productTypeId][$i]['id']; } @@ -518,5 +518,5 @@ function checkProducts($productTypeId) { $objProduct = new SC_Product_Ex(); - $tpl_message = ""; + $tpl_message = ''; // カート内の情報を取得 @@ -538,5 +538,5 @@ $arrDeliv = SC_Helper_Purchase_Ex::getDeliv($productTypeId); if (SC_Utils_Ex::isBlank($arrDeliv)) { - $tpl_message .= "※「" . $product['name'] . "」はまだ配送の準備ができておりません。恐れ入りますがお問い合わせページよりお問い合わせください。\n"; + $tpl_message .= '※「' . $product['name'] . "」はまだ配送の準備ができておりません。恐れ入りますがお問い合わせページよりお問い合わせください。\n"; $this->delProduct($item['cart_no'], $productTypeId); } @@ -550,8 +550,8 @@ $this->setProductValue($item['id'], 'quantity', $limit, $productTypeId); $this->setProductValue($item['id'], 'total_inctax', SC_Helper_DB_Ex::sfCalcIncTax($item['price']) * $limit, $productTypeId); - $tpl_message .= "※「" . $product['name'] . "」は販売制限(または在庫が不足)しております。一度に数量{$limit}を超える購入はできません。\n"; + $tpl_message .= '※「' . $product['name'] . "」は販売制限(または在庫が不足)しております。一度に数量{$limit}を超える購入はできません。\n"; } else { $this->delProduct($item['cart_no'], $productTypeId); - $tpl_message .= "※「" . $product['name'] . "」は売り切れました。\n"; + $tpl_message .= '※「' . $product['name'] . "」は売り切れました。\n"; continue; } @@ -618,5 +618,5 @@ */ function calculate($productTypeId, &$objCustomer, $use_point = 0, - $deliv_pref = "", $charge = 0, $discount = 0, $deliv_id = 0) { + $deliv_pref = '', $charge = 0, $discount = 0, $deliv_id = 0) { $objDb = new SC_Helper_DB_Ex(); @@ -659,5 +659,5 @@ $results['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($total_point, $use_point); - if ($objCustomer != "") { + if ($objCustomer != '') { // 誕生日月であった場合 if ($objCustomer->isBirthMonth()) { Index: branches/version-2_12-dev/data/class/SC_Plugin.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Plugin.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_Plugin.php (revision 21514) @@ -47,5 +47,5 @@ function disablePlugin() { $objQuery = new SC_Query_Ex(); - $name = preg_replace("/.php/", "", __FILE__); // XXX 正規表現エスケープ漏れでは? + $name = preg_replace('/.php/', '', __FILE__); // XXX 正規表現エスケープ漏れでは? $objQuery->update('dtb_plugin', array('enable'=>'0'), "plugin_name = ?", array($name)); } @@ -53,5 +53,5 @@ function enablePlugin() { $objQuery = new SC_Query_Ex(); - $name = preg_replace("/.php/", "", __FILE__); // XXX 正規表現エスケープ漏れでは? + $name = preg_replace('/.php/', '', __FILE__); // XXX 正規表現エスケープ漏れでは? $objQuery->update('dtb_plugin', array('enable'=>'0'), "plugin_name = ?", array($name)); } Index: branches/version-2_12-dev/data/class/SC_SelectSql.php =================================================================== --- branches/version-2_12-dev/data/class/SC_SelectSql.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_SelectSql.php (revision 21514) @@ -37,5 +37,5 @@ //--　コンストラクタ。 - function SC_SelectSql($array = "") { + function SC_SelectSql($array = '') { if (is_array($array)) { $this->arrSql = $array; @@ -44,6 +44,6 @@ //-- SQL分生成 - function getSql($mode = "") { - $this->sql = $this->select ." ". $this->where ." ". $this->group ." "; + function getSql($mode = '') { + $this->sql = $this->select .' '. $this->where .' '. $this->group ." "; // $mode == 1 は limit & offset無し @@ -51,5 +51,5 @@ $this->sql .= $this->order; } elseif ($mode != 1) { - $this->sql .= $this->order . " " .$this->limit ." ". $this->offset; + $this->sql .= $this->order . ' ' .$this->limit .' '. $this->offset; } @@ -59,5 +59,5 @@ // 検索用 function addSearchStr($val) { - $return = "%" .$val. "%"; + $return = '%' .$val. '%'; return $return; } @@ -68,17 +68,17 @@ // ある単位のみ検索($from = $to) if ($from == $to) { - $this->setWhere($column ." = ?"); + $this->setWhere($column .' = ?'); $return = array($from); //　~$toまで検索 } elseif (strlen($from) == 0 && strlen($to) > 0) { - $this->setWhere($column ." <= ? "); + $this->setWhere($column .' <= ? '); $return = array($to); //　~$from以上を検索 } elseif (strlen($from) > 0 && strlen($to) == 0) { - $this->setWhere($column ." >= ? "); + $this->setWhere($column .' >= ? '); $return = array($from); //　$from~$toの検索 } else { - $this->setWhere($column ." BETWEEN ? AND ?"); + $this->setWhere($column .' BETWEEN ? AND ?'); $return = array($from, $to); } @@ -91,5 +91,5 @@ // 開始期間の構築 - $date1 = $from_year . "/" . $from_month . "/" . $from_day; + $date1 = $from_year . '/' . $from_month . '/' . $from_day; // 終了期間の構築 @@ -102,5 +102,5 @@ // 開始期間だけ指定の場合 - if (($from_year != "") && ($from_month != "") && ($from_day != "") && ($to_year == "") && ($to_month == "") && ($to_day == "")) { + if (($from_year != '') && ($from_month != '') && ($from_day != "") && ($to_year == "") && ($to_month == "") && ($to_day == "")) { $this->setWhere($column .' >= ?'); $return[] = $date1; @@ -108,6 +108,6 @@ //　開始～終了 - if( ($from_year != "") && ($from_month != "") && ($from_day != "") && - ($to_year != "") && ($to_month != "") && ($to_day != "")) { + if( ($from_year != '') && ($from_month != '') && ($from_day != "") && + ($to_year != '') && ($to_month != '') && ($to_day != "")) { $this->setWhere($column . ' >= ? AND ' . $column . ' < date(?)'); $return[] = $date1; @@ -116,5 +116,5 @@ // 終了期間だけ指定の場合 - if (($from_year == "") && ($from_month == "") && ($from_day == "") && ($to_year != "") && ($to_month != "") && ($to_day != "")) { + if (($from_year == '') && ($from_month == '') && ($from_day == "") && ($to_year != "") && ($to_month != "") && ($to_day != "")) { $this->setWhere($column . ' < date(?)'); $return[] = $date2; @@ -130,12 +130,12 @@ if (count($arr) > 1) { - if(! is_null($data)) $item .= $ItemStr . " = ? OR "; + if(! is_null($data)) $item .= $ItemStr . ' = ? OR '; } else { - if(! is_null($data)) $item = $ItemStr . " = ?"; + if(! is_null($data)) $item = $ItemStr . ' = ?'; } $return[] = $data; } - if( count($arr) > 1) $item = "(" . rtrim($item, " OR ") . ")"; + if( count($arr) > 1) $item = '(' . rtrim($item, ' OR ') . ")"; $this->setWhere($item); return $return; @@ -149,5 +149,5 @@ if ($arr) { foreach ($arr as $data) { - if ($data != "不明") { + if ($data != '不明') { $item .= " OR ${ItemStr} = ?"; $return[] = $data; @@ -194,25 +194,25 @@ } - $statement = "(" . rtrim($statement, " OR ") . ")"; + $statement = '(' . rtrim($statement, ' OR ') . ")"; if ($this->where) { - $this->where .= " AND " . $statement; + $this->where .= ' AND ' . $statement; } else { - $this->where = "WHERE " . $statement; + $this->where = 'WHERE ' . $statement; } } function setWhere($where) { - if ($where != "") { + if ($where != '') { if ($this->where) { - $this->where .= " AND " . $where; + $this->where .= ' AND ' . $where; } else { - $this->where = "WHERE " . $where; + $this->where = 'WHERE ' . $where; } } @@ -221,5 +221,5 @@ function setOrder($order) { - $this->order = "ORDER BY " . $order; + $this->order = 'ORDER BY ' . $order; } @@ -227,5 +227,5 @@ function setGroup($group) { - $this->group = "GROUP BY " . $group; + $this->group = 'GROUP BY ' . $group; } @@ -235,16 +235,16 @@ if (is_numeric($limit) and is_numeric($offset)) { - $this->limit = " LIMIT " .$limit; - $this->offset = " OFFSET " .$offset; + $this->limit = ' LIMIT ' .$limit; + $this->offset = ' OFFSET ' .$offset; } } function clearSql() { - $this->select = ""; - $this->where = ""; - $this->group = ""; - $this->order = ""; - $this->limit = ""; - $this->offset = ""; + $this->select = ''; + $this->where = ''; + $this->group = ''; + $this->order = ''; + $this->limit = ''; + $this->offset = ''; } Index: branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php (revision 21480) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php (revision 21514) @@ -70,5 +70,5 @@ * @return mixed $is_download = true時 成功失敗フラグ(boolean) 、$is_downalod = false時 string */ - function sfDownloadCsv($csv_id, $where = "", $arrVal = array(), $order = "", $is_download = false) { + function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false) { // 実行時間を制限しない @set_time_limit(0); @@ -92,14 +92,14 @@ }else if ($csv_id == '2') { // 会員の場合 - $sql = "SELECT " . $cols . " FROM dtb_customer " . $where; + $sql = 'SELECT ' . $cols . ' FROM dtb_customer ' . $where; }else if ($csv_id == '3') { // 注文の場合 - $sql = "SELECT " . $cols . " FROM dtb_order " . $where; + $sql = 'SELECT ' . $cols . ' FROM dtb_order ' . $where; }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; + $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') { // カテゴリの場合 - $sql = "SELECT " . $cols . " FROM dtb_category " . $where; + $sql = 'SELECT ' . $cols . ' FROM dtb_category ' . $where; } // 固有処理ここまで @@ -116,5 +116,5 @@ * @return array CSV 項目の配列 */ - function sfGetCsvOutput($csv_id = "", $where = '', $arrVal = array(), $order = 'rank, no') { + function sfGetCsvOutput($csv_id = '', $where = '', $arrVal = array(), $order = 'rank, no') { $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -123,6 +123,6 @@ if (SC_Utils_Ex::sfIsInt($csv_id)) { - if ($where == "") { - $where = "csv_id = ?"; + if ($where == '') { + $where = 'csv_id = ?'; } else { $where = "$where AND csv_id = ?"; @@ -147,5 +147,5 @@ if($val['status'] != CSV_COLUMN_STATUS_FLG_ENABLE and $val['rw_flg'] == CSV_COLUMN_RW_FLG_READ_WRITE - and $val['error_check_types'] != "" + and $val['error_check_types'] != '' and strpos(strtoupper($val['error_check_types']), 'EXIST_CHECK') !== FALSE) { //必須フィールド @@ -235,5 +235,5 @@ // fopen('php://temp/maxmemory:'. (5*1024*1024), 'r+'); $tmp_filename = tempnam(CSV_TEMP_REALDIR, $file_head . '_csv'); - $this->fpOutput = fopen($tmp_filename, "w+"); + $this->fpOutput = fopen($tmp_filename, 'w+'); fwrite($this->fpOutput, $header); $objQuery->doCallbackAll(array(&$this, 'cbOutputCSV'), $sql, $arrVal); @@ -267,10 +267,10 @@ if (strlen($delimiter) != 1) { trigger_error('delimiter must be a single character', E_USER_WARNING); - return ""; + return ''; } if (strlen($enclosure) < 1) { trigger_error('enclosure must be a single character', E_USER_WARNING); - return ""; + return ''; } @@ -302,11 +302,11 @@ * @return void */ - function lfDownloadCsv($arrData, $prefix = "") { - - if ($prefix == "") { + function lfDownloadCsv($arrData, $prefix = '') { + + if ($prefix == '') { $dir_name = SC_Utils_Ex::sfUpDirName(); - $file_name = $dir_name . date('ymdHis') .".csv"; + $file_name = $dir_name . date('ymdHis') .'.csv'; } else { - $file_name = $prefix . date('ymdHis') .".csv"; + $file_name = $prefix . date('ymdHis') .'.csv'; } @@ -314,6 +314,6 @@ Header("Content-disposition: attachment; filename=${file_name}"); Header("Content-type: application/octet-stream; name=${file_name}"); - Header("Cache-Control: "); - Header("Pragma: "); + Header('Cache-Control: '); + Header('Pragma: '); /* データを出力 */ @@ -332,12 +332,12 @@ * @return void */ - function lfDownloadCSVFile($filepath, $prefix = "") { - $file_name = $prefix . date('YmdHis') . ".csv"; + function lfDownloadCSVFile($filepath, $prefix = '') { + $file_name = $prefix . date('YmdHis') . '.csv'; /* HTTPヘッダの出力 */ Header("Content-disposition: attachment; filename=${file_name}"); Header("Content-type: application/octet-stream; name=${file_name}"); - Header("Cache-Control: "); - Header("Pragma: "); + Header('Cache-Control: '); + Header('Pragma: '); /* データを出力 */ Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php (revision 21512) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php (revision 21514) @@ -344,5 +344,5 @@ if (!in_array($value['plugin_id'] , $this->arrPluginIds)) { // 通常ブロック以外. - if ($value['plugin_id'] != "") { + if ($value['plugin_id'] != '') { //　ブロック配列から削除する unset ($arrBlocs[$key]); Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21511) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21514) @@ -94,5 +94,5 @@ if (is_numeric($customer_id)) { // 編集 - $objQuery->update('dtb_customer', $array, "customer_id = ? ", array($customer_id)); + $objQuery->update('dtb_customer', $array, 'customer_id = ? ', array($customer_id)); } else { // 新規登録 @@ -124,5 +124,5 @@ $arrRet = $objQuery->select('customer_id', 'dtb_order', "order_id = ?", array($order_id)); $customer_id = $arrRet[0]['customer_id']; - if ($customer_id != "" && $customer_id >= 1) { + if ($customer_id != '' && $customer_id >= 1) { if (USE_POINT !== false) { $arrRet = $objQuery->select('point', 'dtb_customer', "customer_id = ?", array($customer_id)); @@ -134,6 +134,6 @@ } } else { - $total_point = ""; - $point = ""; + $total_point = ''; + $point = ''; } return array($point, $total_point); @@ -159,7 +159,7 @@ } - $arrRet = $objQuery->select("email, update_date, del_flg", + $arrRet = $objQuery->select('email, update_date, del_flg', 'dtb_customer', - "email = ? OR email_mobile = ? ORDER BY del_flg", + 'email = ? OR email_mobile = ? ORDER BY del_flg', array($email, $email)); @@ -221,5 +221,5 @@ // 会員情報DB取得 - $ret = $objQuery->select("*",'dtb_customer',"customer_id=?", array($customer_id)); + $ret = $objQuery->select('*','dtb_customer',"customer_id=?", array($customer_id)); $arrForm = $ret[0]; @@ -230,5 +230,5 @@ // 誕生日を年月日に分ける if (isset($arrForm['birth'])) { - $birth = explode(" ", $arrForm['birth']); + $birth = explode(' ', $arrForm['birth']); list($arrForm['year'], $arrForm['month'], $arrForm['day']) = explode("-",$birth[0]); } @@ -257,5 +257,5 @@ if ($add_where == '') { $where = 'customer_id = ?'; - $arrData = $objQuery->getRow("*", 'dtb_customer', $where, array($customer_id)); + $arrData = $objQuery->getRow('*', 'dtb_customer', $where, array($customer_id)); } else { $where = $add_where; @@ -264,5 +264,5 @@ $arrAddVal[] = $customer_id; } - $arrData = $objQuery->getRow("*", 'dtb_customer', $where, $arrAddVal); + $arrData = $objQuery->getRow('*', 'dtb_customer', $where, $arrAddVal); } return $arrData; @@ -280,5 +280,5 @@ do { $uniqid = SC_Utils_Ex::sfGetUniqRandomId('r'); - $exists = $objQuery->exists('dtb_customer', "secret_key = ?", array($uniqid)); + $exists = $objQuery->exists('dtb_customer', 'secret_key = ?', array($uniqid)); } while ($exists); return $uniqid; @@ -295,5 +295,5 @@ function sfGetCustomerId($uniqid, $check_status = false) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "secret_key = ?"; + $where = 'secret_key = ?'; if ($check_status) { @@ -316,14 +316,14 @@ SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, $isAdmin); if ($isAdmin) { - $objFormParam->addParam("会員ID", 'customer_id', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('会員ID', 'customer_id', INT_LEN, 'n', array('NUM_CHECK')); $objFormParam->addParam('携帯メールアドレス', 'email_mobile', null, 'a', array('NO_SPTAB', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK', 'MOBILE_EMAIL_CHECK')); - $objFormParam->addParam("会員状態", 'status', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("SHOP用メモ", 'note', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("所持ポイント", 'point', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('会員状態', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('SHOP用メモ', 'note', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('所持ポイント', 'point', INT_LEN, 'n', array('NUM_CHECK')); } if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { // 登録確認画面の「戻る」ボタンのためのパラメーター - $objFormParam->addParam("戻る", 'return', '', '', array(), '', false); + $objFormParam->addParam('戻る', 'return', '', '', array(), '', false); } } @@ -357,5 +357,5 @@ function sfCustomerOtherDelivParam(&$objFormParam) { SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam); - $objFormParam->addParam("", 'other_deliv_id'); + $objFormParam->addParam('', 'other_deliv_id'); } @@ -368,16 +368,16 @@ */ function sfCustomerCommonParam(&$objFormParam) { - $objFormParam->addParam("お名前(姓)", 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(名)", 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・姓)", 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK')); - $objFormParam->addParam("お名前(フリガナ・名)", 'kana02', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK')); - $objFormParam->addParam("郵便番号1", 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'pref', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'addr01', MTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'addr02', MTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お電話番号1", 'tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お電話番号2", 'tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お電話番号3", 'tel03', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・姓)', 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK')); + $objFormParam->addParam('お名前(フリガナ・名)', 'kana02', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK')); + $objFormParam->addParam('郵便番号1', 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'pref', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'addr01', MTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'addr02', MTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お電話番号1', 'tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お電話番号2', 'tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お電話番号3', 'tel03', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); } @@ -391,18 +391,18 @@ */ function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false) { - $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("パスワード確認用の質問の答え", 'reminder_answer', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("パスワード確認用の質問", 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("性別", 'sex', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("職業", 'job', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("年", 'year', 4, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("月", 'month', 2, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("日", 'day', 2, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("メールマガジン", 'mailmaga_flg', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('パスワード', 'password', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('パスワード確認用の質問の答え', 'reminder_answer', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('パスワード確認用の質問', 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('性別', 'sex', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('職業', 'job', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('年', 'year', 4, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('月', 'month', 2, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('日', 'day', 2, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('メールマガジン', 'mailmaga_flg', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) { - $objFormParam->addParam("FAX番号1", 'fax01', TEL_ITEM_LEN, 'n', array('SPTAB_CHECK')); - $objFormParam->addParam("FAX番号2", 'fax02', TEL_ITEM_LEN, 'n', array('SPTAB_CHECK')); - $objFormParam->addParam("FAX番号3", 'fax03', TEL_ITEM_LEN, 'n', array('SPTAB_CHECK')); + $objFormParam->addParam('FAX番号1', 'fax01', TEL_ITEM_LEN, 'n', array('SPTAB_CHECK')); + $objFormParam->addParam('FAX番号2', 'fax02', TEL_ITEM_LEN, 'n', array('SPTAB_CHECK')); + $objFormParam->addParam('FAX番号3', 'fax03', TEL_ITEM_LEN, 'n', array('SPTAB_CHECK')); $objFormParam->addParam('メールアドレス', 'email', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK')); $objFormParam->addParam("パスワード(確認)", 'password02', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK' ,'ALNUM_CHECK'), "", false); @@ -439,9 +439,9 @@ if ($objCustomer->isLoginSuccess(true) && SC_Helper_Customer_Ex::sfCustomerEmailDuplicationCheck($objCustomer->getValue('customer_id'), $objFormParam->getValue('email'))) { - $objErr->arrErr['email'] .= "※ すでに会員登録で使用されているメールアドレスです。
"; + $objErr->arrErr['email'] .= '※ すでに会員登録で使用されているメールアドレスです。
'; } if ($objCustomer->isLoginSuccess(true) && SC_Helper_Customer_Ex::sfCustomerEmailDuplicationCheck($objCustomer->getValue('customer_id'), $objFormParam->getValue('email_mobile'))) { - $objErr->arrErr['email_mobile'] .= "※ すでに会員登録で使用されているメールアドレスです。
"; + $objErr->arrErr['email_mobile'] .= '※ すでに会員登録で使用されているメールアドレスです。
'; } @@ -494,6 +494,6 @@ $objErr->arrErr = $objFormParam->checkError(); - $objErr->doFunc(array("お電話番号", 'tel01', 'tel02', 'tel03'),array('TEL_CHECK')); - $objErr->doFunc(array("郵便番号", 'zip01', 'zip02'), array('ALL_EXIST_CHECK')); + $objErr->doFunc(array('お電話番号', 'tel01', 'tel02', 'tel03'),array('TEL_CHECK')); + $objErr->doFunc(array('郵便番号', 'zip01', 'zip02'), array('ALL_EXIST_CHECK')); return $objErr; @@ -508,5 +508,5 @@ */ function sfCustomerRegisterErrorCheck(&$objErr, $isAdmin = false) { - $objErr->doFunc(array("生年月日", 'year', 'month', 'day'), array('CHECK_BIRTHDAY')); + $objErr->doFunc(array('生年月日', 'year', 'month', 'day'), array('CHECK_BIRTHDAY')); if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) { @@ -515,12 +515,12 @@ $objErr->doFunc(array('メールアドレス', 'メールアドレス(確認)', 'email', 'email02') ,array('EQUAL_CHECK')); } + $objErr->doFunc(array('FAX番号', 'fax01', 'fax02', 'fax03') ,array('TEL_CHECK')); $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02') ,array('EQUAL_CHECK')); - $objErr->doFunc(array("FAX番号", 'fax01', 'fax02', 'fax03') ,array('TEL_CHECK')); } if (!$isAdmin) { // 現会員の判定 → 現会員もしくは仮登録中は、メアド一意が前提になってるので同じメアドで登録不可 - $objErr->doFunc(array("メールアドレス", 'email'), array('CHECK_REGIST_CUSTOMER_EMAIL')); - $objErr->doFunc(array("携帯メールアドレス", 'email_mobile'), array('CHECK_REGIST_CUSTOMER_EMAIL', 'MOBILE_EMAIL_CHECK')); + $objErr->doFunc(array('メールアドレス', 'email'), array('CHECK_REGIST_CUSTOMER_EMAIL')); + $objErr->doFunc(array('携帯メールアドレス', 'email_mobile'), array('CHECK_REGIST_CUSTOMER_EMAIL', 'MOBILE_EMAIL_CHECK')); } return $objErr; @@ -589,20 +589,20 @@ $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); // 拡張エラーチェック - $objErr->doFunc(array("誕生日(開始日)", 'search_b_start_year', 'search_b_start_month', 'search_b_start_day'), array('CHECK_DATE')); - $objErr->doFunc(array("誕生日(終了日)", 'search_b_end_year', 'search_b_end_month', 'search_b_end_day'), array('CHECK_DATE')); - - $objErr->doFunc(array("誕生日(開始日)","誕生日(終了日)", 'search_b_start_year', 'search_b_start_month', 'search_b_start_day', 'search_b_end_year', 'search_b_end_month', 'search_b_end_day'), array('CHECK_SET_TERM')); - $objErr->doFunc(array("登録・更新日(開始日)", 'search_start_year', 'search_start_month', 'search_start_day',), array('CHECK_DATE')); - $objErr->doFunc(array("登録・更新日(終了日)", 'search_end_year', 'search_end_month', 'search_end_day'), array('CHECK_DATE')); - $objErr->doFunc(array("登録・更新日(開始日)","登録・更新日(終了日)", 'search_start_year', 'search_start_month', 'search_start_day', 'search_end_year', 'search_end_month', 'search_end_day'), array('CHECK_SET_TERM')); - $objErr->doFunc(array("最終購入日(開始日)", 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day',), array('CHECK_DATE')); - $objErr->doFunc(array("最終購入(終了日)", 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_DATE')); + $objErr->doFunc(array('誕生日(開始日)', 'search_b_start_year', 'search_b_start_month', 'search_b_start_day'), array('CHECK_DATE')); + $objErr->doFunc(array('誕生日(終了日)', 'search_b_end_year', 'search_b_end_month', 'search_b_end_day'), array('CHECK_DATE')); + + $objErr->doFunc(array('誕生日(開始日)','誕生日(終了日)', 'search_b_start_year', 'search_b_start_month', 'search_b_start_day', 'search_b_end_year', 'search_b_end_month', 'search_b_end_day'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('登録・更新日(開始日)', 'search_start_year', 'search_start_month', 'search_start_day',), array('CHECK_DATE')); + $objErr->doFunc(array('登録・更新日(終了日)', 'search_end_year', 'search_end_month', 'search_end_day'), array('CHECK_DATE')); + $objErr->doFunc(array('登録・更新日(開始日)','登録・更新日(終了日)', 'search_start_year', 'search_start_month', 'search_start_day', 'search_end_year', 'search_end_month', 'search_end_day'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('最終購入日(開始日)', 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day',), array('CHECK_DATE')); + $objErr->doFunc(array('最終購入(終了日)', 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_DATE')); //購入金額(from) ＞ 購入金額(to) の場合はエラーとする - $objErr->doFunc(array("最終購入日(開始日)","登録・更新日(終了日)", 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day', 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('最終購入日(開始日)','登録・更新日(終了日)', 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day', 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_SET_TERM')); if ((SC_Utils_Ex::sfIsInt($array['search_buy_total_from']) && SC_Utils_Ex::sfIsInt($array['search_buy_total_to'])) && ($array['search_buy_total_from'] > $array['buy_total_to'])) { - $objErr->arrErr['search_buy_total_from'] .= "※ 購入金額の指定範囲が不正です。"; + $objErr->arrErr['search_buy_total_from'] .= '※ 購入金額の指定範囲が不正です。'; } @@ -610,5 +610,5 @@ && SC_Utils_Ex::sfIsInt($array['search_buy_times_to'])) && ($array['search_buy_times_from'] > $array['search_buy_times_to'])) { - $objErr->arrErr['search_buy_times_from'] .= "※ 購入回数の指定範囲が不正です。"; + $objErr->arrErr['search_buy_times_from'] .= '※ 購入回数の指定範囲が不正です。'; } if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php (revision 21481) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php (revision 21514) @@ -44,10 +44,10 @@ /* DBに登録されたテンプレートメールの送信 */ - function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = "", $from_name = "", $reply_to = "", $bcc = '') { + function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = "", $bcc = '') { $objQuery = new SC_Query_Ex(); // メールテンプレート情報の取得 - $where = "template_id = ?"; - $arrRet = $objQuery->select("subject, header, footer", 'dtb_mailtemplate', $where, array($template_id)); + $where = 'template_id = ?'; + $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id)); $objPage->tpl_header = $arrRet[0]['header']; $objPage->tpl_footer = $arrRet[0]['footer']; @@ -63,7 +63,7 @@ // メール送信処理 $objSendMail = new SC_SendMail_Ex(); - if ($from_address == "") $from_address = $arrInfo['email03']; - if ($from_name == "") $from_name = $arrInfo['shop_name']; - if ($reply_to == "") $reply_to = $arrInfo['email03']; + if ($from_address == '') $from_address = $arrInfo['email03']; + if ($from_name == '') $from_name = $arrInfo['shop_name']; + if ($reply_to == '') $reply_to = $arrInfo['email03']; $error = $arrInfo['email04']; $tosubject = $this->sfMakeSubject($tmp_subject, $objMailView); @@ -75,5 +75,5 @@ /* 受注完了メール送信 */ - function sfSendOrderMail($order_id, $template_id, $subject = "", $header = "", $footer = "", $send = true) { + function sfSendOrderMail($order_id, $template_id, $subject = '', $header = '', $footer = "", $send = true) { $arrTplVar = new stdClass(); @@ -83,8 +83,8 @@ $objQuery = new SC_Query_Ex(); - if ($subject == "" && $header == "" && $footer == "") { + if ($subject == '' && $header == '' && $footer == "") { // メールテンプレート情報の取得 - $where = "template_id = ?"; - $arrRet = $objQuery->select("subject, header, footer", 'dtb_mailtemplate', $where, array($template_id)); + $where = 'template_id = ?'; + $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id)); $arrTplVar->tpl_header = $arrRet[0]['header']; $arrTplVar->tpl_footer = $arrRet[0]['footer']; @@ -97,16 +97,16 @@ // 受注情報の取得 - $where = "order_id = ?"; - $arrRet = $objQuery->select("*", 'dtb_order', $where, array($order_id)); + $where = 'order_id = ?'; + $arrRet = $objQuery->select('*', 'dtb_order', $where, array($order_id)); $arrOrder = $arrRet[0]; $objQuery->setOrder('order_detail_id'); - $arrTplVar->arrOrderDetail = $objQuery->select("*", 'dtb_order_detail', $where, array($order_id)); + $arrTplVar->arrOrderDetail = $objQuery->select('*', 'dtb_order_detail', $where, array($order_id)); $objProduct = new SC_Product_Ex(); $objQuery->setOrder('shipping_id'); - $arrRet = $objQuery->select("*", 'dtb_shipping', "order_id = ?", array($order_id)); + $arrRet = $objQuery->select('*', 'dtb_shipping', "order_id = ?", array($order_id)); foreach (array_keys($arrRet) as $key) { $objQuery->setOrder('shipping_id'); - $arrItems = $objQuery->select("*", 'dtb_shipment_item', "order_id = ? AND shipping_id = ?", + $arrItems = $objQuery->select('*', 'dtb_shipment_item', "order_id = ? AND shipping_id = ?", array($order_id, $arrRet[$key]['shipping_id'])); foreach ($arrItems as $itemKey => $arrDetail) { @@ -126,5 +126,5 @@ $objQuery->setOrder('customer_id'); $arrRet = $objQuery->select('point', 'dtb_customer', "customer_id = ?", array($customer_id)); - $arrCustomer = isset($arrRet[0]) ? $arrRet[0] : ""; + $arrCustomer = isset($arrRet[0]) ? $arrRet[0] : ''; $arrTplVar->arrCustomer = $arrCustomer; @@ -132,10 +132,10 @@ //その他決済情報 - if ($arrOrder['memo02'] != "") { + if ($arrOrder['memo02'] != '') { $arrOther = unserialize($arrOrder['memo02']); foreach ($arrOther as $other_key => $other_val) { - if (SC_Utils_Ex::sfTrim($other_val['value']) == "") { - $arrOther[$other_key]['value'] = ""; + if (SC_Utils_Ex::sfTrim($other_val['value']) == '') { + $arrOther[$other_key]['value'] = ''; } } @@ -236,5 +236,5 @@ $sqlval['send_date'] = 'CURRENT_TIMESTAMP'; if (!isset($_SESSION['member_id'])) $_SESSION['member_id'] = ""; - if ($_SESSION['member_id'] != "") { + if ($_SESSION['member_id'] != '') { $sqlval['creator_id'] = $_SESSION['member_id']; } else { @@ -250,7 +250,7 @@ /* 会員登録があるかどうかのチェック(仮会員を含まない) */ function sfCheckCustomerMailMaga($email) { - $col = "email, mailmaga_flg, customer_id"; + $col = 'email, mailmaga_flg, customer_id'; $from = 'dtb_customer'; - $where = "(email = ? OR email_mobile = ?) AND status = 2 AND del_flg = 0"; + $where = '(email = ? OR email_mobile = ?) AND status = 2 AND del_flg = 0'; $objQuery = new SC_Query_Ex(); $arrRet = $objQuery->select($col, $from, $where, array($email)); @@ -275,5 +275,5 @@ $arrCustomerData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id); } else { - $arrCustomerData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId('', "secret_key = ?", array($secret_key)); + $arrCustomerData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId('', 'secret_key = ?', array($secret_key)); } if (SC_Utils_Ex::isBlank($arrCustomerData)) { @@ -296,8 +296,8 @@ if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) { $subject = $objHelperMail->sfMakeSubject('会員登録のご確認', $objMailText); - $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl"); + $toCustomerMail = $objMailText->fetch('mail_templates/customer_mail.tpl'); } else { $subject = $objHelperMail->sfMakeSubject('会員登録のご完了', $objMailText); - $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl"); + $toCustomerMail = $objMailText->fetch('mail_templates/customer_regist_mail.tpl'); } @@ -347,5 +347,5 @@ // 表示順 - $objQuery->setOrder("create_date DESC"); + $objQuery->setOrder('create_date DESC'); $arrResults = $objQuery->select('*', 'dtb_mailmaga_template', $where, $arrValues); @@ -374,5 +374,5 @@ // 表示順 - $objQuery->setOrder("create_date DESC"); + $objQuery->setOrder('create_date DESC'); $arrResults = $objQuery->select('*', 'dtb_send_history', $where, $arrValues); @@ -414,6 +414,6 @@ // お名前の変換 $customerName = trim($arrDestination['name']); - $subjectBody = preg_replace("/{name}/", $customerName, $arrMail['subject']); - $mailBody = preg_replace("/{name}/", $customerName, $arrMail['body']); + $subjectBody = preg_replace('/{name}/', $customerName, $arrMail['subject']); + $mailBody = preg_replace('/{name}/', $customerName, $arrMail['body']); $objMail->setItem( @@ -459,5 +459,5 @@ // 送信完了　報告メール - $compSubject = date("Y年m月d日H時i分") . " 下記メールの配信が完了しました。"; + $compSubject = date('Y年m月d日H時i分') . ' 下記メールの配信が完了しました。'; // 管理者宛に変更 $objMail->setTo($objSite['email03']); Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php (revision 21481) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php (revision 21514) @@ -83,5 +83,5 @@ function sfSessWrite($id, $sess_data) { $objQuery = new SC_Query_Ex(); - $exists = $objQuery->exists('dtb_session', "sess_id = ?", array($id)); + $exists = $objQuery->exists('dtb_session', 'sess_id = ?', array($id)); $sqlval = array(); if ($exists) { @@ -89,5 +89,5 @@ $sqlval['sess_data'] = $sess_data; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $objQuery->update('dtb_session', $sqlval, "sess_id = ?", array($id)); + $objQuery->update('dtb_session', $sqlval, 'sess_id = ?', array($id)); } else { // セッションデータがある場合は、レコード作成 @@ -113,5 +113,5 @@ function sfSessDestroy($id) { $objQuery = new SC_Query_Ex(); - $objQuery->delete('dtb_session', "sess_id = ?", array($id)); + $objQuery->delete('dtb_session', 'sess_id = ?', array($id)); return true; } Index: branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (revision 21502) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (revision 21514) @@ -64,5 +64,5 @@ * 引数 $add == false でカラムが存在しない場合 false */ - function sfColumnExists($table_name, $col_name, $col_type = "", $dsn = "", $add = false) { + function sfColumnExists($table_name, $col_name, $col_type = '', $dsn = '', $add = false) { $dbFactory = SC_DB_DBFactory_Ex::getInstance(); $dsn = $dbFactory->getDSN($dsn); @@ -75,5 +75,5 @@ // 正常に接続されている場合 if (!$objQuery->isError()) { - list($db_type) = explode(":", $dsn); + list($db_type) = explode(':', $dsn); // カラムリストを取得 @@ -104,5 +104,5 @@ * $add == false で, データが存在しない場合 false */ - function sfDataExists($table_name, $where, $arrval, $dsn = "", $sql = "", $add = false) { + function sfDataExists($table_name, $where, $arrval, $dsn = '', $sql = '', $add = false) { $dbFactory = SC_DB_DBFactory_Ex::getInstance(); $dsn = $dbFactory->getDSN($dsn); @@ -128,5 +128,5 @@ * @return array 店舗基本情報の配列 */ - function sfGetBasisData($force = false, $col = "") { + function sfGetBasisData($force = false, $col = '') { static $data; @@ -134,5 +134,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - if ($col === "") { + if ($col === '') { $arrRet = $objQuery->select('*', 'dtb_baseinfo'); } else { @@ -188,11 +188,11 @@ if (count($category_id) > 0) { $arrRet = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id); - $root_id = isset($arrRet[0]) ? $arrRet[0] : ""; + $root_id = isset($arrRet[0]) ? $arrRet[0] : ''; } else { - $root_id = ""; + $root_id = ''; } } else { // ROOTカテゴリIDをなしに設定する - $root_id = ""; + $root_id = ''; } $this->g_root_id = $root_id; @@ -214,5 +214,5 @@ $arrRet = $objQuery->select('customer_id', 'dtb_order', "order_id = ?", array($order_id)); $customer_id = $arrRet[0]['customer_id']; - if ($customer_id != "" && $customer_id >= 1) { + if ($customer_id != '' && $customer_id >= 1) { $arrRet = $objQuery->select('point', 'dtb_customer', "customer_id = ?", array($customer_id)); $point = $arrRet[0]['point']; @@ -229,6 +229,6 @@ } } else { - $rollback_point = ""; - $point = ""; + $rollback_point = ''; + $point = ''; } return array($point, $rollback_point); @@ -244,23 +244,23 @@ function sfGetCatTree($parent_category_id, $count_check = false) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = ""; - $col .= " cat.category_id,"; - $col .= " cat.category_name,"; - $col .= " cat.parent_category_id,"; - $col .= " cat.level,"; - $col .= " cat.rank,"; - $col .= " cat.creator_id,"; - $col .= " cat.create_date,"; - $col .= " cat.update_date,"; - $col .= " cat.del_flg, "; - $col .= " ttl.product_count"; - $from = "dtb_category as cat left join dtb_category_total_count as ttl on ttl.category_id = cat.category_id"; + $col = ''; + $col .= ' cat.category_id,'; + $col .= ' cat.category_name,'; + $col .= ' cat.parent_category_id,'; + $col .= ' cat.level,'; + $col .= ' cat.rank,'; + $col .= ' cat.creator_id,'; + $col .= ' cat.create_date,'; + $col .= ' cat.update_date,'; + $col .= ' cat.del_flg, '; + $col .= ' ttl.product_count'; + $from = 'dtb_category as cat left join dtb_category_total_count as ttl on ttl.category_id = cat.category_id'; // 登録商品数のチェック if ($count_check) { - $where = "del_flg = 0 AND product_count > 0"; + $where = 'del_flg = 0 AND product_count > 0'; } else { - $where = "del_flg = 0"; - } - $objQuery->setOption("ORDER BY rank DESC"); + $where = 'del_flg = 0'; + } + $objQuery->setOption('ORDER BY rank DESC'); $arrRet = $objQuery->select($col, $from, $where); @@ -312,23 +312,23 @@ function sfGetMultiCatTree($product_id, $count_check = false) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = ""; - $col .= " cat.category_id,"; - $col .= " cat.category_name,"; - $col .= " cat.parent_category_id,"; - $col .= " cat.level,"; - $col .= " cat.rank,"; - $col .= " cat.creator_id,"; - $col .= " cat.create_date,"; - $col .= " cat.update_date,"; - $col .= " cat.del_flg, "; - $col .= " ttl.product_count"; - $from = "dtb_category as cat left join dtb_category_total_count as ttl on ttl.category_id = cat.category_id"; + $col = ''; + $col .= ' cat.category_id,'; + $col .= ' cat.category_name,'; + $col .= ' cat.parent_category_id,'; + $col .= ' cat.level,'; + $col .= ' cat.rank,'; + $col .= ' cat.creator_id,'; + $col .= ' cat.create_date,'; + $col .= ' cat.update_date,'; + $col .= ' cat.del_flg, '; + $col .= ' ttl.product_count'; + $from = 'dtb_category as cat left join dtb_category_total_count as ttl on ttl.category_id = cat.category_id'; // 登録商品数のチェック if ($count_check) { - $where = "del_flg = 0 AND product_count > 0"; + $where = 'del_flg = 0 AND product_count > 0'; } else { - $where = "del_flg = 0"; - } - $objQuery->setOption("ORDER BY rank DESC"); + $where = 'del_flg = 0'; + } + $objQuery->setOption('ORDER BY rank DESC'); $arrRet = $objQuery->select($col, $from, $where); @@ -362,9 +362,9 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $arrCatID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id); - $ConbName = ""; + $ConbName = ''; // カテゴリ名称を取得する foreach ($arrCatID as $key => $val) { - $sql = "SELECT category_name FROM dtb_category WHERE category_id = ?"; + $sql = 'SELECT category_name FROM dtb_category WHERE category_id = ?'; $arrVal = array($val); $CatName = $objQuery->getOne($sql,$arrVal); @@ -372,5 +372,5 @@ } // 最後の ｜ をカットする - $ConbName = substr_replace($ConbName, "", strlen($ConbName) - 2, 2); + $ConbName = substr_replace($ConbName, '', strlen($ConbName) - 2, 2); return $ConbName; @@ -407,5 +407,5 @@ // カテゴリ名称を取得する - $sql = "SELECT category_name FROM dtb_category WHERE category_id = ?"; + $sql = 'SELECT category_name FROM dtb_category WHERE category_id = ?'; $arrVal = array($arrRet['id']); $arrRet['name'] = $objQuery->getOne($sql,$arrVal); @@ -424,20 +424,20 @@ * @return array カテゴリツリーの配列 */ - function sfGetCategoryList($addwhere = "", $products_check = false, $head = CATEGORY_HEAD) { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "del_flg = 0"; - - if ($addwhere != "") { + function sfGetCategoryList($addwhere = '', $products_check = false, $head = CATEGORY_HEAD) { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $where = 'del_flg = 0'; + + if ($addwhere != '') { $where.= " AND $addwhere"; } - $objQuery->setOption("ORDER BY rank DESC"); + $objQuery->setOption('ORDER BY rank DESC'); if ($products_check) { - $col = "T1.category_id, category_name, level"; - $from = "dtb_category AS T1 LEFT JOIN dtb_category_total_count AS T2 ON T1.category_id = T2.category_id"; - $where .= " AND product_count > 0"; + $col = 'T1.category_id, category_name, level'; + $from = 'dtb_category AS T1 LEFT JOIN dtb_category_total_count AS T2 ON T1.category_id = T2.category_id'; + $where .= ' AND product_count > 0'; } else { - $col = "category_id, category_name, level"; + $col = 'category_id, category_name, level'; $from = 'dtb_category'; } @@ -466,7 +466,7 @@ // カテゴリ名リストを取得 - $col = "category_id, parent_category_id, category_name"; - $where = "del_flg = 0"; - $objQuery->setOption("ORDER BY level"); + $col = 'category_id, parent_category_id, category_name'; + $where = 'del_flg = 0'; + $objQuery->setOption('ORDER BY level'); $arrRet = $objQuery->select($col, 'dtb_category', $where); $arrCatName = array(); @@ -474,11 +474,11 @@ $arrCatName[$arrTmp['category_id']] = (($arrTmp['parent_category_id'] > 0)? - $arrCatName[$arrTmp['parent_category_id']] : "") + $arrCatName[$arrTmp['parent_category_id']] : '') . CATEGORY_HEAD . $arrTmp['category_name']; } - $col = "category_id, parent_category_id, category_name, level"; - $where = "del_flg = 0"; - $objQuery->setOption("ORDER BY rank DESC"); + $col = 'category_id, parent_category_id, category_name, level'; + $where = 'del_flg = 0'; + $objQuery->setOption('ORDER BY rank DESC'); $arrRet = $objQuery->select($col, 'dtb_category', $where); $max = count($arrRet); @@ -489,5 +489,5 @@ $arrValue[$cnt] = $arrRet[$cnt]['category_id']; } else { - $arrValue[$cnt] = ""; + $arrValue[$cnt] = ''; } } else { @@ -511,7 +511,7 @@ function sfGetCategoryId($product_id, $category_id = 0, $closed = false) { if ($closed) { - $status = ""; + $status = ''; } else { - $status = "status = 1"; + $status = 'status = 1'; } $category_id = (int) $category_id; @@ -521,5 +521,5 @@ } else if (SC_Utils_Ex::sfIsInt($product_id) && $product_id != 0 && SC_Helper_DB_Ex::sfIsRecord('dtb_products','product_id', $product_id, $status)) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "product_id = ?"; + $where = 'product_id = ?'; $category_id = $objQuery->getCol('category_id', 'dtb_product_categories', "product_id = ?", array($product_id)); } else { @@ -545,7 +545,7 @@ // 現在の商品カテゴリを取得 - $arrCat = $objQuery->select("product_id, category_id, rank", + $arrCat = $objQuery->select('product_id, category_id, rank', 'dtb_product_categories', - "category_id = ?", + 'category_id = ?', array($category_id)); @@ -577,7 +577,7 @@ // 現在の商品カテゴリを取得 - $arrCat = $objQuery->select("product_id, category_id, rank", + $arrCat = $objQuery->select('product_id, category_id, rank', 'dtb_product_categories', - "category_id = ?", + 'category_id = ?', array($category_id)); @@ -605,5 +605,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $objQuery->delete('dtb_product_categories', - "category_id = ? AND product_id = ?", array($category_id, $product_id)); + 'category_id = ? AND product_id = ?', array($category_id, $product_id)); } @@ -619,7 +619,7 @@ // 現在のカテゴリ情報を取得 - $arrCurrentCat = $objQuery->select("product_id, category_id, rank", + $arrCurrentCat = $objQuery->select('product_id, category_id, rank', 'dtb_product_categories', - "product_id = ?", + 'product_id = ?', array($product_id)); @@ -739,5 +739,5 @@ $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; $sqlval['product_count'] = (string)$arrNew[$cid]; - if ($sqlval['product_count'] =="") { + if ($sqlval['product_count'] =='') { $sqlval['product_count'] = (string)'0'; } @@ -773,6 +773,6 @@ $arrval = array(); list($tmp_where, $tmp_arrval) = $this->sfGetCatWhere($category_id); - if ($tmp_where != "") { - $sql_where_product_ids = "product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; + if ($tmp_where != '') { + $sql_where_product_ids = 'product_id IN (SELECT product_id FROM dtb_product_categories WHERE ' . $tmp_where . ')'; $arrval = array_merge((array)$tmp_arrval, (array)$tmp_arrval); } else { @@ -795,5 +795,5 @@ $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; $sqlval['product_count'] = $count; - if ($sqlval['product_count'] =="") { + if ($sqlval['product_count'] =='') { $sqlval['product_count'] = (string)'0'; } @@ -930,5 +930,5 @@ $arrRet = SC_Helper_DB_Ex::sfGetChildrenArray('dtb_category', 'parent_category_id', 'category_id', $category_id); - $where = "category_id IN (" . implode(',', array_fill(0, count($arrRet), '?')) . ")"; + $where = 'category_id IN (' . implode(',', array_fill(0, count($arrRet), '?')) . ")"; return array($where, $arrRet); @@ -948,6 +948,6 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $col = "$keyname, $valname"; - $objQuery->setWhere("del_flg = 0"); - $objQuery->setOrder("rank DESC"); + $objQuery->setWhere('del_flg = 0'); + $objQuery->setOrder('rank DESC'); $arrList = $objQuery->select($col, $table, $where, $arrVal); $count = count($arrList); @@ -969,9 +969,9 @@ * @return void */ - function sfRankUp($table, $colname, $id, $andwhere = "") { + function sfRankUp($table, $colname, $id, $andwhere = '') { $objQuery =& SC_Query_Ex::getSingletonInstance(); $objQuery->begin(); $where = "$colname = ?"; - if ($andwhere != "") { + if ($andwhere != '') { $where.= " AND $andwhere"; } @@ -983,6 +983,6 @@ if ($rank < $maxrank) { // ランクが一つ上のIDを取得する。 - $where = "rank = ?"; - if ($andwhere != "") { + $where = 'rank = ?'; + if ($andwhere != '') { $where.= " AND $andwhere"; } @@ -991,5 +991,5 @@ // ランク入れ替えの実行 $sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?"; - if ($andwhere != "") { + if ($andwhere != '') { $sqlup.= " AND $andwhere"; } @@ -1009,9 +1009,9 @@ * @return void */ - function sfRankDown($table, $colname, $id, $andwhere = "") { + function sfRankDown($table, $colname, $id, $andwhere = '') { $objQuery =& SC_Query_Ex::getSingletonInstance(); $objQuery->begin(); $where = "$colname = ?"; - if ($andwhere != "") { + if ($andwhere != '') { $where.= " AND $andwhere"; } @@ -1022,6 +1022,6 @@ if ($rank > 1) { // ランクが一つ下のIDを取得する。 - $where = "rank = ?"; - if ($andwhere != "") { + $where = 'rank = ?'; + if ($andwhere != '') { $where.= " AND $andwhere"; } @@ -1030,5 +1030,5 @@ // ランク入れ替えの実行 $sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?"; - if ($andwhere != "") { + if ($andwhere != '') { $sqlup.= " AND $andwhere"; } @@ -1049,10 +1049,10 @@ * @return void */ - function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = "") { + function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = '') { $objQuery =& SC_Query_Ex::getSingletonInstance(); $objQuery->begin(); // 自身のランクを取得する - if ($where != "") { + if ($where != '') { $getWhere = "$keyIdColumn = ? AND " . $where; } else { @@ -1073,8 +1073,8 @@ //入れ替え先の順位が入れ換え元の順位より大きい場合 - if($position > $rank) $term = "rank - 1"; + if($position > $rank) $term = 'rank - 1'; //入れ替え先の順位が入れ換え元の順位より小さい場合 - if($position < $rank) $term = "rank + 1"; + if($position < $rank) $term = 'rank + 1'; // XXX 入れ替え先の順位が入れ替え元の順位と同じ場合 @@ -1083,5 +1083,5 @@ // 指定した順位の商品から移動させる商品までのrankを１つずらす $sql = "UPDATE $tableName SET rank = $term WHERE rank BETWEEN ? AND ?"; - if ($where != "") { + if ($where != '') { $sql.= " AND $where"; } @@ -1092,5 +1092,5 @@ // 指定した順位へrankを書き換える。 $sql = "UPDATE $tableName SET rank = ? WHERE $keyIdColumn = ? "; - if ($where != "") { + if ($where != '') { $sql.= " AND $where"; } @@ -1113,5 +1113,5 @@ * @return void */ - function sfDeleteRankRecord($table, $colname, $id, $andwhere = "", + function sfDeleteRankRecord($table, $colname, $id, $andwhere = '', $delete = false) { $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -1119,5 +1119,5 @@ // 削除レコードのランクを取得する。 $where = "$colname = ?"; - if ($andwhere != "") { + if ($andwhere != '') { $where.= " AND $andwhere"; } @@ -1135,6 +1135,6 @@ // 追加レコードのランクより上のレコードを一つずらす。 - $where = "rank > ?"; - if ($andwhere != "") { + $where = 'rank > ?'; + if ($andwhere != '') { $where.= " AND $andwhere"; } @@ -1157,8 +1157,8 @@ $col = $col_name; $len = count($arrId); - $where = ""; + $where = ''; for ($cnt = 0; $cnt < $len; $cnt++) { - if ($where == "") { + if ($where == '') { $where = "$id_name = ?"; } else { @@ -1243,17 +1243,17 @@ * @return bool レコードが存在する場合 true */ - function sfIsRecord($table, $col, $arrval, $addwhere = "") { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - $arrCol = preg_split("/[, ]/", $col); - - $where = "del_flg = 0"; - - if ($addwhere != "") { + function sfIsRecord($table, $col, $arrval, $addwhere = '') { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $arrCol = preg_split('/[, ]/', $col); + + $where = 'del_flg = 0'; + + if ($addwhere != '') { $where.= " AND $addwhere"; } foreach ($arrCol as $val) { - if ($val != "") { - if ($where == "") { + if ($val != '') { + if ($where == '') { $where = "$val = ?"; } else { @@ -1264,5 +1264,5 @@ $ret = $objQuery->get($col, $table, $where, $arrval); - if ($ret != "") { + if ($ret != '') { return true; } @@ -1277,16 +1277,16 @@ */ function sfCountMaker($objQuery) { - $sql = ""; + $sql = ''; //テーブル内容の削除 - $objQuery->query("DELETE FROM dtb_maker_count"); + $objQuery->query('DELETE FROM dtb_maker_count'); //各メーカーの商品数を数えて格納 - $sql = " INSERT INTO dtb_maker_count(maker_id, product_count, create_date) "; - $sql .= " SELECT T1.maker_id, count(T2.maker_id), CURRENT_TIMESTAMP "; - $sql .= " FROM dtb_maker AS T1 LEFT JOIN dtb_products AS T2"; - $sql .= " ON T1.maker_id = T2.maker_id "; - $sql .= " WHERE T2.del_flg = 0 AND T2.status = 1 "; - $sql .= " GROUP BY T1.maker_id, T2.maker_id "; + $sql = ' INSERT INTO dtb_maker_count(maker_id, product_count, create_date) '; + $sql .= ' SELECT T1.maker_id, count(T2.maker_id), CURRENT_TIMESTAMP '; + $sql .= ' FROM dtb_maker AS T1 LEFT JOIN dtb_products AS T2'; + $sql .= ' ON T1.maker_id = T2.maker_id '; + $sql .= ' WHERE T2.del_flg = 0 AND T2.status = 1 '; + $sql .= ' GROUP BY T1.maker_id, T2.maker_id '; $objQuery->query($sql); } @@ -1302,7 +1302,7 @@ function sfGetMakerId($product_id, $maker_id = 0, $closed = false) { if ($closed) { - $status = ""; + $status = ''; } else { - $status = "status = 1"; + $status = 'status = 1'; } @@ -1315,5 +1315,5 @@ } else if (SC_Utils_Ex::sfIsInt($product_id) && $product_id != 0 && $this->sfIsRecord('dtb_products','product_id', $product_id, $status)) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "product_id = ?"; + $where = 'product_id = ?'; $maker_id = $objQuery->getCol('maker_id', 'dtb_products', "product_id = ?", array($product_id)); $this->g_maker_id = $maker_id; @@ -1335,20 +1335,20 @@ * @return array カテゴリツリーの配列 */ - function sfGetMakerList($addwhere = "", $products_check = false) { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "del_flg = 0"; - - if ($addwhere != "") { + function sfGetMakerList($addwhere = '', $products_check = false) { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $where = 'del_flg = 0'; + + if ($addwhere != '') { $where.= " AND $addwhere"; } - $objQuery->setOption("ORDER BY rank DESC"); + $objQuery->setOption('ORDER BY rank DESC'); if ($products_check) { - $col = "T1.maker_id, name"; - $from = "dtb_maker AS T1 LEFT JOIN dtb_maker_count AS T2 ON T1.maker_id = T2.maker_id"; - $where .= " AND product_count > 0"; + $col = 'T1.maker_id, name'; + $from = 'dtb_maker AS T1 LEFT JOIN dtb_maker_count AS T2 ON T1.maker_id = T2.maker_id'; + $where .= ' AND product_count > 0'; } else { - $col = "maker_id, name"; + $col = 'maker_id, name'; $from = 'dtb_maker'; } Index: branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php (revision 21482) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php (revision 21514) @@ -87,5 +87,5 @@ } - $now = date("Y/m/d H:i:s"); + $now = date('Y/m/d H:i:s'); // 本来 realpath() で正規化したいところだが、NULL を返すケースがあるため避けている (#1618) $log_file_path = DATA_REALDIR . 'logs/site.log'; @@ -127,5 +127,5 @@ static function &_fatal_error_handler(&$buffer) { if (preg_match('/(Fatal) error<\/b>: +(.+) in (.+)<\/b> on line (\d+)<\/b>
/i', $buffer, $matches)) { - $now = date("Y/m/d H:i:s"); + $now = date('Y/m/d H:i:s'); // 本来 realpath() で正規化したいところだが、NULL を返すケースがあるため避けている (#1618) $log_file_path = DATA_REALDIR . 'logs/site.log'; @@ -133,7 +133,7 @@ error_log($message, 3, $log_file_path); if (DEBUG_MODE !== true) { - $url = HTTP_URL . "error.php"; + $url = HTTP_URL . 'error.php'; if (defined('ADMIN_FUNCTION') && ADMIN_FUNCTION) { - $url .= "?admin"; + $url .= '?admin'; } header("Location: $url"); @@ -175,5 +175,5 @@ // ログの書き出し - $now = date("Y/m/d H:i:s"); + $now = date('Y/m/d H:i:s'); // 本来 realpath() で正規化したいところだが、NULL を返すケースがあるため避けている (#1618) $log_file_path = DATA_REALDIR . 'logs/site.log'; Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php (revision 21490) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php (revision 21514) @@ -177,5 +177,5 @@ * セッションデータが有効かどうかをチェックする。 * - * FIXME "@" でエラーを抑制するのは良くない + * FIXME '@' でエラーを抑制するのは良くない * * @return boolean セッションデータが有効な場合は true、無効な場合は false を返す。 @@ -189,5 +189,5 @@ // 有効期限を過ぎていないかどうかをチェックする。 if (intval(@$_SESSION['mobile']['expires']) < time()) { - GC_Utils_Ex::gfPrintLog("Session expired at " . + GC_Utils_Ex::gfPrintLog('Session expired at ' . date('Y/m/d H:i:s', @$_SESSION['mobile']['expires']) . ' : sid=' . session_id()); @@ -199,5 +199,5 @@ $model = SC_MobileUserAgent_Ex::getModel(); if (@$_SESSION['mobile']['model'] != $model) { - GC_Utils_Ex::gfPrintLog("User agent model mismatch : " . + GC_Utils_Ex::gfPrintLog('User agent model mismatch : ' . "\"$model\" != \"" . @$_SESSION['mobile']['model'] . '" (expected), sid=' . session_id()); @@ -231,5 +231,5 @@ //download.phpに対してカタカナ変換をするとファイルが壊れてしまうため回避する - if ($_SERVER['SCRIPT_FILENAME'] != HTML_REALDIR . "mypage/download.php") { + if ($_SERVER['SCRIPT_FILENAME'] != HTML_REALDIR . 'mypage/download.php') { // 全角カタカナを半角カタカナに変換する。 ob_start(create_function('$buffer', 'return mb_convert_kana($buffer, "k");')); @@ -454,5 +454,5 @@ function getMimeType($filename) { //ファイルの拡張子からコンテンツタイプを決定する - $file_extension = strtolower(substr(strrchr($filename,"."),1)); + $file_extension = strtolower(substr(strrchr($filename,'.'),1)); $mime_type = $this->defaultMimeType; if (array_key_exists($file_extension, $this->arrMimetypes)) { Index: branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php (revision 21490) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php (revision 21514) @@ -51,11 +51,11 @@ foreach ($arrDir as $file) { // ./ と ../を除くファイルのみを取得 - if ($file != "." && $file != "..") { - - $path = $dir."/".$file; + if ($file != '.' && $file != '..') { + + $path = $dir.'/'.$file; // SELECT内の見た目を整えるため指定文字数で切る $file_name = SC_Utils_Ex::sfCutString($file, FILE_NAME_LEN); $file_size = SC_Utils_Ex::sfCutString($this->sfGetDirSize($path), FILE_NAME_LEN); - $file_time = date("Y/m/d", filemtime($path)); + $file_time = date('Y/m/d', filemtime($path)); // ディレクトリとファイルで格納配列を変える @@ -99,5 +99,5 @@ // 行末の/を取り除く $dir = ereg_replace("/$", "", $dir); - $path = $dir."/".$file; + $path = $dir.'/'.$file; if ($file != '..' && $file != '.' && !is_dir($path)) { $bytes += filesize($path); @@ -113,5 +113,5 @@ } // ディレクトリ(ファイル)が存在しない場合は0byteを返す - if($bytes == "") $bytes = 0; + if($bytes == '') $bytes = 0; return $bytes; @@ -132,5 +132,5 @@ $cnt = 0; while (false !== ($item = readdir($handle))) { - if ($item != "." && $item != "..") { + if ($item != '.' && $item != '..') { if (is_dir("$dir/$item")) { $this->sfDeleteDir("$dir/$item"); @@ -213,8 +213,8 @@ natcasesort($arrDir); foreach ($arrDir as $item) { - if ($item != "." && $item != "..") { + if ($item != '.' && $item != '..') { // 文末の/を取り除く $dir = ereg_replace("/$", "", $dir); - $path = $dir."/".$item; + $path = $dir.'/'.$item; // ディレクトリのみ取得 if (is_dir($path)) { @@ -257,5 +257,5 @@ // 行末の/を取り除く $dir = ereg_replace("/$", "", $dir); - $path = $dir."/".$file; + $path = $dir.'/'.$file; if ($file != '..' && $file != '.' && is_dir($path)) { return true; @@ -293,8 +293,8 @@ function sfDownloadFile($file) { // ファイルの場合はダウンロードさせる - Header("Content-disposition: attachment; filename=".basename($file)); - Header("Content-type: application/octet-stream; name=".basename($file)); - Header("Cache-Control: "); - Header("Pragma: "); + Header('Content-disposition: attachment; filename='.basename($file)); + Header('Content-type: application/octet-stream; name='.basename($file)); + Header('Cache-Control: '); + Header('Pragma: '); echo ($this->sfReadFile($file)); } @@ -307,7 +307,7 @@ * @return bool ファイル作成に成功した場合 true */ - function sfCreateFile($file, $mode = "") { + function sfCreateFile($file, $mode = '') { // 行末の/を取り除く - if ($mode != "") { + if ($mode != '') { $ret = @mkdir($file, $mode); } else { @@ -325,5 +325,5 @@ */ function sfReadFile($filename) { - $str = ""; + $str = ''; // バイナリモードでオープン $fp = @fopen($filename, 'rb'); @@ -369,10 +369,10 @@ $dlFileName = 'tpl_package_' . $template_code . '_' . date('YmdHis') . '.tar.gz'; - $debug_message = $dir . " から " . $dlFileName . " を作成します...\n"; + $debug_message = $dir . ' から ' . $dlFileName . " を作成します...\n"; // ファイル一覧取得 $arrFileHash = SC_Utils_Ex::sfGetFileList($dir); foreach ($arrFileHash as $val) { $arrFileList[] = $val['file_name']; - $debug_message.= "圧縮：".$val['file_name']."\n"; + $debug_message.= '圧縮：'.$val['file_name']."\n"; } GC_Utils_Ex::gfPrintLog($debug_message); @@ -386,8 +386,8 @@ header("Content-disposition: attachment; filename=${dlFileName}"); header("Content-type: application/octet-stream; name=${dlFileName}"); - header("Cache-Control: "); - header("Pragma: "); + header('Cache-Control: '); + header('Pragma: '); readfile($dlFileName); - unlink($dir . "/" . $dlFileName); + unlink($dir . '/' . $dlFileName); return true; } else { @@ -413,9 +413,9 @@ // 指定されたフォルダ内に解凍する - $result = $tar->extractModify($dir. "/", $unpacking_name); - GC_Utils_Ex::gfPrintLog("解凍：" . $dir."/".$file_name."->".$dir."/".$unpacking_name); + $result = $tar->extractModify($dir. '/', $unpacking_name); + GC_Utils_Ex::gfPrintLog('解凍：' . $dir.'/'.$file_name."->".$dir."/".$unpacking_name); // フォルダ削除 - SC_Utils_Ex::sfDelFile($dir . "/" . $unpacking_name); + SC_Utils_Ex::sfDelFile($dir . '/' . $unpacking_name); // 圧縮ファイル削除 unlink($path); Index: branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php (revision 21481) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php (revision 21514) @@ -47,5 +47,5 @@ * @return void */ - function sfGetPageLayout(&$objPage, $preview = false, $url = "", $device_type_id = DEVICE_TYPE_PC) { + function sfGetPageLayout(&$objPage, $preview = false, $url = '', $device_type_id = DEVICE_TYPE_PC) { // URLを元にページ情報を取得 @@ -59,5 +59,5 @@ } - $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id) . $arrPageData[0]['filename'] . ".tpl"; + $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id) . $arrPageData[0]['filename'] . '.tpl'; $objPage->arrPageLayout =& $arrPageData[0]; @@ -82,6 +82,6 @@ } else { $error = "ブロックが見つかりません\n" - . "tpl_path: " . $arrBloc['tpl_path'] . "\n" - . "php_path: " . $arrBloc['php_path']; + . 'tpl_path: ' . $arrBloc['tpl_path'] . "\n" + . 'php_path: ' . $arrBloc['php_path']; GC_Utils_Ex::gfPrintLog($error); } @@ -159,7 +159,7 @@ AND bloc.device_type_id = pos.device_type_id __EOF__; - $where = "bloc.device_type_id = ? AND (anywhere = 1 OR pos.page_id = ?)"; + $where = 'bloc.device_type_id = ? AND (anywhere = 1 OR pos.page_id = ?)'; $objQuery->setOrder('target_id, bloc_row'); - $arrBlocs = $objQuery->select("*", $table, $where, + $arrBlocs = $objQuery->select('*', $table, $where, array($device_type_id, $page_id)); if ($has_realpath) { @@ -186,5 +186,5 @@ if ($page_id != '') { $arrPageData = $this->getPageProperties($device_type_id, $page_id); - $ret = $objQuery->delete('dtb_pagelayout', "page_id = ? AND device_type_id = ?", array($page_id, $device_type_id)); + $ret = $objQuery->delete('dtb_pagelayout', 'page_id = ? AND device_type_id = ?', array($page_id, $device_type_id)); // ファイルの削除 $this->lfDelFile($arrPageData[0]['filename'], $device_type_id); @@ -255,5 +255,5 @@ */ function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false) { - $templateName = ""; + $templateName = ''; switch ($device_type_id) { case DEVICE_TYPE_MOBILE: @@ -274,5 +274,5 @@ $userPath = USER_REALDIR; if ($isUser) { - $dir = $userPath . USER_PACKAGE_DIR . $templateName . "/"; + $dir = $userPath . USER_PACKAGE_DIR . $templateName . '/'; } return $dir; @@ -306,5 +306,5 @@ $userDir = ROOT_URLPATH . USER_DIR; if ($hasPackage) { - return $userDir . USER_PACKAGE_DIR . $templateName . "/"; + return $userDir . USER_PACKAGE_DIR . $templateName . '/'; } return $userDir; Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php (revision 21481) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php (revision 21514) @@ -92,5 +92,5 @@ $this->cleanupSession($orderId, $objCartSession, $objCustomer, $cartkey); - GC_Utils_Ex::gfFrontLog("order complete. customerId=" . $customerId); + GC_Utils_Ex::gfFrontLog('order complete. customerId=' . $customerId); } @@ -129,5 +129,5 @@ foreach ($arrOrderDetail as $arrDetail) { $objQuery->update('dtb_products_class', array(), - "product_class_id = ?", array($arrDetail['product_class_id']), + 'product_class_id = ?', array($arrDetail['product_class_id']), array('stock' => 'stock + ?'), array($arrDetail['quantity'])); } @@ -234,5 +234,5 @@ function getOrderTemp($uniqId) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - return $objQuery->getRow("*", 'dtb_order_temp', "order_temp_id = ?", + return $objQuery->getRow('*', 'dtb_order_temp', "order_temp_id = ?", array($uniqId)); } @@ -246,5 +246,5 @@ function getOrderTempByOrderId($order_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - return $objQuery->getRow("*", 'dtb_order_temp', "order_id = ?", + return $objQuery->getRow('*', 'dtb_order_temp', "order_id = ?", array($order_id)); } @@ -498,6 +498,6 @@ // 削除されていない支払方法を取得 $where = 'del_flg = 0 AND payment_id IN (' . implode(', ', array_pad(array(), count($arrPaymentIds), '?')) . ')'; - $objQuery->setOrder("rank DESC"); - $payments = $objQuery->select("payment_id, payment_method, rule, upper_rule, note, payment_image, charge", 'dtb_payment', $where, $arrPaymentIds); + $objQuery->setOrder('rank DESC'); + $payments = $objQuery->select('payment_id, payment_method, rule, upper_rule, note, payment_image, charge', 'dtb_payment', $where, $arrPaymentIds); foreach ($payments as $data) { // 下限と上限が設定されている @@ -573,9 +573,9 @@ //お取り寄せ(商品入荷後) case '9': - $start_day = ""; + $start_day = ''; break; default: //お届け日が設定されていない場合 - $start_day = ""; + $start_day = ''; } //お届け可能日のスタート値から、お届け日の配列を取得する @@ -598,6 +598,6 @@ // 基本時間から日数を追加していく $tmp_time = $now_time + ($i * 24 * 3600); - list($y, $m, $d, $w) = explode(" ", date("Y m d w", $tmp_time)); - $val = sprintf("%04d/%02d/%02d(%s)", $y, $m, $d, $arrWDAY[$w]); + 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; } @@ -680,7 +680,7 @@ && $convert_shipping_date) { $d = mb_strcut($arrValues['shipping_date'], 0, 10); - $arrDate = explode("/", $d); + $arrDate = explode('/', $d); $ts = mktime(0, 0, 0, $arrDate[1], $arrDate[2], $arrDate[0]); - $arrValues['shipping_date'] = date("Y-m-d", $ts); + $arrValues['shipping_date'] = date('Y-m-d', $ts); } @@ -802,5 +802,5 @@ if (!$objProduct->reduceStock($p['product_class_id'], $item['quantity'])) { $objQuery->rollback(); - SC_Utils_Ex::sfDispSiteError(SOLD_OUT, "", true); + SC_Utils_Ex::sfDispSiteError(SOLD_OUT, '', true); } $i++; @@ -809,5 +809,5 @@ $objQuery->update('dtb_order_temp', array('del_flg' => 1), - "order_temp_id = ?", + 'order_temp_id = ?', array(SC_SiteSession_Ex::getUniqId())); @@ -1000,5 +1000,5 @@ $arrResults = array(); $objQuery->setOrder('shipping_id'); - $arrShippings = $objQuery->select("*", 'dtb_shipping', "order_id = ?", + $arrShippings = $objQuery->select('*', 'dtb_shipping', "order_id = ?", array($order_id)); // shipping_id ごとの配列を生成する @@ -1031,6 +1031,6 @@ $objProduct = new SC_Product_Ex(); $arrResults = array(); - $arrItems = $objQuery->select("*", 'dtb_shipment_item', - "order_id = ? AND shipping_id = ?", + $arrItems = $objQuery->select('*', 'dtb_shipment_item', + 'order_id = ? AND shipping_id = ?', array($order_id, $shipping_id)); @@ -1200,5 +1200,5 @@ array($order_id), array('shipping_time' => - "(SELECT deliv_time FROM dtb_delivtime WHERE time_id = dtb_shipping.time_id AND deliv_id = dtb_shipping.deliv_id)")); + '(SELECT deliv_time FROM dtb_delivtime WHERE time_id = dtb_shipping.time_id AND deliv_id = dtb_shipping.deliv_id)')); } @@ -1208,5 +1208,5 @@ array($order_id), array('payment_method' => - "(SELECT payment_method FROM dtb_payment WHERE payment_id = " . $tgt_table . ".payment_id)")); + '(SELECT payment_method FROM dtb_payment WHERE payment_id = ' . $tgt_table . '.payment_id)')); } Index: branches/version-2_12-dev/data/class/SC_Query.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Query.php (revision 21490) +++ branches/version-2_12-dev/data/class/SC_Query.php (revision 21514) @@ -47,7 +47,7 @@ * @param boolean $new 新規に接続を行うかどうか */ - function SC_Query($dsn = "", $force_run = false, $new = false) { - - if ($dsn == "") { + function SC_Query($dsn = '', $force_run = false, $new = false) { + + if ($dsn == '') { $dsn = DEFAULT_DSN; } @@ -90,5 +90,5 @@ * @return SC_Query シングルトンの SC_Query インスタンス */ - function getSingletonInstance($dsn = "", $force_run = false, $new = false) { + function getSingletonInstance($dsn = '', $force_run = false, $new = false) { if (!isset($GLOBALS['_SC_Query_instance']) || is_null($GLOBALS['_SC_Query_instance'])) { @@ -153,5 +153,5 @@ * @return array|null */ - function select($col, $table, $where = "", $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) { + function select($col, $table, $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) { $sqlse = $this->getSql($col, $table, $where, $arrWhereVal); return $this->getAll($sqlse, $arrWhereVal, $fetchmode); @@ -303,5 +303,5 @@ $sqlse .= " WHERE $where"; } elseif (strlen($this->where) >= 1) { - $sqlse .= " WHERE " . $this->where; + $sqlse .= ' WHERE ' . $this->where; // 実行時と同じくキャストしてから評価する (空文字を要素1の配列と評価させる意図) $arrWhereValForEval = (array)$arrWhereVal; @@ -342,6 +342,6 @@ if (is_numeric($limit) && is_numeric($offset)) { - $option = " LIMIT " . $limit; - $option.= " OFFSET " . $offset; + $option = ' LIMIT ' . $limit; + $option.= ' OFFSET ' . $offset; $this->option .= $option; } @@ -361,5 +361,5 @@ $this->groupby = ''; } else { - $this->groupby = "GROUP BY " . $str; + $this->groupby = 'GROUP BY ' . $str; } return $this; @@ -375,6 +375,6 @@ */ function andWhere($str) { - if ($this->where != "") { - $this->where .= " AND " . $str; + if ($this->where != '') { + $this->where .= ' AND ' . $str; } else { $this->where = $str; @@ -392,6 +392,6 @@ */ function orWhere($str) { - if ($this->where != "") { - $this->where .= " OR " . $str; + if ($this->where != '') { + $this->where .= ' OR ' . $str; } else { $this->where = $str; @@ -427,5 +427,5 @@ $this->order = ''; } else { - $this->order = "ORDER BY " . $str; + $this->order = 'ORDER BY ' . $str; } return $this; @@ -442,5 +442,5 @@ function setLimit($limit) { if (is_numeric($limit)) { - $this->option = " LIMIT " .$limit; + $this->option = ' LIMIT ' .$limit; } return $this; @@ -457,5 +457,5 @@ function setOffset($offset) { if (is_numeric($offset)) { - $this->offset = " OFFSET " .$offset; + $this->offset = ' OFFSET ' .$offset; } return $this; @@ -480,5 +480,5 @@ foreach ($sqlval as $key => $val) { $strcol .= $key . ','; - if (strcasecmp("Now()", $val) === 0) { + if (strcasecmp('Now()', $val) === 0) { $strval .= 'Now(),'; } else if (strcasecmp('CURRENT_TIMESTAMP', $val) === 0) { @@ -501,5 +501,5 @@ return false; } - // 文末の","を削除 + // 文末の','を削除 $strcol = preg_replace("/,$/", "", $strcol); $strval = preg_replace("/,$/", "", $strval); @@ -522,5 +522,5 @@ * @return */ - function update($table, $sqlval, $where = "", $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array()) { + function update($table, $sqlval, $where = '', $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array()) { $arrCol = array(); $arrVal = array(); @@ -528,5 +528,5 @@ foreach ($sqlval as $key => $val) { - if (strcasecmp("Now()", $val) === 0) { + if (strcasecmp('Now()', $val) === 0) { $arrCol[] = $key . '= Now()'; } else if (strcasecmp('CURRENT_TIMESTAMP', $val) === 0) { @@ -539,5 +539,5 @@ } - if ($arrRawSql != "") { + if ($arrRawSql != '') { foreach ($arrRawSql as $key => $val) { $arrCol[] = "$key = $val"; @@ -551,5 +551,5 @@ } - // 文末の","を削除 + // 文末の','を削除 $strcol = implode(', ', $arrCol); @@ -577,5 +577,5 @@ * @return integer MAX文の実行結果 */ - function max($col, $table, $where = "", $arrval = array()) { + function max($col, $table, $where = '', $arrval = array()) { $ret = $this->get("MAX($col)", $table, $where, $arrval); return $ret; @@ -591,5 +591,5 @@ * @return integer MIN文の実行結果 */ - function min($col, $table, $where = "", $arrval = array()) { + function min($col, $table, $where = '', $arrval = array()) { $ret = $this->get("MIN($col)", $table, $where, $arrval); return $ret; @@ -605,5 +605,5 @@ * @return mixed SQL の実行結果 */ - function get($col, $table, $where = "", $arrWhereVal = array()) { + function get($col, $table, $where = '', $arrWhereVal = array()) { $sqlse = $this->getSql($col, $table, $where, $arrWhereVal); // SQL文の実行 @@ -652,5 +652,5 @@ * @return array array('カラム名' => '値', ...)の連想配列 */ - function getRow($col, $table, $where = "", $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) { + function getRow($col, $table, $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) { $sql = $this->getSql($col, $table, $where, $arrWhereVal); @@ -685,5 +685,5 @@ * @return array SQL の実行結果の配列 */ - function getCol($col, $table, $where = "", $arrWhereVal = array()) { + function getCol($col, $table, $where = '', $arrWhereVal = array()) { $sql = $this->getSql($col, $table, $where, $arrWhereVal); $sql = $this->dbFactory->sfChangeMySQL($sql); @@ -716,5 +716,5 @@ * @return */ - function delete($table, $where = "", $arrval = array()) { + function delete($table, $where = '', $arrval = array()) { if (strlen($where) <= 0) { $sqlde = "DELETE FROM $table"; @@ -967,19 +967,19 @@ * @return string トレースしたエラー文字列 */ - function traceError($error, $sql = "", $arrVal = false) { + function traceError($error, $sql = '', $arrVal = false) { $scheme = ''; if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') { - $scheme = "http://"; + $scheme = 'http://'; } else { - $scheme = "https://"; + $scheme = 'https://'; } $err = $scheme . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . "\n\n" - . "SERVER_ADDR: " . $_SERVER['SERVER_ADDR'] . "\n" - . "REMOTE_ADDR: " . $_SERVER['REMOTE_ADDR'] . "\n" - . "USER_AGENT: " . $_SERVER['HTTP_USER_AGENT'] . "\n\n" - . "SQL: " . $sql . "\n\n"; + . 'SERVER_ADDR: ' . $_SERVER['SERVER_ADDR'] . "\n" + . 'REMOTE_ADDR: ' . $_SERVER['REMOTE_ADDR'] . "\n" + . 'USER_AGENT: ' . $_SERVER['HTTP_USER_AGENT'] . "\n\n" + . 'SQL: ' . $sql . "\n\n"; if ($arrVal !== false) { - $err .= "PlaceHolder: " . var_export($arrVal, true) . "\n\n"; + $err .= 'PlaceHolder: ' . var_export($arrVal, true) . "\n\n"; } $err .= $error->getMessage() . "\n\n"; Index: branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php =================================================================== --- branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php (revision 21490) +++ branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php (revision 21514) @@ -36,10 +36,10 @@ * 変換したいファイルの拡張子をカンマ区切りで羅列. */ - var $includes = "php,inc,tpl,css,sql,js,png,jpg,gif,swf,txt,doc,pdf"; + var $includes = 'php,inc,tpl,css,sql,js,png,jpg,gif,swf,txt,doc,pdf'; /** * 除外するファイル名をカンマ区切りで羅列. */ - var $excludes = "distinfo.php"; + var $excludes = 'distinfo.php'; /** @@ -49,5 +49,5 @@ * @return void */ - function execute($target = ".") { + function execute($target = '.') { $msg = ''; $oldMask = umask(0); @@ -84,8 +84,8 @@ // distinfo の変数定義 - $distinfo = isset($distinfo) ? $distinfo : ""; + $distinfo = isset($distinfo) ? $distinfo : ''; // distinfo.php を読み込む - if ($fileName == "distinfo.php") { + if ($fileName == 'distinfo.php') { include_once $path; } @@ -93,6 +93,6 @@ // 除外ファイルをスキップ if (in_array($fileName, $excludeArray)) { - //$arrLog['ok'][] = "次のファイルは除外されました: " . $path; - $msg = "次のファイルは除外されました: " . $path; + //$arrLog['ok'][] = '次のファイルは除外されました: ' . $path; + $msg = '次のファイルは除外されました: ' . $path; $this->printLog($msg); continue; @@ -102,5 +102,5 @@ $sha1 = sha1_file($path); - //$arrLog[] = $sha1 . " => " . $path; + //$arrLog[] = $sha1 . ' => ' . $path; // 変換対象を順に処理 @@ -115,5 +115,5 @@ $out = $distinfo[$sha1]; } else { - $msg = "ハッシュ値が一致しないため, コピー先が取得できません: " . $path; + $msg = 'ハッシュ値が一致しないため, コピー先が取得できません: ' . $path; $arrLog['err'][] = $msg; $this->printLog($msg); @@ -122,5 +122,5 @@ if (file_exists($out) && $sha1 == sha1_file($out)) { - $msg = "同じ内容のファイルをスキップしました: " . $out; + $msg = '同じ内容のファイルをスキップしました: ' . $out; $this->printLog($msg); continue; @@ -133,10 +133,10 @@ if (!@copy($out, $bkupTo)) { - $msg = "バックアップファイルの作成に失敗しました: " . $out . ' -> ' . $bkupTo; + $msg = 'バックアップファイルの作成に失敗しました: ' . $out . ' -> ' . $bkupTo; $arrLog['err'][] = $msg; $this->printLog($msg); break 2; } - $msg = "バックアップファイルの作成に成功しました: " . $out . ' -> ' . $bkupTo; + $msg = 'バックアップファイルの作成に成功しました: ' . $out . ' -> ' . $bkupTo; $this->printLog($msg); } @@ -149,5 +149,5 @@ $handle = @fopen($out, 'w'); if (!$handle) { - $msg = "コピー先に書き込み権限がありません: " . $out; + $msg = 'コピー先に書き込み権限がありません: ' . $out; $arrLog['err'][] = $msg; $this->printLog($msg); @@ -158,5 +158,5 @@ // 取得した内容を書き込む if (fwrite($handle, $contents) === false) { - $msg = "コピー先に書き込み権限がありません: " . $out; + $msg = 'コピー先に書き込み権限がありません: ' . $out; $arrLog['err'][] = $msg; $this->printLog($msg); @@ -164,5 +164,5 @@ } - $msg = "ファイルのコピーに成功しました: " . $out; + $msg = 'ファイルのコピーに成功しました: ' . $out; $arrLog['ok'][] = $msg; $this->printLog($msg); @@ -178,8 +178,8 @@ @fwrite($handle, $src); @fclose($handle); - $msg = "distinfoファイルの作成に成功しました: " . $bkupPath . 'distinfo.php'; + $msg = 'distinfoファイルの作成に成功しました: ' . $bkupPath . 'distinfo.php'; $this->printLog($msg); } else { - $msg = "distinfoファイルの作成に失敗しました: " . $bkupPath . 'distinfo.php'; + $msg = 'distinfoファイルの作成に失敗しました: ' . $bkupPath . 'distinfo.php'; $arrLog['err'][] = $msg; $this->printLog($msg); @@ -224,7 +224,7 @@ $path = preg_replace("@\Q".DATA_REALDIR."\E@", "", $path); } else { - $dir = ""; - } - $arrDirs = explode("/", str_replace("\\", "/", $path)); + $dir = ''; + } + $arrDirs = explode('/', str_replace("\\", "/", $path)); foreach ($arrDirs as $n) { Index: branches/version-2_12-dev/data/class/SC_Cookie.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Cookie.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_Cookie.php (revision 21514) @@ -35,5 +35,5 @@ // クッキー書き込み function setCookie($key, $val) { - setcookie($key, $val, $this->expire, "/", DOMAIN_NAME); + setcookie($key, $val, $this->expire, '/', DOMAIN_NAME); } Index: branches/version-2_12-dev/data/class/SC_View.php =================================================================== --- branches/version-2_12-dev/data/class/SC_View.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_View.php (revision 21514) @@ -47,5 +47,5 @@ $this->_smarty->register_modifier('sfRmDupSlash', array('SC_Utils_Ex', 'sfRmDupSlash')); $this->_smarty->register_modifier('sfCutString', array('SC_Utils_Ex', 'sfCutString')); - $this->_smarty->plugins_dir=array('plugins', realpath(dirname(__FILE__)) . "/../smarty_extends"); + $this->_smarty->plugins_dir=array('plugins', realpath(dirname(__FILE__)) . '/../smarty_extends'); $this->_smarty->register_modifier('sfMbConvertEncoding', array('SC_Utils_Ex', 'sfMbConvertEncoding')); $this->_smarty->register_modifier('sfGetEnabled', array('SC_Utils_Ex', 'sfGetEnabled')); @@ -155,6 +155,6 @@ // ヘッダとフッタを割り当て $templatePath = SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id); - $header_tpl = $templatePath . "header.tpl"; - $footer_tpl = $templatePath . "footer.tpl"; + $header_tpl = $templatePath . 'header.tpl'; + $footer_tpl = $templatePath . 'footer.tpl'; $this->assign('header_tpl', $header_tpl); Index: branches/version-2_12-dev/data/class/SC_Date.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Date.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_Date.php (revision 21514) @@ -115,5 +115,5 @@ $month_array = array(); for ($i=1; $i <= 12; $i++) { - $val = sprintf("%02d", $i); + $val = sprintf('%02d', $i); $month_array[$val] = $val; } Index: branches/version-2_12-dev/data/class/SC_Fpdf.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Fpdf.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_Fpdf.php (revision 21514) @@ -44,8 +44,8 @@ $this->width_cell = array(110.3,12,21.7,24.5); - $this->label_cell[] = $this->lfConvSjis("商品名 / 商品コード / [ 規格 ]"); - $this->label_cell[] = $this->lfConvSjis("数量"); - $this->label_cell[] = $this->lfConvSjis("単価"); - $this->label_cell[] = $this->lfConvSjis("金額(税込)"); + $this->label_cell[] = $this->lfConvSjis('商品名 / 商品コード / [ 規格 ]'); + $this->label_cell[] = $this->lfConvSjis('数量'); + $this->label_cell[] = $this->lfConvSjis('単価'); + $this->label_cell[] = $this->lfConvSjis('金額(税込)'); $this->arrMessage = array( @@ -107,5 +107,5 @@ $this->lfText(125, 63, $arrInfo['law_url'], 8); //URL $this->lfText(125, 68, $arrInfo['law_company'], 8); //会社名 - $text = "〒 ".$arrInfo['law_zip01']." - ".$arrInfo['law_zip02']; + $text = '〒 '.$arrInfo['law_zip01']." - ".$arrInfo['law_zip02']; $this->lfText(125, 71, $text, 8); //郵便番号 $text = $this->arrPref[$arrInfo['law_pref']].$arrInfo['law_addr01']; @@ -113,13 +113,13 @@ $this->lfText(125, 77, $arrInfo['law_addr02'], 8); //住所2 - $text = "TEL: ".$arrInfo['law_tel01']."-".$arrInfo['law_tel02']."-".$arrInfo['law_tel03']; + $text = 'TEL: '.$arrInfo['law_tel01']."-".$arrInfo['law_tel02']."-".$arrInfo['law_tel03']; //FAX番号が存在する場合、表示する if (strlen($arrInfo['law_fax01']) > 0) { - $text .= "　FAX: ".$arrInfo['law_fax01']."-".$arrInfo['law_fax02']."-".$arrInfo['law_fax03']; + $text .= '　FAX: '.$arrInfo['law_fax01']."-".$arrInfo['law_fax02']."-".$arrInfo['law_fax03']; } $this->lfText(125, 80, $text, 8); //TEL・FAX if (strlen($arrInfo['law_email']) > 0) { - $text = "Email: ".$arrInfo['law_email']; + $text = 'Email: '.$arrInfo['law_email']; $this->lfText(125, 83, $text, 8); //Email } @@ -135,5 +135,5 @@ $this->lfText(27, 74, $this->arrData['msg2'], 8); //メッセージ2 $this->lfText(27, 78, $this->arrData['msg3'], 8); //メッセージ3 - $text = "作成日: ".$this->arrData['year']."年".$this->arrData['month']."月".$this->arrData['day']."日"; + $text = '作成日: '.$this->arrData['year']."年".$this->arrData['month']."月".$this->arrData['day']."日"; $this->lfText(158, 288, $text, 8); //作成日 } @@ -144,10 +144,10 @@ // 購入者情報 - $text = "〒 ".$this->arrDisp['order_zip01']." - ".$this->arrDisp['order_zip02']; + $text = '〒 '.$this->arrDisp['order_zip01']." - ".$this->arrDisp['order_zip02']; $this->lfText(23, 43, $text, 10); //購入者郵便番号 $text = $this->arrPref[$this->arrDisp['order_pref']] . $this->arrDisp['order_addr01']; $this->lfText(27, 47, $text, 10); //購入者都道府県+住所1 $this->lfText(27, 51, $this->arrDisp['order_addr02'], 10); //購入者住所2 - $text = $this->arrDisp['order_name01']."　".$this->arrDisp['order_name02']."　様"; + $text = $this->arrDisp['order_name01'].'　'.$this->arrDisp['order_name02']."　様"; $this->lfText(27, 59, $text, 11); //購入者氏名 @@ -162,10 +162,10 @@ $this->Cell(5, 0, '', 0, 0, 'R', 0, ''); $this->SetFont('SJIS', 'B', 15); - $this->Cell(67, 8, $this->lfConvSjis(number_format($this->arrDisp['payment_total'])." 円"), 0, 2, 'R', 0, ''); + $this->Cell(67, 8, $this->lfConvSjis(number_format($this->arrDisp['payment_total']).' 円'), 0, 2, 'R', 0, ''); $this->Cell(0, 45, '', 0, 2, '', 0, ''); $this->SetFont('SJIS', '', 8); - $monetary_unit = $this->lfConvSjis("円"); + $monetary_unit = $this->lfConvSjis('円'); $point_unit = $this->lfConvSjis('Pt'); @@ -182,12 +182,12 @@ $data[2] = $data[0] * $data[1]; - $arrOrder[$i][0] = $this->lfConvSjis($this->arrDisp['product_name'][$i]." / "); - $arrOrder[$i][0] .= $this->lfConvSjis($this->arrDisp['product_code'][$i]." / "); + $arrOrder[$i][0] = $this->lfConvSjis($this->arrDisp['product_name'][$i].' / '); + $arrOrder[$i][0] .= $this->lfConvSjis($this->arrDisp['product_code'][$i].' / '); if ($this->arrDisp['classcategory_name1'][$i]) { - $arrOrder[$i][0] .= $this->lfConvSjis(" [ ".$this->arrDisp['classcategory_name1'][$i]); - if ($this->arrDisp['classcategory_name2'][$i] == "") { - $arrOrder[$i][0] .= " ]"; + $arrOrder[$i][0] .= $this->lfConvSjis(' [ '.$this->arrDisp['classcategory_name1'][$i]); + if ($this->arrDisp['classcategory_name2'][$i] == '') { + $arrOrder[$i][0] .= ' ]'; } else { - $arrOrder[$i][0] .= $this->lfConvSjis(" * ".$this->arrDisp['classcategory_name2'][$i]." ]"); + $arrOrder[$i][0] .= $this->lfConvSjis(' * '.$this->arrDisp['classcategory_name2'][$i]." ]"); } } @@ -198,37 +198,37 @@ } - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = ""; - $arrOrder[$i][3] = ""; - - $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = $this->lfConvSjis("商品合計"); + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = ''; + $arrOrder[$i][3] = ''; + + $i++; + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = $this->lfConvSjis('商品合計'); $arrOrder[$i][3] = number_format($this->arrDisp['subtotal']).$monetary_unit; $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = $this->lfConvSjis("送料"); + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = $this->lfConvSjis('送料'); $arrOrder[$i][3] = number_format($this->arrDisp['deliv_fee']).$monetary_unit; $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = $this->lfConvSjis("手数料"); + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = $this->lfConvSjis('手数料'); $arrOrder[$i][3] = number_format($this->arrDisp['charge']).$monetary_unit; $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = $this->lfConvSjis("値引き"); - $arrOrder[$i][3] = "- ".number_format(($this->arrDisp['use_point'] * POINT_VALUE) + $this->arrDisp['discount']).$monetary_unit; - - $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = $this->lfConvSjis("請求金額"); + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = $this->lfConvSjis('値引き'); + $arrOrder[$i][3] = '- '.number_format(($this->arrDisp['use_point'] * POINT_VALUE) + $this->arrDisp['discount']).$monetary_unit; + + $i++; + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = $this->lfConvSjis('請求金額'); $arrOrder[$i][3] = number_format($this->arrDisp['payment_total']).$monetary_unit; @@ -236,19 +236,19 @@ if ($this->arrData['disp_point'] && $this->arrDisp['customer_id']) { $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = ""; - $arrOrder[$i][3] = ""; + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = ''; + $arrOrder[$i][3] = ''; $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = $this->lfConvSjis("利用ポイント"); + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = $this->lfConvSjis('利用ポイント'); $arrOrder[$i][3] = number_format($this->arrDisp['use_point']).$point_unit; $i++; - $arrOrder[$i][0] = ""; - $arrOrder[$i][1] = ""; - $arrOrder[$i][2] = $this->lfConvSjis("加算ポイント"); + $arrOrder[$i][0] = ''; + $arrOrder[$i][1] = ''; + $arrOrder[$i][2] = $this->lfConvSjis('加算ポイント'); $arrOrder[$i][3] = number_format($this->arrDisp['add_point']).$point_unit; } @@ -260,5 +260,5 @@ $this->Cell(0, 10, '', 0, 1, 'C', 0, ''); $this->SetFont('Gothic', 'B', 9); - $this->MultiCell(0, 6, $this->lfConvSjis("＜ 備 考 ＞"), 'T', 2, 'L', 0, ''); //備考 + $this->MultiCell(0, 6, $this->lfConvSjis('＜ 備 考 ＞'), 'T', 2, 'L', 0, ''); //備考 $this->Ln(); $this->SetFont('SJIS', '', 8); @@ -271,7 +271,7 @@ if ($this->pdf_download == 1) { if ($this->PageNo() == 1) { - $filename = "nouhinsyo-No".$this->arrData['order_id'].".pdf"; + $filename = 'nouhinsyo-No'.$this->arrData['order_id'].".pdf"; } else { - $filename = "nouhinsyo.pdf"; + $filename = 'nouhinsyo.pdf'; } $this->Output($this->lfConvSjis($filename), 'D'); @@ -302,6 +302,6 @@ // DBから受注情報を読み込む $objQuery = new SC_Query_Ex(); - $where = "order_id = ?"; - $arrRet = $objQuery->select("*", 'dtb_order', $where, array($order_id)); + $where = 'order_id = ?'; + $arrRet = $objQuery->select('*', 'dtb_order', $where, array($order_id)); $this->arrDisp = $arrRet[0]; list($point) = SC_Helper_Customer_Ex::sfGetCustomerPoint($order_id, $arrRet[0]['use_point'], $arrRet[0]['add_point']); @@ -314,6 +314,6 @@ // その他支払い情報を表示 - if($this->arrDisp['memo02'] != "") $this->arrDisp['payment_info'] = unserialize($this->arrDisp['memo02']); - $this->arrDisp['payment_type'] = "お支払い"; + if($this->arrDisp['memo02'] != '') $this->arrDisp['payment_info'] = unserialize($this->arrDisp['memo02']); + $this->arrDisp['payment_type'] = 'お支払い'; } } @@ -322,6 +322,6 @@ function lfGetOrderDetail($order_id) { $objQuery = new SC_Query_Ex(); - $col = "product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate"; - $where = "order_id = ?"; + $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate'; + $where = 'order_id = ?'; $objQuery->setOrder('order_detail_id'); $arrRet = $objQuery->select($col, 'dtb_order_detail', $where, array($order_id)); @@ -331,5 +331,5 @@ // 文字コードSJIS変換 -> japanese.phpで使用出来る文字コードはSJIS-winのみ function lfConvSjis($conv_str) { - return mb_convert_encoding($conv_str, "SJIS-win", CHAR_CODE); + return mb_convert_encoding($conv_str, 'SJIS-win', CHAR_CODE); } Index: branches/version-2_12-dev/data/class/SC_Product.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Product.php (revision 21507) +++ branches/version-2_12-dev/data/class/SC_Product.php (revision 21514) @@ -77,5 +77,5 @@ __EOS__; $objQuery->setGroupBy('alldtl.product_id'); - if (is_array($this->arrOrderData) and $objQuery->order == "") { + if (is_array($this->arrOrderData) and $objQuery->order == '') { $o_col = $this->arrOrderData['col']; $o_table = $this->arrOrderData['table']; @@ -93,5 +93,5 @@ $objQuery->setOrder($order); } - $results = $objQuery->select('alldtl.product_id', $table, "", $arrVal, + $results = $objQuery->select('alldtl.product_id', $table, '', $arrVal, MDB2_FETCHMODE_ORDERED); $resultValues = array(); @@ -209,6 +209,6 @@ function getDetail($productId) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $result = $objQuery->select("*", $this->alldtlSQL('product_id = ?'), - "product_id = ?", + $result = $objQuery->select('*', $this->alldtlSQL('product_id = ?'), + 'product_id = ?', array($productId, $productId)); return $result[0]; @@ -379,5 +379,5 @@ $objQuery->setOrder('T3.rank DESC'); // XXX - $arrRet = $objQuery->select($col, $table, "", $params); + $arrRet = $objQuery->select($col, $table, '', $params); return $arrRet; @@ -519,5 +519,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $objQuery->update('dtb_products_class', array(), - "product_class_id = ?", array($productClassId), + 'product_class_id = ?', array($productClassId), array('stock' => 'stock - ?'), array($quantity)); // TODO エラーハンドリング @@ -672,8 +672,8 @@ * @return string 商品規格詳細の SQL */ - function prdclsSQL($where = "") { - $where_clause = ""; + function prdclsSQL($where = '') { + $where_clause = ''; if (!SC_Utils_Ex::isBlank($where)) { - $where_clause = " WHERE " . $where; + $where_clause = ' WHERE ' . $where; } $sql = <<< __EOS__ Index: branches/version-2_12-dev/data/class/SC_Session.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Session.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_Session.php (revision 21514) @@ -58,8 +58,8 @@ // ログに記録する - GC_Utils_Ex::gfPrintLog("access : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid); + GC_Utils_Ex::gfPrintLog('access : user='.$this->login_id.' auth='.$this->authority." sid=".$this->sid); } else { // ログに記録する - GC_Utils_Ex::gfPrintLog("access error."); + GC_Utils_Ex::gfPrintLog('access error.'); } } @@ -126,5 +126,5 @@ session_destroy(); // ログに記録する - GC_Utils_Ex::gfPrintLog("logout : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid); + GC_Utils_Ex::gfPrintLog('logout : user='.$this->login_id.' auth='.$this->authority." sid=".$this->sid); } @@ -139,5 +139,5 @@ SC_Helper_Session_Ex::destroyToken(); // ログに記録する - GC_Utils_Ex::gfPrintLog("logout : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid); + GC_Utils_Ex::gfPrintLog('logout : user='.$this->login_id.' auth='.$this->authority." sid=".$this->sid); } } Index: branches/version-2_12-dev/data/class/SC_AdminView.php =================================================================== --- branches/version-2_12-dev/data/class/SC_AdminView.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_AdminView.php (revision 21514) @@ -28,5 +28,5 @@ $this->_smarty->compile_dir = COMPILE_ADMIN_REALDIR; $this->assign('TPL_URLPATH_DEFAULT', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/'); - $this->assign('TPL_URLPATH', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . "admin/"); + $this->assign('TPL_URLPATH', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . 'admin/'); $this->initpath(); } Index: branches/version-2_12-dev/data/class/SC_FormParam.php =================================================================== --- branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21480) +++ branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21514) @@ -66,5 +66,5 @@ // パラメーターの追加 - function addParam($disp_name, $keyname, $length = "", $convert = "", $arrCheck = array(), $default = "", $input_db = 'true') { + function addParam($disp_name, $keyname, $length = '', $convert = '', $arrCheck = array(), $default = "", $input_db = 'true') { $this->disp_name[] = $disp_name; $this->keyname[] = $keyname; @@ -111,5 +111,5 @@ $this->html_disp_name[$cnt] = $this->disp_name[$cnt]; } - if ($this->default[$cnt] != "") { + if ($this->default[$cnt] != '') { $this->html_disp_name[$cnt] .= ' [省略時初期値: ' . $this->default[$cnt] . ']'; } @@ -133,5 +133,5 @@ for ($cnt = 0; $cnt < $count; $cnt++) { $key = $keyname.$no; - if ($arrVal[$cnt][$keyname] != "") { + if ($arrVal[$cnt][$keyname] != '') { $this->setValue($key, $arrVal[$cnt][$keyname]); } @@ -143,5 +143,5 @@ if (!empty($db_date)) { - list($y, $m, $d) = preg_split("/[- ]/", $db_date); + list($y, $m, $d) = preg_split('/[- ]/', $db_date); $this->setValue($year_key, $y); $this->setValue($month_key, $m); @@ -180,5 +180,5 @@ foreach ($this->keyname as $val) { foreach ($this->arrCheck[$cnt] as $func) { - if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; + if (!isset($this->param[$cnt])) $this->param[$cnt] = ''; switch ($func) { case 'EXIST_CHECK': @@ -217,12 +217,12 @@ // ファイルの存在チェック case 'FILE_EXISTS': - if ($this->param[$cnt] != "" && !file_exists($this->check_dir . $this->param[$cnt])) { - $objErr->arrErr[$val] = "※ " . $this->disp_name[$cnt] . "のファイルが存在しません。
"; + if ($this->param[$cnt] != '' && !file_exists($this->check_dir . $this->param[$cnt])) { + $objErr->arrErr[$val] = '※ ' . $this->disp_name[$cnt] . 'のファイルが存在しません。
'; } break; // ダウンロード用ファイルの存在チェック case 'DOWN_FILE_EXISTS': - if ($this->param[$cnt] != "" && !file_exists(DOWN_SAVE_REALDIR . $this->param[$cnt])) { - $objErr->arrErr[$val] = "※ " . $this->disp_name[$cnt] . "のファイルが存在しません。
"; + if ($this->param[$cnt] != '' && !file_exists(DOWN_SAVE_REALDIR . $this->param[$cnt])) { + $objErr->arrErr[$val] = '※ ' . $this->disp_name[$cnt] . 'のファイルが存在しません。
'; } break; @@ -295,5 +295,5 @@ $cnt = 0; foreach ($this->keyname as $val) { - if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; + if (!isset($this->param[$cnt])) $this->param[$cnt] = ''; $this->recursionConvParam($this->param[$cnt], $this->convert[$cnt]); $cnt++; @@ -340,5 +340,5 @@ foreach ($this->keyname as $val) { if ($this->input_db[$cnt]) { - $arrRet[$val] = isset($this->param[$cnt]) ? $this->param[$cnt] : ""; + $arrRet[$val] = isset($this->param[$cnt]) ? $this->param[$cnt] : ''; } $cnt++; @@ -383,7 +383,7 @@ } - if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; - - if ($this->default[$cnt] != "" && $this->param[$cnt] == "") { + if (!isset($this->param[$cnt])) $this->param[$cnt] = ''; + + if ($this->default[$cnt] != '' && $this->param[$cnt] == '') { $arrRet[$val]['value'] = $this->default[$cnt]; } @@ -409,5 +409,5 @@ foreach ($this->keyname as $val) { if ($val == $keyname) { - $ret = isset($this->param[$cnt]) ? $this->param[$cnt] : ""; + $ret = isset($this->param[$cnt]) ? $this->param[$cnt] : ''; break; } @@ -437,5 +437,5 @@ if ($val == $keyname) { if (isset($this->param[$cnt]) && !is_array($this->param[$cnt])) { - $this->param[$cnt] = explode("-", $this->param[$cnt]); + $this->param[$cnt] = explode('-', $this->param[$cnt]); } } @@ -453,5 +453,5 @@ $cnt = 0; foreach ($this->keyname as $val) { - if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; + if (!isset($this->param[$cnt])) $this->param[$cnt] = ''; $this->recursionTrim($this->param[$cnt], $has_wide_space); $cnt++; @@ -496,5 +496,5 @@ if (preg_match('/^' . $prefix . '/', $key)) { $arrResults[$key] = isset($this->param[$cnt]) - ? $this->param[$cnt] : ""; + ? $this->param[$cnt] : ''; } $cnt++; @@ -519,7 +519,7 @@ } - if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; - - if ($this->default[$cnt] != "" && $this->param[$cnt] == "") { + if (!isset($this->param[$cnt])) $this->param[$cnt] = ''; + + if ($this->default[$cnt] != '' && $this->param[$cnt] == '') { $arrRet[$cnt]['value'] = $this->default[$cnt]; } Index: branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php =================================================================== --- branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php (revision 21514) @@ -44,7 +44,7 @@ function init() { parent::init(); - $this->tpl_mainpage = "rss/index.tpl"; - $this->encode = "UTF-8"; - $this->description = "新着情報"; + $this->tpl_mainpage = 'rss/index.tpl'; + $this->encode = 'UTF-8'; + $this->description = '新着情報'; } @@ -62,8 +62,8 @@ //キャッシュしない(念のため) - header("pragma: no-cache"); + header('pragma: no-cache'); //XMLテキスト(これがないと正常にRSSとして認識してくれないツールがあるため) - header("Content-type: application/xml"); + header('Content-type: application/xml'); //新着情報をセット @@ -99,16 +99,16 @@ */ function lfGetNews(&$objQuery) { - $col = ""; - $col .= "news_id "; // 新着情報ID - $col .= ",news_title "; // 新着情報タイトル - $col .= ",news_comment "; // 新着情報本文 - $col .= ",news_date "; // 日付 - $col .= ",news_url "; // 新着情報URL - $col .= ",news_select "; // 新着情報の区分(1:URL、2:本文) - $col .= ",(SELECT shop_name FROM dtb_baseinfo limit 1) AS shop_name "; // 店名 - $col .= ",(SELECT email04 FROM dtb_baseinfo limit 1) AS email "; // 代表Emailアドレス + $col = ''; + $col .= 'news_id '; // 新着情報ID + $col .= ',news_title '; // 新着情報タイトル + $col .= ',news_comment '; // 新着情報本文 + $col .= ',news_date '; // 日付 + $col .= ',news_url '; // 新着情報URL + $col .= ',news_select '; // 新着情報の区分(1:URL、2:本文) + $col .= ',(SELECT shop_name FROM dtb_baseinfo limit 1) AS shop_name '; // 店名 + $col .= ',(SELECT email04 FROM dtb_baseinfo limit 1) AS email '; // 代表Emailアドレス $from = 'dtb_news'; $where = "del_flg = '0'"; - $order = "rank DESC"; + $order = 'rank DESC'; $objQuery->setOrder($order); $arrNews = $objQuery->select($col,$from,$where); Index: branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php =================================================================== --- branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php (revision 21508) +++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php (revision 21514) @@ -44,7 +44,7 @@ function init() { parent::init(); - $this->tpl_mainpage = "rss/products.tpl"; - $this->encode = "UTF-8"; - $this->title = "商品一覧情報"; + $this->tpl_mainpage = 'rss/products.tpl'; + $this->encode = 'UTF-8'; + $this->title = '商品一覧情報'; } @@ -107,8 +107,8 @@ //キャッシュしない(念のため) - header("Pragma: no-cache"); + header('Pragma: no-cache'); //XMLテキスト(これがないと正常にRSSとして認識してくれないツールがあるため) - header("Content-type: application/xml"); + header('Content-type: application/xml'); P_DETAIL_URLPATH; Index: branches/version-2_12-dev/data/class/pages/LC_Page.php =================================================================== --- branches/version-2_12-dev/data/class/pages/LC_Page.php (revision 21500) +++ branches/version-2_12-dev/data/class/pages/LC_Page.php (revision 21514) @@ -144,8 +144,8 @@ function sendResponseCSV($file_name, $data) { $this->objDisplay->prepare($this); - $this->objDisplay->addHeader("Content-disposition", "attachment; filename=${file_name}"); - $this->objDisplay->addHeader("Content-type", "application/octet-stream; name=${file_name}"); - $this->objDisplay->addHeader("Cache-Control", ""); - $this->objDisplay->addHeader('Pragma', ""); + $this->objDisplay->addHeader('Content-disposition', "attachment; filename=${file_name}"); + $this->objDisplay->addHeader('Content-type', "application/octet-stream; name=${file_name}"); + $this->objDisplay->addHeader('Cache-Control', ''); + $this->objDisplay->addHeader('Pragma', ''); $this->objDisplay->response->body = $data; @@ -166,5 +166,5 @@ $timeExecTime = $timeEnd - $this->timeStart; if (defined('PAGE_DISPLAY_TIME_LOG_MIN_EXEC_TIME') && $timeExecTime >= (float)PAGE_DISPLAY_TIME_LOG_MIN_EXEC_TIME) { - $logMsg = sprintf("PAGE_DISPLAY_TIME_LOG [%.2fsec]", $timeExecTime); + $logMsg = sprintf('PAGE_DISPLAY_TIME_LOG [%.2fsec]', $timeExecTime); GC_Utils_Ex::gfPrintLog($logMsg); } @@ -358,5 +358,5 @@ SC_Utils_Ex::sfDispError(INVALID_MOVE_ERRORR); } else { - SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true); + SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, '', true); } exit; @@ -386,5 +386,5 @@ */ function log($mess, $log_level) { - $mess = $mess . " user=" . $_SESSION['customer']['customer_id']; + $mess = $mess . ' user=' . $_SESSION['customer']['customer_id']; GC_Utils_Ex::gfFrontLog($mess, $log_level); Index: branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php =================================================================== --- branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php (revision 21442) +++ branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php (revision 21514) @@ -44,5 +44,5 @@ function init() { parent::init(); - $this->tpl_message = "住所を検索しています。"; + $this->tpl_message = '住所を検索しています。'; } @@ -59,5 +59,5 @@ // 入力エラーの場合は終了 if (count($arrErr) > 0) { - $tpl_message = ""; + $tpl_message = ''; foreach ($arrErr as $key => $val) { $tpl_message .= preg_replace("/
/", "\n", $val); @@ -76,10 +76,10 @@ // 郵便番号が発見された場合 if (!empty($arrAdsList)) { - $data = $arrAdsList[0]['state']. "|". $arrAdsList[0]['city']. "|". $arrAdsList[0]['town']; + $data = $arrAdsList[0]['state']. '|'. $arrAdsList[0]['city']. "|". $arrAdsList[0]['town']; echo $data; // 該当無し } else { - echo "該当する住所が見つかりませんでした。"; + echo '該当する住所が見つかりませんでした。'; } } @@ -113,8 +113,8 @@ // 親ウィンドウの戻り値を格納するinputタグのnameのエラーチェック if (!$this->lfInputNameCheck($arrRequest['input1'])) { - $arrErr['input1'] = "※ 入力形式が不正です。
"; + $arrErr['input1'] = '※ 入力形式が不正です。
'; } if (!$this->lfInputNameCheck($arrRequest['input2'])) { - $arrErr['input2'] = "※ 入力形式が不正です。
"; + $arrErr['input2'] = '※ 入力形式が不正です。
'; } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php (revision 21514) @@ -82,5 +82,5 @@ $objCustomer = new SC_Customer_Ex(); if (!$objCustomer->isLoginSuccess(true)) { - SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); + SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,'',true); } @@ -93,5 +93,5 @@ $this->arrErr = $this->lfCheckError($objFormParam); if (count($this->arrErr)!=0) { - SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); + SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,'',true); } } @@ -116,16 +116,16 @@ //ファイル情報が無い場合はNG - if ($arrForm['down_realfilename'] == "") { - SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); + if ($arrForm['down_realfilename'] == '') { + SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,'',true); } //ファイルそのものが無い場合もとりあえずNG $realpath = DOWN_SAVE_REALDIR . $arrForm['down_realfilename']; if (!file_exists($realpath)) { - SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); + SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,'',true); } //ファイル名をエンコードする Safariの対策はUTF-8で様子を見る $encoding = 'Shift_JIS'; if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'Safari')) { - $encoding = "UTF-8"; + $encoding = 'UTF-8'; } $sdown_filename = mb_convert_encoding($arrForm['down_filename'], $encoding, 'auto'); @@ -179,7 +179,7 @@ $dbFactory = SC_DB_DBFactory_Ex::getInstance(); - $where = "o.customer_id = ? AND o.order_id = ? AND pc.product_id = ? AND pc.product_class_id = ?"; - $where .= " AND " . $dbFactory->getDownloadableDaysWhereSql('o'); - $where .= " = 1"; + $where = 'o.customer_id = ? AND o.order_id = ? AND pc.product_id = ? AND pc.product_class_id = ?'; + $where .= ' AND ' . $dbFactory->getDownloadableDaysWhereSql('o'); + $where .= ' = 1'; $arrRet = $objQuery->select($col, $table, $where, array($customer_id, $order_id, $product_id, $product_class_id)); @@ -213,8 +213,8 @@ $mime_type = $objHelperMobile->getMIMEType($realpath); header('Content-Type: ' . $mime_type); - header("Content-Disposition: attachment; filename=" . $sdown_filename); + header('Content-Disposition: attachment; filename=' . $sdown_filename); header('Accept-Ranges: bytes'); - header("Last-Modified: " . gmdate("D,d M Y H:i:s") . " GMT"); - header("Cache-Control: public"); + header('Last-Modified: ' . gmdate('D,d M Y H:i:s') . " GMT"); + header('Cache-Control: public'); } @@ -234,15 +234,15 @@ if (isset($_SERVER['HTTP_RANGE'])) { // 二回目以降のリクエスト - list($range_offset, $range_limit) = sscanf($_SERVER['HTTP_RANGE'], "bytes=%d-%d"); - $content_range = sprintf("bytes %d-%d/%d", $range_offset, $range_limit, $file_size); + list($range_offset, $range_limit) = sscanf($_SERVER['HTTP_RANGE'], 'bytes=%d-%d'); + $content_range = sprintf('bytes %d-%d/%d', $range_offset, $range_limit, $file_size); $content_length = $range_limit - $range_offset + 1; fseek($fp, $range_offset, SEEK_SET); - header("HTTP/1.1 206 Partial Content"); - header("Content-Lenth: " . $content_length); - header("Content-Range: " . $content_range); + header('HTTP/1.1 206 Partial Content'); + header('Content-Lenth: ' . $content_length); + header('Content-Range: ' . $content_range); } else { // 一回目のリクエスト $content_length = $file_size; - header("Content-Length: " . $content_length); + header('Content-Length: ' . $content_length); } echo fread($fp, $content_length) ; @@ -269,7 +269,7 @@ if (isset($_SERVER['HTTP_RANGE'])) { // 二回目以降のリクエスト - list($a, $range) = explode("=",$_SERVER['HTTP_RANGE'],2); - list($range) = explode(",",$range,2); - list($range, $range_end) = explode("-", $range); + list($a, $range) = explode('=',$_SERVER['HTTP_RANGE'],2); + list($range) = explode(',',$range,2); + list($range, $range_end) = explode('-', $range); $range=intval($range); @@ -281,5 +281,5 @@ $new_length = $range_end-$range+1; - header("HTTP/1.1 206 Partial Content"); + header('HTTP/1.1 206 Partial Content'); header("Content-Length: $new_length"); header("Content-Range: bytes $range-$range_end/$file_size"); @@ -287,5 +287,5 @@ // 一回目のリクエスト $new_length=$file_size; - header("Content-Length: ".$file_size); + header('Content-Length: '.$file_size); } @@ -324,17 +324,17 @@ $contentType = $this->arrContentType[$extension]; } - header("Content-Type: ".$contentType); + header('Content-Type: '.$contentType); //ファイル名指定 header('Content-Disposition: attachment; filename="' . $sdown_filename . '"'); - header("Content-Transfer-Encoding: binary"); + header('Content-Transfer-Encoding: binary'); //キャッシュ無効化 - header("Expires: Mon, 26 Nov 1962 00:00:00 GMT"); - header("Last-Modified: " . gmdate("D,d M Y H:i:s") . " GMT"); + header('Expires: Mon, 26 Nov 1962 00:00:00 GMT'); + header('Last-Modified: ' . gmdate('D,d M Y H:i:s') . " GMT"); //IE6+SSL環境下は、キャッシュ無しでダウンロードできない - header("Cache-Control: private"); - header("Pragma: private"); + header('Cache-Control: private'); + header('Pragma: private'); //ファイルサイズ指定 $zv_filesize = filesize($realpath); - header("Content-Length: " . $zv_filesize); + header('Content-Length: ' . $zv_filesize); set_time_limit(0); ob_end_flush(); @@ -343,5 +343,5 @@ $handle = fopen($realpath, 'rb'); if ($handle === false) { - SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); + SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,'',true); exit; } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php (revision 21514) @@ -91,10 +91,10 @@ //customer_idを検証 $customer_id = $objCustomer->getValue('customer_id'); - $order_count = $objQuery->count('dtb_order', "order_id = ? and customer_id = ?", array($order_id, $customer_id)); + $order_count = $objQuery->count('dtb_order', 'order_id = ? and customer_id = ?', array($order_id, $customer_id)); if ($order_count != 1) return array(); - $col = "product_class_id, quantity"; - $table = "dtb_order_detail LEFT JOIN dtb_products_class USING(product_class_id)"; - $where = "order_id = ?"; + $col = 'product_class_id, quantity'; + $table = 'dtb_order_detail LEFT JOIN dtb_products_class USING(product_class_id)'; + $where = 'order_id = ?'; $objQuery->setOrder('order_detail_id'); $arrOrderDetail = $objQuery->select($col, $table, $where, array($order_id)); Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php (revision 21441) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php (revision 21514) @@ -111,8 +111,8 @@ function lfGetMailView($send_id, $customer_id) { $objQuery = SC_Query_Ex::getSingletonInstance(); - $col = "subject, mail_body"; - $where = "send_id = ? AND customer_id = ?"; + $col = 'subject, mail_body'; + $where = 'send_id = ? AND customer_id = ?'; $arrval = array($send_id, $customer_id); - return $objQuery->select($col, "dtb_mail_history LEFT JOIN dtb_order USING(order_id)", $where, $arrval); + return $objQuery->select($col, 'dtb_mail_history LEFT JOIN dtb_order USING(order_id)', $where, $arrval); } } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (revision 21514) @@ -44,5 +44,5 @@ function init() { parent::init(); - $this->tpl_title = "お届け先の追加･変更"; + $this->tpl_title = 'お届け先の追加･変更'; $masterData = new SC_DB_MasterData_Ex(); $this->arrPref = $masterData->getMasterData('mtb_pref'); @@ -132,5 +132,5 @@ default : - if ($_GET['other_deliv_id'] != "") { + if ($_GET['other_deliv_id'] != '') { $arrOtherDeliv = $this->lfGetOtherDeliv($objCustomer->getValue('customer_id'), $_SESSION['other_deliv_id']); @@ -172,5 +172,5 @@ function lfGetOtherDeliv($customer_id, $other_deliv_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - return $objQuery->select("*", 'dtb_other_deliv', "customer_id = ? AND other_deliv_id = ?", array($customer_id, $other_deliv_id)); + return $objQuery->select('*', 'dtb_other_deliv', "customer_id = ? AND other_deliv_id = ?", array($customer_id, $other_deliv_id)); } @@ -187,8 +187,8 @@ if (strlen($arrRet['other_deliv_id'] == 0)) { // 別のお届け先登録数の取得 - $deliv_count = $objQuery->count('dtb_other_deliv', "customer_id = ?", array($customer_id)); + $deliv_count = $objQuery->count('dtb_other_deliv', 'customer_id = ?', array($customer_id)); // 別のお届け先最大登録数に達している場合、エラー if ($deliv_count >= DELIV_ADDR_MAX) { - SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", false, '別のお届け先最大登録数に達しています。'); + SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先最大登録数に達しています。'); } @@ -199,11 +199,11 @@ // 変更 } else { - $deliv_count = $objQuery->count('dtb_other_deliv',"customer_id = ? AND other_deliv_id = ?" ,array($customer_id, $arrRet['other_deliv_id'])); + $deliv_count = $objQuery->count('dtb_other_deliv','customer_id = ? AND other_deliv_id = ?' ,array($customer_id, $arrRet['other_deliv_id'])); if ($deliv_count != 1) { - SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", false, '一致する別のお届け先がありません。'); + SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '一致する別のお届け先がありません。'); } // 実行 - $objQuery->update('dtb_other_deliv', $sqlval, "other_deliv_id = ?", array($arrRet['other_deliv_id'])); + $objQuery->update('dtb_other_deliv', $sqlval, 'other_deliv_id = ?', array($arrRet['other_deliv_id'])); } } @@ -215,5 +215,5 @@ } if (count($_SESSION['shipping']) >= DELIV_ADDR_MAX) { - SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", false, '別のお届け先最大登録数に達しています。'); + SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', false, '別のお届け先最大登録数に達しています。'); } else { $_SESSION['shipping'][] = $arrRegist; Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 21514) @@ -161,5 +161,5 @@ // 取得した表示すべきIDだけを指定して情報を取得。 - $where = ""; + $where = ''; if (is_array($arrProductId) && !empty($arrProductId)) { $where = $tablename . 'product_id IN (' . implode(',', $arrProductId) . ')'; @@ -179,8 +179,8 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $exists = $objQuery->exists('dtb_customer_favorite_products', "customer_id = ? AND product_id = ?", array($customer_id, $product_id)); + $exists = $objQuery->exists('dtb_customer_favorite_products', 'customer_id = ? AND product_id = ?', array($customer_id, $product_id)); if ($exists) { - $objQuery->delete('dtb_customer_favorite_products', "customer_id = ? AND product_id = ?", array($customer_id, $product_id)); + $objQuery->delete('dtb_customer_favorite_products', 'customer_id = ? AND product_id = ?', array($customer_id, $product_id)); } } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 21514) @@ -123,9 +123,9 @@ $objQuery = SC_Query_Ex::getSingletonInstance(); - $col = "order_id, create_date, payment_id, payment_total"; + $col = 'order_id, create_date, payment_id, payment_total'; $from = 'dtb_order'; - $where = "del_flg = 0 AND customer_id = ?"; + $where = 'del_flg = 0 AND customer_id = ?'; $arrval = array($customer_id); - $order = "order_id DESC"; + $order = 'order_id DESC'; if ($startno == -1) { Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 21514) @@ -141,6 +141,6 @@ if ($key == 'shipping_date' && SC_Utils_Ex::isBlank($val) == false) { // お届け日を整形 - list($y, $m, $d, $w) = explode(" ", date("Y m d w" , strtotime($val))); - $arrShipping[$shipping_index]['shipping_date'] = sprintf("%04d/%02d/%02d(%s)", $y, $m, $d, $arrWDAY[$w]); + list($y, $m, $d, $w) = explode(' ', date('Y m d w' , strtotime($val))); + $arrShipping[$shipping_index]['shipping_date'] = sprintf('%04d/%02d/%02d(%s)', $y, $m, $d, $arrWDAY[$w]); } } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 21514) @@ -130,5 +130,5 @@ function lfInitParam(&$objFormParam) { $objFormParam->addParam('お届け先ID', 'other_deliv_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("現在ページ", 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('現在ページ', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php (revision 21514) @@ -66,5 +66,5 @@ // クッキー判定(メールアドレスをクッキーに保存しているか） $this->tpl_login_email = $objCookie->getCookie('login_email'); - if ($this->tpl_login_email != "") { + if ($this->tpl_login_email != '') { $this->tpl_login_memory = '1'; } @@ -72,5 +72,5 @@ // POSTされてきたIDがある場合は優先する。 if(isset($_POST['login_email']) - && $_POST['login_email'] != "") { + && $_POST['login_email'] != '') { $this->tpl_login_email = $_POST['login_email']; } Index: branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php =================================================================== --- branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php (revision 21514) @@ -193,10 +193,10 @@ $tar->extract($exract_dir); - $objLog->log("* copy batch start"); + $objLog->log('* copy batch start'); @include_once CLASS_REALDIR . 'batch/SC_Batch_Update.php'; $objBatch = new SC_Batch_Update(); $arrCopyLog = $objBatch->execute($exract_dir); - $objLog->log("* copy batch check start"); + $objLog->log('* copy batch check start'); if (count($arrCopyLog['err']) > 0) { $objJson->setError(OSTORE_E_C_BATCH_ERR); @@ -209,17 +209,17 @@ // dtb_module_update_logの更新 - $objLog->log("* insert dtb_module_update start"); + $objLog->log('* insert dtb_module_update start'); $this->registerUpdateLog($arrCopyLog, $objRet->data); // dtb_moduleの更新 - $objLog->log("* insert/update dtb_module start"); + $objLog->log('* insert/update dtb_module start'); $this->updateMdlTable($objRet->data); // DB更新ファイルの読み込み、実行 - $objLog->log("* file execute start"); + $objLog->log('* file execute start'); $this->fileExecute($objRet->data->product_code); // 配信サーバーへ通知 - $objLog->log("* notify to lockon server start"); + $objLog->log('* notify to lockon server start'); $objReq = $this->notifyDownload($mode, $objReq->getResponseCookies()); Index: branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php =================================================================== --- branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php (revision 21514) @@ -42,5 +42,5 @@ */ function end() { - $message = "##### end #####"; + $message = '##### end #####'; $this->log($message); } Index: branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php =================================================================== --- branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php (revision 21514) @@ -70,5 +70,5 @@ */ function display() { - header("Content-Type: text/javascript; charset=UTF-8"); + header('Content-Type: text/javascript; charset=UTF-8'); echo $this->encode($this->arrData); } Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php (revision 21514) @@ -44,5 +44,5 @@ function init() { parent::init(); - $this->tpl_title = "ご注文完了"; + $this->tpl_title = 'ご注文完了'; } Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php (revision 21514) @@ -44,5 +44,5 @@ function init() { parent::init(); - $this->tpl_title = "お届け先の複数指定"; + $this->tpl_title = 'お届け先の複数指定'; $this->httpCacheControl('nocache'); } @@ -97,5 +97,5 @@ $objCartSess); $objSiteSess->setRegistFlag(); - SC_Response_Ex::sendRedirect("payment.php"); + SC_Response_Ex::sendRedirect('payment.php'); exit; } @@ -130,17 +130,17 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("商品規格ID", 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("商品名", 'name'); - $objFormParam->addParam("規格1", 'class_name1'); - $objFormParam->addParam("規格2", 'class_name2'); - $objFormParam->addParam("規格分類1", 'classcategory_name1'); - $objFormParam->addParam("規格分類2", 'classcategory_name2'); - $objFormParam->addParam("メイン画像", 'main_image'); - $objFormParam->addParam("メイン一覧画像", 'main_list_image'); - $objFormParam->addParam("販売価格", 'price'); - $objFormParam->addParam("数量", 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("配送先住所", 'shipping', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("カート番号", 'cart_no', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("行数", 'line_of_num', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品名', 'name'); + $objFormParam->addParam('規格1', 'class_name1'); + $objFormParam->addParam('規格2', 'class_name2'); + $objFormParam->addParam('規格分類1', 'classcategory_name1'); + $objFormParam->addParam('規格分類2', 'classcategory_name2'); + $objFormParam->addParam('メイン画像', 'main_image'); + $objFormParam->addParam('メイン一覧画像', 'main_list_image'); + $objFormParam->addParam('販売価格', 'price'); + $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('配送先住所', 'shipping', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('カート番号', 'cart_no', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('行数', 'line_of_num', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); } @@ -194,5 +194,5 @@ $other_deliv_id = SC_Utils_Ex::isBlank($val['other_deliv_id']) ? 0 : $val['other_deliv_id']; $arrResults[$other_deliv_id] = $val['name01'] . $val['name02'] - . " " . $arrPref[$val['pref']] . $val['addr01'] . $val['addr02']; + . ' ' . $arrPref[$val['pref']] . $val['addr01'] . $val['addr02']; } } @@ -202,5 +202,5 @@ foreach ($arrShippings as $shipping_id => $val) { $arrResults[$shipping_id] = $val['shipping_name01'] . $val['shipping_name02'] - . " " . $arrPref[$val['shipping_pref']] + . ' ' . $arrPref[$val['shipping_pref']] . $val['shipping_addr01'] . $val['shipping_addr02']; } @@ -287,6 +287,6 @@ if ($objCustomer->isLoginSuccess(true)) { if ($other_deliv_id != 0) { - $otherDeliv = $objQuery->select("*", 'dtb_other_deliv', - "other_deliv_id = ?", + $otherDeliv = $objQuery->select('*', 'dtb_other_deliv', + 'other_deliv_id = ?', array($other_deliv_id)); foreach ($otherDeliv[0] as $key => $val) { Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (revision 21514) @@ -44,5 +44,5 @@ function init() { parent::init(); - $this->tpl_title = "ご入力内容のご確認"; + $this->tpl_title = 'ご入力内容のご確認'; $masterData = new SC_DB_MasterData(); $this->arrPref = $masterData->getMasterData('mtb_pref'); Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 21514) @@ -52,6 +52,6 @@ function init() { parent::init(); - $this->tpl_onload = "fnCheckInputPoint();"; - $this->tpl_title = "お支払方法・お届け時間等の指定"; + $this->tpl_onload = 'fnCheckInputPoint();'; + $this->tpl_title = 'お支払方法・お届け時間等の指定'; $masterData = new SC_DB_MasterData(); $this->arrPref = $masterData->getMasterData('mtb_pref'); @@ -254,17 +254,17 @@ */ function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping) { - $objFormParam->addParam("配送業者", 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("ポイント", 'use_point', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK', 'ZERO_START')); - $objFormParam->addParam("その他お問い合わせ", 'message', LTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ポイントを使用する", 'point_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '2'); + $objFormParam->addParam('配送業者', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ポイント', 'use_point', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK', 'ZERO_START')); + $objFormParam->addParam('その他お問い合わせ', 'message', LTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ポイントを使用する', 'point_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '2'); if ($deliv_only) { - $objFormParam->addParam("お支払い方法", 'payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お支払い方法', 'payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); } else { - $objFormParam->addParam("お支払い方法", 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お支払い方法', 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); foreach ($arrShipping as $val) { - $objFormParam->addParam("お届け時間", 'deliv_time_id' . $val['shipping_id'], INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日", 'deliv_date' . $val['shipping_id'], STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('お届け時間', 'deliv_time_id' . $val['shipping_id'], INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日', 'deliv_date' . $val['shipping_id'], STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); } } @@ -293,15 +293,15 @@ if ($arrForm['point_check'] == '1') { - $objErr->doFunc(array("ポイントを使用する", 'point_check'), array('EXIST_CHECK')); - $objErr->doFunc(array("ポイント", 'use_point'), array('EXIST_CHECK')); - if ($max_point == "") { + $objErr->doFunc(array('ポイントを使用する', 'point_check'), array('EXIST_CHECK')); + $objErr->doFunc(array('ポイント', 'use_point'), array('EXIST_CHECK')); + if ($max_point == '') { $max_point = 0; } // FIXME mobile 互換のため br は閉じない... if ($arrForm['use_point'] > $max_point) { - $objErr->arrErr['use_point'] = "※ ご利用ポイントが所持ポイントを超えています。
"; + $objErr->arrErr['use_point'] = '※ ご利用ポイントが所持ポイントを超えています。
'; } if (($arrForm['use_point'] * POINT_VALUE) > $subtotal) { - $objErr->arrErr['use_point'] = "※ ご利用ポイントがご購入金額を超えています。
"; + $objErr->arrErr['use_point'] = '※ ご利用ポイントがご購入金額を超えています。
'; } } @@ -432,5 +432,5 @@ } } else { - return SHOPPING_URL . "?from=nonmember"; + return SHOPPING_URL . '?from=nonmember'; } } Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 21514) @@ -103,6 +103,6 @@ if ($this->cartKey == PRODUCT_TYPE_DOWNLOAD) { SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, $objSiteSess, false, - "ダウンロード商品を含むお買い物は、会員登録が必要です。
" - . "お手数ですが、会員登録をお願いします。"); + 'ダウンロード商品を含むお買い物は、会員登録が必要です。
' + . 'お手数ですが、会員登録をお願いします。'); exit; } @@ -274,40 +274,40 @@ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("お名前(姓)", 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(名)", 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・姓)", 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・名)", 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("郵便番号1", 'order_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'order_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'order_pref', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'order_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'order_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号1", 'order_tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号2", 'order_tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号3", 'order_tel03', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("FAX番号1", 'order_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("FAX番号2", 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("FAX番号3", 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("メールアドレス", 'order_email', null, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); - $objFormParam->addParam("メールアドレス（確認）", 'order_email02', null, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'), "", false); - $objFormParam->addParam("年", 'year', INT_LEN, 'n', array('MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("月", 'month', INT_LEN, 'n', array('MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("日", 'day', INT_LEN, 'n', array('MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("性別", 'order_sex', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("職業", 'order_job', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("別のお届け先", 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お名前(姓)", 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(名)", 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・姓)", 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・名)", 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("郵便番号1", 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号1", 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号2", 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号3", 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("メールマガジン", 'mail_flag', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'order_pref', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'order_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'order_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'order_tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号2', 'order_tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号3', 'order_tel03', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('FAX番号1', 'order_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('FAX番号2', 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('FAX番号3', 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); + $objFormParam->addParam('メールアドレス（確認）', 'order_email02', null, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'), "", false); + $objFormParam->addParam('年', 'year', INT_LEN, 'n', array('MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('月', 'month', INT_LEN, 'n', array('MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('日', 'day', INT_LEN, 'n', array('MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('性別', 'order_sex', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('職業', 'order_job', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('別のお届け先', 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('メールマガジン', 'mail_flag', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); } @@ -319,7 +319,7 @@ */ function lfInitLoginFormParam(&$objFormParam) { - $objFormParam->addParam("記憶する", 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("メールアドレス", 'login_email', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("パスワード", 'login_pass', PASSWORD_MAX_LEN, "", array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('メールアドレス', 'login_email', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, "", array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); } @@ -423,16 +423,16 @@ // 別のお届け先チェック if (isset($arrParams['deliv_check']) && $arrParams['deliv_check'] == '1') { - $objErr->doFunc(array("お名前(姓)", 'shipping_name01'), array('EXIST_CHECK')); - $objErr->doFunc(array("お名前(名)", 'shipping_name02'), array('EXIST_CHECK')); - $objErr->doFunc(array("お名前(フリガナ・姓)", 'shipping_kana01'), array('EXIST_CHECK')); - $objErr->doFunc(array("お名前(フリガナ・名)", 'shipping_kana02'), array('EXIST_CHECK')); - $objErr->doFunc(array("郵便番号1", 'shipping_zip01'), array('EXIST_CHECK')); - $objErr->doFunc(array("郵便番号2", 'shipping_zip02'), array('EXIST_CHECK')); - $objErr->doFunc(array("都道府県", 'shipping_pref'), array('EXIST_CHECK')); - $objErr->doFunc(array("住所1", 'shipping_addr01'), array('EXIST_CHECK')); - $objErr->doFunc(array("住所2", 'shipping_addr02'), array('EXIST_CHECK')); - $objErr->doFunc(array("電話番号1", 'shipping_tel01'), array('EXIST_CHECK')); - $objErr->doFunc(array("電話番号2", 'shipping_tel02'), array('EXIST_CHECK')); - $objErr->doFunc(array("電話番号3", 'shipping_tel03'), array('EXIST_CHECK')); + $objErr->doFunc(array('お名前(姓)', 'shipping_name01'), array('EXIST_CHECK')); + $objErr->doFunc(array('お名前(名)', 'shipping_name02'), array('EXIST_CHECK')); + $objErr->doFunc(array('お名前(フリガナ・姓)', 'shipping_kana01'), array('EXIST_CHECK')); + $objErr->doFunc(array('お名前(フリガナ・名)', 'shipping_kana02'), array('EXIST_CHECK')); + $objErr->doFunc(array('郵便番号1', 'shipping_zip01'), array('EXIST_CHECK')); + $objErr->doFunc(array('郵便番号2', 'shipping_zip02'), array('EXIST_CHECK')); + $objErr->doFunc(array('都道府県', 'shipping_pref'), array('EXIST_CHECK')); + $objErr->doFunc(array('住所1', 'shipping_addr01'), array('EXIST_CHECK')); + $objErr->doFunc(array('住所2', 'shipping_addr02'), array('EXIST_CHECK')); + $objErr->doFunc(array('電話番号1', 'shipping_tel01'), array('EXIST_CHECK')); + $objErr->doFunc(array('電話番号2', 'shipping_tel02'), array('EXIST_CHECK')); + $objErr->doFunc(array('電話番号3', 'shipping_tel03'), array('EXIST_CHECK')); } @@ -440,9 +440,9 @@ $objErr->doFunc(array('TEL', 'order_tel01', 'order_tel02', 'order_tel03'), array('TEL_CHECK')); $objErr->doFunc(array('FAX', 'order_fax01', 'order_fax02', 'order_fax03'), array('TEL_CHECK')); - $objErr->doFunc(array("郵便番号", 'order_zip01', 'order_zip02'), array('ALL_EXIST_CHECK')); + $objErr->doFunc(array('郵便番号', 'order_zip01', 'order_zip02'), array('ALL_EXIST_CHECK')); $objErr->doFunc(array('TEL', 'shipping_tel01', 'shipping_tel02', 'shipping_tel03'), array('TEL_CHECK')); - $objErr->doFunc(array("郵便番号", 'shipping_zip01', 'shipping_zip02'), array('ALL_EXIST_CHECK')); - $objErr->doFunc(array("生年月日", 'year', 'month', 'day'), array('CHECK_BIRTHDAY')); - $objErr->doFunc(array("メールアドレス", "メールアドレス（確認）", 'order_email', 'order_email02'), array('EQUAL_CHECK')); + $objErr->doFunc(array('郵便番号', 'shipping_zip01', 'shipping_zip02'), array('ALL_EXIST_CHECK')); + $objErr->doFunc(array('生年月日', 'year', 'month', 'day'), array('CHECK_BIRTHDAY')); + $objErr->doFunc(array('メールアドレス', 'メールアドレス（確認）', 'order_email', 'order_email02'), array('EQUAL_CHECK')); return $objErr->arrErr; @@ -463,6 +463,6 @@ $arrOrderTemp = $objPurchase->getOrderTemp($uniqid); if (SC_Utils_Ex::isBlank($arrOrderTemp)) { - $arrOrderTemp = array('order_email' => "", - 'order_birth' => ""); + $arrOrderTemp = array('order_email' => '', + 'order_birth' => ''); } $arrShippingTemp = $objPurchase->getShippingTemp(); @@ -542,5 +542,5 @@ function checkTempCustomer($login_email) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "email = ? AND status = 1 AND del_flg = 0"; + $where = 'email = ? AND status = 1 AND del_flg = 0'; $exists = $objQuery->exists('dtb_customer', $where, array($login_email)); return $exists; @@ -564,5 +564,5 @@ case SITE_LOGIN_ERROR: default: - $msg = "メールアドレスもしくはパスワードが正しくありません。"; + $msg = 'メールアドレスもしくはパスワードが正しくありません。'; } return SC_Utils_Ex::jsonEncode(array('login_error' => $msg)); Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php (revision 21514) @@ -46,5 +46,5 @@ $masterData = new SC_DB_MasterData(); $this->arrPref = $masterData->getMasterData('mtb_pref'); - $this->tpl_title = "お届け先の指定"; + $this->tpl_title = 'お届け先の指定'; $this->httpCacheControl('nocache'); } @@ -99,5 +99,5 @@ $arrErr = $objFormParam->checkError(); if (!SC_Utils_Ex::isBlank($arrErr)) { - SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true); + SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, '', true); exit; } @@ -122,5 +122,5 @@ } else { - SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true); + SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, '', true); } break; @@ -167,6 +167,6 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("その他のお届け先ID", 'other_deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お届け先チェック", 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('その他のお届け先ID', 'other_deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お届け先チェック', 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK')); } @@ -179,5 +179,5 @@ function doDelete($other_deliv_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "other_deliv_id = ?"; + $where = 'other_deliv_id = ?'; $objQuery->delete('dtb_other_deliv', $where, array($other_deliv_id)); } @@ -197,5 +197,5 @@ */ function registerDeliv($deliv_check, $uniqid, &$objPurchase, &$objCustomer) { - $this->log("register deliv. deliv_check=" . $deliv_check, 'Debug'); + $this->log('register deliv. deliv_check=' . $deliv_check, 'Debug'); $arrValues = array(); // 会員登録住所がチェックされている場合 @@ -209,6 +209,6 @@ elseif ($deliv_check >= 1) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $arrOtherDeliv = $objQuery->getRow("*", 'dtb_other_deliv', - "customer_id = ? AND other_deliv_id = ?", + $arrOtherDeliv = $objQuery->getRow('*', 'dtb_other_deliv', + 'customer_id = ? AND other_deliv_id = ?', array($objCustomer->getValue('customer_id'), $deliv_check)); if (SC_Utils_Ex::isBlank($arrOtherDeliv)) { Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php (revision 21514) @@ -58,5 +58,5 @@ $order_id = $this->getOrderId(); if ($order_id === false) { - SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true); + SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, '', true); return; } @@ -64,6 +64,6 @@ $module_path = $this->getModulePath($order_id); if ($module_path === false) { - SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", true, - "モジュールファイルの取得に失敗しました。
この手続きは無効となりました。"); + SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', true, + 'モジュールファイルの取得に失敗しました。
この手続きは無効となりました。'); return; } Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 21514) @@ -103,5 +103,5 @@ case 'delete': // 商品、子テーブル(商品規格)、会員お気に入り商品の削除 - $this->doDelete("product_id = ?", array($objFormParam->getValue('product_id'))); + $this->doDelete('product_id = ?', array($objFormParam->getValue('product_id'))); // 件数カウントバッチ実行 $objDb->sfCountCategory($objQuery); @@ -120,7 +120,7 @@ if (count($this->arrErr) == 0) { - $where = "del_flg = 0"; + $where = 'del_flg = 0'; foreach ($arrParam as $key => $val) { - if ($val == "") { + if ($val == '') { continue; } @@ -128,5 +128,5 @@ } - $order = "update_date DESC"; + $order = 'update_date DESC'; /* ----------------------------------------------- @@ -229,5 +229,5 @@ $objErr->arrErr = $objFormParam->checkError(); - $objErr->doFunc(array("開始日", "終了日", 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('開始日', '終了日', 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); return $objErr->arrErr; @@ -238,6 +238,6 @@ $max = count($arrCatKey); for ($cnt = 0; $cnt < $max; $cnt++) { - $key = isset($arrCatKey[$cnt]) ? $arrCatKey[$cnt] : ""; - $val = isset($arrCatVal[$cnt]) ? $arrCatVal[$cnt] : ""; + $key = isset($arrCatKey[$cnt]) ? $arrCatKey[$cnt] : ''; + $val = isset($arrCatVal[$cnt]) ? $arrCatVal[$cnt] : ''; $arrRet[$key] = $val; } @@ -283,15 +283,15 @@ // 商品ID case 'search_product_id': - $where .= " AND product_id = ?"; + $where .= ' AND product_id = ?'; $arrValues[] = sprintf('%d', $objFormParam->getValue($key)); break; // 商品コード case 'search_product_code': - $where .= " AND product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code ILIKE ? GROUP BY product_id)"; + $where .= ' AND product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code ILIKE ? GROUP BY product_id)'; $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key)); break; // 商品名 case 'search_name': - $where .= " AND name LIKE ?"; + $where .= ' AND name LIKE ?'; $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key)); break; @@ -299,6 +299,6 @@ case 'search_category_id': list($tmp_where, $tmp_Values) = $objDb->sfGetCatWhere($objFormParam->getValue($key)); - if ($tmp_where != "") { - $where.= " AND product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; + if ($tmp_where != '') { + $where.= ' AND product_id IN (SELECT product_id FROM dtb_product_categories WHERE ' . $tmp_where . ')'; $arrValues = array_merge((array)$arrValues, (array)$tmp_Values); } @@ -306,11 +306,11 @@ // 種別 case 'search_status': - $tmp_where = ""; + $tmp_where = ''; foreach ($objFormParam->getValue($key) as $element) { - if ($element != "") { + if ($element != '') { if (SC_Utils_Ex::isBlank($tmp_where)) { - $tmp_where .= " AND (status = ?"; + $tmp_where .= ' AND (status = ?'; } else { - $tmp_where .= " OR status = ?"; + $tmp_where .= ' OR status = ?'; } $arrValues[] = $element; @@ -319,5 +319,5 @@ if (!SC_Utils_Ex::isBlank($tmp_where)) { - $tmp_where .= ")"; + $tmp_where .= ')'; $where .= " $tmp_where "; } @@ -328,5 +328,5 @@ $objFormParam->getValue('search_startmonth'), $objFormParam->getValue('search_startday')); - $where.= " AND update_date >= ?"; + $where.= ' AND update_date >= ?'; $arrValues[] = $date; break; @@ -336,5 +336,5 @@ $objFormParam->getValue('search_endmonth'), $objFormParam->getValue('search_endday'), true); - $where.= " AND update_date <= ?"; + $where.= ' AND update_date <= ?'; $arrValues[] = $date; break; @@ -342,7 +342,7 @@ case 'search_product_statuses': if (count($objFormParam->getValue($key)) > 0) { - $where .= " AND product_id IN (SELECT product_id FROM dtb_product_status WHERE product_status_id IN ("; + $where .= ' AND product_id IN (SELECT product_id FROM dtb_product_status WHERE product_status_id IN ('; foreach ($objFormParam->getValue($key) as $param) { - $where .= "?,"; + $where .= '?,'; $arrValues[] = $param; } @@ -380,5 +380,5 @@ // 読み込む列とテーブルの指定 - $col = "product_id, name, main_list_image, status, product_code_min, product_code_max, price02_min, price02_max, stock_min, stock_max, stock_unlimited_min, stock_unlimited_max, update_date"; + $col = 'product_id, name, main_list_image, status, product_code_min, product_code_max, price02_min, price02_max, stock_min, stock_max, stock_unlimited_min, stock_unlimited_max, update_date'; $from = $objProduct->alldtlSQL(); Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21502) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21514) @@ -124,5 +124,5 @@ if ($mode == 'copy') { $this->arrForm['copy_product_id'] = $this->arrForm['product_id']; - $this->arrForm['product_id'] = ""; + $this->arrForm['product_id'] = ''; // 画像ファイルのコピー $this->lfCopyProductImageFiles($objUpFile); @@ -199,5 +199,5 @@ // ファイルを一時ディレクトリにアップロード $this->arrErr[$arrForm['image_key']] = $objUpFile->makeTempFile($arrForm['image_key'], IMAGE_RENAME); - if ($this->arrErr[$arrForm['image_key']] == "") { + if ($this->arrErr[$arrForm['image_key']] == '') { // 縮小画像作成 $this->lfSetScaleImage($objUpFile, $arrForm['image_key']); @@ -302,5 +302,5 @@ */ function lfInitFormParam_PreEdit(&$objFormParam, $arrPost) { - $objFormParam->addParam("商品ID", 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->setParam($arrPost); $objFormParam->convParam(); @@ -315,33 +315,33 @@ */ function lfInitFormParam(&$objFormParam, $arrPost) { - $objFormParam->addParam("商品ID", 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("商品名", 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("商品カテゴリ", 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("公開・非公開", 'status', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("商品ステータス", 'product_status', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品カテゴリ', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('公開・非公開', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品ステータス', 'product_status', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); if ($this->lfGetProductClassFlag($arrPost['has_product_class']) == false) { // 新規登録, 規格なし商品の編集の場合 - $objFormParam->addParam("商品種別", 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ダウンロード商品ファイル名", 'down_filename', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ダウンロード商品実ファイル名", 'down_realfilename', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品種別', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ダウンロード商品ファイル名', 'down_filename', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ダウンロード商品実ファイル名', 'down_realfilename', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('temp_down_file', 'temp_down_file', '', "", array()); $objFormParam->addParam('save_down_file', 'save_down_file', '', "", array()); - $objFormParam->addParam("商品コード", 'product_code', STEXT_LEN, 'KVna', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品コード', 'product_code', STEXT_LEN, 'KVna', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK')); $objFormParam->addParam(NORMAL_PRICE_TITLE, 'price01', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam(SALE_PRICE_TITLE, 'price02', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("在庫数", 'stock', AMOUNT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("在庫無制限", 'stock_unlimited', INT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - } - $objFormParam->addParam("商品送料", 'deliv_fee', PRICE_LEN, 'n', array('NUM_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ポイント付与率", 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("発送日目安", 'deliv_date_id', INT_LEN, 'n', array('NUM_CHECK')); - $objFormParam->addParam("販売制限数", 'sale_limit', AMOUNT_LEN, 'n', array('SPTAB_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("メーカー", 'maker_id', INT_LEN, 'n', array('NUM_CHECK')); - $objFormParam->addParam("メーカーURL", 'comment1', URL_LEN, 'a', array('SPTAB_CHECK', 'URL_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("検索ワード", 'comment3', LLTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("備考欄(SHOP専用)", 'note', LLTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("一覧-メインコメント", 'main_list_comment', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("詳細-メインコメント", 'main_comment', LLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('在庫数', 'stock', AMOUNT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('在庫無制限', 'stock_unlimited', INT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + } + $objFormParam->addParam('商品送料', 'deliv_fee', PRICE_LEN, 'n', array('NUM_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ポイント付与率', 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('発送日目安', 'deliv_date_id', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('販売制限数', 'sale_limit', AMOUNT_LEN, 'n', array('SPTAB_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('メーカー', 'maker_id', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('メーカーURL', 'comment1', URL_LEN, 'a', array('SPTAB_CHECK', 'URL_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('検索ワード', 'comment3', LLTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('備考欄(SHOP専用)', 'note', LLTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('一覧-メインコメント', 'main_list_comment', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('詳細-メインコメント', 'main_comment', LLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('save_main_list_image', 'save_main_list_image', '', "", array()); $objFormParam->addParam('save_main_image', 'save_main_image', '', "", array()); @@ -352,6 +352,6 @@ for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) { - $objFormParam->addParam("詳細-サブタイトル" . $cnt, 'sub_title' . $cnt, STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("詳細-サブコメント" . $cnt, 'sub_comment' . $cnt, LLTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('詳細-サブタイトル' . $cnt, 'sub_title' . $cnt, STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('詳細-サブコメント' . $cnt, 'sub_comment' . $cnt, LLTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('save_sub_image' . $cnt, 'save_sub_image' . $cnt, '', "", array()); $objFormParam->addParam('save_sub_large_image' . $cnt, 'save_sub_large_image' . $cnt, '', "", array()); @@ -361,10 +361,10 @@ for ($cnt = 1; $cnt <= RECOMMEND_PRODUCT_MAX; $cnt++) { - $objFormParam->addParam("関連商品コメント" . $cnt, 'recommend_comment' . $cnt, LTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("関連商品ID" . $cnt, 'recommend_id' . $cnt, INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('関連商品コメント' . $cnt, 'recommend_comment' . $cnt, LTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('関連商品ID' . $cnt, 'recommend_id' . $cnt, INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('recommend_delete' . $cnt, 'recommend_delete' . $cnt, '', 'n', array()); } - $objFormParam->addParam("商品ID", 'copy_product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品ID', 'copy_product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('has_product_class', 'has_product_class', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); @@ -417,7 +417,7 @@ */ function lfInitFile(&$objUpFile) { - $objUpFile->addFile("一覧-メイン画像", 'main_list_image', array('jpg', 'gif', 'png'),IMAGE_SIZE, false, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT); - $objUpFile->addFile("詳細-メイン画像", 'main_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT); - $objUpFile->addFile("詳細-メイン拡大画像", 'main_large_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, LARGE_IMAGE_WIDTH, LARGE_IMAGE_HEIGHT); + $objUpFile->addFile('一覧-メイン画像', 'main_list_image', array('jpg', 'gif', 'png'),IMAGE_SIZE, false, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT); + $objUpFile->addFile('詳細-メイン画像', 'main_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT); + $objUpFile->addFile('詳細-メイン拡大画像', 'main_large_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, LARGE_IMAGE_WIDTH, LARGE_IMAGE_HEIGHT); for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) { $objUpFile->addFile("詳細-サブ画像$cnt", "sub_image$cnt", array('jpg', 'gif', 'png'), IMAGE_SIZE, false, NORMAL_SUBIMAGE_WIDTH, NORMAL_SUBIMAGE_HEIGHT); @@ -434,5 +434,5 @@ */ function lfInitDownFile(&$objDownFile) { - $objDownFile->addFile("ダウンロード販売用ファイル", 'down_file', explode(",", DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0); + $objDownFile->addFile('ダウンロード販売用ファイル', 'down_file', explode(",", DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0); } @@ -457,7 +457,7 @@ // HTMLタグ許可チェック - $objErr->doFunc(array("詳細-メインコメント", 'main_comment', $this->arrAllowedTag), array('HTML_TAG_CHECK')); + $objErr->doFunc(array('詳細-メインコメント', 'main_comment', $this->arrAllowedTag), array('HTML_TAG_CHECK')); for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) { - $objErr->doFunc(array("詳細-サブコメント" . $cnt, 'sub_comment' . $cnt, $this->arrAllowedTag), array('HTML_TAG_CHECK')); + $objErr->doFunc(array('詳細-サブコメント' . $cnt, 'sub_comment' . $cnt, $this->arrAllowedTag), array('HTML_TAG_CHECK')); } @@ -466,10 +466,10 @@ // 在庫必須チェック(在庫無制限ではない場合) if ($arrForm['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { - $objErr->doFunc(array("在庫数", 'stock'), array('EXIST_CHECK')); + $objErr->doFunc(array('在庫数', 'stock'), array('EXIST_CHECK')); } // ダウンロード商品ファイル必須チェック(ダウンロード商品の場合) if ($arrForm['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) { $arrErr = array_merge((array)$arrErr, (array)$objDownFile->checkEXISTS()); - $objErr->doFunc(array("ダウンロード商品ファイル名", 'down_filename'), array('EXIST_CHECK')); + $objErr->doFunc(array('ダウンロード商品ファイル名', 'down_filename'), array('EXIST_CHECK')); } } @@ -579,8 +579,8 @@ $arrForm['category_id'] = unserialize($arrForm['category_id']); } - if ($arrForm['status'] == "") { + if ($arrForm['status'] == '') { $arrForm['status'] = DEFAULT_PRODUCT_DISP; } - if ($arrForm['product_type_id'] == "") { + if ($arrForm['product_type_id'] == '') { $arrForm['product_type_id'] = DEFAULT_PRODUCT_DOWN; } @@ -634,5 +634,5 @@ */ function lfSetScaleImage(&$objUpFile, $image_key) { - $subno = str_replace('sub_large_image', "", $image_key); + $subno = str_replace('sub_large_image', '', $image_key); switch ($image_key) { case 'main_large_image': @@ -678,5 +678,5 @@ function lfMakeScaleImage(&$objUpFile, $from_key, $to_key, $forced = false) { $arrImageKey = array_flip($objUpFile->keyname); - $from_path = ""; + $from_path = ''; if ($objUpFile->temp_file[$arrImageKey[$from_key]]) { @@ -691,10 +691,10 @@ $to_h = $objUpFile->height[$arrImageKey[$to_key]]; - if($forced) $objUpFile->save_file[$arrImageKey[$to_key]] = ""; + if($forced) $objUpFile->save_file[$arrImageKey[$to_key]] = ''; if(empty($objUpFile->temp_file[$arrImageKey[$to_key]]) && empty($objUpFile->save_file[$arrImageKey[$to_key]])) { // リネームする際は、自動生成される画像名に一意となるように、Suffixを付ける - $dst_file = $objUpFile->lfGetTmpImageName(IMAGE_RENAME, "", $objUpFile->temp_file[$arrImageKey[$from_key]]) . $this->lfGetAddSuffix($to_key); + $dst_file = $objUpFile->lfGetTmpImageName(IMAGE_RENAME, '', $objUpFile->temp_file[$arrImageKey[$from_key]]) . $this->lfGetAddSuffix($to_key); $path = $objUpFile->makeThumb($from_path, $to_w, $to_h, $dst_file); $objUpFile->temp_file[$arrImageKey[$to_key]] = basename($path); @@ -788,5 +788,5 @@ $sqlval[] = $image_file_name; } - $where = implode(" OR ", $arrWhere); + $where = implode(' OR ', $arrWhere); $where = "del_flg = ? AND ((product_id <> ? AND ({$where}))"; @@ -797,5 +797,5 @@ $sqlval[] = $image_file_name; } - $where .= ")"; + $where .= ')'; $objQuery = new SC_Query_Ex(); @@ -815,5 +815,5 @@ // 商品データ取得 - $col = "*"; + $col = '*'; $table = <<< __EOF__ dtb_products AS T1 @@ -835,5 +835,5 @@ ON T1.product_id = T2.product_id_sub __EOF__; - $where = "product_id = ?"; + $where = 'product_id = ?'; $objQuery->setLimit('1'); $arrProduct = $objQuery->select($col, $table, $where, array($product_id)); @@ -842,5 +842,5 @@ $col = 'category_id'; $table = 'dtb_product_categories'; - $where = "product_id = ?"; + $where = 'product_id = ?'; $objQuery->setOption(''); $arrProduct[0]['category_id'] = $objQuery->getCol($col, $table, $where, array($product_id)); @@ -881,5 +881,5 @@ $table = 'dtb_recommend_products'; $where = 'product_id = ?'; - $objQuery->setOrder("rank DESC"); + $objQuery->setOrder('rank DESC'); $arrRet = $objQuery->select($col, $table, $where, array($product_id)); @@ -960,5 +960,5 @@ * @return string ページonload用JavaScript */ - function lfSetOnloadJavaScript_InputPage($anchor_hash = "") { + function lfSetOnloadJavaScript_InputPage($anchor_hash = '') { return "fnCheckStockLimit('" . DISABLED_RGB . "'); fnMoveSelect('category_id_unselect', 'category_id');" . $anchor_hash; } @@ -1012,5 +1012,5 @@ // 新規登録(複製時を含む) - if ($arrList['product_id'] == "") { + if ($arrList['product_id'] == '') { $product_id = $objQuery->nextVal('dtb_products_product_id'); $sqlval['product_id'] = $product_id; @@ -1026,5 +1026,5 @@ // 複製商品の場合には規格も複製する - if ($arrList['copy_product_id'] != "" && SC_Utils_Ex::sfIsInt($arrList['copy_product_id'])) { + if ($arrList['copy_product_id'] != '' && SC_Utils_Ex::sfIsInt($arrList['copy_product_id'])) { if ($this->lfGetProductClassFlag($arrList['has_product_class']) == false) { //規格なしの場合、複製は価格等の入力が発生しているため、その内容で追加登録を行う @@ -1082,5 +1082,5 @@ $objDownFile->deleteDBDownFile($arrRet); // UPDATEの実行 - $where = "product_id = ?"; + $where = 'product_id = ?'; $objQuery->update('dtb_products', $sqlval, $where, array($product_id)); @@ -1090,5 +1090,5 @@ // 商品登録の時は規格を生成する。複製の場合は規格も複製されるのでこの処理は不要。 - if ($arrList['copy_product_id'] == "") { + if ($arrList['copy_product_id'] == '') { // 規格登録 if ($objDb->sfHasProductClass($product_id)) { @@ -1141,5 +1141,5 @@ $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; // UPDATEの実行 - $objQuery->update('dtb_products_class', $sqlval, "product_class_id = ?", array($sqlval['product_class_id'])); + $objQuery->update('dtb_products_class', $sqlval, 'product_class_id = ?', array($sqlval['product_class_id'])); } @@ -1174,5 +1174,5 @@ function lfInsertRecommendProducts(&$objQuery, $arrList, $product_id) { // 一旦関連商品をすべて削除する - $objQuery->delete('dtb_recommend_products', "product_id = ?", array($product_id)); + $objQuery->delete('dtb_recommend_products', 'product_id = ?', array($product_id)); $sqlval['product_id'] = $product_id; $rank = RECOMMEND_PRODUCT_MAX; @@ -1184,5 +1184,5 @@ if (!isset($arrList[$deletekey])) $arrList[$deletekey] = null; - if ($arrList[$keyname] != "" && $arrList[$deletekey] != '1') { + if ($arrList[$keyname] != '' && $arrList[$deletekey] != '1') { $sqlval['recommend_product_id'] = $arrList[$keyname]; $sqlval['comment'] = $arrList[$commentkey]; @@ -1206,7 +1206,7 @@ function lfCopyProductClass($arrList, &$objQuery) { // 複製元のdtb_products_classを取得（規格なしのため、1件のみの取得） - $col = "*"; + $col = '*'; $table = 'dtb_products_class'; - $where = "product_id = ?"; + $where = 'product_id = ?'; $arrProductClass = $objQuery->select($col, $table, $where, array($arrList['copy_product_id'])); @@ -1258,5 +1258,5 @@ // 自動生成される画像名 - $dist_name = ""; + $dist_name = ''; switch ($to_key) { case 'main_list_image': @@ -1307,8 +1307,8 @@ */ function getAnchorHash($anchor_key) { - if ($anchor_key != "") { + if ($anchor_key != '') { return "location.hash='#" . htmlspecialchars($anchor_key) . "'"; } else { - return ""; + return ''; } } Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php (revision 21514) @@ -46,5 +46,5 @@ $this->tpl_mainpage = 'products/product_select.tpl'; $this->tpl_mainno = 'products'; - $this->tpl_subno = ""; + $this->tpl_subno = ''; $this->tpl_maintitle = '商品管理'; $this->tpl_subtitle = '商品選択'; @@ -107,31 +107,31 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("カテゴリ", 'search_category_id', STEXT_LEN, 'n'); - $objFormParam->addParam("商品名", 'search_name', STEXT_LEN, 'KVa'); - $objFormParam->addParam("商品コード", 'search_product_code', STEXT_LEN, 'KVa'); + $objFormParam->addParam('カテゴリ', 'search_category_id', STEXT_LEN, 'n'); + $objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa'); + $objFormParam->addParam('商品コード', 'search_product_code', STEXT_LEN, 'KVa'); } /* 商品検索結果取得 */ function lfGetProducts(&$objDb) { - $where = "del_flg = 0"; + $where = 'del_flg = 0'; /* 入力エラーなし */ foreach ($this->arrForm AS $key=>$val) { - if($val == "") continue; + if($val == '') continue; switch ($key) { case 'search_name': - $where .= " AND name ILIKE ?"; + $where .= ' AND name ILIKE ?'; $arrval[] = "%$val%"; break; case 'search_category_id': list($tmp_where, $tmp_arrval) = $objDb->sfGetCatWhere($val); - if ($tmp_where != "") { - $where.= " AND product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; + if ($tmp_where != '') { + $where.= ' AND product_id IN (SELECT product_id FROM dtb_product_categories WHERE ' . $tmp_where . ')'; $arrval = array_merge((array)$arrval, (array)$tmp_arrval); } break; case 'search_product_code': - $where .= " AND product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? GROUP BY product_id)"; + $where .= ' AND product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? GROUP BY product_id)'; $arrval[] = "$val%"; break; @@ -141,5 +141,5 @@ } - $order = "update_date DESC, product_id DESC "; + $order = 'update_date DESC, product_id DESC '; $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -166,5 +166,5 @@ // 検索結果の取得 // FIXME 商品コードの表示 - $arrProducts = $objQuery->select("*", SC_Product_Ex::alldtlSQL(), $where, $arrval); + $arrProducts = $objQuery->select('*', SC_Product_Ex::alldtlSQL(), $where, $arrval); return $arrProducts; } Index: 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 (revision 21502) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21514) @@ -141,5 +141,5 @@ */ function addRowResult($line_count, $message) { - $this->arrRowResult[] = $line_count . "行目：" . $message; + $this->arrRowResult[] = $line_count . '行目：' . $message; } @@ -152,5 +152,5 @@ */ function addRowErr($line_count, $message) { - $this->arrRowErr[] = $line_count . "行目：" . $message; + $this->arrRowErr[] = $line_count . '行目：' . $message; } @@ -179,5 +179,5 @@ // 失敗した場合はエラー表示 if (!$fp) { - SC_Utils_Ex::sfDispError(""); + SC_Utils_Ex::sfDispError(''); } @@ -223,5 +223,5 @@ $col_count = count($arrCSV); if ($col_max_count != $col_count) { - $this->addRowErr($line_count, "※ 項目数が" . $col_count . "個検出されました。項目数は" . $col_max_count . "個になります。"); + $this->addRowErr($line_count, '※ 項目数が' . $col_count . '個検出されました。項目数は' . $col_max_count . "個になります。"); $errFlag = true; break; @@ -249,5 +249,5 @@ $arrParam = $objFormParam->getHashArray(); - $this->addRowResult($line_count, "商品ID：".$arrParam['product_id'] . " / 商品名：" . $arrParam['name']); + $this->addRowResult($line_count, '商品ID：'.$arrParam['product_id'] . " / 商品名：" . $arrParam['name']); } SC_Utils_Ex::extendTimeOut(); @@ -287,5 +287,5 @@ */ function lfInitFile(&$objUpFile) { - $objUpFile->addFile("CSVファイル", 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false); + $objUpFile->addFile('CSVファイル', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false); } @@ -317,5 +317,5 @@ $arrErrorCheckTypes = explode(',', $error_check_types); foreach ($arrErrorCheckTypes as $key => $val) { - if (trim($val) == "") { + if (trim($val) == '') { unset($arrErrorCheckTypes[$key]); } else { @@ -377,5 +377,5 @@ * @return void */ - function lfRegistProduct($objQuery, $line = "", &$objFormParam) { + function lfRegistProduct($objQuery, $line = '', &$objFormParam) { $objProduct = new SC_Product_Ex(); // 登録データ対象取得 @@ -391,7 +391,7 @@ $sqlval = $this->lfSetProductDefaultData($sqlval); - if ($sqlval['product_id'] != "") { + if ($sqlval['product_id'] != '') { // 同じidが存在すればupdate存在しなければinsert - $where = "product_id = ?"; + $where = 'product_id = ?'; $product_exists = $objQuery->exists('dtb_products', $where, array($sqlval['product_id'])); if ($product_exists) { @@ -454,5 +454,5 @@ $sqlval = $this->lfSetProductClassDefaultData($sqlval); - if ($product_class_id == "") { + if ($product_class_id == '') { // 新規登録 $sqlval['product_id'] = $product_id; @@ -464,9 +464,9 @@ } else { // UPDATEの実行 - $where = "product_class_id = ?"; + $where = 'product_class_id = ?'; $objQuery->update('dtb_products_class', $sqlval, $where, array($product_class_id)); } // 支払い方法登録 - if ($arrList['product_payment_ids'] != "") { + if ($arrList['product_payment_ids'] != '') { $arrPayment_id = explode(',', $arrList['product_payment_ids']); $objProduct->setPaymentOptions($product_class_id, $arrPayment_id); @@ -486,11 +486,11 @@ */ function lfRegistReccomendProducts($objQuery, $arrList, $product_id) { - $objQuery->delete('dtb_recommend_products', "product_id = ?", array($product_id)); + $objQuery->delete('dtb_recommend_products', 'product_id = ?', array($product_id)); for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { $keyname = 'recommend_product_id' . $i; $comment_key = 'recommend_comment' . $i; - if ($arrList[$keyname] != "") { + if ($arrList[$keyname] != '') { $arrProduct = $objQuery->select('product_id', 'dtb_products', "product_id = ?", array($arrList[$keyname])); - if ($arrProduct[0]['product_id'] != "") { + if ($arrProduct[0]['product_id'] != '') { $arrval['product_id'] = $product_id; $arrval['recommend_product_id'] = $arrProduct[0]['product_id']; @@ -547,14 +547,14 @@ function lfSetProductDefaultData(&$sqlval) { //新規登録時のみ設定する項目 - if ($sqlval['product_id'] == "") { - if ($sqlval['status'] == "") { + if ($sqlval['product_id'] == '') { + if ($sqlval['status'] == '') { $sqlval['status'] = DEFAULT_PRODUCT_DISP; } } //共通で空欄時に上書きする項目 - if ($sqlval['del_flg'] == "") { + if ($sqlval['del_flg'] == '') { $sqlval['del_flg'] = '0'; //有効 } - if ($sqlval['creator_id'] == "") { + if ($sqlval['creator_id'] == '') { $sqlval['creator_id'] = $_SESSION['member_id']; } @@ -570,19 +570,19 @@ function lfSetProductClassDefaultData(&$sqlval) { //新規登録時のみ設定する項目 - if ($sqlval['product_class_id'] == "") { - if ($sqlval['point_rate'] == "") { + if ($sqlval['product_class_id'] == '') { + if ($sqlval['point_rate'] == '') { $sqlval['point_rate'] = $this->arrInfo['point_rate']; } - if ($sqlval['product_type_id'] == "") { + if ($sqlval['product_type_id'] == '') { $sqlval['product_type_id'] = DEFAULT_PRODUCT_DOWN; } // TODO: 在庫数、無制限フラグの扱いについて仕様がぶれているので要調整 - if ($sqlval['stock'] == "" and $sqlval['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { + if ($sqlval['stock'] == '' and $sqlval['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { //在庫数設定がされておらず、かつ無制限フラグが設定されていない場合、強制無制限 $sqlval['stock_unlimited'] = UNLIMITED_FLG_UNLIMITED; - } elseif ($sqlval['stock'] != "" and $sqlval['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { + } elseif ($sqlval['stock'] != '' and $sqlval['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { //在庫数設定時は在庫無制限フラグをクリア $sqlval['stock_unlimited'] = UNLIMITED_FLG_LIMITED; - } elseif ($sqlval['stock'] != "" and $sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) { + } elseif ($sqlval['stock'] != '' and $sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) { //在庫無制限フラグ設定時は在庫数をクリア $sqlval['stock'] = ''; @@ -595,8 +595,8 @@ } //共通で設定する項目 - if ($sqlval['del_flg'] == "") { + if ($sqlval['del_flg'] == '') { $sqlval['del_flg'] = '0'; //有効 } - if ($sqlval['creator_id'] == "") { + if ($sqlval['creator_id'] == '') { $sqlval['creator_id'] = $_SESSION['member_id']; } @@ -615,15 +615,15 @@ // FIXME 規格分類ID自体のが有効かを主眼においたチェックをすべきと感じる。 if (!$this->lfIsDbRecord('dtb_products_class', 'product_class_id', $item)) { - $arrErr['product_class_id'] = "※ 指定の商品規格IDは、登録されていません。"; + $arrErr['product_class_id'] = '※ 指定の商品規格IDは、登録されていません。'; } // 商品ID、規格IDの組合せチェック if(array_search('product_class_id', $this->arrFormKeyList) !== FALSE - and $item['product_class_id'] != "") { - if ($item['product_id'] == "") { - $arrErr['product_class_id'] = "※ 商品規格ID指定時には商品IDの指定が必須です。"; + and $item['product_class_id'] != '') { + if ($item['product_id'] == '') { + $arrErr['product_class_id'] = '※ 商品規格ID指定時には商品IDの指定が必須です。'; } else { if(!$this->objDb->sfIsRecord('dtb_products_class', 'product_id, product_class_id' , array($item['product_id'], $item['product_class_id']))) { - $arrErr['product_class_id'] = "※ 指定の商品IDと商品規格IDの組合せは正しくありません。"; + $arrErr['product_class_id'] = '※ 指定の商品IDと商品規格IDの組合せは正しくありません。'; } } @@ -631,22 +631,22 @@ // 表示ステータスの存在チェック if (!$this->lfIsArrayRecord($this->arrDISP, 'status', $item)) { - $arrErr['status'] = "※ 指定の表示ステータスは、登録されていません。"; + $arrErr['status'] = '※ 指定の表示ステータスは、登録されていません。'; } // メーカーIDの存在チェック if (!$this->lfIsArrayRecord($this->arrMaker, 'maker_id', $item)) { - $arrErr['maker_id'] = "※ 指定のメーカーIDは、登録されていません。"; + $arrErr['maker_id'] = '※ 指定のメーカーIDは、登録されていません。'; } // 発送日目安IDの存在チェック if (!$this->lfIsArrayRecord($this->arrDELIVERYDATE, 'deliv_date_id', $item)) { - $arrErr['deliv_date_id'] = "※ 指定の発送日目安IDは、登録されていません。"; + $arrErr['deliv_date_id'] = '※ 指定の発送日目安IDは、登録されていません。'; } // 発送日目安IDの存在チェック if (!$this->lfIsArrayRecord($this->arrProductType, 'product_type_id', $item)) { - $arrErr['product_type_id'] = "※ 指定の商品種別IDは、登録されていません。"; + $arrErr['product_type_id'] = '※ 指定の商品種別IDは、登録されていません。'; } // 関連商品IDの存在チェック for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { if(array_search('recommend_product_id' . $i, $this->arrFormKeyList) !== FALSE - and $item['recommend_product_id' . $i] != "" + and $item['recommend_product_id' . $i] != '' and !$this->objDb->sfIsRecord('dtb_products', 'product_id', (array)$item['recommend_product_id' . $i])) { $arrErr['recommend_product_id' . $i] = "※ 指定の関連商品ID($i)は、登録されていません。"; @@ -655,19 +655,19 @@ // カテゴリIDの存在チェック if (!$this->lfIsDbRecordMulti('dtb_category', 'category_id', 'category_ids', $item, ',')) { - $arrErr['category_ids'] = "※ 指定のカテゴリIDは、登録されていません。"; + $arrErr['category_ids'] = '※ 指定のカテゴリIDは、登録されていません。'; } // 商品ステータスIDの存在チェック if (!$this->lfIsArrayRecordMulti($this->arrSTATUS, 'product_statuses', $item, ',')) { - $arrErr['product_statuses'] = "※ 指定の商品ステータスIDは、登録されていません。"; + $arrErr['product_statuses'] = '※ 指定の商品ステータスIDは、登録されていません。'; } // 支払い方法IDの存在チェック if (!$this->lfIsArrayRecordMulti($this->arrPayments, 'product_payment_ids', $item, ',')) { - $arrErr['product_payment_ids'] = "※ 指定の支払い方法IDは、登録されていません。"; + $arrErr['product_payment_ids'] = '※ 指定の支払い方法IDは、登録されていません。'; } // 削除フラグのチェック if(array_search('del_flg', $this->arrFormKeyList) !== FALSE - and $item['del_flg'] != "") { + and $item['del_flg'] != '') { if (!($item['del_flg'] == '0' or $item['del_flg'] == '1')) { - $arrErr['del_flg'] = "※ 削除フラグは「0」(有効)、「1」(削除)のみが有効な値です。"; + $arrErr['del_flg'] = '※ 削除フラグは「0」(有効)、「1」(削除)のみが有効な値です。'; } } @@ -675,9 +675,9 @@ TODO: 在庫数の扱いが2.4仕様ではぶれているのでどうするか・・ // 在庫数/在庫無制限フラグの有効性に関するチェック - if ($item['stock'] == "") { + if ($item['stock'] == '') { if (array_search('stock_unlimited', $this->arrFormKeyList) === FALSE) { - $arrErr['stock'] = "※ 在庫数は必須です（無制限フラグ項目がある場合のみ空欄許可）。"; + $arrErr['stock'] = '※ 在庫数は必須です（無制限フラグ項目がある場合のみ空欄許可）。'; }else if ($item['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { - $arrErr['stock'] = "※ 在庫数または在庫無制限フラグのいずれかの入力が必須です。"; + $arrErr['stock'] = '※ 在庫数または在庫無制限フラグのいずれかの入力が必須です。'; } } @@ -687,18 +687,18 @@ and $item['product_type_id'] == PRODUCT_TYPE_NORMAL) { //実商品の場合 - if ($item['down_filename'] != "") { - $arrErr['down_filename'] = "※ 実商品の場合はダウンロードファイル名は入力できません。"; - } - if ($item['down_realfilename'] != "") { - $arrErr['down_realfilename'] = "※ 実商品の場合はダウンロード商品用ファイルアップロードは入力できません。"; + if ($item['down_filename'] != '') { + $arrErr['down_filename'] = '※ 実商品の場合はダウンロードファイル名は入力できません。'; + } + if ($item['down_realfilename'] != '') { + $arrErr['down_realfilename'] = '※ 実商品の場合はダウンロード商品用ファイルアップロードは入力できません。'; } }elseif(array_search('product_type_id', $this->arrFormKeyList) !== FALSE and $item['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) { //ダウンロード商品の場合 - if ($item['down_filename'] == "") { - $arrErr['down_filename'] = "※ ダウンロード商品の場合はダウンロードファイル名は必須です。"; - } - if ($item['down_realfilename'] == "") { - $arrErr['down_realfilename'] = "※ ダウンロード商品の場合はダウンロード商品用ファイルアップロードは必須です。"; + if ($item['down_filename'] == '') { + $arrErr['down_filename'] = '※ ダウンロード商品の場合はダウンロードファイル名は必須です。'; + } + if ($item['down_realfilename'] == '') { + $arrErr['down_realfilename'] = '※ ダウンロード商品の場合はダウンロード商品用ファイルアップロードは必須です。'; } } @@ -716,8 +716,8 @@ */ function lfGetDbFormatTimeWithLine($line_no = '') { - $time = date("Y-m-d H:i:s"); + $time = date('Y-m-d H:i:s'); // 秒以下を生成 if ($line_no != '') { - $microtime = sprintf("%06d", $line_no); + $microtime = sprintf('%06d', $line_no); $time .= ".$microtime"; } @@ -738,10 +738,10 @@ return true; } - if ($item[$keyname] == "") { + if ($item[$keyname] == '') { return true; } $arrItems = explode($delimiter, $item[$keyname]); //空項目のチェック 1つでも空指定があったら不正とする。 - if (array_search("", $arrItems) !== FALSE) { + if (array_search('', $arrItems) !== FALSE) { return false; } @@ -769,14 +769,14 @@ return true; } - if ($item[$keyname] == "") { + if ($item[$keyname] == '') { return true; } $arrItems = explode($delimiter, $item[$keyname]); //空項目のチェック 1つでも空指定があったら不正とする。 - if (array_search("", $arrItems) !== FALSE) { + if (array_search('', $arrItems) !== FALSE) { return false; } $count = count($arrItems); - $where = $tblkey ." IN (" . implode(",", array_fill(0, $count, "?")) . ")"; + $where = $tblkey .' IN (' . implode(',', array_fill(0, $count, "?")) . ")"; $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -798,5 +798,5 @@ function lfIsDbRecord($table, $keyname, $item) { if(array_search($keyname, $this->arrFormKeyList) !== FALSE //入力対象である - and $item[$keyname] != "" // 空ではない + and $item[$keyname] != '' // 空ではない and !$this->objDb->sfIsRecord($table, $keyname, (array)$item[$keyname]) //DBに存在するか ) { @@ -816,5 +816,5 @@ function lfIsArrayRecord($arr, $keyname, $item) { if(array_search($keyname, $this->arrFormKeyList) !== FALSE //入力対象である - and $item[$keyname] != "" // 空ではない + and $item[$keyname] != '' // 空ではない and !array_key_exists($item[$keyname], $arr) //配列に存在するか ) { Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php (revision 21514) @@ -147,14 +147,14 @@ switch ($this->getMode()) { case 'search': - $objErr->doFunc(array("投稿者", 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); - $objErr->doFunc(array("開始日", 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); - $objErr->doFunc(array("終了日", 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_DATE')); - $objErr->doFunc(array("開始日", "終了日", 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('投稿者', 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); + $objErr->doFunc(array('開始日', 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); + $objErr->doFunc(array('終了日', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_DATE')); + $objErr->doFunc(array('開始日', '終了日', 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); break; case 'complete': - $objErr->doFunc(array("おすすめレベル", 'recommend_level'), array('SELECT_CHECK')); - $objErr->doFunc(array("タイトル", 'title', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objErr->doFunc(array("コメント", 'comment', LTEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('おすすめレベル', 'recommend_level'), array('SELECT_CHECK')); + $objErr->doFunc(array('タイトル', 'title', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('コメント', 'comment', LTEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); break; } @@ -171,5 +171,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $sqlval['del_flg'] = 1; - $objQuery->update('dtb_review', $sqlval, "review_id = ?", array($review_id)); + $objQuery->update('dtb_review', $sqlval, 'review_id = ?', array($review_id)); } @@ -183,10 +183,10 @@ $arrHidden = array(); foreach ($arrForm AS $key=>$val) { - if (preg_match("/^search_/", $key)) { + if (preg_match('/^search_/', $key)) { switch ($key) { case 'search_sex': $arrHidden[$key] = SC_Utils_Ex::sfMergeParamCheckBoxes($val); if (!is_array($val)) { - $arrForm[$key] = explode("-", $val); + $arrForm[$key] = explode('-', $val); } break; @@ -207,19 +207,19 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("投稿者名", 'search_reviewer_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("投稿者URL", 'search_reviewer_url', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("商品名", 'search_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("商品コード", 'search_product_code', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("性別", 'search_sex', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("おすすめレベル", 'search_recommend_level', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("投稿年", 'search_startyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); - $objFormParam->addParam("投稿月", 'search_startmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); - $objFormParam->addParam("投稿日", 'search_startday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); - $objFormParam->addParam("投稿年", 'search_endyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); - $objFormParam->addParam("投稿月", 'search_endmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); - $objFormParam->addParam("投稿日", 'search_endday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); - $objFormParam->addParam("最大表示件数", 'search_page_max', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("ページ番号件数", 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); - $objFormParam->addParam("レビューID", 'review_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('投稿者名', 'search_reviewer_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('投稿者URL', 'search_reviewer_url', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('商品コード', 'search_product_code', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('性別', 'search_sex', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('おすすめレベル', 'search_recommend_level', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('投稿年', 'search_startyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); + $objFormParam->addParam('投稿月', 'search_startmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); + $objFormParam->addParam('投稿日', 'search_startday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); + $objFormParam->addParam('投稿年', 'search_endyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); + $objFormParam->addParam('投稿月', 'search_endmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); + $objFormParam->addParam('投稿日', 'search_endday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'),"",false); + $objFormParam->addParam('最大表示件数', 'search_page_max', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('ページ番号件数', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); + $objFormParam->addParam('レビューID', 'review_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK'),"",false); } @@ -233,8 +233,8 @@ function lfDoOutputCsv($where, $arrVal) { $objCSV = new SC_Helper_CSV_Ex(); - if ($where != "") { - $where = "WHERE " . $where; - } - $objCSV->sfDownloadCsv('4', $where, $arrVal, "", true); + if ($where != '') { + $where = 'WHERE ' . $where; + } + $objCSV->sfDownloadCsv('4', $where, $arrVal, '', true); } @@ -247,5 +247,5 @@ function lfGetWhere($arrForm) { //削除されていない商品を検索 - $where = "A.del_flg = 0 AND B.del_flg = 0"; + $where = 'A.del_flg = 0 AND B.del_flg = 0'; foreach ($arrForm AS $key=>$val) { @@ -254,43 +254,43 @@ switch ($key) { case 'search_reviewer_name': - $val = preg_replace("/ /", "%", $val); - $where.= " AND reviewer_name LIKE ? "; + $val = preg_replace('/ /', '%', $val); + $where.= ' AND reviewer_name LIKE ? '; $arrval[] = "%$val%"; break; case 'search_reviewer_url': - $val = preg_replace("/ /", "%", $val); - $where.= " AND reviewer_url LIKE ? "; + $val = preg_replace('/ /', '%', $val); + $where.= ' AND reviewer_url LIKE ? '; $arrval[] = "%$val%"; break; case 'search_name': - $val = preg_replace("/ /", "%", $val); - $where.= " AND name LIKE ? "; + $val = preg_replace('/ /', '%', $val); + $where.= ' AND name LIKE ? '; $arrval[] = "%$val%"; break; case 'search_product_code': - $val = preg_replace("/ /", "%", $val); - $where.= " AND A.product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ?)"; + $val = preg_replace('/ /', '%', $val); + $where.= ' AND A.product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ?)'; $arrval[] = "%$val%"; break; case 'search_sex': - $tmp_where = ""; + $tmp_where = ''; //$val=配列の中身,$element=各キーの値(1,2) if (is_array($val)) { foreach ($val as $element) { - if ($element != "") { - if ($tmp_where == "") { - $tmp_where .= " AND (sex = ?"; + if ($element != '') { + if ($tmp_where == '') { + $tmp_where .= ' AND (sex = ?'; } else { - $tmp_where .= " OR sex = ?"; + $tmp_where .= ' OR sex = ?'; } $arrval[] = $element; } } - if ($tmp_where != "") { - $tmp_where .= ")"; + if ($tmp_where != '') { + $tmp_where .= ')'; $where .= " $tmp_where "; } @@ -300,5 +300,5 @@ case 'search_recommend_level': - $where.= " AND recommend_level = ? "; + $where.= ' AND recommend_level = ? '; $arrval[] = $val; break; @@ -307,5 +307,5 @@ if (isset($_POST['search_startyear']) && isset($_POST['search_startmonth']) && isset($_POST['search_startday'])) { $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_startyear'], $_POST['search_startmonth'], $_POST['search_startday']); - $where.= " AND A.create_date >= ? "; + $where.= ' AND A.create_date >= ? '; $arrval[] = $date; } @@ -315,5 +315,5 @@ if (isset($_POST['search_startyear']) && isset($_POST['search_startmonth']) && isset($_POST['search_startday'])) { $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_endyear'], $_POST['search_endmonth'], $_POST['search_endday']); - $end_date = date("Y/m/d",strtotime("1 day" ,strtotime($date))); + $end_date = date('Y/m/d',strtotime('1 day' ,strtotime($date))); $where.= " AND A.create_date <= cast('$end_date' as date) "; } @@ -341,5 +341,5 @@ if (!isset($arrval)) $arrval = array(); - $from = "dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id "; + $from = 'dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id '; $linemax = $objQuery->count($from, $where, $arrval); $this->tpl_linemax = $linemax; @@ -357,11 +357,11 @@ // 表示順序 - $order = "A.create_date DESC"; + $order = 'A.create_date DESC'; $objQuery->setOrder($order); //検索結果の取得 //レビュー情報のカラムの取得 - $col = "review_id, A.product_id, reviewer_name, sex, recommend_level, "; - $col .= "reviewer_url, title, comment, A.status, A.create_date, A.update_date, name"; - $from = "dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id "; + $col = 'review_id, A.product_id, reviewer_name, sex, recommend_level, '; + $col .= 'reviewer_url, title, comment, A.status, A.create_date, A.update_date, name'; + $from = 'dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id '; $arrReview = $objQuery->select($col, $from, $where, $arrval); Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php (revision 21514) @@ -147,7 +147,7 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("規格ID", 'class_id', INT_LEN, 'n', array('NUM_CHECK')); - $objFormParam->addParam("規格分類名", 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); - $objFormParam->addParam("規格分類ID", 'classcategory_id', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('規格ID', 'class_id', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('規格分類名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); + $objFormParam->addParam('規格分類ID', 'classcategory_id', INT_LEN, 'n', array('NUM_CHECK')); } @@ -161,7 +161,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "del_flg <> 1 AND class_id = ?"; - $objQuery->setOrder("rank DESC"); // XXX 降順 - $arrClassCat = $objQuery->select("name, classcategory_id", 'dtb_classcategory', $where, array($class_id)); + $where = 'del_flg <> 1 AND class_id = ?'; + $objQuery->setOrder('rank DESC'); // XXX 降順 + $arrClassCat = $objQuery->select('name, classcategory_id', 'dtb_classcategory', $where, array($class_id)); return $arrClassCat; } @@ -176,5 +176,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "class_id = ?"; + $where = 'class_id = ?'; $name = $objQuery->get('name', 'dtb_class', $where, array($class_id)); return $name; @@ -188,5 +188,5 @@ function lfGetClassCatName($classcategory_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "classcategory_id = ?"; + $where = 'classcategory_id = ?'; $name = $objQuery->get('name', 'dtb_classcategory', $where, array($classcategory_id)); return $name; @@ -203,5 +203,5 @@ $objQuery->begin(); // 親規格IDの存在チェック - $where = "del_flg <> 1 AND class_id = ?"; + $where = 'del_flg <> 1 AND class_id = ?'; $class_id = $objQuery->get('class_id', 'dtb_class', $where, array($arrForm['class_id'])); if (!SC_Utils_Ex::isBlank($class_id)) { @@ -232,5 +232,5 @@ $sqlval['name'] = $arrForm['name']; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $where = "classcategory_id = ?"; + $where = 'classcategory_id = ?'; // UPDATEの実行 $ret = $objQuery->update('dtb_classcategory', $sqlval, $where, array($arrForm['classcategory_id'])); @@ -255,9 +255,9 @@ } - $where = "class_id = ? AND name = ?"; - $arrRet = $objQuery->select("classcategory_id, name", 'dtb_classcategory', $where, array($arrForm['class_id'], $arrForm['name'])); + $where = 'class_id = ? AND name = ?'; + $arrRet = $objQuery->select('classcategory_id, name', 'dtb_classcategory', $where, array($arrForm['class_id'], $arrForm['name'])); // 編集中のレコード以外に同じ名称が存在する場合 if ($arrRet[0]['classcategory_id'] != $arrForm['classcategory_id'] && $arrRet[0]['name'] == $arrForm['name']) { - $arrErr['name'] = "※ 既に同じ内容の登録が存在します。
"; + $arrErr['name'] = '※ 既に同じ内容の登録が存在します。
'; } return $arrErr; @@ -288,5 +288,5 @@ function lfDeleteClassCat($class_id, $classcategory_id) { $objDb = new SC_Helper_DB_Ex(); - $where = "class_id = " . SC_Utils_Ex::sfQuoteSmart($class_id); + $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id); $objDb->sfDeleteRankRecord('dtb_classcategory', 'classcategory_id', $classcategory_id, $where, true); } @@ -300,5 +300,5 @@ function lfUpRank($class_id, $classcategory_id) { $objDb = new SC_Helper_DB_Ex(); - $where = "class_id = " . SC_Utils_Ex::sfQuoteSmart($class_id); + $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id); $objDb->sfRankUp('dtb_classcategory', 'classcategory_id', $classcategory_id, $where); } @@ -312,5 +312,5 @@ function lfDownRank($class_id, $classcategory_id) { $objDb = new SC_Helper_DB_Ex(); - $where = "class_id = " . SC_Utils_Ex::sfQuoteSmart($class_id); + $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id); $objDb->sfRankDown('dtb_classcategory', 'classcategory_id', $classcategory_id, $where); } Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php (revision 21514) @@ -144,6 +144,6 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("規格名", 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); - $objFormParam->addParam("規格ID", 'class_id', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('規格名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); + $objFormParam->addParam('規格ID', 'class_id', INT_LEN, 'n', array('NUM_CHECK')); } @@ -157,7 +157,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "del_flg <> 1"; - $objQuery->setOrder("rank DESC"); - $arrClass = $objQuery->select("name, class_id", 'dtb_class', $where); + $where = 'del_flg <> 1'; + $objQuery->setOrder('rank DESC'); + $arrClass = $objQuery->select('name, class_id', 'dtb_class', $where); return $arrClass; } @@ -171,5 +171,5 @@ function lfGetClassName($class_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "class_id = ?"; + $where = 'class_id = ?'; $class_name = $objQuery->get('name', 'dtb_class', $where, array($class_id)); return $class_name; @@ -207,5 +207,5 @@ $sqlval['name'] = $arrForm['name']; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $where = "class_id = ?"; + $where = 'class_id = ?'; // UPDATEの実行 $ret = $objQuery->update('dtb_class', $sqlval, $where, array($arrForm['class_id'])); @@ -225,5 +225,5 @@ $objDb->sfDeleteRankRecord('dtb_class', 'class_id', $class_id, "", true); - $where= "class_id = ?"; + $where= 'class_id = ?'; $ret = $objQuery->delete('dtb_classcategory', $where, array($class_id)); return $ret; @@ -247,9 +247,9 @@ } - $where = "del_flg = 0 AND name = ?"; - $arrClass = $objQuery->select("class_id, name", 'dtb_class', $where, array($arrForm['name'])); + $where = 'del_flg = 0 AND name = ?'; + $arrClass = $objQuery->select('class_id, name', 'dtb_class', $where, array($arrForm['name'])); // 編集中のレコード以外に同じ名称が存在する場合 if ($arrClass[0]['class_id'] != $arrForm['class_id'] && $arrClass[0]['name'] == $arrForm['name']) { - $arrErr['name'] = "※ 既に同じ内容の登録が存在します。
"; + $arrErr['name'] = '※ 既に同じ内容の登録が存在します。
'; } return $arrErr; Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21502) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21514) @@ -228,5 +228,5 @@ $objQuery->begin(); - $arrProductsClass = $objQuery->select("*", 'dtb_products_class', "product_id = ?", array($product_id)); + $arrProductsClass = $objQuery->select('*', 'dtb_products_class', "product_id = ?", array($product_id)); $arrExists = array(); foreach ($arrProductsClass as $val) { @@ -286,5 +286,5 @@ $arrBlank['update_date'] = 'CURRENT_TIMESTAMP'; $objQuery->update('dtb_products_class', $arrBlank, - "product_id = ? AND classcategory_id1 = 0 AND classcategory_id2 = 0", + 'product_id = ? AND classcategory_id1 = 0 AND classcategory_id2 = 0', array($product_id)); @@ -303,7 +303,7 @@ function lfCheckSelectClass() { $objErr = new SC_CheckError_Ex(); - $objErr->doFunc(array("規格1", 'class_id1'), array('EXIST_CHECK')); - $objErr->doFunc(array("規格", 'class_id1', 'select_class_id2'), array('TOP_EXIST_CHECK')); - $objErr->doFunc(array("規格1", "規格2", 'class_id1', 'class_id2'), array('DIFFERENT_CHECK')); + $objErr->doFunc(array('規格1', 'class_id1'), array('EXIST_CHECK')); + $objErr->doFunc(array('規格', 'class_id1', 'select_class_id2'), array('TOP_EXIST_CHECK')); + $objErr->doFunc(array('規格1', '規格2', 'class_id1', 'class_id2'), array('DIFFERENT_CHECK')); return $objErr->arrErr; } @@ -351,5 +351,5 @@ */ if (SC_Utils_Ex::isBlank($arrValues['product_type_id'][$i])) { - $arrErr['product_type_id'][$i] = "※ 商品種別は、いずれかを選択してください。
"; + $arrErr['product_type_id'][$i] = '※ 商品種別は、いずれかを選択してください。
'; } /* @@ -358,8 +358,8 @@ if ($arrValues['product_type_id'][$i] == PRODUCT_TYPE_DOWNLOAD) { if (SC_Utils_Ex::isBlank($arrValues['down_filename'][$i])) { - $arrErr['down_filename'][$i] = "※ ダウンロード商品の場合はダウンロードファイル名を入力してください。
"; + $arrErr['down_filename'][$i] = '※ ダウンロード商品の場合はダウンロードファイル名を入力してください。
'; } if (SC_Utils_Ex::isBlank($arrValues['down_realfilename'][$i])) { - $arrErr['down_realfilename'][$i] = "※ ダウンロード商品の場合はダウンロード商品用ファイルをアップロードしてください。
"; + $arrErr['down_realfilename'][$i] = '※ ダウンロード商品の場合はダウンロード商品用ファイルをアップロードしてください。
'; } } @@ -369,8 +369,8 @@ else if ($arrValues['product_type_id'][$i] == PRODUCT_TYPE_NORMAL) { if (!SC_Utils_Ex::isBlank($arrValues['down_filename'][$i])) { - $arrErr['down_filename'][$i] = "※ 通常商品の場合はダウンロードファイル名を設定できません。
"; + $arrErr['down_filename'][$i] = '※ 通常商品の場合はダウンロードファイル名を設定できません。
'; } if (!SC_Utils_Ex::isBlank($arrValues['down_realfilename'][$i])) { - $arrErr['down_realfilename'][$i] = "※ 実商品の場合はダウンロード商品用ファイルをアップロードできません。
ファイルを取り消してください。
"; + $arrErr['down_realfilename'][$i] = '※ 実商品の場合はダウンロード商品用ファイルをアップロードできません。
ファイルを取り消してください。
'; } } @@ -533,9 +533,9 @@ // 商品規格なしデータの復元 $where = 'product_id = ? AND classcategory_id1 = 0 AND classcategory_id2 = 0'; - $objQuery->update("dtb_products_class", array('del_flg' => 0), $where, array($product_id)); + $objQuery->update('dtb_products_class', array('del_flg' => 0), $where, array($product_id)); // 商品規格データの削除 $where = 'product_id = ? AND (classcategory_id1 <> 0 OR classcategory_id2 <> 0)'; - $objQuery->delete("dtb_products_class", $where, array($product_id)); + $objQuery->delete('dtb_products_class', $where, array($product_id)); $objQuery->commit(); @@ -576,17 +576,17 @@ $byte = 'MB'; } - $this->arrErr['down_realfilename'][$index] = "※ ダウンロード販売用ファイル名のファイルサイズは" . $size . $byte . "以下のものを使用してください。
"; + $this->arrErr['down_realfilename'][$index] = '※ ダウンロード販売用ファイル名のファイルサイズは' . $size . $byte . "以下のものを使用してください。
"; } else { - $array_ext = explode(".", $_FILES['down_realfilename']['name'][$index]); + $array_ext = explode('.', $_FILES['down_realfilename']['name'][$index]); $is_error = true; - $strExt = ""; - - foreach (explode(",", DOWNLOAD_EXTENSION) as $checkExt) { - $ext = ""; + $strExt = ''; + + foreach (explode(',', DOWNLOAD_EXTENSION) as $checkExt) { + $ext = ''; // チェック拡張子のピリオドの数を取得('tar.gz'の場合1個、'jpg'のように通常は0個) - $count_period = substr_count($checkExt, "."); + $count_period = substr_count($checkExt, '.'); if ($count_period > 0) { for ($i = max(array_keys($array_ext)) - $count_period; $i < count($array_ext); $i++) { - $ext .= $array_ext[$i] . "."; + $ext .= $array_ext[$i] . '.'; } $ext = preg_replace("/.$/", "" ,$ext); @@ -599,5 +599,5 @@ $is_error = false; } - if ($strExt == "") { + if ($strExt == '') { $strExt .= $checkExt; } else { @@ -606,5 +606,5 @@ } if ($is_error) { - $this->arrErr['down_realfilename'][$index] = "※ ダウンロード販売用ファイル名で許可されている形式は、" . $strExt . "です。
"; + $this->arrErr['down_realfilename'][$index] = '※ ダウンロード販売用ファイル名で許可されている形式は、' . $strExt . "です。
"; } @@ -673,7 +673,7 @@ $arrParams = array(); if (SC_Utils_Ex::isBlank($class_id2)) { - $table = "dtb_classcategory T1 "; - $objQuery->setWhere("T1.class_id = ?"); - $objQuery->setOrder("T1.rank DESC"); + $table = 'dtb_classcategory T1 '; + $objQuery->setWhere('T1.class_id = ?'); + $objQuery->setOrder('T1.rank DESC'); $arrParams = array($class_id1); } else { @@ -685,10 +685,10 @@ T2.rank AS rank2 __EOF__; - $table = "dtb_classcategory AS T1, dtb_classcategory AS T2"; - $objQuery->setWhere("T1.class_id = ? AND T2.class_id = ?"); - $objQuery->setOrder("T1.rank DESC, T2.rank DESC"); + $table = 'dtb_classcategory AS T1, dtb_classcategory AS T2'; + $objQuery->setWhere('T1.class_id = ? AND T2.class_id = ?'); + $objQuery->setOrder('T1.rank DESC, T2.rank DESC'); $arrParams = array($class_id1, $class_id2); } - return $objQuery->select($col, $table, "", $arrParams); + return $objQuery->select($col, $table, '', $arrParams); } @@ -738,5 +738,5 @@ function getProductsClass($product_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "product_code, price01, price02, stock, stock_unlimited, sale_limit, deliv_fee, point_rate"; + $col = 'product_code, price01, price02, stock, stock_unlimited, sale_limit, deliv_fee, point_rate'; $where = 'product_id = ? AND classcategory_id1 = 0 AND classcategory_id2 = 0'; return $objQuery->getRow($col, 'dtb_products_class', $where, array($product_id)); Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (revision 21514) @@ -120,16 +120,16 @@ // 検索条件のパラメーターを初期化 parent::lfInitParam($objFormParam); - $objFormParam->addParam("レビューID", 'review_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("商品名", 'name', "", "", array(), "", false); - $objFormParam->addParam("投稿日", 'create_date', "", "", array(), "", false); + $objFormParam->addParam('レビューID', 'review_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品名', 'name', "", "", array(), "", false); + $objFormParam->addParam('投稿日', 'create_date', "", "", array(), "", false); // 登録情報 - $objFormParam->addParam("レビュー表示", 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("投稿者名", 'reviewer_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("投稿者URL", 'reviewer_url', URL_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("性別", 'sex', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("おすすめレベル", 'recommend_level', INT_LEN, 'n', array('SELECT_CHECK')); - $objFormParam->addParam("タイトル", 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("コメント", 'comment', LTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('レビュー表示', 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('投稿者名', 'reviewer_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('投稿者URL', 'reviewer_url', URL_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('性別', 'sex', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('おすすめレベル', 'recommend_level', INT_LEN, 'n', array('SELECT_CHECK')); + $objFormParam->addParam('タイトル', 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('コメント', 'comment', LTEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); } @@ -155,11 +155,11 @@ function lfGetReviewData($review_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $select="review_id, A.product_id, reviewer_name, sex, recommend_level, "; - $select.="reviewer_url, title, comment, A.status, A.create_date, A.update_date, name"; - $from = "dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id "; - $where = "A.del_flg = 0 AND B.del_flg = 0 AND review_id = ? "; + $select='review_id, A.product_id, reviewer_name, sex, recommend_level, '; + $select.='reviewer_url, title, comment, A.status, A.create_date, A.update_date, name'; + $from = 'dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id '; + $where = 'A.del_flg = 0 AND B.del_flg = 0 AND review_id = ? '; $arrReview = $objQuery->select($select, $from, $where, array($review_id)); if (empty($arrReview)) { - SC_Utils_Ex::sfDispError(""); + SC_Utils_Ex::sfDispError(''); } return $arrReview[0]; @@ -177,5 +177,5 @@ $arrValues = $objFormParam->getDbArray(); $arrValues['update_date'] = 'CURRENT_TIMESTAMP'; - $objQuery->update('dtb_review', $arrValues, "review_id = ?", array($review_id)); + $objQuery->update('dtb_review', $arrValues, 'review_id = ?', array($review_id)); } } Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php (revision 21514) @@ -90,5 +90,5 @@ case 'tree': // カテゴリの切替は、ページ番号をクリアする。 - $this->tpl_pageno = ""; + $this->tpl_pageno = ''; break; case 'renumber': @@ -119,9 +119,9 @@ // FIXME SC_Product クラスを使用した実装 $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "product_id, name, main_list_image, product_code_min, product_code_max, status"; + $col = 'product_id, name, main_list_image, product_code_min, product_code_max, status'; $objProduct = new SC_Product(); $table = $objProduct->alldtlSQL(); - $table.= " LEFT JOIN dtb_product_categories AS T5 USING(product_id)"; - $where = "del_flg = 0 AND category_id = ?"; + $table.= ' LEFT JOIN dtb_product_categories AS T5 USING(product_id)'; + $where = 'del_flg = 0 AND category_id = ?'; // 行数の取得 @@ -140,5 +140,5 @@ $objQuery->setLimitOffset(SEARCH_PMAX, $startno); - $objQuery->setOrder("rank DESC, product_id DESC"); + $objQuery->setOrder('rank DESC, product_id DESC'); $arrRet = $objQuery->select($col, $table, $where, array($category_id)); @@ -175,18 +175,18 @@ function lfRankUp(&$objDb, $parent_category_id, $product_id) { - $where = "category_id = " . SC_Utils_Ex::sfQuoteSmart($parent_category_id); + $where = 'category_id = ' . SC_Utils_Ex::sfQuoteSmart($parent_category_id); $objDb->sfRankUp('dtb_product_categories', 'product_id', $product_id, $where); } function lfRankDown(&$objDb, $parent_category_id, $product_id) { - $where = "category_id = " . SC_Utils_Ex::sfQuoteSmart($parent_category_id); + $where = 'category_id = ' . SC_Utils_Ex::sfQuoteSmart($parent_category_id); $objDb->sfRankDown('dtb_product_categories', 'product_id', $product_id, $where); } function lfRankMove(&$objDb, $parent_category_id, $product_id) { - $key = "pos-".$product_id; + $key = 'pos-'.$product_id; $input_pos = mb_convert_kana($_POST[$key], 'n'); if (SC_Utils_Ex::sfIsInt($input_pos)) { - $where = "category_id = " . SC_Utils_Ex::sfQuoteSmart($parent_category_id); + $where = 'category_id = ' . SC_Utils_Ex::sfQuoteSmart($parent_category_id); $objDb->sfMoveRank('dtb_product_categories', 'product_id', $product_id, $input_pos, $where); } Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 21514) @@ -106,5 +106,5 @@ case 'moveByDnD': // DnDしたカテゴリと移動先のセットを分解する - $keys = explode("-", $_POST['keySet']); + $keys = explode('-', $_POST['keySet']); if ($keys[0] && $keys[1]) { $objQuery = new SC_Query_Ex(); @@ -117,5 +117,5 @@ // 同一level内のrank配列を作成 - $objQuery->setOption("ORDER BY rank DESC"); + $objQuery->setOption('ORDER BY rank DESC'); if ($level == 1) { // 第1階層の時 @@ -164,5 +164,5 @@ // CSVを送信する $objCSV = new SC_Helper_CSV_Ex(); - $objCSV->sfDownloadCsv('5', "", array(), "", true); + $objCSV->sfDownloadCsv('5', '', array(), "", true); exit; break; @@ -211,16 +211,16 @@ // 子カテゴリのチェック - $where = "parent_category_id = ? AND del_flg = 0"; + $where = 'parent_category_id = ? AND del_flg = 0'; $exists = $objQuery->exists('dtb_category', $where, array($category_id)); if ($exists) { - $this->arrErr['category_name'] = "※ 子カテゴリが存在するため削除できません。
"; + $this->arrErr['category_name'] = '※ 子カテゴリが存在するため削除できません。
'; return; } // 登録商品のチェック - $table = "dtb_product_categories AS T1 LEFT JOIN dtb_products AS T2 ON T1.product_id = T2.product_id"; - $where = "T1.category_id = ? AND T2.del_flg = 0"; + $table = 'dtb_product_categories AS T1 LEFT JOIN dtb_products AS T2 ON T1.product_id = T2.product_id'; + $where = 'T1.category_id = ? AND T2.del_flg = 0'; $exists = $objQuery->exists($table, $where, array($category_id)); if ($exists) { - $this->arrErr['category_name'] = "※ カテゴリ内に商品が存在するため削除できません。
"; + $this->arrErr['category_name'] = '※ カテゴリ内に商品が存在するため削除できません。
'; return; } @@ -242,6 +242,6 @@ // 編集対象のカテゴリ名をDBより取得する - $where = "category_id = ?"; - $arrRes = $objQuery->getRow("*", 'dtb_category', $where, array($category_id)); + $where = 'category_id = ?'; + $arrRes = $objQuery->getRow('*', 'dtb_category', $where, array($category_id)); $objFormParam->setParam($arrRes); @@ -314,8 +314,8 @@ if ($add) { // 登録数上限チェック - $where = "del_flg = 0"; + $where = 'del_flg = 0'; $count = $objQuery->count('dtb_category', $where); if ($count >= CATEGORY_MAX) { - $arrErr['category_name'] = "※ カテゴリの登録最大数を超えました。
"; + $arrErr['category_name'] = '※ カテゴリの登録最大数を超えました。
'; return $arrErr; } @@ -323,5 +323,5 @@ // 階層上限チェック if ($this->isOverLevel($parent_category_id)) { - $arrErr['category_name'] = "※ " . LEVEL_MAX . "階層以上の登録はできません。
"; + $arrErr['category_name'] = '※ ' . LEVEL_MAX . "階層以上の登録はできません。
"; return $arrErr; } @@ -340,5 +340,5 @@ $exists = $objQuery->exists('dtb_category', $where, $arrWhereVal); if ($exists) { - $arrErr['category_name'] = "※ 既に同じ内容の登録が存在します。
"; + $arrErr['category_name'] = '※ 既に同じ内容の登録が存在します。
'; return $arrErr; } @@ -359,5 +359,5 @@ $objQuery->begin(); $up_id = $this->lfGetUpRankID($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $category_id); - if ($up_id != "") { + if ($up_id != '') { // 上のグループのrankから減算する数 $my_count = $this->lfCountChilds($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $category_id); @@ -386,5 +386,5 @@ $objQuery->begin(); $down_id = $this->lfGetDownRankID($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $category_id); - if ($down_id != "") { + if ($down_id != '') { // 下のグループのrankに加算する数 $my_count = $this->lfCountChilds($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $category_id); @@ -408,7 +408,7 @@ */ function initParam(&$objFormParam) { - $objFormParam->addParam("親カテゴリID", 'parent_category_id', null, null, array()); - $objFormParam->addParam("カテゴリID", 'category_id', null, null, array()); - $objFormParam->addParam("カテゴリ名", 'category_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('親カテゴリID', 'parent_category_id', null, null, array()); + $objFormParam->addParam('カテゴリID', 'category_id', null, null, array()); + $objFormParam->addParam('カテゴリ名', 'category_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); } @@ -428,7 +428,7 @@ } $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "category_id, category_name, level, rank"; - $where = "del_flg = 0 AND parent_category_id = ?"; - $objQuery->setOption("ORDER BY rank DESC"); + $col = 'category_id, category_name, level, rank'; + $where = 'del_flg = 0 AND parent_category_id = ?'; + $objQuery->setOption('ORDER BY rank DESC'); return $objQuery->select($col, 'dtb_category', $where, array($parent_category_id)); } @@ -446,5 +446,5 @@ $objQuery->begin(); - $where = "category_id = ?"; + $where = 'category_id = ?'; $objQuery->update('dtb_category', $arrCategory, $where, array($category_id)); $objQuery->commit(); @@ -467,16 +467,16 @@ if ($parent_category_id == 0) { // ROOT階層で最大のランクを取得する。 - $where = "parent_category_id = ?"; + $where = 'parent_category_id = ?'; $rank = $objQuery->max('rank', 'dtb_category', $where, array($parent_category_id)) + 1; } else { // 親のランクを自分のランクとする。 - $where = "category_id = ?"; + $where = 'category_id = ?'; $rank = $objQuery->get('rank', 'dtb_category', $where, array($parent_category_id)); // 追加レコードのランク以上のレコードを一つあげる。 - $sqlup = "UPDATE dtb_category SET rank = (rank + 1) WHERE rank >= ?"; + $sqlup = 'UPDATE dtb_category SET rank = (rank + 1) WHERE rank >= ?'; $objQuery->exec($sqlup, array($rank)); } - $where = "category_id = ?"; + $where = 'category_id = ?'; // 自分のレベルを取得する(親のレベル + 1) $level = $objQuery->get('level', 'dtb_category', $where, array($parent_category_id)) + 1; @@ -526,5 +526,5 @@ $arrRet = $objQuery->select($col, $table, $where, array($pid)); $max = count($arrRet); - $down_id = ""; + $down_id = ''; for ($cnt = 0; $cnt < $max; $cnt++) { if ($arrRet[$cnt][$id_name] == $id) { @@ -547,5 +547,5 @@ $arrRet = $objQuery->select($col, $table, $where, array($pid)); $max = count($arrRet); - $up_id = ""; + $up_id = ''; for ($cnt = 0; $cnt < $max; $cnt++) { if ($arrRet[$cnt][$id_name] == $id) { @@ -570,5 +570,5 @@ $line = SC_Utils_Ex::sfGetCommaList($arrRet); $sql = "UPDATE $table SET rank = (rank + $count) WHERE $id_name IN ($line) "; - $sql.= "AND del_flg = 0"; + $sql.= 'AND del_flg = 0'; $ret = $objQuery->exec($sql); return $ret; @@ -581,5 +581,5 @@ $line = SC_Utils_Ex::sfGetCommaList($arrRet); $sql = "UPDATE $table SET rank = (rank - $count) WHERE $id_name IN ($line) "; - $sql.= "AND del_flg = 0"; + $sql.= 'AND del_flg = 0'; $ret = $objQuery->exec($sql); return $ret; Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 21514) @@ -138,5 +138,5 @@ */ function addRowResult($line_count, $message) { - $this->arrRowResult[] = $line_count . "行目：" . $message; + $this->arrRowResult[] = $line_count . '行目：' . $message; } @@ -149,5 +149,5 @@ */ function addRowErr($line_count, $message) { - $this->arrRowErr[] = $line_count . "行目：" . $message; + $this->arrRowErr[] = $line_count . '行目：' . $message; } @@ -176,5 +176,5 @@ // 失敗した場合はエラー表示 if (!$fp) { - SC_Utils_Ex::sfDispError(""); + SC_Utils_Ex::sfDispError(''); } @@ -210,5 +210,5 @@ $col_count = count($arrCSV); if ($col_max_count != $col_count) { - $this->addRowErr($line_count, "※ 項目数が" . $col_count . "個検出されました。項目数は" . $col_max_count . "個になります。"); + $this->addRowErr($line_count, '※ 項目数が' . $col_count . '個検出されました。項目数は' . $col_max_count . "個になります。"); $errFlag = true; break; @@ -233,5 +233,5 @@ $category_id = $this->lfRegistCategory($objQuery, $line_count, $objFormParam); - $this->addRowResult($line_count, "カテゴリID：".$category_id . " / カテゴリ名：" . $objFormParam->getValue('category_name')); + $this->addRowResult($line_count, 'カテゴリID：'.$category_id . ' / カテゴリ名：' . $objFormParam->getValue('category_name')); } @@ -268,5 +268,5 @@ */ function lfInitFile(&$objUpFile) { - $objUpFile->addFile("CSVファイル", 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false); + $objUpFile->addFile('CSVファイル', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false); } @@ -298,5 +298,5 @@ $arrErrorCheckTypes = explode(',', $error_check_types); foreach ($arrErrorCheckTypes as $key => $val) { - if (trim($val) == "") { + if (trim($val) == '') { unset($arrErrorCheckTypes[$key]); } else { @@ -370,11 +370,11 @@ $sqlval = $this->lfSetCategoryDefaultData($sqlval); - if ($sqlval['category_id'] != "") { + if ($sqlval['category_id'] != '') { // 同じidが存在すればupdate存在しなければinsert - $where = "category_id = ?"; + $where = 'category_id = ?'; $category_exists = $objQuery->exists('dtb_category', $where, array($sqlval['category_id'])); if ($category_exists) { // UPDATEの実行 - $where = "category_id = ?"; + $where = 'category_id = ?'; $objQuery->update('dtb_category', $sqlval, $where, array($sqlval['category_id'])); } else { @@ -426,11 +426,11 @@ */ function lfSetCategoryDefaultData(&$sqlval) { - if ($sqlval['del_flg'] == "") { + if ($sqlval['del_flg'] == '') { $sqlval['del_flg'] = '0'; //有効 } - if ($sqlval['creator_id'] == "") { + if ($sqlval['creator_id'] == '') { $sqlval['creator_id'] = $_SESSION['member_id']; } - if ($sqlval['parent_category_id'] == "") { + if ($sqlval['parent_category_id'] == '') { $sqlval['parent_category_id'] = (string)'0'; } @@ -450,30 +450,30 @@ // カテゴリIDの存在チェック if (!$this->lfIsDbRecord('dtb_category', 'category_id', $item)) { - $arrErr['category_id'] = "※ 指定のカテゴリIDは、登録されていません。"; + $arrErr['category_id'] = '※ 指定のカテゴリIDは、登録されていません。'; } */ // 親カテゴリIDの存在チェック if(array_search('parent_category_id', $this->arrFormKeyList) !== FALSE - and $item['parent_category_id'] != "" + and $item['parent_category_id'] != '' and $item['parent_category_id'] != '0' and !SC_Helper_DB_Ex::sfIsRecord('dtb_category', 'category_id', array($item['parent_category_id'])) ) { - $arrErr['parent_category_id'] = "※ 指定の親カテゴリID(" . $item['parent_category_id'] . ")は、存在しません。"; + $arrErr['parent_category_id'] = '※ 指定の親カテゴリID(' . $item['parent_category_id'] . ")は、存在しません。"; } // 削除フラグのチェック if(array_search('del_flg', $this->arrFormKeyList) !== FALSE - and $item['del_flg'] != "") { + and $item['del_flg'] != '') { if (!($item['del_flg'] == '0' or $item['del_flg'] == '1')) { - $arrErr['del_flg'] = "※ 削除フラグは「0」(有効)、「1」(削除)のみが有効な値です。"; + $arrErr['del_flg'] = '※ 削除フラグは「0」(有効)、「1」(削除)のみが有効な値です。'; } } // 重複チェック 同じカテゴリ内に同名の存在は許可されない if(array_search('category_name', $this->arrFormKeyList) !== FALSE - and $item['category_name'] != "") { + and $item['category_name'] != '') { $parent_category_id = $item['parent_category_id']; if ($parent_category_id == '') { $parent_category_id = (string)'0'; } - $where = "parent_category_id = ? AND category_id <> ? AND category_name = ?"; + $where = 'parent_category_id = ? AND category_id <> ? AND category_name = ?'; $exists = $objQuery->exists('dtb_category', $where, @@ -482,19 +482,19 @@ $item['category_name'])); if ($exists) { - $arrErr['category_name'] = "※ 既に同名のカテゴリが存在します。"; + $arrErr['category_name'] = '※ 既に同名のカテゴリが存在します。'; } } // 登録数上限チェック - $where = "del_flg = 0"; + $where = 'del_flg = 0'; $count = $objQuery->count('dtb_category', $where); if ($count >= CATEGORY_MAX) { - $item['category_name'] = "※ カテゴリの登録最大数を超えました。"; + $item['category_name'] = '※ カテゴリの登録最大数を超えました。'; } // 階層上限チェック if (array_search('parent_category_id', $this->arrFormKeyList) !== FALSE - and $item['parent_category_id'] != "") { + and $item['parent_category_id'] != '') { $level = $objQuery->get('level', 'dtb_category', "category_id = ?", array($parent_category_id)); if ($level >= LEVEL_MAX) { - $arrErr['parent_category_id'] = "※ " . LEVEL_MAX . "階層以上の登録はできません。"; + $arrErr['parent_category_id'] = '※ ' . LEVEL_MAX . "階層以上の登録はできません。"; } } @@ -517,16 +517,16 @@ if ($parent_category_id == 0) { // ROOT階層で最大のランクを取得する。 - $where = "parent_category_id = ?"; + $where = 'parent_category_id = ?'; $rank = $objQuery->max('rank', 'dtb_category', $where, array($parent_category_id)) + 1; } else { // 親のランクを自分のランクとする。 - $where = "category_id = ?"; + $where = 'category_id = ?'; $rank = $objQuery->get('rank', 'dtb_category', $where, array($parent_category_id)); // 追加レコードのランク以上のレコードを一つあげる。 - $sqlup = "UPDATE dtb_category SET rank = (rank + 1) WHERE rank >= ?"; + $sqlup = 'UPDATE dtb_category SET rank = (rank + 1) WHERE rank >= ?'; $objQuery->exec($sqlup, array($rank)); } - $where = "category_id = ?"; + $where = 'category_id = ?'; // 自分のレベルを取得する(親のレベル + 1) $level = $objQuery->get('level', 'dtb_category', $where, array($parent_category_id)) + 1; @@ -564,8 +564,8 @@ */ function lfGetDbFormatTimeWithLine($line_no = '') { - $time = date("Y-m-d H:i:s"); + $time = date('Y-m-d H:i:s'); // 秒以下を生成 if ($line_no != '') { - $microtime = sprintf("%06d", $line_no); + $microtime = sprintf('%06d', $line_no); $time .= ".$microtime"; } @@ -583,5 +583,5 @@ function lfIsDbRecord($table, $keyname, $item) { if(array_search($keyname, $this->arrFormKeyList) !== FALSE //入力対象である - and $item[$keyname] != "" // 空ではない + and $item[$keyname] != '' // 空ではない and !SC_Helper_DB_EX::sfIsRecord($table, $keyname, (array)$item[$keyname]) //DBに存在するか ) { Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 21514) @@ -94,5 +94,5 @@ $this->arrErr = $this->lfErrorCheck($this->arrForm); if (count($this->arrErr) <= 0) { - if ($this->arrForm['maker_id'] == "") { + if ($this->arrForm['maker_id'] == '') { // メーカー情報新規登録 $this->lfInsert($this->arrForm); @@ -157,6 +157,6 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("メーカーID", 'maker_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("メーカー名", 'name', SMTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('メーカーID', 'maker_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('メーカー名', 'name', SMTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); } @@ -170,8 +170,8 @@ // 削除されていないメーカー情報を表示する - $where = "del_flg = 0"; - $objQuery->setOrder("rank DESC"); + $where = 'del_flg = 0'; + $objQuery->setOrder('rank DESC'); $arrMaker = array(); - $arrMaker = $objQuery->select("maker_id, name", 'dtb_maker', $where); + $arrMaker = $objQuery->select('maker_id, name', 'dtb_maker', $where); return $arrMaker; } @@ -210,5 +210,5 @@ $sqlval['name'] = $arrForm['name']; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $where = "maker_id = ?"; + $where = 'maker_id = ?'; // UPDATEの実行 @@ -262,5 +262,5 @@ // 編集項目を取得する - $where = "maker_id = ?"; + $where = 'maker_id = ?'; $arrMaker = array(); $arrMaker = $objQuery->select('name', 'dtb_maker', $where, array($maker_id)); @@ -278,5 +278,5 @@ function lfErrorCheck(&$arrForm) { $objErr = new SC_CheckError_Ex($arrForm); - $objErr->doFunc(array("メーカー名", 'name', SMTEXT_LEN), array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objErr->doFunc(array('メーカー名', 'name', SMTEXT_LEN), array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); // maker_id の正当性チェック @@ -288,5 +288,5 @@ // maker_idが指定されていて、且つその値が不正と思われる場合はエラー - $objErr->arrErr['maker_id'] = "※ メーカーIDが不正です
"; + $objErr->arrErr['maker_id'] = '※ メーカーIDが不正です
'; } } @@ -294,9 +294,9 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $arrMaker = array(); - $arrMaker = $objQuery->select("maker_id, name", 'dtb_maker', "del_flg = 0 AND name = ?", array($arrForm['name'])); + $arrMaker = $objQuery->select('maker_id, name', 'dtb_maker', "del_flg = 0 AND name = ?", array($arrForm['name'])); // 編集中のレコード以外に同じ名称が存在する場合 if ($arrMaker[0]['maker_id'] != $arrForm['maker_id'] && $arrMaker[0]['name'] == $arrForm['name']) { - $objErr->arrErr['name'] = "※ 既に同じ内容の登録が存在します。
"; + $objErr->arrErr['name'] = '※ 既に同じ内容の登録が存在します。
'; } } Index: branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 21514) @@ -65,10 +65,10 @@ // ページタイトル todo あとでなおす - $this->arrTitle[''] = "期間別集計"; - $this->arrTitle['term'] = "期間別集計"; - $this->arrTitle['products'] = "商品別集計"; - $this->arrTitle['age'] = "年代別集計"; - $this->arrTitle['job'] = "職業別集計"; - $this->arrTitle['member'] = "会員別集計"; + $this->arrTitle[''] = '期間別集計'; + $this->arrTitle['term'] = '期間別集計'; + $this->arrTitle['products'] = '商品別集計'; + $this->arrTitle['age'] = '年代別集計'; + $this->arrTitle['job'] = '職業別集計'; + $this->arrTitle['member'] = '会員別集計'; // 月度集計のkey名 @@ -132,5 +132,5 @@ $type = ($objFormParam->getValue('type')) ? $objFormParam->getValue('type'): 'all'; - $this->tpl_page_type = "total/page_". $page .".tpl"; + $this->tpl_page_type = 'total/page_'. $page .'.tpl'; list($this->arrResults, $this->tpl_image) = call_user_func_array(array($this, 'lfGetOrder'.$page), array($type, $sdate, $edate)); @@ -201,19 +201,19 @@ // 月度集計 - $objFormParam->addParam("月度", 'search_startyear_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear_m']); - $objFormParam->addParam("月度", 'search_startmonth_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth_m']); + $objFormParam->addParam('月度', 'search_startyear_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear_m']); + $objFormParam->addParam('月度', 'search_startmonth_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth_m']); // 期間集計 - $objFormParam->addParam("開始日", 'search_startyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear']); - $objFormParam->addParam("開始日", 'search_startmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth']); - $objFormParam->addParam("開始日", 'search_startday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startday']); - $objFormParam->addParam("終了日", 'search_endyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endyear']); - $objFormParam->addParam("終了日", 'search_endmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endmonth']); - $objFormParam->addParam("終了日", 'search_endday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endday']); + $objFormParam->addParam('開始日', 'search_startyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear']); + $objFormParam->addParam('開始日', 'search_startmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth']); + $objFormParam->addParam('開始日', 'search_startday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startday']); + $objFormParam->addParam('終了日', 'search_endyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endyear']); + $objFormParam->addParam('終了日', 'search_endmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endmonth']); + $objFormParam->addParam('終了日', 'search_endday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endday']); // hiddenデータの取得用 - $objFormParam->addParam("", 'page'); - $objFormParam->addParam("", 'type'); - $objFormParam->addParam("", 'mode'); - $objFormParam->addParam("", 'form'); + $objFormParam->addParam('', 'page'); + $objFormParam->addParam('', 'type'); + $objFormParam->addParam('', 'mode'); + $objFormParam->addParam('', 'form'); } @@ -227,14 +227,14 @@ // 特殊項目チェック if ($objFormParam->getValue('form') == 1) { - $objErr->doFunc(array("月度", 'search_startyear_m'), array('ONE_EXIST_CHECK')); + $objErr->doFunc(array('月度', 'search_startyear_m'), array('ONE_EXIST_CHECK')); } if ($objFormParam->getValue('form') == 2) { - $objErr->doFunc(array("期間", 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('FULL_EXIST_CHECK')); - } - $objErr->doFunc(array("月度", 'search_startyear_m', 'search_startmonth_m'), array('ALL_EXIST_CHECK')); - $objErr->doFunc(array("開始日", 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); - $objErr->doFunc(array("終了日", 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_DATE')); - $objErr->doFunc(array("開始日", "終了日", 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('期間', 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('FULL_EXIST_CHECK')); + } + $objErr->doFunc(array('月度', 'search_startyear_m', 'search_startmonth_m'), array('ALL_EXIST_CHECK')); + $objErr->doFunc(array('開始日', 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); + $objErr->doFunc(array('終了日', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_DATE')); + $objErr->doFunc(array('開始日', '終了日', 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); return $objErr->arrErr; } @@ -270,13 +270,13 @@ foreach ($arrRet as $key => $val) { - if ($val == "") { + if ($val == '') { continue; } switch ($key) { case 'search_startyear': - $sdate = $objFormParam->getValue('search_startyear') . "/" . $objFormParam->getValue('search_startmonth') . "/" . $objFormParam->getValue('search_startday'); + $sdate = $objFormParam->getValue('search_startyear') . '/' . $objFormParam->getValue('search_startmonth') . "/" . $objFormParam->getValue('search_startday'); break; case 'search_endyear': - $edate = $objFormParam->getValue('search_endyear') . "/" . $objFormParam->getValue('search_endmonth') . "/" . $objFormParam->getValue('search_endday'); + $edate = $objFormParam->getValue('search_endyear') . '/' . $objFormParam->getValue('search_endmonth') . "/" . $objFormParam->getValue('search_endday'); break; case 'search_startyear_m': @@ -296,5 +296,5 @@ function lfGetGraphLine($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate, $xincline) { - $ret_path = ""; + $ret_path = ''; // 結果が0行以上ある場合のみグラフを生成する。 @@ -330,9 +330,9 @@ // メインタイトル作成 - 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); + 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); // グラフ描画 @@ -352,7 +352,7 @@ // 円グラフの作成 - function lfGetGraphPie($arrResults, $keyname, $type, $title = "", $sdate = "", $edate = "") { - - $ret_path = ""; + function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = "") { + + $ret_path = ''; // 結果が0行以上ある場合のみグラフを生成する。 if (count($arrResults) > 0 && $this->install_GD) { @@ -374,9 +374,9 @@ // メインタイトル作成 - 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); + 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); // 円グラフ描画 @@ -397,5 +397,5 @@ // 棒グラフの作成 function lfGetGraphBar($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate) { - $ret_path = ""; + $ret_path = ''; // 結果が0行以上ある場合のみグラフを生成する。 @@ -411,5 +411,5 @@ foreach (array_keys($arrList) as $val) { - $arrKey[] = ereg_replace("～", "-", $val); + $arrKey[] = ereg_replace('～', '-', $val); } @@ -422,9 +422,9 @@ // メインタイトル作成 $arrKey = array_keys($arrList); - 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); + 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); $objGraphBar->drawGraph(); @@ -444,8 +444,8 @@ function lfGetGraphPng($keyname) { - if ($_POST['search_startyear_m'] != "") { - $pngname = sprintf("%s_%02d%02d.png", $keyname, substr($_POST['search_startyear_m'],2), $_POST['search_startmonth_m']); + if ($_POST['search_startyear_m'] != '') { + $pngname = sprintf('%s_%02d%02d.png', $keyname, substr($_POST['search_startyear_m'],2), $_POST['search_startmonth_m']); } else { - $pngname = sprintf("%s_%02d%02d%02d_%02d%02d%02d.png", $keyname, substr($_POST['search_startyear'], 2), $_POST['search_startmonth'], $_POST['search_startday'], substr($_POST['search_endyear'],2), $_POST['search_endmonth'], $_POST['search_endday']); + $pngname = sprintf('%s_%02d%02d%02d_%02d%02d%02d.png', $keyname, substr($_POST['search_startyear'], 2), $_POST['search_startmonth'], $_POST['search_startday'], substr($_POST['search_endyear'],2), $_POST['search_endmonth'], $_POST['search_endday']); } return $pngname; @@ -454,18 +454,18 @@ // 会員、非会員集計のWHERE分の作成 function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id') { - $where = ""; + $where = ''; // 取得日付の指定 - if ($sdate != "") { - if ($where != "") { - $where.= " AND "; + if ($sdate != '') { + if ($where != '') { + $where.= ' AND '; } $where.= " $col_date >= '". $sdate ."'"; } - if ($edate != "") { - if ($where != "") { - $where.= " AND "; - } - $edate = date("Y/m/d",strtotime("1 day" ,strtotime($edate))); + if ($edate != '') { + if ($where != '') { + $where.= ' AND '; + } + $edate = date('Y/m/d',strtotime('1 day' ,strtotime($edate))); $where.= " $col_date < date('" . $edate ."')"; } @@ -477,12 +477,12 @@ break; case 'member': - if ($where != "") { - $where.= " AND "; + if ($where != '') { + $where.= ' AND '; } $where.= " $col_member <> 0"; break; case 'nonmember': - if ($where != "") { - $where.= " AND "; + if ($where != '') { + $where.= ' AND '; } $where.= " $col_member = 0"; @@ -500,5 +500,5 @@ list($where, $arrval) = $this->lfGetWhereMember('create_date', $sdate, $edate, $type); - $where .= " AND del_flg = 0 AND status <> " . ORDER_CANCEL; + $where .= ' AND del_flg = 0 AND status <> ' . ORDER_CANCEL; // 会員集計の取得 @@ -515,5 +515,5 @@ $from = 'dtb_order'; - $objQuery->setGroupBy("member, order_sex"); + $objQuery->setGroupBy('member, order_sex'); $arrTotalResults = $objQuery->select($col, $from, $where, $arrval); @@ -522,8 +522,8 @@ $arrResult =& $arrTotalResults[$key]; $member_key = $arrResult['order_sex']; - if ($member_key != "") { + if ($member_key != '') { $arrResult['member_name'] = (($arrResult['member']) ? '会員' : '非会員') . $this->arrSex[$member_key]; } else { - $arrResult['member_name'] = "未回答"; + $arrResult['member_name'] = '未回答'; } } @@ -540,5 +540,5 @@ list($where, $arrval) = $this->lfGetWhereMember('create_date', $sdate, $edate, $type); - $where .= " AND dtb_order.del_flg = 0 AND dtb_order.status <> " . ORDER_CANCEL; + $where .= ' AND dtb_order.del_flg = 0 AND dtb_order.status <> ' . ORDER_CANCEL; $col = " @@ -551,9 +551,9 @@ (price * SUM(quantity)) AS total"; - $from = "dtb_order_detail JOIN dtb_order USING(order_id)"; + $from = 'dtb_order_detail JOIN dtb_order USING(order_id)'; /* if ($mode != 'csv') { - $sql.= "LIMIT " . PRODUCTS_TOTAL_MAX; + $sql.= 'LIMIT ' . PRODUCTS_TOTAL_MAX; }*/ @@ -583,5 +583,5 @@ $from = 'dtb_order JOIN dtb_customer USING ( customer_id)'; - $where .= " AND dtb_order.del_flg = 0 AND dtb_order.status <> " . ORDER_CANCEL; + $where .= ' AND dtb_order.del_flg = 0 AND dtb_order.status <> ' . ORDER_CANCEL; $objQuery->setGroupBy('job'); @@ -592,8 +592,8 @@ $arrResult =& $arrTotalResults[$key]; $job_key = $arrResult['job']; - if ($job_key != "") { + if ($job_key != '') { $arrResult['job_name'] = $this->arrJob[$job_key]; } else { - $arrResult['job_name'] = "未回答"; + $arrResult['job_name'] = '未回答'; } @@ -620,5 +620,5 @@ $from = 'dtb_order'; - $where .= " AND del_flg = 0 AND status <> " . ORDER_CANCEL; + $where .= ' AND del_flg = 0 AND status <> ' . ORDER_CANCEL; $objQuery->setGroupBy('age'); @@ -629,8 +629,8 @@ $arrResult =& $arrTotalResults[$key]; $age_key = $arrResult['age']; - if ($age_key != "") { + if ($age_key != '') { $arrResult['age_name'] = $arrResult['age'] . '代'; } else { - $arrResult['age_name'] = "未回答"; + $arrResult['age_name'] = '未回答'; } @@ -647,30 +647,30 @@ list($where, $arrval) = $this->lfGetWhereMember('create_date', $sdate, $edate); - $where .= " AND del_flg = 0 AND status <> " . ORDER_CANCEL; + $where .= ' AND del_flg = 0 AND status <> ' . ORDER_CANCEL; switch ($type) { case 'month': - $xtitle = "(月別)"; - $ytitle = "(売上合計)"; + $xtitle = '(月別)'; + $ytitle = '(売上合計)'; $format = '%m'; break; case 'year': - $xtitle = "(年別)"; - $ytitle = "(売上合計)"; + $xtitle = '(年別)'; + $ytitle = '(売上合計)'; $format = '%Y'; break; case 'wday': - $xtitle = "(曜日別)"; - $ytitle = "(売上合計)"; + $xtitle = '(曜日別)'; + $ytitle = '(売上合計)'; $format = '%a'; break; case 'hour': - $xtitle = "(時間別)"; - $ytitle = "(売上合計)"; + $xtitle = '(時間別)'; + $ytitle = '(売上合計)'; $format = '%H'; break; default: - $xtitle = "(日別)"; - $ytitle = "(売上合計)"; + $xtitle = '(日別)'; + $ytitle = '(売上合計)'; $format = '%Y-%m-%d'; $xincline = true; @@ -786,5 +786,5 @@ function lfGetDataColCSV($arrData, $arrDataCol) { $max = count($arrData); - $csv_data = ""; + $csv_data = ''; for ($i = 0; $i < $max; $i++) { foreach ($arrDataCol as $val) { Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php (revision 21514) @@ -76,5 +76,5 @@ case 'confirm' : $message = $this->lfDoChange($objFormParam); - if (!is_array($message) && $message != "") { + if (!is_array($message) && $message != '') { $this->tpl_onload = $message; } @@ -118,9 +118,9 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $arrTarget = $this->lfGetTargetData($objFormParam); - $message = ""; + $message = ''; if (is_array($arrTarget) && count($arrTarget) == 0) { $message = "window.alert('変更対象となるデータはありませんでした。');"; return $message; - } elseif (!is_array($arrTarget) && $arrTarget != "") { + } elseif (!is_array($arrTarget) && $arrTarget != '') { return $arrTarget; // window.alert が返ってきているはず。 } @@ -147,5 +147,5 @@ $arrColumnName = $objFormParam->getValue('column_name'); $arrTarget = array(); - $message = ""; + $message = ''; // 変更されている対象を走査 @@ -157,9 +157,9 @@ 'column_name' => $arrColumnName[$i]); $objErr = new SC_CheckError_Ex($param); - $objErr->doFunc(array("インデックス(" . $i . ")", 'indexflag', INT_LEN), array('NUM_CHECK')); - $objErr->doFunc(array("インデックス変更後(" . $i . ")", 'indexflag_new', INT_LEN), array('NUM_CHECK')); - $objErr->doFunc(array("インデックス変更後(" . $i . ")", 'indexflag_new', INT_LEN), array('NUM_CHECK')); - $objErr->doFunc(array("テーブル名(" . $i . ")", 'table_name', STEXT_LEN), array('GRAPH_CHECK', 'EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objErr->doFunc(array("カラム名(" . $i . ")", 'column_name', STEXT_LEN), array('GRAPH_CHECK', 'EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('インデックス(' . $i . ')', 'indexflag', INT_LEN), array('NUM_CHECK')); + $objErr->doFunc(array('インデックス変更後(' . $i . ')', 'indexflag_new', INT_LEN), array('NUM_CHECK')); + $objErr->doFunc(array('インデックス変更後(' . $i . ')', 'indexflag_new', INT_LEN), array('NUM_CHECK')); + $objErr->doFunc(array('テーブル名(' . $i . ')', 'table_name', STEXT_LEN), array('GRAPH_CHECK', 'EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('カラム名(' . $i . ')', 'column_name', STEXT_LEN), array('GRAPH_CHECK', 'EXIST_CHECK', 'MAX_LENGTH_CHECK')); $arrErr = $objErr->arrErr; if (count($arrErr) != 0) { @@ -186,8 +186,8 @@ // データベースからインデックス設定一覧を取得する $objQuery =& SC_Query_Ex::getSingletonInstance(); - $objQuery->setOrder("table_name, column_name"); - $arrIndexList = $objQuery->select("table_name , column_name , recommend_flg, recommend_comment", 'dtb_index_list'); - - $table = ""; + $objQuery->setOrder('table_name, column_name'); + $arrIndexList = $objQuery->select('table_name , column_name , recommend_flg, recommend_comment', 'dtb_index_list'); + + $table = ''; foreach ($arrIndexList as $key => $arrIndex) { // テーブルに対するインデックス一覧を取得 Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php (revision 21514) @@ -71,5 +71,5 @@ break; default: - $arrClean['move'] = ""; + $arrClean['move'] = ''; break; } @@ -95,5 +95,5 @@ // エラー処理 else { - GC_Utils_Ex::gfPrintLog("error id=".$_GET['id']); + GC_Utils_Ex::gfPrintLog('error id='.$_GET['id']); } @@ -116,12 +116,12 @@ // 自身のランクを取得する。 - $rank = $objQuery->getOne("SELECT rank FROM dtb_member WHERE member_id = ?", array($id)); + $rank = $objQuery->getOne('SELECT rank FROM dtb_member WHERE member_id = ?', array($id)); // ランクの最大値を取得する。 - $maxno = $objQuery->getOne("SELECT max(rank) FROM dtb_member"); + $maxno = $objQuery->getOne('SELECT max(rank) FROM dtb_member'); // ランクが最大値よりも小さい場合に実行する。 if ($rank < $maxno) { // ランクがひとつ上のIDを取得する。 - $sqlse = "SELECT member_id FROM dtb_member WHERE rank = ?"; + $sqlse = 'SELECT member_id FROM dtb_member WHERE rank = ?'; $up_id = $objQuery->getOne($sqlse, $rank + 1); @@ -131,5 +131,5 @@ $sqlVal1['rank'] = $rank + 1; $sqlVal2['rank'] = $rank; - $where = "member_id = ?"; + $where = 'member_id = ?'; // ランク入れ替えの実行 @@ -146,11 +146,11 @@ // 自身のランクを取得する。 - $rank = $objQuery->getOne("SELECT rank FROM dtb_member WHERE member_id = ?", array($id)); + $rank = $objQuery->getOne('SELECT rank FROM dtb_member WHERE member_id = ?', array($id)); // ランクの最小値を取得する。 - $minno = $objQuery->getOne("SELECT min(rank) FROM dtb_member"); + $minno = $objQuery->getOne('SELECT min(rank) FROM dtb_member'); // ランクが最大値よりも大きい場合に実行する。 if ($rank > $minno) { // ランクがひとつ下のIDを取得する。 - $sqlse = "SELECT member_id FROM dtb_member WHERE rank = ?"; + $sqlse = 'SELECT member_id FROM dtb_member WHERE rank = ?'; $down_id = $objQuery->getOne($sqlse, $rank - 1); @@ -160,5 +160,5 @@ $sqlVal1['rank'] = $rank - 1; $sqlVal2['rank'] = $rank; - $where = "member_id = ?"; + $where = 'member_id = ?'; // ランク入れ替えの実行 Index: 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 (revision 21512) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 21514) @@ -95,5 +95,5 @@ } } else { - $this->arrErr[$file_key] = "※ 既にインストールされているプラグインです。
"; + $this->arrErr[$file_key] = '※ 既にインストールされているプラグインです。
'; } } @@ -175,5 +175,5 @@ } } else { - $this->arrErr[$plugin_code] = "※ プラグインファイルが不正です。
"; + $this->arrErr[$plugin_code] = '※ プラグインファイルが不正です。
'; } } @@ -244,5 +244,5 @@ */ function lfInitUploadFile(&$objUpFile, $key) { - $objUpFile->addFile("プラグインファイル", $key, explode(",", PLUGIN_EXTENSION), FILE_SIZE, true, 0, 0, false); + $objUpFile->addFile('プラグインファイル', $key, explode(',', PLUGIN_EXTENSION), FILE_SIZE, true, 0, 0, false); } @@ -257,5 +257,5 @@ $objErr = new SC_CheckError_Ex(); // 拡張子チェック - $objErr->doFunc(array('プラグインファイル', $file_key, explode(",", PLUGIN_EXTENSION)), array('FILE_EXT_CHECK')); + $objErr->doFunc(array('プラグインファイル', $file_key, explode(',', PLUGIN_EXTENSION)), array('FILE_EXT_CHECK')); // ファイルサイズチェック $objErr->doFunc(array('プラグインファイル', $file_key, FILE_SIZE), array('FILE_SIZE_CHECK')); @@ -295,12 +295,12 @@ // 圧縮ファイル名とディレクトリ名が同一であるかを判定します. if ($this->checkUploadFileName($tar_obj, $plugin_code) === false) { - $arrErr[$key_file] = "※ 圧縮ファイル名 or フォルダ名が不正です。圧縮ファイル名とフォルダ名が同一である事を確認して下さい。
"; + $arrErr[$key_file] = '※ 圧縮ファイル名 or フォルダ名が不正です。圧縮ファイル名とフォルダ名が同一である事を確認して下さい。
'; return $arrErr; } // 必須となるクラスファイルが含まれているかを判定します. - $plugin_main_file = $plugin_code . "/" . $plugin_code . ".php"; + $plugin_main_file = $plugin_code . '/' . $plugin_code . '.php'; if ($this->checkContainsFile($tar_obj, $plugin_main_file) === false) { - $arrErr[$key_file] = "※ ファイルに" . $plugin_code . ".phpが含まれていません。
"; + $arrErr[$key_file] = '※ ファイルに' . $plugin_code . '.phpが含まれていません。
'; return $arrErr; } @@ -319,5 +319,5 @@ function getPluginCode($file_name) { // 分解 - $array_ext = explode(".", $file_name); + $array_ext = explode('.', $file_name); $array_file_name = array_diff($array_ext, array('tar','gz')); // 結合 @@ -399,5 +399,5 @@ if ($this->registerData($objReflection) === false) { SC_Utils_Ex::deleteFile($plugin_dir); - $arrErr['plugin_file'] = "※ DB登録に失敗しました。
"; + $arrErr['plugin_file'] = '※ DB登録に失敗しました。
'; return $arrErr; } @@ -423,21 +423,21 @@ if ($objReflection->getConstant('PLUGIN_NAME') === false) { - $arrErr['plugin_file'] = "※ PLUGIN_NAMEが定義されていません。
"; + $arrErr['plugin_file'] = '※ PLUGIN_NAMEが定義されていません。
'; return $arrErr; } if ($objReflection->getConstant('PLUGIN_VERSION') === false) { - $arrErr['plugin_file'] = "※ PLUGIN_VERSIONが定義されていません。
"; + $arrErr['plugin_file'] = '※ PLUGIN_VERSIONが定義されていません。
'; return $arrErr; } if ($objReflection->getConstant('COMPLIANT_VERSION') === false) { - $arrErr['plugin_file'] = "※ COMPLIANT_VERSIONが定義されていません。
"; + $arrErr['plugin_file'] = '※ COMPLIANT_VERSIONが定義されていません。
'; return $arrErr; } if ($objReflection->getConstant('AUTHOR') === false) { - $arrErr['plugin_file'] = "※ AUTHORが定義されていません。
"; + $arrErr['plugin_file'] = '※ AUTHORが定義されていません。
'; return $arrErr; } if ($objReflection->getConstant('DESCRIPTION') === false) { - $arrErr['plugin_file'] = "※ DESCRIPTIONが定義されていません。
"; + $arrErr['plugin_file'] = '※ DESCRIPTIONが定義されていません。
'; return $arrErr; } @@ -457,5 +457,5 @@ // エラー内容を出力用の配列にセットします. if ($this->isError($objErr->arrErr)) { - $arrErr['plugin_file'] = ""; + $arrErr['plugin_file'] = ''; foreach ($objErr->arrErr as $error) { $arrErr['plugin_file'] .= $error; @@ -488,5 +488,5 @@ // 展開されたディレクトリからプラグインクラスファイルを読み込みます. - $update_plugin_class_path = $temp_plugin_dir . "/" . $plugin_code . ".php"; + $update_plugin_class_path = $temp_plugin_dir . '/' . $plugin_code . '.php'; $arrErr = $this->requirePluginFile($update_plugin_class_path, $file_key); if ($this->isError($arrErr) === true) { @@ -539,7 +539,7 @@ // 解凍 - $update_plugin_file_path = $unpack_dir . "/" . $unpack_file_name; + $update_plugin_file_path = $unpack_dir . '/' . $unpack_file_name; if (!SC_Helper_FileManager_Ex::unpackFile($update_plugin_file_path)) { - $arrErr['plugin_file'] = "※ 解凍に失敗しました。
"; + $arrErr['plugin_file'] = '※ 解凍に失敗しました。
'; return $arrErr; } @@ -639,5 +639,5 @@ $sqlval['priority'] = $priority; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $where = "plugin_id = ?"; + $where = 'plugin_id = ?'; // UPDATEの実行 $ret = $objQuery->update('dtb_plugin', $sqlval, $where, array($plugin_id)); @@ -679,5 +679,5 @@ $hook_point = $objReflection->getConstant('HOOK_POINTS'); if ($hook_point !== false) { - $array_hook_point = explode(",", $hook_point); + $array_hook_point = explode(',', $hook_point); if (is_array($array_hook_point)) { foreach ($array_hook_point as $hook_point) { @@ -707,5 +707,5 @@ require_once $file_path; } else { - $arrErr[$key] = "※ " . $file_path ."の読み込みに失敗しました。
"; + $arrErr[$key] = '※ ' . $file_path .'の読み込みに失敗しました。
'; } return $arrErr; @@ -726,5 +726,5 @@ call_user_func(array($plugin_code, $exec_func), $plugin_id); } else { - $arrErr['plugin_error'] = "※ " . $plugin_code . ".php に" . $exec_func . "が見つかりません。
"; + $arrErr['plugin_error'] = '※ ' . $plugin_code . ".php に" . $exec_func . "が見つかりません。
"; } @@ -754,5 +754,5 @@ $sqlval['enable'] = $enable_flg; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $where = "plugin_id = ?"; + $where = 'plugin_id = ?'; // UPDATEの実行 $ret = $objQuery->update('dtb_plugin', $sqlval, $where, array($plugin_id)); @@ -772,5 +772,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $objQuery->begin(); - $where = "plugin_id = ?"; + $where = 'plugin_id = ?'; $objQuery->delete('dtb_plugin', $where, array($plugin_id)); $objQuery->delete('dtb_plugin_hookpoint', $where, array($plugin_id)); @@ -834,5 +834,5 @@ $arrayFile = $tar_obj->listContent(); // ディレクトリ名と圧縮ファイル名が同じかをチェック. - $pattern = ("|^". preg_quote($dir_name) ."\/(.*?)|"); + $pattern = ('|^'. preg_quote($dir_name) ."\/(.*?)|"); foreach ($arrayFile as $value) { if(preg_match($pattern, $value['filename'])) return true; @@ -862,16 +862,16 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $table = 'dtb_plugin_hookpoint'; - $where = "plugin_id = ?"; - $conflictHookPoints = $objQuery->select("*", $table, $where, array($plugin_id)); - - $conflict_alert_message = ""; + $where = 'plugin_id = ?'; + $conflictHookPoints = $objQuery->select('*', $table, $where, array($plugin_id)); + + $conflict_alert_message = ''; foreach ($conflictHookPoints as $conflictHookPoint) { // 登録商品のチェック - $table = "dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 ON T1.plugin_id = T2.plugin_id"; - $where = "T1.hook_point = ? AND NOT T1.plugin_id = ? AND T2.enable = " . PLUGIN_ENABLE_TRUE . " GROUP BY T1.plugin_id"; - $conflictPlugins = $objQuery->select("T1.plugin_id, T2.plugin_name", $table, $where, array($conflictHookPoint['hook_point'], $conflictHookPoint['plugin_id'])); + $table = 'dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 ON T1.plugin_id = T2.plugin_id'; + $where = 'T1.hook_point = ? AND NOT T1.plugin_id = ? AND T2.enable = ' . PLUGIN_ENABLE_TRUE . ' GROUP BY T1.plugin_id'; + $conflictPlugins = $objQuery->select('T1.plugin_id, T2.plugin_name', $table, $where, array($conflictHookPoint['hook_point'], $conflictHookPoint['plugin_id'])); foreach ($conflictPlugins as $conflictPlugin) { - $conflict_alert_message =+ "* " . $conflictPlugin['plugin_name'] . "と競合する可能性があります。
"; + $conflict_alert_message =+ '* ' . $conflictPlugin['plugin_name'] . "と競合する可能性があります。
"; } } Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 21511) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 21514) @@ -91,5 +91,5 @@ $this->insertMemberData($this->arrForm); // 親ウィンドウを更新後、自ウィンドウを閉じる。 - $url = ADMIN_SYSTEM_URLPATH . "?pageno=" . $this->arrForm['pageno']; + $url = ADMIN_SYSTEM_URLPATH . '?pageno=' . $this->arrForm['pageno']; $this->tpl_onload = "fnUpdateParent('".$url."'); window.close();"; @@ -120,5 +120,5 @@ $this->updateMemberData($this->arrForm['member_id'], $this->arrForm); // 親ウィンドウを更新後、自ウィンドウを閉じる。 - $url = ADMIN_SYSTEM_URLPATH . "?pageno=" . $this->arrForm['pageno']; + $url = ADMIN_SYSTEM_URLPATH . '?pageno=' . $this->arrForm['pageno']; $this->tpl_onload = "fnUpdateParent('".$url."'); window.close();"; @@ -141,5 +141,5 @@ // $_GET['id']（member_id）が登録済みのものかチェック。 // 登録されていない場合は不正なものとして、新規扱いとする。 - $clean_id = ""; + $clean_id = ''; $clean_mode_flg = 'new'; @@ -156,5 +156,5 @@ $this->tpl_mode = $clean_mode_flg; $this->tpl_member_id = $clean_id; - $this->tpl_onfocus = "fnClearText(this.name);"; + $this->tpl_onfocus = 'fnClearText(this.name);'; $this->arrForm = $this->getMemberData($clean_id); $this->arrForm['password'] = DEFAULT_PASSWORD; @@ -190,5 +190,5 @@ * @return void */ - function initForm(&$objFormParam, &$arrParams, $mode = "") { + function initForm(&$objFormParam, &$arrParams, $mode = '') { $objFormParam->addParam('メンバーID', 'member_id', INT_LEN, 'n', array('NUM_CHECK')); @@ -226,9 +226,9 @@ $objErr = new SC_CheckError_Ex(); if ($mode == 'new') { - $objErr->doFunc(array("パスワード", 'password', ID_MIN_LEN, ID_MAX_LEN), array('NUM_RANGE_CHECK')); - $objErr->doFunc(array("ログインID", 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('NUM_RANGE_CHECK')); + $objErr->doFunc(array('パスワード', 'password', ID_MIN_LEN, ID_MAX_LEN), array('NUM_RANGE_CHECK')); + $objErr->doFunc(array('ログインID', 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('NUM_RANGE_CHECK')); } elseif ($mode == 'edit') { - $objErr->doFunc(array("パスワード", 'password', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK')); - $objErr->doFunc(array("ログインID", 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK')); + $objErr->doFunc(array('パスワード', 'password', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK')); + $objErr->doFunc(array('ログインID', 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK')); } $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02') ,array('EQUAL_CHECK')); @@ -240,9 +240,9 @@ // 管理者名が登録済みでないか if ($this->memberDataExists('name = ? AND del_flg = 0', $arrParams['name'])) { - $arrErr['name'] = "既に登録されている名前なので利用できません。
"; + $arrErr['name'] = '既に登録されている名前なので利用できません。
'; } // ログインIDが登録済みでないか if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) { - $arrErr['login_id'] = "既に登録されているIDなので利用できません。
"; + $arrErr['login_id'] = '既に登録されているIDなので利用できません。
'; } break; @@ -252,5 +252,5 @@ // ログインIDが登録済みでないか if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) { - $arrErr['login_id'] = "既に登録されているIDなので利用できません。
"; + $arrErr['login_id'] = '既に登録されているIDなので利用できません。
'; } } @@ -301,5 +301,5 @@ function lfCheckPageNo($pageno) { - $clean_pageno = ""; + $clean_pageno = ''; // $pagenoが0以上の整数かチェック @@ -369,5 +369,5 @@ } - $where = "member_id = ?"; + $where = 'member_id = ?'; // UPDATEの実行 Index: 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 (revision 21441) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php (revision 21514) @@ -57,6 +57,6 @@ $masterData = new SC_DB_MasterData_Ex(); $this->arrAUTHORITY = $masterData->getMasterData('mtb_authority'); - $this->arrWORK[0] = "非稼働"; - $this->arrWORK[1] = "稼働"; + $this->arrWORK[0] = '非稼働'; + $this->arrWORK[1] = '稼働'; } @@ -79,9 +79,9 @@ // ADMIN_ID以外の管理者件数を取得 - $linemax = $this->getMemberCount("del_flg <> 1 AND member_id <> " . ADMIN_ID); + $linemax = $this->getMemberCount('del_flg <> 1 AND member_id <> ' . ADMIN_ID); // ADMIN_ID以外で稼動中の管理者件数を取得 $this->workmax - = $this->getMemberCount("work = 1 AND del_flg <> 1 AND member_id <> " . ADMIN_ID); + = $this->getMemberCount('work = 1 AND del_flg <> 1 AND member_id <> ' . ADMIN_ID); // ページ送りの処理 $_GET['pageno']が信頼しうる値かどうかチェックする。 @@ -128,7 +128,7 @@ function getMemberData($startno) { $objSql = new SC_SelectSql_Ex(); - $objSql->setSelect("SELECT member_id,name,department,login_id,authority,rank,work FROM dtb_member"); - $objSql->setOrder("rank DESC"); - $objSql->setWhere("del_flg <> 1 AND member_id <> ". ADMIN_ID); + $objSql->setSelect('SELECT member_id,name,department,login_id,authority,rank,work FROM dtb_member'); + $objSql->setOrder('rank DESC'); + $objSql->setWhere('del_flg <> 1 AND member_id <> '. ADMIN_ID); $objSql->setLimitOffset(MEMBER_PMAX, $startno); @@ -148,5 +148,5 @@ function lfCheckPageNo($pageno) { - $clean_pageno = ""; + $clean_pageno = ''; // $pagenoが0以上の整数かチェック Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php (revision 21514) @@ -69,5 +69,5 @@ function action() { - if (strpos(HTTPS_URL,"https://") !== FALSE) { + if (strpos(HTTPS_URL,'https://') !== FALSE) { $this->tpl_enable_ssl = TRUE; } @@ -103,5 +103,5 @@ } else { - $admin_dir = str_replace("/","",ADMIN_DIR); + $admin_dir = str_replace('/','',ADMIN_DIR); $this->arrForm = array('admin_dir'=>$admin_dir,'admin_force_ssl'=>ADMIN_FORCE_SSL,'admin_allow_hosts'=>""); if (defined('ADMIN_ALLOW_HOSTS')) { @@ -147,5 +147,5 @@ */ function lfCheckAdminArea(&$arrForm, &$arrErr) { - $admin_dir = trim($arrForm['admin_dir'])."/"; + $admin_dir = trim($arrForm['admin_dir']).'/'; $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES); @@ -153,10 +153,10 @@ if (strpos($line,'ADMIN_DIR') !== false and ADMIN_DIR != $admin_dir) { //既存ディレクトリのチェック - if (file_exists(HTML_REALDIR.$admin_dir) and $admin_dir != "admin/") { - $arrErr['admin_dir'] .= ROOT_URLPATH.$admin_dir."は既に存在しています。別のディレクトリ名を指定してください。"; + if (file_exists(HTML_REALDIR.$admin_dir) and $admin_dir != 'admin/') { + $arrErr['admin_dir'] .= ROOT_URLPATH.$admin_dir.'は既に存在しています。別のディレクトリ名を指定してください。'; } //権限チェック if (!is_writable(HTML_REALDIR . ADMIN_DIR)) { - $arrErr['admin_dir'] .= ROOT_URLPATH.ADMIN_DIR."のディレクトリ名を変更する権限がありません。"; + $arrErr['admin_dir'] .= ROOT_URLPATH.ADMIN_DIR.'のディレクトリ名を変更する権限がありません。'; } } @@ -166,5 +166,5 @@ //管理機能ディレクトリのリネームと CONFIG_REALFILE の変更 function lfUpdateAdminData(&$arrForm) { - $admin_dir = trim($arrForm['admin_dir'])."/"; + $admin_dir = trim($arrForm['admin_dir']).'/'; $admin_force_ssl = 'FALSE'; if ($arrForm['admin_force_ssl'] == 1) { @@ -190,5 +190,5 @@ //管理機能ディレクトリのリネーム if (!rename(HTML_REALDIR.ADMIN_DIR,HTML_REALDIR.$admin_dir)) { - $this->arrErr['admin_dir'] .= ROOT_URLPATH.ADMIN_DIR."のディレクトリ名を変更できませんでした。"; + $this->arrErr['admin_dir'] .= ROOT_URLPATH.ADMIN_DIR.'のディレクトリ名を変更できませんでした。'; return false; } Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 21514) @@ -50,5 +50,5 @@ $this->tpl_subtitle = 'バックアップ管理'; - $this->bkup_dir = DATA_REALDIR . "downloads/backup/"; + $this->bkup_dir = DATA_REALDIR . 'downloads/backup/'; $this->bkup_ext = '.tar.gz'; } @@ -98,5 +98,5 @@ $arrData = $objFormParam->getHashArray(); - $work_dir = $this->bkup_dir . $arrData['bkup_name'] . "/"; + $work_dir = $this->bkup_dir . $arrData['bkup_name'] . '/'; // バックアップデータの事前削除 SC_Utils_Ex::sfDelFile($work_dir); @@ -175,5 +175,5 @@ Header("Content-disposition: attachment; filename=${filename}"); Header("Content-type: application/octet-stream; name=${filename}"); - header("Content-Length: " .filesize($dl_file)); + header('Content-Length: ' .filesize($dl_file)); readfile ($dl_file); exit(); @@ -189,5 +189,5 @@ // バックアップリストを取得する - $arrBkupList = $this->lfGetBkupData("ORDER BY create_date DESC"); + $arrBkupList = $this->lfGetBkupData('ORDER BY create_date DESC'); // テンプレートファイルに渡すデータをセット $this->arrErr = isset($arrErr) ? $arrErr : array(); @@ -251,9 +251,9 @@ // 重複・存在チェック - $ret = $this->lfGetBkupData("WHERE bkup_name = ?", $arrVal); + $ret = $this->lfGetBkupData('WHERE bkup_name = ?', $arrVal); if (count($ret) > 0 && $mode == 'bkup') { - $arrErr['bkup_name'] = "バックアップ名が重複しています。別名を入力してください。"; + $arrErr['bkup_name'] = 'バックアップ名が重複しています。別名を入力してください。'; } elseif (count($ret) <= 0 && $mode != 'bkup') { - $arrErr['list_name'] = "選択されたデータがみつかりませんでした。既に削除されている可能性があります。"; + $arrErr['list_name'] = '選択されたデータがみつかりませんでした。既に削除されている可能性があります。'; } @@ -272,5 +272,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $csv_autoinc = ""; + $csv_autoinc = ''; $arrData = array(); @@ -318,5 +318,5 @@ $csv_autoinc = $this->lfGetAutoIncrement(); - $csv_autoinc_file = $work_dir . "autoinc_data.csv"; + $csv_autoinc_file = $work_dir . 'autoinc_data.csv'; // CSV出力 @@ -325,5 +325,5 @@ $fp = fopen($csv_autoinc_file,'w'); if ($fp) { - if ($csv_autoinc != "") { + if ($csv_autoinc != '') { $success = fwrite($fp, $csv_autoinc); if (!$success) { @@ -379,5 +379,5 @@ $seq = $objQuery->currVal($val); - $ret .= $val . ","; + $ret .= $val . ','; $ret .= is_null($seq) ? '0' : $seq; $ret .= "\r\n"; @@ -399,9 +399,9 @@ // バックアップテーブルからデータを取得する - function lfGetBkupData($where = "", $data = array()) { + function lfGetBkupData($where = '', $data = array()) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $sql = "SELECT bkup_name, bkup_memo, create_date FROM dtb_bkup "; - if ($where != "") { + $sql = 'SELECT bkup_name, bkup_memo, create_date FROM dtb_bkup '; + if ($where != '') { $sql .= $where; } @@ -453,9 +453,9 @@ if ($success) { $objQuery->commit(); - $this->restore_msg = "リストア終了しました。"; + $this->restore_msg = 'リストア終了しました。'; $this->restore_err = true; } else { $objQuery->rollback(); - $this->restore_msg = "リストアに失敗しました。"; + $this->restore_msg = 'リストアに失敗しました。'; $this->restore_name = $bkup_name; $this->restore_err = false; @@ -536,5 +536,5 @@ foreach ($arrCsvData as $val) { - $arrData = explode(",", trim($val)); + $arrData = explode(',', trim($val)); $objQuery->setval($arrData[0], $arrData[1]); @@ -570,6 +570,6 @@ } - $delsql = "DELETE FROM dtb_bkup WHERE bkup_name = ?"; - $objQuery->delete('dtb_bkup', "bkup_name = ?", array($arrForm['list_name'])); + $delsql = 'DELETE FROM dtb_bkup WHERE bkup_name = ?'; + $objQuery->delete('dtb_bkup', 'bkup_name = ?', array($arrForm['list_name'])); } Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php (revision 21514) @@ -136,9 +136,9 @@ // ランクの取得 - $where1 = "member_id = ?"; + $where1 = 'member_id = ?'; $rank = $objQuery->get('rank', 'dtb_member', $where1, array($id)); // Updateする値を作成する. - $where2 = "rank > ? AND del_flg <> 1"; + $where2 = 'rank > ? AND del_flg <> 1'; // UPDATEの実行 - 削除したレコードより上のランキングを下げてRANKの空きを埋める。 @@ -159,5 +159,5 @@ $sqlVal['rank'] = 0; $sqlVal['del_flg'] = 1; - $where = "member_id = ?"; + $where = 'member_id = ?'; // UPDATEの実行 - ランクを最下位にする、DELフラグON Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php (revision 21514) @@ -120,5 +120,5 @@ return $master_data_name; } else { - SC_Utils_Ex::sfDispError(""); + SC_Utils_Ex::sfDispError(''); } @@ -163,8 +163,8 @@ $id = $arrId[$i]; // 空の値は無視 - if ($arrId[$i] != "") { + if ($arrId[$i] != '') { for ($j = $i + 1; $j < count($arrId); $j++) { if ($id == $arrId[$j]) { - return $id . " が重複しているため登録できません."; + return $id . ' が重複しているため登録できません.'; } } @@ -188,5 +188,5 @@ // ID が空のデータは生成しない - if ($val != "") { + if ($val != '') { $arrTmp[$val] = $arrParams['name'][$key]; } Index: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php (revision 21500) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php (revision 21514) @@ -64,5 +64,5 @@ // ディスプレイクラス生成 $this->objDisplay = new SC_Display_Ex(); - if ($_SERVER['PHP_SELF'] !== ROOT_URLPATH . ADMIN_DIR . "system/plugin.php") { + if ($_SERVER['PHP_SELF'] !== ROOT_URLPATH . ADMIN_DIR . 'system/plugin.php') { // スーパーフックポイントを実行. $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance(); @@ -90,5 +90,5 @@ function sendResponse() { - if ($_SERVER['PHP_SELF'] !== ROOT_URLPATH . ADMIN_DIR . "system/plugin.php") { + if ($_SERVER['PHP_SELF'] !== ROOT_URLPATH . ADMIN_DIR . 'system/plugin.php') { // プラグインによってトランスフォームされたテンプレートがあればセットする @@ -130,5 +130,5 @@ */ function log($mess, $log_level) { - $mess = $mess . " id=" . $_SESSION['login_id'] . "(" . $_SESSION['authority'] . ")" . "[" . session_id() . "]"; + $mess = $mess . ' id=' . $_SESSION['login_id'] . "(" . $_SESSION['authority'] . ")" . "[" . session_id() . "]"; GC_Utils_Ex::gfAdminLog($mess, $log_level); Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 21514) @@ -150,9 +150,9 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("ブロックID", 'bloc_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("端末種別ID", 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ブロック名", 'bloc_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ファイル名", 'filename', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ブロックデータ", 'bloc_html'); + $objFormParam->addParam('ブロックID', 'bloc_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ブロック名', 'bloc_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ファイル名', 'filename', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ブロックデータ', 'bloc_html'); } @@ -292,5 +292,5 @@ $objErr = new SC_CheckError_Ex($arrParams); $objErr->arrErr =& $arrErr; - $objErr->doFunc(array("ブロック名", 'bloc_name', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('ブロック名', 'bloc_name', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); $objErr->doFunc(array('ファイル名', 'filename', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK','FILE_NAME_CHECK_BY_NOUPLOAD')); Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php (revision 21514) @@ -152,14 +152,14 @@ */ function lfInitParam(&$objFormParam, $bloc_cnt = 0) { - $objFormParam->addParam("ページID", 'page_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("端末種別ID", 'device_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("ブロック数", 'bloc_cnt', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ブロック数', 'bloc_cnt', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); for ($i = 1; $i <= $bloc_cnt; $i++) { - $objFormParam->addParam("ブロック名", 'name_' . $i, STEXT_LEN, 'a', array('MAX_LENGTH_CHECK', 'GRAPH_CHECK')); - $objFormParam->addParam("ブロックID", 'id_' . $i, INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("ターゲットID", 'target_id_' . $i, STEXT_LEN, 'a', array('MAX_LENGTH_CHECK', 'ALNUM_CHECK')); - $objFormParam->addParam("TOP座標", 'top_' . $i, INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("全ページ", 'anywhere_' . $i, INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ブロック名', 'name_' . $i, STEXT_LEN, 'a', array('MAX_LENGTH_CHECK', 'GRAPH_CHECK')); + $objFormParam->addParam('ブロックID', 'id_' . $i, INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ターゲットID', 'target_id_' . $i, STEXT_LEN, 'a', array('MAX_LENGTH_CHECK', 'ALNUM_CHECK')); + $objFormParam->addParam('TOP座標', 'top_' . $i, INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('全ページ', 'anywhere_' . $i, INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); } } @@ -256,5 +256,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $objQuery->begin(); - $objQuery->delete('dtb_blocposition', "page_id = ? AND device_type_id = ?", + $objQuery->delete('dtb_blocposition', 'page_id = ? AND device_type_id = ?', array($page_id, $device_type_id)); $arrTargetFlip = array_flip($this->arrTarget); Index: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (revision 21514) @@ -84,5 +84,5 @@ $this->device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC); - $css_dir = $objLayout->getTemplatePath($this->device_type_id, true) . "css/"; + $css_dir = $objLayout->getTemplatePath($this->device_type_id, true) . 'css/'; $css_path = $css_dir . $this->css_name . '.css'; @@ -148,8 +148,8 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("端末種別ID", 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("CSSファイル名", 'css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("旧CSSファイル名", 'old_css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("CSSデータ", 'css_data'); + $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('CSSファイル名', 'css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('旧CSSファイル名', 'old_css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('CSSデータ', 'css_data'); } @@ -262,5 +262,5 @@ */ function getCSSDir($device_type_id) { - return SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id, true) . "css/"; + return SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id, true) . 'css/'; } } Index: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php (revision 21514) @@ -130,8 +130,8 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("端末種別ID", 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('division', 'division', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("ヘッダデータ", 'header'); - $objFormParam->addParam("フッタデータ", 'footer'); + $objFormParam->addParam('ヘッダデータ', 'header'); + $objFormParam->addParam('フッタデータ', 'footer'); } Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 21514) @@ -149,12 +149,12 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("ページID", 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("端末種別ID", 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("名称", 'page_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('名称', 'page_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('URL', 'filename', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ヘッダチェック", 'header_chk', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("フッタチェック", 'footer_chk', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("修正フラグ", 'edit_flg', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("TPLデータ", 'tpl_data'); + $objFormParam->addParam('ヘッダチェック', 'header_chk', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('フッタチェック', 'footer_chk', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('修正フラグ', 'edit_flg', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('TPLデータ', 'tpl_data'); } @@ -171,5 +171,5 @@ $templatePath = $objLayout->getTemplatePath($device_type_id); - $filename = $templatePath . $arrPageData[0]['filename'] . ".tpl"; + $filename = $templatePath . $arrPageData[0]['filename'] . '.tpl'; if (file_exists($filename)) { $arrPageData[0]['tpl_data'] = file_get_contents($filename); @@ -294,5 +294,5 @@ $objErr = new SC_CheckError_Ex($arrParams); $objErr->arrErr =& $arrErr; - $objErr->doFunc(array("名称", 'page_name', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('名称', 'page_name', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); $objErr->doFunc(array('URL', 'filename', STEXT_LEN), array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); @@ -312,5 +312,5 @@ } if (!$valid_url) { - $objErr->arrErr['filename'] = "※ URLを正しく入力してください。
"; + $objErr->arrErr['filename'] = '※ URLを正しく入力してください。
'; } // 同一URLの存在チェック Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 21514) @@ -147,5 +147,5 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("端末種別ID", 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('template_code', 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK')); } @@ -199,8 +199,8 @@ // 改行、タブを1スペースに変換 $sql = preg_replace("/[\r\n\t]/", " " ,$sql); - $sql_split = explode(";", $sql); + $sql_split = explode(';', $sql); $objQuery =& SC_Query_Ex::getSingletonInstance(); foreach ($sql_split as $val) { - if (trim($val) != "") { + if (trim($val) != '') { $objQuery->query($val); } @@ -219,5 +219,5 @@ if ($template_code == $this->getTemplateName($device_type_id) || $template_code == $this->getTemplateName($device_type_id, true)) { - $this->arrErr['err'] = "※ デフォルトテンプレートと、選択中のテンプレートは削除出来ません
"; + $this->arrErr['err'] = '※ デフォルトテンプレートと、選択中のテンプレートは削除出来ません
'; return false; } else { @@ -227,7 +227,7 @@ array($template_code, $device_type_id)); - $error = "※ テンプレートの削除ができませんでした
"; + $error = '※ テンプレートの削除ができませんでした
'; // テンプレート削除 - $templates_dir = SMARTY_TEMPLATES_REALDIR . $template_code. "/"; + $templates_dir = SMARTY_TEMPLATES_REALDIR . $template_code. '/'; if (SC_Utils_Ex::sfDelFile($templates_dir) === false) { $this->arrErr['err'] = $error; @@ -236,5 +236,5 @@ } // ユーザーデータ削除 - $user_dir = USER_TEMPLATE_REALDIR. $template_code. "/"; + $user_dir = USER_TEMPLATE_REALDIR. $template_code. '/'; if (SC_Utils_Ex::sfDelFile($user_dir) === false) { $this->arrErr['err'] = $error; @@ -244,5 +244,5 @@ // コンパイル削除 - $templates_c_dir = DATA_REALDIR. "Smarty/templates_c/". $template_code. "/"; + $templates_c_dir = DATA_REALDIR. 'Smarty/templates_c/'. $template_code. '/'; if (SC_Utils_Ex::sfDelFile($templates_c_dir) === false) { $this->arrErr['err'] = $error; @@ -273,5 +273,5 @@ // 更新SQLファイルが存在する場合はブロック位置を更新 - $sql_file = $tpl_dir . "sql/update_bloc.sql"; + $sql_file = $tpl_dir . 'sql/update_bloc.sql'; if (file_exists($sql_file)) { $this->updateBloc($sql_file); @@ -295,6 +295,6 @@ */ function doDownload($template_code) { - $from_dir = USER_TEMPLATE_REALDIR . $template_code . "/"; - $to_dir = SMARTY_TEMPLATES_REALDIR . $template_code . "/_packages/"; + $from_dir = USER_TEMPLATE_REALDIR . $template_code . '/'; + $to_dir = SMARTY_TEMPLATES_REALDIR . $template_code . '/_packages/'; if (SC_Utils_Ex::recursiveMkdir($to_dir) === false) { $this->arrErr['err'] = '※ ディレクトリの作成に失敗しました
'; Index: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (revision 21514) @@ -121,5 +121,5 @@ $pkg_dir = SMARTY_TEMPLATES_REALDIR . $objForm->getValue('template_code'); $objUpFile = new SC_UploadFile_Ex(TEMPLATE_TEMP_REALDIR, $pkg_dir); - $objUpFile->addFile("テンプレートファイル", 'template_file', array(), TEMPLATE_SIZE, true, 0, 0, false); + $objUpFile->addFile('テンプレートファイル', 'template_file', array(), TEMPLATE_SIZE, true, 0, 0, false); return $objUpFile; } @@ -132,7 +132,7 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("テンプレートコード", 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK')); - $objFormParam->addParam("テンプレート名", 'template_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("端末種別ID", 'device_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('テンプレートコード', 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK')); + $objFormParam->addParam('テンプレート名', 'template_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); } @@ -150,5 +150,5 @@ // 同名のフォルダが存在する場合はエラー if (file_exists(USER_TEMPLATE_REALDIR . $template_code)) { - $arrErr['template_code'] = "※ 同名のファイルがすでに存在します。
"; + $arrErr['template_code'] = '※ 同名のファイルがすでに存在します。
'; } @@ -159,12 +159,12 @@ DEFAULT_TEMPLATE_NAME); if (in_array($template_code, $arrIgnoreCode)) { - $arrErr['template_code'] = "※ このテンプレートコードは使用できません。
"; + $arrErr['template_code'] = '※ このテンプレートコードは使用できません。
'; } // DBにすでに登録されていないかチェック $objQuery =& SC_Query_Ex::getSingletonInstance(); - $exists = $objQuery->exists('dtb_templates', "template_code = ?", array($template_code)); + $exists = $objQuery->exists('dtb_templates', 'template_code = ?', array($template_code)); if ($exists) { - $arrErr['template_code'] = "※ すでに登録されているテンプレートコードです。
"; + $arrErr['template_code'] = '※ すでに登録されているテンプレートコードです。
'; } @@ -176,5 +176,5 @@ $arrArchive = $tar->listContent(); if (!is_array($arrArchive)) { - $arrErr['template_file'] = "※ テンプレートファイルが解凍できません。許可されている形式は、tar/tar.gzです。
"; + $arrErr['template_file'] = '※ テンプレートファイルが解凍できません。許可されている形式は、tar/tar.gzです。
'; } else { $make_temp_error = $objUpFile->makeTempFile('template_file', false); @@ -201,5 +201,5 @@ $template_dir = SMARTY_TEMPLATES_REALDIR . $template_code; - $compile_dir = DATA_REALDIR . "Smarty/templates_c/" . $template_code; + $compile_dir = DATA_REALDIR . 'Smarty/templates_c/' . $template_code; $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -217,5 +217,5 @@ if (!file_exists($template_dir)) { if (!mkdir($template_dir)) { - $this->arrErr['err'] = "※ テンプレートフォルダが作成できませんでした。
"; + $this->arrErr['err'] = '※ テンプレートフォルダが作成できませんでした。
'; $objQuery->rollback(); return false; @@ -224,5 +224,5 @@ if (!file_exists($compile_dir)) { if (!mkdir($compile_dir)) { - $this->arrErr['err'] = "※ Smarty コンパイルフォルダが作成できませんでした。
"; + $this->arrErr['err'] = '※ Smarty コンパイルフォルダが作成できませんでした。
'; $objQuery->rollback(); return false; @@ -234,14 +234,14 @@ // 解凍 - if (!SC_Helper_FileManager_Ex::unpackFile($template_dir . "/" . $_FILES['template_file']['name'])) { - $this->arrErr['err'] = "※ テンプレートファイルの解凍に失敗しました。
"; + if (!SC_Helper_FileManager_Ex::unpackFile($template_dir . '/' . $_FILES['template_file']['name'])) { + $this->arrErr['err'] = '※ テンプレートファイルの解凍に失敗しました。
'; $objQuery->rollback(); return false; } // ユーザデータの下のファイルをコピーする - $from_dir = SMARTY_TEMPLATES_REALDIR . $template_code . "/_packages/"; - $to_dir = USER_REALDIR . "packages/" . $template_code . "/"; + $from_dir = SMARTY_TEMPLATES_REALDIR . $template_code . '/_packages/'; + $to_dir = USER_REALDIR . 'packages/' . $template_code . '/'; if (!SC_Utils_Ex::recursiveMkdir($to_dir)) { - $this->arrErr['err'] = "※ " . $to_dir . " の作成に失敗しました。
"; + $this->arrErr['err'] = '※ ' . $to_dir . " の作成に失敗しました。
"; $objQuery->rollback(); return false; Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 21514) @@ -54,8 +54,8 @@ $this->LONGTEXT_MAX = LTEXT_LEN; - $this->arrType[0] = "納品書"; - - $this->arrDownload[0] = "ブラウザに開く"; - $this->arrDownload[1] = "ファイルに保存"; + $this->arrType[0] = '納品書'; + + $this->arrDownload[0] = 'ブラウザに開く'; + $this->arrDownload[1] = 'ファイルに保存'; } @@ -117,5 +117,5 @@ $arrForm = array(); // タイトルをセット - $arrForm['title'] = "お買上げ明細書(納品書)"; + $arrForm['title'] = 'お買上げ明細書(納品書)'; // 今日の日付をセット @@ -182,19 +182,19 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("注文番号", 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("注文番号", 'pdf_order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("発行日", 'year', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("発行日", 'month', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("発行日", 'day', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("帳票の種類", 'type', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("ダウンロード方法", 'download', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("帳票タイトル", 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("帳票メッセージ1行目", 'msg1', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("帳票メッセージ2行目", 'msg2', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("帳票メッセージ3行目", 'msg3', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("備考1行目", 'etc1', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("備考2行目", 'etc2', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("備考3行目", 'etc3', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("ポイント表記", 'disp_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('注文番号', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('注文番号', 'pdf_order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('発行日', 'year', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('発行日', 'month', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('発行日', 'day', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('帳票の種類', 'type', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ダウンロード方法', 'download', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('帳票タイトル', 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('帳票メッセージ1行目', 'msg1', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('帳票メッセージ2行目', 'msg2', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('帳票メッセージ3行目', 'msg3', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('備考1行目', 'etc1', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('備考2行目', 'etc2', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('備考3行目', 'etc3', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('ポイント表記', 'disp_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); } @@ -211,21 +211,21 @@ $year = $objFormParam->getValue('year'); if (!is_numeric($year)) { - $arrErr['year'] = "発行年は数値で入力してください。"; + $arrErr['year'] = '発行年は数値で入力してください。'; } $month = $objFormParam->getValue('month'); if (!is_numeric($month)) { - $arrErr['month'] = "発行月は数値で入力してください。"; + $arrErr['month'] = '発行月は数値で入力してください。'; }else if (0 >= $month && 12 < $month) { - $arrErr['month'] = "発行月は1〜12の間で入力してください。"; + $arrErr['month'] = '発行月は1〜12の間で入力してください。'; } $day = $objFormParam->getValue('day'); if (!is_numeric($day)) { - $arrErr['day'] = "発行日は数値で入力してください。"; + $arrErr['day'] = '発行日は数値で入力してください。'; }else if (0 >= $day && 31 < $day) { - $arrErr['day'] = "発行日は1〜31の間で入力してください。"; + $arrErr['day'] = '発行日は1〜31の間で入力してください。'; } Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php (revision 21514) @@ -47,5 +47,5 @@ $this->tpl_mainpage = 'order/multiple.tpl'; $this->tpl_mainno = 'order'; - $this->tpl_subno = ""; + $this->tpl_subno = ''; $this->tpl_maintitle = '受注管理'; $this->tpl_subtitle = '複数配送設定'; Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php (revision 21514) @@ -81,6 +81,6 @@ function getMailHistory($send_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "subject, mail_body"; - $where = "send_id = ?"; + $col = 'subject, mail_body'; + $where = 'send_id = ?'; $mailHistory = $objQuery->select($col, 'dtb_mail_history', $where, array($send_id)); return $mailHistory; Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php (revision 21488) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php (revision 21514) @@ -150,100 +150,100 @@ // お客様情報 - $objFormParam->addParam("会員名1", 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("会員名2", 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("会員名カナ1", 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("会員名カナ2", 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("メールアドレス", 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); - $objFormParam->addParam("郵便番号1", 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号1", 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号2", 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号3", 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('会員名1', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('会員名2', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('会員名カナ1', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('会員名カナ2', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); + $objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); // 受注商品情報 - $objFormParam->addParam("値引き", 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("送料", 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("手数料", 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('値引き', 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('送料', 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('手数料', 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); // ポイント機能ON時のみ if (USE_POINT !== false) { - $objFormParam->addParam("利用ポイント", 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('利用ポイント', 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); } - $objFormParam->addParam("配送業者", 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お支払い方法", 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("対応状況", 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お支払方法名称", 'payment_method'); + $objFormParam->addParam('配送業者', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お支払い方法', 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('対応状況', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お支払方法名称', 'payment_method'); // 受注詳細情報 - $objFormParam->addParam("商品種別ID", 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("単価", 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("数量", 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("商品ID", 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("商品規格ID", 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("ポイント付与率", 'point_rate'); - $objFormParam->addParam("商品コード", 'product_code'); - $objFormParam->addParam("商品名", 'product_name'); - $objFormParam->addParam("規格名1", 'classcategory_name1'); - $objFormParam->addParam("規格名2", 'classcategory_name2'); - $objFormParam->addParam("メモ", 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("削除用項番", 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品種別ID', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('単価', 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('ポイント付与率', 'point_rate'); + $objFormParam->addParam('商品コード', 'product_code'); + $objFormParam->addParam('商品名', 'product_name'); + $objFormParam->addParam('規格名1', 'classcategory_name1'); + $objFormParam->addParam('規格名2', 'classcategory_name2'); + $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); // DB読込用 - $objFormParam->addParam("小計", 'subtotal'); - $objFormParam->addParam("合計", 'total'); - $objFormParam->addParam("支払い合計", 'payment_total'); - $objFormParam->addParam("加算ポイント", 'add_point'); - $objFormParam->addParam("お誕生日ポイント", 'birth_point'); - $objFormParam->addParam("消費税合計", 'tax'); - $objFormParam->addParam("最終保持ポイント", 'total_point'); - $objFormParam->addParam("会員ID", 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("会員ID", 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("現在のポイント", 'customer_point'); - $objFormParam->addParam("受注前ポイント", 'point'); - $objFormParam->addParam("注文番号", 'order_id'); - $objFormParam->addParam("受注日", 'create_date'); - $objFormParam->addParam("発送日", 'commit_date'); - $objFormParam->addParam("備考", 'message'); - $objFormParam->addParam("入金日", 'payment_date'); - $objFormParam->addParam("端末種別", 'device_type_id'); + $objFormParam->addParam('小計', 'subtotal'); + $objFormParam->addParam('合計', 'total'); + $objFormParam->addParam('支払い合計', 'payment_total'); + $objFormParam->addParam('加算ポイント', 'add_point'); + $objFormParam->addParam('お誕生日ポイント', 'birth_point'); + $objFormParam->addParam('消費税合計', 'tax'); + $objFormParam->addParam('最終保持ポイント', 'total_point'); + $objFormParam->addParam('会員ID', 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('会員ID', 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('現在のポイント', 'customer_point'); + $objFormParam->addParam('受注前ポイント', 'point'); + $objFormParam->addParam('注文番号', 'order_id'); + $objFormParam->addParam('受注日', 'create_date'); + $objFormParam->addParam('発送日', 'commit_date'); + $objFormParam->addParam('備考', 'message'); + $objFormParam->addParam('入金日', 'payment_date'); + $objFormParam->addParam('端末種別', 'device_type_id'); // 複数情報 - $objFormParam->addParam("配送数", 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("配送ID", 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0); - $objFormParam->addParam("お名前1", 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前2", 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・姓)", 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・名)", 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("郵便番号1", 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号1", 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号2", 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号3", 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("お届け時間ID", 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日(年)", 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日(月)", 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日(日)", 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日", 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("配送商品数量", 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - - $objFormParam->addParam("商品規格ID", 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("商品コード", 'shipment_product_code'); - $objFormParam->addParam("商品名", 'shipment_product_name'); - $objFormParam->addParam("規格名1", 'shipment_classcategory_name1'); - $objFormParam->addParam("規格名2", 'shipment_classcategory_name2'); - $objFormParam->addParam("単価", 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("数量", 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - - $objFormParam->addParam("商品項番", 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("追加商品規格ID", 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("修正商品規格ID", 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("アンカーキー", 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('配送数', 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('配送ID', 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0); + $objFormParam->addParam('お名前1', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前2', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('お届け時間ID', 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日(年)', 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日(月)', 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日(日)', 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日', 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('配送商品数量', 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + + $objFormParam->addParam('商品規格ID', 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品コード', 'shipment_product_code'); + $objFormParam->addParam('商品名', 'shipment_product_name'); + $objFormParam->addParam('規格名1', 'shipment_classcategory_name1'); + $objFormParam->addParam('規格名2', 'shipment_classcategory_name2'); + $objFormParam->addParam('単価', 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('数量', 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + + $objFormParam->addParam('商品項番', 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('追加商品規格ID', 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('修正商品規格ID', 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('アンカーキー', 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); } Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php (revision 21514) @@ -117,7 +117,7 @@ if (count($this->arrErr) == 0) { - $where = "del_flg = 0"; + $where = 'del_flg = 0'; foreach ($arrParam as $key => $val) { - if ($val == "") { + if ($val == '') { continue; } @@ -125,5 +125,5 @@ } - $order = "update_date DESC"; + $order = 'update_date DESC'; /* ----------------------------------------------- @@ -180,42 +180,42 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("注文番号1", 'search_order_id1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("注文番号2", 'search_order_id2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("対応状況", 'search_order_status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("注文者 お名前", 'search_order_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("注文者 お名前(フリガナ)", 'search_order_kana', STEXT_LEN, 'KVCa', array('KANA_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("性別", 'search_order_sex', INT_LEN, 'n', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("年齢1", 'search_age1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("年齢2", 'search_age2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("メールアドレス", 'search_order_email', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('注文番号1', 'search_order_id1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('注文番号2', 'search_order_id2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('対応状況', 'search_order_status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('注文者 お名前', 'search_order_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('注文者 お名前(フリガナ)', 'search_order_kana', STEXT_LEN, 'KVCa', array('KANA_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('性別', 'search_order_sex', INT_LEN, 'n', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('年齢1', 'search_age1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('年齢2', 'search_age2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('メールアドレス', 'search_order_email', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); $objFormParam->addParam('TEL', 'search_order_tel', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("支払い方法", 'search_payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("購入金額1", 'search_total1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("購入金額2", 'search_total2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("表示件数", 'search_page_max', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('支払い方法', 'search_payment_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('購入金額1', 'search_total1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('購入金額2', 'search_total2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('表示件数', 'search_page_max', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); // 受注日 - $objFormParam->addParam("開始年", 'search_sorderyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("開始月", 'search_sordermonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("開始日", 'search_sorderday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了年", 'search_eorderyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了月", 'search_eordermonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了日", 'search_eorderday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始年', 'search_sorderyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始月', 'search_sordermonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始日', 'search_sorderday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了年', 'search_eorderyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了月', 'search_eordermonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了日', 'search_eorderday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); // 更新日 - $objFormParam->addParam("開始年", 'search_supdateyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("開始月", 'search_supdatemonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("開始日", 'search_supdateday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了年", 'search_eupdateyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了月", 'search_eupdatemonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了日", 'search_eupdateday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始年', 'search_supdateyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始月', 'search_supdatemonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始日', 'search_supdateday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了年', 'search_eupdateyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了月', 'search_eupdatemonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了日', 'search_eupdateday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); // 生年月日 - $objFormParam->addParam("開始年", 'search_sbirthyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("開始月", 'search_sbirthmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("開始日", 'search_sbirthday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了年", 'search_ebirthyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了月", 'search_ebirthmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("終了日", 'search_ebirthday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("購入商品",'search_product_name',STEXT_LEN,'KVa',array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("ページ送り番号",'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("受注ID", 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始年', 'search_sbirthyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始月', 'search_sbirthmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始日', 'search_sbirthday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了年', 'search_ebirthyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了月', 'search_ebirthmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('終了日', 'search_ebirthday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('購入商品','search_product_name',STEXT_LEN,'KVa',array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('ページ送り番号','search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('受注ID', 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); } @@ -231,19 +231,19 @@ // 相関チェック - $objErr->doFunc(array("注文番号1", "注文番号2", 'search_order_id1', 'search_order_id2'), array('GREATER_CHECK')); - $objErr->doFunc(array("年齢1", "年齢2", 'search_age1', 'search_age2'), array('GREATER_CHECK')); - $objErr->doFunc(array("購入金額1", "購入金額2", 'search_total1', 'search_total2'), array('GREATER_CHECK')); + $objErr->doFunc(array('注文番号1', '注文番号2', 'search_order_id1', 'search_order_id2'), array('GREATER_CHECK')); + $objErr->doFunc(array('年齢1', '年齢2', 'search_age1', 'search_age2'), array('GREATER_CHECK')); + $objErr->doFunc(array('購入金額1', '購入金額2', 'search_total1', 'search_total2'), array('GREATER_CHECK')); // 受注日 - $objErr->doFunc(array("開始", 'search_sorderyear', 'search_sordermonth', 'search_sorderday'), array('CHECK_DATE')); - $objErr->doFunc(array("終了", 'search_eorderyear', 'search_eordermonth', 'search_eorderday'), array('CHECK_DATE')); - $objErr->doFunc(array("開始", "終了", 'search_sorderyear', 'search_sordermonth', 'search_sorderday', 'search_eorderyear', 'search_eordermonth', 'search_eorderday'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('開始', 'search_sorderyear', 'search_sordermonth', 'search_sorderday'), array('CHECK_DATE')); + $objErr->doFunc(array('終了', 'search_eorderyear', 'search_eordermonth', 'search_eorderday'), array('CHECK_DATE')); + $objErr->doFunc(array('開始', '終了', 'search_sorderyear', 'search_sordermonth', 'search_sorderday', 'search_eorderyear', 'search_eordermonth', 'search_eorderday'), array('CHECK_SET_TERM')); // 更新日 - $objErr->doFunc(array("開始", 'search_supdateyear', 'search_supdatemonth', 'search_supdateday'), array('CHECK_DATE')); - $objErr->doFunc(array("終了", 'search_eupdateyear', 'search_eupdatemonth', 'search_eupdateday'), array('CHECK_DATE')); - $objErr->doFunc(array("開始", "終了", 'search_supdateyear', 'search_supdatemonth', 'search_supdateday', 'search_eupdateyear', 'search_eupdatemonth', 'search_eupdateday'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('開始', 'search_supdateyear', 'search_supdatemonth', 'search_supdateday'), array('CHECK_DATE')); + $objErr->doFunc(array('終了', 'search_eupdateyear', 'search_eupdatemonth', 'search_eupdateday'), array('CHECK_DATE')); + $objErr->doFunc(array('開始', '終了', 'search_supdateyear', 'search_supdatemonth', 'search_supdateday', 'search_eupdateyear', 'search_eupdatemonth', 'search_eupdateday'), array('CHECK_SET_TERM')); // 生年月日 - $objErr->doFunc(array("開始", 'search_sbirthyear', 'search_sbirthmonth', 'search_sbirthday'), array('CHECK_DATE')); - $objErr->doFunc(array("終了", 'search_ebirthyear', 'search_ebirthmonth', 'search_ebirthday'), array('CHECK_DATE')); - $objErr->doFunc(array("開始", "終了", 'search_sbirthyear', 'search_sbirthmonth', 'search_sbirthday', 'search_ebirthyear', 'search_ebirthmonth', 'search_ebirthday'), array('CHECK_SET_TERM')); + $objErr->doFunc(array('開始', 'search_sbirthyear', 'search_sbirthmonth', 'search_sbirthday'), array('CHECK_DATE')); + $objErr->doFunc(array('終了', 'search_ebirthyear', 'search_ebirthmonth', 'search_ebirthday'), array('CHECK_DATE')); + $objErr->doFunc(array('開始', '終了', 'search_sbirthyear', 'search_sbirthmonth', 'search_sbirthday', 'search_ebirthyear', 'search_ebirthmonth', 'search_ebirthday'), array('CHECK_SET_TERM')); return $objErr->arrErr; @@ -269,31 +269,31 @@ case 'search_product_name': - $where .= " AND EXISTS (SELECT 1 FROM dtb_order_detail od WHERE od.order_id = dtb_order.order_id AND od.product_name LIKE ?)"; + $where .= ' AND EXISTS (SELECT 1 FROM dtb_order_detail od WHERE od.order_id = dtb_order.order_id AND od.product_name LIKE ?)'; $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key)); break; case 'search_order_name': - $where .= " AND " . $dbFactory->concatColumn(array('order_name01', 'order_name02')) . " LIKE ?"; + $where .= ' AND ' . $dbFactory->concatColumn(array('order_name01', 'order_name02')) . " LIKE ?"; $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key)); break; case 'search_order_kana': - $where .= " AND " . $dbFactory->concatColumn(array('order_kana01', 'order_kana02')) . " LIKE ?"; + $where .= ' AND ' . $dbFactory->concatColumn(array('order_kana01', 'order_kana02')) . " LIKE ?"; $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key)); break; case 'search_order_id1': - $where .= " AND order_id >= ?"; + $where .= ' AND order_id >= ?'; $arrValues[] = sprintf('%d', $objFormParam->getValue($key)); break; case 'search_order_id2': - $where .= " AND order_id <= ?"; + $where .= ' AND order_id <= ?'; $arrValues[] = sprintf('%d', $objFormParam->getValue($key)); break; case 'search_order_sex': - $tmp_where = ""; + $tmp_where = ''; foreach ($objFormParam->getValue($key) as $element) { - if ($element != "") { + if ($element != '') { if (SC_Utils_Ex::isBlank($tmp_where)) { - $tmp_where .= " AND (order_sex = ?"; + $tmp_where .= ' AND (order_sex = ?'; } else { - $tmp_where .= " OR order_sex = ?"; + $tmp_where .= ' OR order_sex = ?'; } $arrValues[] = $element; @@ -302,24 +302,24 @@ if (!SC_Utils_Ex::isBlank($tmp_where)) { - $tmp_where .= ")"; + $tmp_where .= ')'; $where .= " $tmp_where "; } break; case 'search_order_tel': - $where .= " AND (" . $dbFactory->concatColumn(array('order_tel01', 'order_tel02', 'order_tel03')) . " LIKE ?)"; + $where .= ' AND (' . $dbFactory->concatColumn(array('order_tel01', 'order_tel02', 'order_tel03')) . " LIKE ?)"; $arrValues[] = sprintf('%%%d%%', preg_replace('/[()-]+/','', $objFormParam->getValue($key))); break; case 'search_order_email': - $where .= " AND order_email LIKE ?"; + $where .= ' AND order_email LIKE ?'; $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key)); break; case 'search_payment_id': - $tmp_where = ""; + $tmp_where = ''; foreach ($objFormParam->getValue($key) as $element) { - if ($element != "") { - if ($tmp_where == "") { - $tmp_where .= " AND (payment_id = ?"; + if ($element != '') { + if ($tmp_where == '') { + $tmp_where .= ' AND (payment_id = ?'; } else { - $tmp_where .= " OR payment_id = ?"; + $tmp_where .= ' OR payment_id = ?'; } $arrValues[] = $element; @@ -328,14 +328,14 @@ if (!SC_Utils_Ex::isBlank($tmp_where)) { - $tmp_where .= ")"; + $tmp_where .= ')'; $where .= " $tmp_where "; } break; case 'search_total1': - $where .= " AND total >= ?"; + $where .= ' AND total >= ?'; $arrValues[] = sprintf('%d', $objFormParam->getValue($key)); break; case 'search_total2': - $where .= " AND total <= ?"; + $where .= ' AND total <= ?'; $arrValues[] = sprintf('%d', $objFormParam->getValue($key)); break; @@ -344,5 +344,5 @@ $objFormParam->getValue('search_sordermonth'), $objFormParam->getValue('search_sorderday')); - $where.= " AND create_date >= ?"; + $where.= ' AND create_date >= ?'; $arrValues[] = $date; break; @@ -351,5 +351,5 @@ $objFormParam->getValue('search_eordermonth'), $objFormParam->getValue('search_eorderday'), true); - $where.= " AND create_date <= ?"; + $where.= ' AND create_date <= ?'; $arrValues[] = $date; break; @@ -358,5 +358,5 @@ $objFormParam->getValue('search_supdatemonth'), $objFormParam->getValue('search_supdateday')); - $where.= " AND update_date >= ?"; + $where.= ' AND update_date >= ?'; $arrValues[] = $date; break; @@ -365,5 +365,5 @@ $objFormParam->getValue('search_eupdatemonth'), $objFormParam->getValue('search_eupdateday'), true); - $where.= " AND update_date <= ?"; + $where.= ' AND update_date <= ?'; $arrValues[] = $date; break; @@ -372,5 +372,5 @@ $objFormParam->getValue('search_sbirthmonth'), $objFormParam->getValue('search_sbirthday')); - $where.= " AND order_birth >= ?"; + $where.= ' AND order_birth >= ?'; $arrValues[] = $date; break; @@ -379,9 +379,9 @@ $objFormParam->getValue('search_ebirthmonth'), $objFormParam->getValue('search_ebirthday'), true); - $where.= " AND order_birth <= ?"; + $where.= ' AND order_birth <= ?'; $arrValues[] = $date; break; case 'search_order_status': - $where.= " AND status = ?"; + $where.= ' AND status = ?'; $arrValues[] = $objFormParam->getValue($key); break; @@ -416,5 +416,5 @@ */ function doOutputCSV($where, $arrVal, $order) { - if ($where != "") { + if ($where != '') { $where = " WHERE $where "; } Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (revision 21514) @@ -46,5 +46,5 @@ $this->tpl_mainpage = 'order/product_select.tpl'; $this->tpl_mainno = 'order'; - $this->tpl_subno = ""; + $this->tpl_subno = ''; $this->tpl_maintitle = '受注管理'; $this->tpl_subtitle = '商品選択'; @@ -134,5 +134,5 @@ // 表示順序 - $order = "update_date DESC, product_id DESC"; + $order = 'update_date DESC, product_id DESC'; $objQuery->setOrder($order); @@ -202,8 +202,8 @@ function createWhere(&$objFormParam,&$objDb) { $arrForm = $objFormParam->getHashArray(); - $where = "alldtl.del_flg = 0"; + $where = 'alldtl.del_flg = 0'; $bind = array(); foreach ($arrForm as $key => $val) { - if ($val == "") { + if ($val == '') { continue; } @@ -211,16 +211,16 @@ switch ($key) { case 'search_name': - $where .= " AND name ILIKE ?"; - $bind[] = "%".$val."%"; + $where .= ' AND name ILIKE ?'; + $bind[] = '%'.$val.'%'; break; case 'search_category_id': list($tmp_where, $tmp_bind) = $objDb->sfGetCatWhere($val); - if ($tmp_where != "") { - $where.= " AND alldtl.product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; + if ($tmp_where != '') { + $where.= ' AND alldtl.product_id IN (SELECT product_id FROM dtb_product_categories WHERE ' . $tmp_where . ')'; $bind = array_merge((array)$bind, (array)$tmp_bind); } break; case 'search_product_code': - $where .= " AND alldtl.product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? AND del_flg = 0 GROUP BY product_id)"; + $where .= ' AND alldtl.product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? AND del_flg = 0 GROUP BY product_id)'; $bind[] = '%'.$val.'%'; break; @@ -279,9 +279,9 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("オーダーID", 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("商品名", 'search_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("カテゴリID", 'search_category_id', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); - $objFormParam->addParam("商品コード", 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); - $objFormParam->addParam("フッター", 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); + $objFormParam->addParam('オーダーID', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('カテゴリID', 'search_category_id', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); + $objFormParam->addParam('商品コード', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); + $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); } } Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php (revision 21514) @@ -124,7 +124,7 @@ function getMailHistory($order_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "send_date, subject, template_id, send_id"; - $where = "order_id = ?"; - $objQuery->setOrder("send_date DESC"); + $col = 'send_date, subject, template_id, send_id'; + $where = 'order_id = ?'; + $objQuery->setOrder('send_date DESC'); return $objQuery->select($col, 'dtb_mail_history', $where, array($order_id)); } @@ -187,6 +187,6 @@ if (SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "template_id = ?"; - $mailTemplates = $objQuery->select("subject, header, footer", 'dtb_mailtemplate', $where, array($objFormParam->getValue('template_id'))); + $where = 'template_id = ?'; + $mailTemplates = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($objFormParam->getValue('template_id'))); if (!is_null($mailTemplates)) { foreach (array('subject','header','footer') as $key) { @@ -197,5 +197,5 @@ } else { foreach (array('subject','header','footer') as $key) { - $objFormParam->setValue($key,""); + $objFormParam->setValue($key,''); } } @@ -220,9 +220,9 @@ parent::lfInitParam($objFormParam); - $objFormParam->addParam("オーダーID", 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("テンプレート", 'template_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("メールタイトル", 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'SPTAB_CHECK')); - $objFormParam->addParam("ヘッダー", 'header', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); - $objFormParam->addParam("フッター", 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); + $objFormParam->addParam('オーダーID', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('テンプレート', 'template_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('メールタイトル', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'SPTAB_CHECK')); + $objFormParam->addParam('ヘッダー', 'header', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); + $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK')); } } Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php (revision 21514) @@ -129,9 +129,9 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("注文番号", 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("変更前対応状況", 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("変更後対応状況", 'change_status', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("ページ番号", 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("移動注文番号", 'move', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('注文番号', 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('変更前対応状況', 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('変更後対応状況', 'change_status', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ページ番号', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('移動注文番号', 'move', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); } @@ -150,5 +150,5 @@ if ($this->getMode() == 'change') { if (is_null($objFormParam->getValue('change_status'))) { - $objFormParam->setValue('change_status',""); + $objFormParam->setValue('change_status',''); } } @@ -169,9 +169,9 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $select ="*"; + $select ='*'; $from = 'dtb_order'; - $where = "del_flg = 0 AND status = ?"; + $where = 'del_flg = 0 AND status = ?'; $arrval[] = $status; - $order = "order_id DESC"; + $order = 'order_id DESC'; $linemax = $objQuery->count($from, $where, $arrval); Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 21514) @@ -282,100 +282,100 @@ // お客様情報 - $objFormParam->addParam("注文者 お名前(姓)", 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("注文者 お名前(名)", 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("注文者 お名前(フリガナ・姓)", 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("注文者 お名前(フリガナ・名)", 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("メールアドレス", 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); - $objFormParam->addParam("郵便番号1", 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号1", 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号2", 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号3", 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('注文者 お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); + $objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); // 受注商品情報 - $objFormParam->addParam("値引き", 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("送料", 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("手数料", 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('値引き', 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('送料', 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('手数料', 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); // ポイント機能ON時のみ if (USE_POINT !== false) { - $objFormParam->addParam("利用ポイント", 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - } - - $objFormParam->addParam("配送業者", 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お支払い方法", 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("対応状況", 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お支払方法名称", 'payment_method'); + $objFormParam->addParam('利用ポイント', 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + } + + $objFormParam->addParam('配送業者', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お支払い方法', 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('対応状況', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お支払方法名称', 'payment_method'); // 受注詳細情報 - $objFormParam->addParam("商品種別ID", 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("単価", 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("数量", 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("商品ID", 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("商品規格ID", 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("ポイント付与率", 'point_rate'); - $objFormParam->addParam("商品コード", 'product_code'); - $objFormParam->addParam("商品名", 'product_name'); - $objFormParam->addParam("規格名1", 'classcategory_name1'); - $objFormParam->addParam("規格名2", 'classcategory_name2'); - $objFormParam->addParam("メモ", 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("削除用項番", 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品種別ID', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('単価', 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('ポイント付与率', 'point_rate'); + $objFormParam->addParam('商品コード', 'product_code'); + $objFormParam->addParam('商品名', 'product_name'); + $objFormParam->addParam('規格名1', 'classcategory_name1'); + $objFormParam->addParam('規格名2', 'classcategory_name2'); + $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); // DB読込用 - $objFormParam->addParam("小計", 'subtotal'); - $objFormParam->addParam("合計", 'total'); - $objFormParam->addParam("支払い合計", 'payment_total'); - $objFormParam->addParam("加算ポイント", 'add_point'); - $objFormParam->addParam("お誕生日ポイント", 'birth_point'); - $objFormParam->addParam("消費税合計", 'tax'); - $objFormParam->addParam("最終保持ポイント", 'total_point'); - $objFormParam->addParam("会員ID", 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("会員ID", 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("現在のポイント", 'customer_point'); - $objFormParam->addParam("受注前ポイント", 'point'); - $objFormParam->addParam("注文番号", 'order_id'); - $objFormParam->addParam("受注日", 'create_date'); - $objFormParam->addParam("発送日", 'commit_date'); - $objFormParam->addParam("備考", 'message'); - $objFormParam->addParam("入金日", 'payment_date'); - $objFormParam->addParam("端末種別", 'device_type_id'); + $objFormParam->addParam('小計', 'subtotal'); + $objFormParam->addParam('合計', 'total'); + $objFormParam->addParam('支払い合計', 'payment_total'); + $objFormParam->addParam('加算ポイント', 'add_point'); + $objFormParam->addParam('お誕生日ポイント', 'birth_point'); + $objFormParam->addParam('消費税合計', 'tax'); + $objFormParam->addParam('最終保持ポイント', 'total_point'); + $objFormParam->addParam('会員ID', 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('会員ID', 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('現在のポイント', 'customer_point'); + $objFormParam->addParam('受注前ポイント', 'point'); + $objFormParam->addParam('注文番号', 'order_id'); + $objFormParam->addParam('受注日', 'create_date'); + $objFormParam->addParam('発送日', 'commit_date'); + $objFormParam->addParam('備考', 'message'); + $objFormParam->addParam('入金日', 'payment_date'); + $objFormParam->addParam('端末種別', 'device_type_id'); // 複数情報 - $objFormParam->addParam("配送数", 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("配送ID", 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0); - $objFormParam->addParam("お名前(姓)", 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(名)", 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・姓)", 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・名)", 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("郵便番号1", 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号1", 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号2", 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号3", 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("お届け時間ID", 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日(年)", 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日(月)", 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日(日)", 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("お届け日", 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("配送商品数量", 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - - $objFormParam->addParam("商品規格ID", 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("商品コード", 'shipment_product_code'); - $objFormParam->addParam("商品名", 'shipment_product_name'); - $objFormParam->addParam("規格名1", 'shipment_classcategory_name1'); - $objFormParam->addParam("規格名2", 'shipment_classcategory_name2'); - $objFormParam->addParam("単価", 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - $objFormParam->addParam("数量", 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); - - $objFormParam->addParam("商品項番", 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("追加商品規格ID", 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("修正商品規格ID", 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("アンカーキー", 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('配送数', 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('配送ID', 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0); + $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('お届け時間ID', 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日(年)', 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日(月)', 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日(日)', 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('お届け日', 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('配送商品数量', 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + + $objFormParam->addParam('商品規格ID', 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品コード', 'shipment_product_code'); + $objFormParam->addParam('商品名', 'shipment_product_name'); + $objFormParam->addParam('規格名1', 'shipment_classcategory_name1'); + $objFormParam->addParam('規格名2', 'shipment_classcategory_name2'); + $objFormParam->addParam('単価', 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + $objFormParam->addParam('数量', 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0'); + + $objFormParam->addParam('商品項番', 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('追加商品規格ID', 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('修正商品規格ID', 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('アンカーキー', 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); } @@ -387,12 +387,12 @@ */ function lfInitMultipleParam(&$objFormParam) { - $objFormParam->addParam("商品規格ID", 'multiple_product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("商品コード", 'multiple_product_code', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("商品名", 'multiple_product_name', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("規格1", 'multiple_classcategory_name1', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("規格2", 'multiple_classcategory_name2', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("単価", 'multiple_price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("数量", 'multiple_quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); - $objFormParam->addParam("配送先住所", 'multiple_shipping_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品規格ID', 'multiple_product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('商品コード', 'multiple_product_code', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('商品名', 'multiple_product_name', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('規格1', 'multiple_classcategory_name1', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('規格2', 'multiple_classcategory_name2', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('単価', 'multiple_price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('数量', 'multiple_quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1); + $objFormParam->addParam('配送先住所', 'multiple_shipping_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); } @@ -639,5 +639,5 @@ $arrValues = $objFormParam->getDbArray(); - $where = "order_id = ?"; + $where = 'order_id = ?'; $objQuery->begin(); @@ -679,5 +679,5 @@ ++$k; } - $objQuery->delete('dtb_order_detail', "order_id = ? AND product_class_id = ?", array($order_id, $arrDetail[$i]['product_class_id'])); + $objQuery->delete('dtb_order_detail', 'order_id = ? AND product_class_id = ?', array($order_id, $arrDetail[$i]['product_class_id'])); } } Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 21514) @@ -116,5 +116,5 @@ // カテゴリ取得 $objDb = new SC_Helper_DB_Ex(); - $this->arrCatList = $objDb->sfGetCategoryList("level = 1"); + $this->arrCatList = $objDb->sfGetCategoryList('level = 1'); } @@ -133,8 +133,8 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("商品ID", 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("カテゴリID", 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ランク", 'rank', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("コメント", 'comment', LTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ランク', 'rank', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('コメント', 'comment', LTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); } Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php (revision 21514) @@ -108,5 +108,5 @@ if (SC_Utils_Ex::isBlank($this->arrErr)) { if ($this->tryView($objFormParam)) { - $file_url = htmlspecialchars(ereg_replace($objFormParam->getValue('top_dir'), "", $objFormParam->getValue('select_file'))); + $file_url = htmlspecialchars(ereg_replace($objFormParam->getValue('top_dir'), '', $objFormParam->getValue('select_file'))); $tpl_onload = "win02('./file_view.php?file=". $file_url ."', 'user_data', '600', '400');"; $this->setTplOnLoad($tpl_onload); @@ -125,5 +125,5 @@ if (SC_Utils_Ex::isBlank($this->arrErr)) { if (is_dir($objFormParam->getValue('select_file'))) { - $disp_error = "※ ディレクトリをダウンロードすることは出来ません。
"; + $disp_error = '※ ディレクトリをダウンロードすることは出来ません。
'; $this->setDispError('select_file', $disp_error); } else { @@ -156,5 +156,5 @@ if (SC_Utils_Ex::isBlank($this->arrErr)) { if (!$this->tryCreateDir($objFileManager, $objFormParam)) { - $disp_error = "※ ".htmlspecialchars($objFormParam->getValue('create_file'), ENT_QUOTES)."の作成に失敗しました。
"; + $disp_error = '※ '.htmlspecialchars($objFormParam->getValue('create_file'), ENT_QUOTES)."の作成に失敗しました。
"; $this->setDispError('create_file', $disp_error); } else { @@ -225,5 +225,5 @@ // 共通定義 $this->lfInitParamCommon($objFormParam); - $objFormParam->addParam("選択ファイル", 'select_file', MTEXT_LEN, 'a', array()); + $objFormParam->addParam('選択ファイル', 'select_file', MTEXT_LEN, 'a', array()); } @@ -237,5 +237,5 @@ // 共通定義 $this->lfInitParamCommon($objFormParam); - $objFormParam->addParam("選択ファイル", 'select_file', MTEXT_LEN, 'a', array('SELECT_CHECK')); + $objFormParam->addParam('選択ファイル', 'select_file', MTEXT_LEN, 'a', array('SELECT_CHECK')); } @@ -249,6 +249,6 @@ // 共通定義 $this->lfInitParamCommon($objFormParam); - $objFormParam->addParam("選択ファイル", 'select_file', MTEXT_LEN, 'a', array()); - $objFormParam->addParam("作成ファイル名", 'create_file', MTEXT_LEN, 'a', array('EXIST_CHECK', 'FILE_NAME_CHECK_BY_NOUPLOAD')); + $objFormParam->addParam('選択ファイル', 'select_file', MTEXT_LEN, 'a', array()); + $objFormParam->addParam('作成ファイル名', 'create_file', MTEXT_LEN, 'a', array('EXIST_CHECK', 'FILE_NAME_CHECK_BY_NOUPLOAD')); } @@ -260,9 +260,9 @@ */ function lfInitParamCommon(&$objFormParam) { - $objFormParam->addParam("ルートディレクトリ", 'top_dir', MTEXT_LEN, 'a', array()); - $objFormParam->addParam("現在の階層ディレクトリ", 'now_dir', MTEXT_LEN, 'a', array()); - $objFormParam->addParam("現在の階層ファイル", 'now_file', MTEXT_LEN, 'a', array()); - $objFormParam->addParam("ツリー選択状態", 'tree_status', MTEXT_LEN, 'a', array()); - $objFormParam->addParam("ツリー選択ディレクトリ", 'tree_select_file', MTEXT_LEN, 'a', array()); + $objFormParam->addParam('ルートディレクトリ', 'top_dir', MTEXT_LEN, 'a', array()); + $objFormParam->addParam('現在の階層ディレクトリ', 'now_dir', MTEXT_LEN, 'a', array()); + $objFormParam->addParam('現在の階層ファイル', 'now_file', MTEXT_LEN, 'a', array()); + $objFormParam->addParam('ツリー選択状態', 'tree_status', MTEXT_LEN, 'a', array()); + $objFormParam->addParam('ツリー選択ディレクトリ', 'tree_select_file', MTEXT_LEN, 'a', array()); } @@ -274,5 +274,5 @@ */ function lfInitFile(&$objUpFile) { - $objUpFile->addFile("ファイル", 'upload_file', array(), FILE_SIZE, true, 0, 0, false); + $objUpFile->addFile('ファイル', 'upload_file', array(), FILE_SIZE, true, 0, 0, false); } @@ -316,5 +316,5 @@ $create_dir = ereg_replace("/$", "", $objFormParam->getValue('now_dir')); // ファイル作成 - if ($objFileManager->sfCreateFile($create_dir."/".$objFormParam->getValue('create_file'), 0755)) { + if ($objFileManager->sfCreateFile($create_dir.'/'.$objFormParam->getValue('create_file'), 0755)) { $create_dir_flg = true; } @@ -356,5 +356,5 @@ */ function setDispPath($objFormParam) { - $tpl_now_dir = ""; + $tpl_now_dir = ''; // Windows 環境で DIRECTORY_SEPARATOR が JavaScript に渡るとエスケープ文字と勘違いするので置換 $html_realdir = str_replace(DIRECTORY_SEPARATOR, '/', HTML_REALDIR); @@ -421,5 +421,5 @@ */ function lfGetParentDir($dir) { - $parent_dir = ""; + $parent_dir = ''; $dir = ereg_replace("/$", "", $dir); $arrDir = explode('/', $dir); @@ -455,5 +455,5 @@ $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"; Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php (revision 21514) @@ -98,5 +98,5 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("ファイル名", 'file', MTEXT_LEN, 'a', array('EXIST_CHECK')); + $objFormParam->addParam('ファイル名', 'file', MTEXT_LEN, 'a', array('EXIST_CHECK')); } Index: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (revision 21514) @@ -132,5 +132,5 @@ $objCSV = new SC_Helper_CSV_Ex(); if (SC_Utils_Ex::sfIsInt($csv_id)) { - if ($csv_status_flg !="") { + if ($csv_status_flg !='') { $arrData = $objCSV->sfGetCsvOutput($csv_id, 'status = ?' , array($csv_status_flg), $order); } else { @@ -226,5 +226,5 @@ // ひとまず、全部使用しないで更新する $table = 'dtb_csv'; - $where = "csv_id = ?"; + $where = 'csv_id = ?'; $arrWhereVal = array($csv_id); $arrUpdVal = array('status' => '2', 'rank' => NULL, 'update_date' => 'CURRENT_TIMESTAMP'); @@ -234,5 +234,5 @@ // 使用するものだけ、再更新する。 if (is_array($arrData)) { - $where .= " AND no = ?"; + $where .= ' AND no = ?'; $arrUpdVal = array('status' => '1'); foreach ($arrData as $key => $val) { Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 21514) @@ -160,6 +160,6 @@ // 拡張エラーチェック $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); - $objErr->doFunc( array("名称", 'sql_name'), array('EXIST_CHECK')); - $objErr->doFunc( array("SQL文", 'csv_sql', '30000'), array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc( array('名称', 'sql_name'), array('EXIST_CHECK')); + $objErr->doFunc( array('SQL文', 'csv_sql', '30000'), array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); $objErr->doFunc( array('SQL文には読み込み関係以外のSQLコマンドおよび";"記号', 'csv_sql', $this->lfGetSqlDenyList()), array('PROHIBITED_STR_CHECK')); if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { @@ -170,5 +170,5 @@ $sql_error = $this->lfCheckSQL($objFormParam->getValue('csv_sql')); if (!SC_Utils_Ex::isBlank($sql_error)) { - $arrErr['csv_sql'] = "※ SQL文が不正です。SQL文を見直してください"; + $arrErr['csv_sql'] = '※ SQL文が不正です。SQL文を見直してください'; } } @@ -187,5 +187,5 @@ // 拡張エラーチェック $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); - $objErr->doFunc( array("SQL文", 'csv_sql', '30000'), array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc( array('SQL文', 'csv_sql', '30000'), array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); $objErr->doFunc( array('SQL文には読み込み関係以外のSQLコマンドおよび";"記号', 'csv_sql', $this->lfGetSqlDenyList()), array('PROHIBITED_STR_CHECK')); if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { @@ -206,5 +206,5 @@ // 拡張エラーチェック $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); - $objErr->doFunc( array("SQL ID", 'sql_id'), array('EXIST_CHECK')); + $objErr->doFunc( array('SQL ID', 'sql_id'), array('EXIST_CHECK')); if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { $arrErr = array_merge($arrErr, $objErr->arrErr); @@ -224,5 +224,5 @@ // 拡張エラーチェック $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); - $objErr->doFunc( array("CSV出力対象SQL ID", 'csv_output_id'), array('EXIST_CHECK')); + $objErr->doFunc( array('CSV出力対象SQL ID', 'csv_output_id'), array('EXIST_CHECK')); if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { $arrErr = array_merge($arrErr, $objErr->arrErr); @@ -289,5 +289,5 @@ * @return array 取得結果の配列 */ - function lfGetSqlList($where = "" , $arrVal = array()) { + function lfGetSqlList($where = '' , $arrVal = array()) { $objQuery =& SC_Query_Ex::getSingletonInstance(); $table = 'dtb_csv_sql'; @@ -304,7 +304,7 @@ function lfCheckSQL($sql) { // FIXME: 意図的に new SC_Query しています。 force_runをtrueにする必要があるので.本当はqueryの引数で制御したい。ref SC_Query - $objQuery = new SC_Query_Ex("", true); - $err = ""; - $sql = "SELECT " . $sql . " "; + $objQuery = new SC_Query_Ex('', true); + $err = ''; + $sql = 'SELECT ' . $sql . ' '; $objErrMsg = $objQuery->query($sql); if (PEAR::isError($objErrMsg)) { @@ -342,5 +342,5 @@ function lfDoCsvOutput($sql_id) { $arrData = $this->lfGetSqlList('sql_id = ?', array($sql_id)); - $sql = "SELECT " . $arrData[0]['csv_sql'] . " "; + $sql = 'SELECT ' . $arrData[0]['csv_sql'] . " "; // TODO: ヘッダ取得 SQL内にLIMIT文がある場合はLIMIT句は追加しないので重いかも @@ -348,6 +348,6 @@ $arrHeader = array(); - if (!preg_match("/ LIMIT /", $sql)) { - $head_sql = $sql . " LIMIT 0"; + if (!preg_match('/ LIMIT /', $sql)) { + $head_sql = $sql . ' LIMIT 0'; } else { $head_sql = $sql; @@ -377,5 +377,5 @@ if (SC_Utils_Ex::sfIsInt($sql_id)) { //データ更新 - $where = "sql_id = ?"; + $where = 'sql_id = ?'; $objQuery->update($table, $arrSqlVal, $where, array($sql_id)); } else { @@ -398,5 +398,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $table = 'dtb_csv_sql'; - $where = "sql_id = ?"; + $where = 'sql_id = ?'; if (SC_Utils_Ex::sfIsInt($sql_id)) { $objQuery->delete($table, $where, array($sql_id)); Index: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php (revision 21514) @@ -45,5 +45,5 @@ parent::init(); $this->tpl_mainno = 'contents'; - $this->tpl_subno = ""; + $this->tpl_subno = ''; $this->tpl_subtitle = '商品検索'; @@ -120,7 +120,7 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("商品ID", 'search_name', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("商品ID", 'search_category_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK')); - $objFormParam->addParam("ページ番号", 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK')); + $objFormParam->addParam('商品ID', 'search_name', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品ID', 'search_category_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK')); + $objFormParam->addParam('ページ番号', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK')); } @@ -144,8 +144,8 @@ function createWhere(&$objFormParam,&$objDb) { $arrForm = $objFormParam->getHashArray(); - $where = "alldtl.del_flg = 0"; + $where = 'alldtl.del_flg = 0'; $bind = array(); foreach ($arrForm as $key => $val) { - if ($val == "") { + if ($val == '') { continue; } @@ -153,11 +153,11 @@ switch ($key) { case 'search_name': - $where .= " AND name ILIKE ?"; - $bind[] = "%".$val."%"; + $where .= ' AND name ILIKE ?'; + $bind[] = '%'.$val.'%'; break; case 'search_category_id': list($tmp_where, $tmp_bind) = $objDb->sfGetCatWhere($val); - if ($tmp_where != "") { - $where.= " AND alldtl.product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; + if ($tmp_where != '') { + $where.= ' AND alldtl.product_id IN (SELECT product_id FROM dtb_product_categories WHERE ' . $tmp_where . ')'; $bind = array_merge((array)$bind, (array)$tmp_bind); } @@ -217,5 +217,5 @@ // 表示順序 - $order = "update_date DESC, product_id DESC"; + $order = 'update_date DESC, product_id DESC'; $objQuery->setOrder($order); Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 21514) @@ -101,5 +101,5 @@ $this->lfNewsInsert($arrPost,$member_id); } - $news_id = ""; + $news_id = ''; $this->tpl_onload = "window.alert('編集が完了しました');"; } else { @@ -169,5 +169,5 @@ $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); $objErr->arrErr = $objFormParam->checkError(); - $objErr->doFunc(array("日付", 'year', 'month', 'day'), array('CHECK_DATE')); + $objErr->doFunc(array('日付', 'year', 'month', 'day'), array('CHECK_DATE')); return $objErr->arrErr; } @@ -179,12 +179,12 @@ function lfInitParam(&$objFormParam) { $objFormParam->addParam('news_id', 'news_id'); - $objFormParam->addParam("日付(年)", 'year', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("日付(月)", 'month', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("日付(日)", 'day', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("タイトル", 'news_title', MTEXT_LEN, 'KVa', array('EXIST_CHECK','MAX_LENGTH_CHECK','SPTAB_CHECK')); + $objFormParam->addParam('日付(年)', 'year', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('日付(月)', 'month', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('日付(日)', 'day', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('タイトル', 'news_title', MTEXT_LEN, 'KVa', array('EXIST_CHECK','MAX_LENGTH_CHECK','SPTAB_CHECK')); $objFormParam->addParam('URL', 'news_url', URL_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("本文", 'news_comment', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("別ウィンドウで開く", 'link_method', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("ランク移動", 'term', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('本文', 'news_comment', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('別ウィンドウで開く', 'link_method', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ランク移動', 'term', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); } @@ -240,5 +240,5 @@ */ function getRegistDate($arrPost) { - $registDate = $arrPost['year'] ."/". $arrPost['month'] ."/". $arrPost['day']; + $registDate = $arrPost['year'] .'/'. $arrPost['month'] ."/". $arrPost['day']; return $registDate; } @@ -321,5 +321,5 @@ */ function splitNewsDate($news_date) { - return explode("-", $news_date); + return explode('-', $news_date); } @@ -344,5 +344,5 @@ function getPostRank($news_id) { if (strlen($news_id) > 0 && is_numeric($news_id) == true) { - $key = "pos-".$news_id; + $key = 'pos-'.$news_id; $input_pos = $_POST[$key]; return $input_pos; Index: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php (revision 21514) @@ -123,5 +123,5 @@ // ログインチェック if (!$this->lfIsLoginMember($arrForm['login_id'], $arrForm['password'])) { - $arrErr['password'] = "ログイン出来ません。"; + $arrErr['password'] = 'ログイン出来ません。'; $this->lfSetIncorrectData($arrForm['login_id']); } @@ -140,7 +140,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); //パスワード、saltの取得 - $cols = "password, salt"; + $cols = 'password, salt'; $table = 'dtb_member'; - $where = "login_id = ? AND del_flg <> 1 AND work = 1"; + $where = 'login_id = ? AND del_flg <> 1 AND work = 1'; $arrData = $objQuery->getRow($cols, $table, $where, array($login_id)); if (SC_Utils_Ex::isBlank($arrData)) { @@ -163,7 +163,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); //メンバー情報取得 - $cols = "member_id, authority, login_date, name"; + $cols = 'member_id, authority, login_date, name'; $table = 'dtb_member'; - $where = "login_id = ?"; + $where = 'login_id = ?'; $arrData = $objQuery->getRow($cols, $table, $where, array($login_id)); // セッション登録 @@ -193,5 +193,5 @@ $objSess->SetSession('uniqid', $objSess->getUniqId()); if (SC_Utils_Ex::isBlank($last_login)) { - $objSess->SetSession('last_login', date("Y-m-d H:i:s")); + $objSess->SetSession('last_login', date('Y-m-d H:i:s')); } else { $objSess->SetSession('last_login', $last_login); @@ -219,7 +219,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $sqlval = array(); - $sqlval['login_date'] = date("Y-m-d H:i:s"); + $sqlval['login_date'] = date('Y-m-d H:i:s'); $table = 'dtb_member'; - $where = "member_id = ?"; + $where = 'member_id = ?'; $objQuery->update($table, $sqlval, $where, array($member_id)); } @@ -234,5 +234,5 @@ */ function lfSetIncorrectData($error_login_id) { - GC_Utils_Ex::gfPrintLog($error_login_id . " password incorrect."); + GC_Utils_Ex::gfPrintLog($error_login_id . ' password incorrect.'); } } Index: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php (revision 21514) @@ -121,5 +121,5 @@ */ function lfGetPHPVersion() { - return "PHP " . phpversion(); + return 'PHP ' . phpversion(); } @@ -141,7 +141,7 @@ function lfGetCustomerCnt() { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "COUNT(customer_id)"; + $col = 'COUNT(customer_id)'; $table = 'dtb_customer'; - $where = "del_flg = 0 AND status = 2"; + $where = 'del_flg = 0 AND status = 2'; return $objQuery->get($col, $table, $where); } @@ -170,5 +170,5 @@ function lfGetOrderMonth($method) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $month = date("Y/m", mktime()); + $month = date('Y/m', mktime()); // TODO: DBFactory使わないでも共通化できそうな気もしますが @@ -186,6 +186,6 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "SUM(point)"; - $where = "del_flg = 0"; + $col = 'SUM(point)'; + $where = 'del_flg = 0'; $from = 'dtb_customer'; return $objQuery->get($col, $from, $where); @@ -214,6 +214,6 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $table = "dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id"; - $where = "A.del_flg = 0 AND A.status = 2 AND B.del_flg = 0"; + $table = 'dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id'; + $where = 'A.del_flg = 0 AND A.status = 2 AND B.del_flg = 0'; return $objQuery->count($table, $where); } @@ -227,9 +227,9 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $cols = "product_id, name"; + $cols = 'product_id, name'; $table = 'dtb_products'; - $where = "product_id IN (" - . "SELECT product_id FROM dtb_products_class " - . "WHERE stock_unlimited = ? AND stock <= 0)"; + $where = 'product_id IN (' + . 'SELECT product_id FROM dtb_products_class ' + . 'WHERE stock_unlimited = ? AND stock <= 0)'; return $objQuery->select($cols, $table, $where, array(UNLIMITED_FLG_LIMITED)); } @@ -243,46 +243,48 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $sql = "SELECT - ord.order_id, - ord.customer_id, - ord.order_name01 AS name01, - ord.order_name02 AS name02, - ord.total, - ord.create_date, - (SELECT - det.product_name - FROM - dtb_order_detail AS det - WHERE - ord.order_id = det.order_id - ORDER BY det.order_detail_id - LIMIT 1 - ) AS product_name, - (SELECT - pay.payment_method - FROM - dtb_payment AS pay - WHERE - ord.payment_id = pay.payment_id - ) AS payment_method - FROM ( - SELECT - order_id, - customer_id, - order_name01, - order_name02, - total, - create_date, - payment_id - FROM - dtb_order AS ord - WHERE - del_flg = 0 AND status <> " . ORDER_CANCEL . " - ORDER BY - create_date DESC LIMIT 10 OFFSET 0 - ) AS ord"; - $arrNewOrder = $objQuery->getAll($sql); + $sql = <<< __EOS__ + SELECT + ord.order_id, + ord.customer_id, + ord.order_name01 AS name01, + ord.order_name02 AS name02, + ord.total, + ord.create_date, + (SELECT + det.product_name + FROM + dtb_order_detail AS det + WHERE + ord.order_id = det.order_id + ORDER BY det.order_detail_id + LIMIT 1 + ) AS product_name, + (SELECT + pay.payment_method + FROM + dtb_payment AS pay + WHERE + ord.payment_id = pay.payment_id + ) AS payment_method + FROM ( + SELECT + order_id, + customer_id, + order_name01, + order_name02, + total, + create_date, + payment_id + FROM + dtb_order AS ord + WHERE + del_flg = 0 AND status <> ? + ORDER BY + create_date DESC LIMIT 10 OFFSET 0 + ) AS ord +__EOS__; + $arrNewOrder = $objQuery->getAll($sql, ORDER_CANCEL); foreach ($arrNewOrder as $key => $val) { - $arrNewOrder[$key]['create_date'] = str_replace("-", "/", substr($val['create_date'], 0,19)); + $arrNewOrder[$key]['create_date'] = str_replace('-', "/", substr($val['create_date'], 0,19)); } @@ -321,5 +323,5 @@ if (empty($arrTmpData)) { - SC_Utils_Ex::sfErrorHeader(">> 更新情報の取得に失敗しました。"); + SC_Utils_Ex::sfErrorHeader('>> 更新情報の取得に失敗しました。'); return array(); } Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php (revision 21514) @@ -101,5 +101,5 @@ if (count($this->arrErr) <= 0) { // 新規作成 - if ($post['holiday_id'] == "") { + if ($post['holiday_id'] == '') { $this->lfInsertClass($this->arrForm, $_SESSION['member_id']); } @@ -164,6 +164,6 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "holiday_id = ?"; - return $objQuery->select("title, month, day", 'dtb_holiday', $where, array($holiday_id)); + $where = 'holiday_id = ?'; + return $objQuery->select('title, month, day', 'dtb_holiday', $where, array($holiday_id)); } @@ -171,7 +171,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "del_flg <> 1"; - $objQuery->setOrder("rank DESC"); - return $objQuery->select("holiday_id, title, month, day", 'dtb_holiday', $where); + $where = 'del_flg <> 1'; + $objQuery->setOrder('rank DESC'); + return $objQuery->select('holiday_id, title, month, day', 'dtb_holiday', $where); } @@ -201,5 +201,5 @@ $sqlval['day'] = $arrData['day']; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $where = "holiday_id = ?"; + $where = 'holiday_id = ?'; // UPDATEの実行 $ret = $objQuery->update('dtb_holiday', $sqlval, $where, array($arrData['holiday_id'])); @@ -238,15 +238,15 @@ if (!isset($arrErr['date'])) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "del_flg = 0 AND month = ? AND day = ?"; + $where = 'del_flg = 0 AND month = ? AND day = ?'; $arrval = array($post['month'], $post['day']); if (!empty($post['holiday_id'])) { - $where .= " AND holiday_id <> ?"; + $where .= ' AND holiday_id <> ?'; $arrval[] = $post['holiday_id']; } - $arrRet = $objQuery->select("count(holiday_id) as count", 'dtb_holiday', $where, $arrval); + $arrRet = $objQuery->select('count(holiday_id) as count', 'dtb_holiday', $where, $arrval); // 編集中のレコード以外に同じ日付が存在する場合 if ($arrRet[0]['count'] > 0) { - $arrErr['date'] = "※ 既に同じ日付の登録が存在します。
"; + $arrErr['date'] = '※ 既に同じ日付の登録が存在します。
'; } } Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php (revision 21514) @@ -121,6 +121,6 @@ /* パラメーター情報の初期化 */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("ポイント付与率", 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("会員登録時付与ポイント", 'welcome_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('ポイント付与率', 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('会員登録時付与ポイント', 'welcome_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); } Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php (revision 21514) @@ -32,8 +32,8 @@ /** 郵便番号CSV ファイルのパス */ -define('ZIP_CSV_REALFILE', DATA_REALDIR . "downloads/KEN_ALL.CSV"); +define('ZIP_CSV_REALFILE', DATA_REALDIR . 'downloads/KEN_ALL.CSV'); /** UTF-8 変換済みの郵便番号CSV ファイルのパス */ -define('ZIP_CSV_UTF8_REALFILE', DATA_REALDIR . "downloads/KEN_ALL_utf-8.CSV"); +define('ZIP_CSV_UTF8_REALFILE', DATA_REALDIR . 'downloads/KEN_ALL_utf-8.CSV'); /** @@ -194,5 +194,5 @@ function lfInitParam($tpl_mode, &$objFormParam) { if ($tpl_mode == 'manual') { - $objFormParam->addParam("開始行", 'startRowNum', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('開始行', 'startRowNum', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); } } @@ -206,14 +206,14 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $img_path = USER_URL . USER_PACKAGE_DIR . "admin/img/basis/"; // 画像パスは admin 固定 + $img_path = USER_URL . USER_PACKAGE_DIR . 'admin/img/basis/'; // 画像パスは admin 固定 ?> - + - +

DB 登録進捗状況

-
+
- Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 21514) @@ -94,5 +94,5 @@ if (count($this->arrErr) <= 0) { - if ($post['kiyaku_id'] == "") { + if ($post['kiyaku_id'] == '') { $this->lfInsertClass($this->arrForm, $_SESSION['member_id']); // 新規作成 } else { @@ -170,6 +170,6 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "kiyaku_id = ?"; - return $objQuery->select("kiyaku_text, kiyaku_title", 'dtb_kiyaku', $where, array($kiyaku_id)); + $where = 'kiyaku_id = ?'; + return $objQuery->select('kiyaku_text, kiyaku_title', 'dtb_kiyaku', $where, array($kiyaku_id)); } @@ -177,7 +177,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "del_flg <> 1"; - $objQuery->setOrder("rank DESC"); - return $objQuery->select("kiyaku_title, kiyaku_text, kiyaku_id", 'dtb_kiyaku', $where); + $where = 'del_flg <> 1'; + $objQuery->setOrder('rank DESC'); + return $objQuery->select('kiyaku_title, kiyaku_text, kiyaku_id', 'dtb_kiyaku', $where); } @@ -189,5 +189,5 @@ $sqlval['kiyaku_text'] = $arrData['kiyaku_text']; $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - $where = "kiyaku_id = ?"; + $where = 'kiyaku_id = ?'; // UPDATEの実行 $ret = $objQuery->update('dtb_kiyaku', $sqlval, $where, array($kiyaku_id)); @@ -222,8 +222,8 @@ $post = $objFormParam->getHashArray(); $objQuery =& SC_Query_Ex::getSingletonInstance(); - $arrRet = $objQuery->select("kiyaku_id, kiyaku_title", 'dtb_kiyaku', "del_flg = 0 AND kiyaku_title = ?", array($post['kiyaku_title'])); + $arrRet = $objQuery->select('kiyaku_id, kiyaku_title', 'dtb_kiyaku', "del_flg = 0 AND kiyaku_title = ?", array($post['kiyaku_title'])); // 編集中のレコード以外に同じ名称が存在する場合 if ($arrRet[0]['kiyaku_id'] != $post['kiyaku_id'] && $arrRet[0]['kiyaku_title'] == $post['kiyaku_title']) { - $arrErr['name'] = "※ 既に同じ内容の登録が存在します。
"; + $arrErr['name'] = '※ 既に同じ内容の登録が存在します。
'; } } Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php (revision 21514) @@ -121,8 +121,8 @@ function lfGetPaymentList() { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "payment_id, payment_method, charge, rule, upper_rule, note, fix, charge_flg"; - $where = "del_flg = 0"; + $col = 'payment_id, payment_method, charge, rule, upper_rule, note, fix, charge_flg'; + $where = 'del_flg = 0'; $table = 'dtb_payment'; - $objQuery->setOrder("rank DESC"); + $objQuery->setOrder('rank DESC'); $arrRet = $objQuery->select($col, $table, $where); return $arrRet; Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php (revision 21514) @@ -128,9 +128,9 @@ $arrRet = $this->lfGetData($post['payment_id']); - $objFormParam->addParam("支払方法", 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("手数料", 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以上)", 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以下)", 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("固定", 'fix'); + $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('固定', 'fix'); $objFormParam->setParam($arrRet); @@ -163,5 +163,5 @@ /* ファイル情報の初期化 */ function lfInitFile() { - $this->objUpFile->addFile("ロゴ画像", 'payment_image', array('gif'), IMAGE_SIZE, false, CLASS_IMAGE_WIDTH, CLASS_IMAGE_HEIGHT); + $this->objUpFile->addFile('ロゴ画像', 'payment_image', array('gif'), IMAGE_SIZE, false, CLASS_IMAGE_WIDTH, CLASS_IMAGE_HEIGHT); return $this->objUpFile; } @@ -172,9 +172,9 @@ switch ($mode) { case 'edit': - $objFormParam->addParam("支払方法", 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("手数料", 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以上)", 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以下)", 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("固定", 'fix'); + $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('固定', 'fix'); $objFormParam->addParam('支払いID', 'payment_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('課金フラグ', 'charge_flg', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); @@ -184,10 +184,10 @@ case 'delete_image': $objFormParam->addParam('支払いID', 'payment_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("支払方法", 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("手数料", 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以上)", 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以下)", 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("固定", 'fix'); - $objFormParam->addParam("画像キー", 'image_key', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('固定', 'fix'); + $objFormParam->addParam('画像キー', 'image_key', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); break; @@ -198,9 +198,9 @@ default: - $objFormParam->addParam("支払方法", 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("手数料", 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以上)", 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("利用条件(～円以下)", 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("固定", 'fix'); + $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('固定', 'fix'); break; @@ -211,11 +211,11 @@ function lfGetData($payment_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "payment_id = ?"; - $arrRet = $objQuery->select("*", 'dtb_payment', $where, array($payment_id)); + $where = 'payment_id = ?'; + $arrRet = $objQuery->select('*', 'dtb_payment', $where, array($payment_id)); return $arrRet[0]; } /* DBへデータを登録する */ - function lfRegistData($payment_id = "", $member_id, &$objFormParam) { + function lfRegistData($payment_id = '', $member_id, &$objFormParam) { $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -230,5 +230,5 @@ // 新規登録 - if ($payment_id == "") { + if ($payment_id == '') { // INSERTの実行 $sqlval['creator_id'] = $member_id; @@ -239,5 +239,5 @@ // 既存編集 } else { - $where = "payment_id = ?"; + $where = 'payment_id = ?'; $objQuery->update('dtb_payment', $sqlval, $where, array($payment_id)); } @@ -262,14 +262,14 @@ // 利用条件(下限)チェック if ($arrRet['rule'] < $arrPaymentData['rule_min'] and $arrPaymentData['rule_min'] != "") { - $objErr->arrErr['rule'] = "利用条件(下限)は" . $arrPaymentData['rule_min'] ."円以上にしてください。
"; + $objErr->arrErr['rule'] = '利用条件(下限)は' . $arrPaymentData['rule_min'] ."円以上にしてください。
"; } // 利用条件(上限)チェック if ($arrRet['upper_rule'] > $arrPaymentData['upper_rule_max'] and $arrPaymentData['upper_rule_max'] != "") { - $objErr->arrErr['upper_rule'] = "利用条件(上限)は" . $arrPaymentData['upper_rule_max'] ."円以下にしてください。
"; + $objErr->arrErr['upper_rule'] = '利用条件(上限)は' . $arrPaymentData['upper_rule_max'] ."円以下にしてください。
"; } // 利用条件チェック - $objErr->doFunc(array("利用条件(～円以上)", "利用条件(～円以下)", 'rule', 'upper_rule'), array('GREATER_CHECK')); + $objErr->doFunc(array('利用条件(～円以上)', '利用条件(～円以下)', 'rule', 'upper_rule'), array('GREATER_CHECK')); return $objErr->arrErr; Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 21514) @@ -185,5 +185,5 @@ //配列の場合は、パイプ区切りの文字列に変換 if (is_array($array[$val])) { - $sqlval[$val] = implode("|", $array[$val]); + $sqlval[$val] = implode('|', $array[$val]); } else { $sqlval[$val] = $array[$val]; @@ -194,5 +194,5 @@ $ret = $objQuery->update('dtb_baseinfo', $sqlval); - $this->log("update done."); + $this->log('update done.'); } @@ -207,5 +207,5 @@ $ret = $objQuery->insert('dtb_baseinfo', $sqlval); - $this->log("insert done."); + $this->log('insert done.'); } @@ -214,14 +214,14 @@ $objFormParam->addParam('会社名(フリガナ)', 'company_kana', STEXT_LEN, 'KVC', array('KANA_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("店名", 'shop_name', STEXT_LEN, 'KVa', array('EXIST_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("店名(フリガナ)", 'shop_kana', STEXT_LEN, 'KVC', array('KANA_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("店名(英語表記)", 'shop_name_eng',MTEXT_LEN, 'a', array('GRAPH_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('店名', 'shop_name', STEXT_LEN, 'KVa', array('EXIST_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('店名(フリガナ)', 'shop_kana', STEXT_LEN, 'KVC', array('KANA_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('店名(英語表記)', 'shop_name_eng',MTEXT_LEN, 'a', array('GRAPH_CHECK','MAX_LENGTH_CHECK')); // 郵便番号チェック - $objFormParam->addParam("郵便番号1", 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号1', 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK')); // 住所チェック - $objFormParam->addParam("都道府県", 'pref', '', 'n', array('EXIST_CHECK')); - $objFormParam->addParam("住所1", 'addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('都道府県', 'pref', '', 'n', array('EXIST_CHECK')); + $objFormParam->addParam('住所1', 'addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); // メールチェック $objFormParam->addParam('商品注文受付メールアドレス', 'email01', null, 'a', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); @@ -231,31 +231,31 @@ // 電話番号 - $objFormParam->addParam("電話番号1", 'tel01', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号2", 'tel02', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号3", 'tel03', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'tel01', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号2', 'tel02', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号3', 'tel03', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); // FAX番号 - $objFormParam->addParam("FAX番号1", 'fax01', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("FAX番号2", 'fax02', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("FAX番号3", 'fax03', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('FAX番号1', 'fax01', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('FAX番号2', 'fax02', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('FAX番号3', 'fax03', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); // その他 - $objFormParam->addParam("消費税率", 'tax', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("課税規則 ", 'tax_rule', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("送料無料条件", 'free_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("店舗営業時間", 'business_hour', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - - $objFormParam->addParam("取扱商品", 'good_traded', LLTEXT_LEN, '', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("メッセージ", 'message', LLTEXT_LEN, '', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('消費税率', 'tax', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('課税規則 ', 'tax_rule', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('送料無料条件', 'free_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('店舗営業時間', 'business_hour', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + + $objFormParam->addParam('取扱商品', 'good_traded', LLTEXT_LEN, '', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('メッセージ', 'message', LLTEXT_LEN, '', array('MAX_LENGTH_CHECK')); if (!isset($post['downloadable_days_unlimited']) && $post['downloadable_days_unlimited'] != '1') { - $objFormParam->addParam("ダウンロード可能日数", 'downloadable_days', DOWNLOAD_DAYS_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('ダウンロード可能日数', 'downloadable_days', DOWNLOAD_DAYS_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); } else { - $objFormParam->addParam("ダウンロード無制限", 'downloadable_days_unlimited', array('EXIST_CHECK')); + $objFormParam->addParam('ダウンロード無制限', 'downloadable_days_unlimited', array('EXIST_CHECK')); } $objFormParam->addParam('緯度', 'latitude', STEXT_LEN, '', array('MAX_LENGTH_CHECK')); $objFormParam->addParam('軽度', 'longitude', STEXT_LEN, '', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("定休日", 'regular_holiday_ids', INT_LEN, 'n', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('定休日', 'regular_holiday_ids', INT_LEN, 'n', array('MAX_LENGTH_CHECK')); } @@ -266,5 +266,5 @@ $objErr = new SC_CheckError_Ex($post); - $objErr->doFunc(array("郵便番号", 'zip01', 'zip02'), array('ALL_EXIST_CHECK')); + $objErr->doFunc(array('郵便番号', 'zip01', 'zip02'), array('ALL_EXIST_CHECK')); // 電話番号チェック @@ -272,6 +272,6 @@ $objErr->doFunc(array('FAX', 'fax01', 'fax02', 'fax03'), array('TEL_CHECK')); - $objErr->doFunc(array("緯度", 'latitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK')); - $objErr->doFunc(array("経度", 'longitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('緯度', 'latitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('経度', 'longitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK')); return array_merge((array)$arrErr, (array)$objErr->arrErr); Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php (revision 21514) @@ -97,5 +97,5 @@ if ($this->arrErr) { // エラーメッセージ - $this->tpl_msg = "エラーが発生しました"; + $this->tpl_msg = 'エラーが発生しました'; } else { @@ -125,5 +125,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $sql = "SELECT * FROM dtb_mailtemplate WHERE template_id = ?"; + $sql = 'SELECT * FROM dtb_mailtemplate WHERE template_id = ?'; return $objQuery->getAll($sql, array($template_id)); } @@ -135,8 +135,8 @@ $post['update_date'] = 'CURRENT_TIMESTAMP'; - $sql = "SELECT * FROM dtb_mailtemplate WHERE template_id = ?"; + $sql = 'SELECT * FROM dtb_mailtemplate WHERE template_id = ?'; $template_data = $objQuery->getAll($sql, array($post['template_id'])); if ($template_data) { - $sql_where = "template_id = ?"; + $sql_where = 'template_id = ?'; $objQuery->update('dtb_mailtemplate', $post, $sql_where, array(addslashes($post['template_id']))); } else { Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php (revision 21514) @@ -113,8 +113,8 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "deliv_id, name, service_name"; - $where = "del_flg = 0"; + $col = 'deliv_id, name, service_name'; + $where = 'del_flg = 0'; $table = 'dtb_deliv'; - $objQuery->setOrder("rank DESC"); + $objQuery->setOrder('rank DESC'); return $objQuery->select($col, $table, $where); Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php (revision 21514) @@ -115,10 +115,10 @@ case 'edit': $objFormParam->addParam('配送業者ID', 'deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("配送業者名", 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("名称", 'service_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("説明", 'remark', LLTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); - $objFormParam->addParam("伝票No.確認URL", 'confirm_url', URL_LEN, 'n', array('URL_CHECK', 'MAX_LENGTH_CHECK'), "http://"); - $objFormParam->addParam("取扱商品種別", 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("取扱支払方法", 'payment_ids', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('配送業者名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('名称', 'service_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('説明', 'remark', LLTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); + $objFormParam->addParam('伝票No.確認URL', 'confirm_url', URL_LEN, 'n', array('URL_CHECK', 'MAX_LENGTH_CHECK'), "http://"); + $objFormParam->addParam('取扱商品種別', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('取扱支払方法', 'payment_ids', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { @@ -161,12 +161,12 @@ // deliv_id が決まっていた場合 - if ($arrRet['deliv_id'] != "") { + if ($arrRet['deliv_id'] != '') { $deliv_id = $arrRet['deliv_id']; - $where = "deliv_id = ?"; + $where = 'deliv_id = ?'; $objQuery->update('dtb_deliv', $sqlval, $where, array($deliv_id)); // お届け時間の登録 $table = 'dtb_delivtime'; - $where = "deliv_id = ? AND time_id = ?"; + $where = 'deliv_id = ? AND time_id = ?'; for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { $sqlval = array(); @@ -174,7 +174,7 @@ $arrval = array($deliv_id, $cnt); // 既存データの有無を確認 - $curData = $objQuery->select("*", $table, $where, $arrval); - - if (strcmp($arrRet[$keyname], "") != 0) { + $curData = $objQuery->select('*', $table, $where, $arrval); + + if (strcmp($arrRet[$keyname], '') != 0) { $sqlval['deliv_time'] = $arrRet[$keyname]; @@ -200,7 +200,7 @@ for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { $keyname = 'fee'.$cnt; - if (strcmp($arrRet[$keyname], "") != 0) { + if (strcmp($arrRet[$keyname], '') != 0) { $sqlval = array('fee' => $arrRet[$keyname]); - $objQuery->update('dtb_delivfee', $sqlval, "deliv_id = ? AND fee_id = ?", array($deliv_id, $cnt)); + $objQuery->update('dtb_delivfee', $sqlval, 'deliv_id = ? AND fee_id = ?', array($deliv_id, $cnt)); } } @@ -219,5 +219,5 @@ for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { $keyname = "deliv_time$cnt"; - if ($arrRet[$keyname] != "") { + if ($arrRet[$keyname] != '') { $sqlval['deliv_id'] = $deliv_id; $sqlval['time_id'] = $cnt; @@ -233,5 +233,5 @@ for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { $keyname = "fee$cnt"; - if ($arrRet[$keyname] != "") { + if ($arrRet[$keyname] != '') { $sqlval['deliv_id'] = $deliv_id; $sqlval['fee'] = $arrRet[$keyname]; @@ -269,6 +269,6 @@ // 配送業者一覧の取得 - $col = "deliv_id, name, service_name, remark, confirm_url, product_type_id"; - $where = "deliv_id = ?"; + $col = 'deliv_id, name, service_name, remark, confirm_url, product_type_id'; + $where = 'deliv_id = ?'; $table = 'dtb_deliv'; $arrRet = $objQuery->select($col, $table, $where, array($deliv_id)); @@ -276,5 +276,5 @@ // お届け時間の取得 $col = 'deliv_time'; - $where = "deliv_id = ? ORDER BY time_id"; + $where = 'deliv_id = ? ORDER BY time_id'; $table = 'dtb_delivtime'; $arrRet = $objQuery->select($col, $table, $where, array($deliv_id)); @@ -282,5 +282,5 @@ // 配送料金の取得 $col = 'fee'; - $where = "deliv_id = ? ORDER BY pref"; + $where = 'deliv_id = ? ORDER BY pref'; $table = 'dtb_delivfee'; $arrRet = $objQuery->select($col, $table, $where, array($deliv_id)); @@ -310,5 +310,5 @@ $ret = $objDb->sfIsRecord('dtb_deliv', 'service_name', array($arrRet['service_name'])); if ($ret) { - $objErr->arrErr['name'] = "※ 同じ名称の組み合わせは登録できません。
"; + $objErr->arrErr['name'] = '※ 同じ名称の組み合わせは登録できません。
'; } } Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php (revision 21514) @@ -121,25 +121,25 @@ /* パラメーター情報の初期化 */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("販売業者", 'law_company', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("運営責任者", 'law_manager', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("郵便番号1", 'law_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'law_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'law_pref', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'law_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'law_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("電話番号1", 'law_tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号2", 'law_tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("電話番号3", 'law_tel03', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("FAX番号1", 'law_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("FAX番号2", 'law_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("FAX番号3", 'law_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); - $objFormParam->addParam("メールアドレス", 'law_email', null, 'KVa', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); + $objFormParam->addParam('販売業者', 'law_company', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('運営責任者', 'law_manager', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('郵便番号1', 'law_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'law_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'law_pref', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'law_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'law_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('電話番号1', 'law_tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号2', 'law_tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('電話番号3', 'law_tel03', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('FAX番号1', 'law_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('FAX番号2', 'law_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('FAX番号3', 'law_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); + $objFormParam->addParam('メールアドレス', 'law_email', null, 'KVa', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); $objFormParam->addParam('URL', 'law_url', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'URL_CHECK')); - $objFormParam->addParam("必要料金", 'law_term01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("注文方法", 'law_term02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("支払方法", 'law_term03', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("支払期限", 'law_term04', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("引き渡し時期", 'law_term05', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("返品・交換について", 'law_term06', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('必要料金', 'law_term01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('注文方法', 'law_term02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('支払方法', 'law_term03', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('支払期限', 'law_term04', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('引き渡し時期', 'law_term05', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('返品・交換について', 'law_term06', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); } @@ -168,5 +168,5 @@ $objErr->doFunc(array('TEL', 'law_tel01', 'law_tel02', 'law_tel03'), array('TEL_CHECK')); $objErr->doFunc(array('FAX', 'law_fax01', 'law_fax02', 'law_fax03'), array('TEL_CHECK')); - $objErr->doFunc(array("郵便番号", 'law_zip01', 'law_zip02'), array('ALL_EXIST_CHECK')); + $objErr->doFunc(array('郵便番号', 'law_zip01', 'law_zip02'), array('ALL_EXIST_CHECK')); return $objErr->arrErr; Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php (revision 21514) @@ -142,17 +142,17 @@ function lfUpdPageData($arrUpdData = array()) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $sql = ""; + $sql = ''; // SQL生成 - $sql .= " UPDATE "; - $sql .= " dtb_pagelayout "; - $sql .= " SET "; - $sql .= " author = ? , "; - $sql .= " description = ? , "; - $sql .= " keyword = ? "; - $sql .= " WHERE "; - $sql .= " device_type_id = ? "; - $sql .= " AND page_id = ? "; - $sql .= " "; + $sql .= ' UPDATE '; + $sql .= ' dtb_pagelayout '; + $sql .= ' SET '; + $sql .= ' author = ? , '; + $sql .= ' description = ? , '; + $sql .= ' keyword = ? '; + $sql .= ' WHERE '; + $sql .= ' device_type_id = ? '; + $sql .= ' AND page_id = ? '; + $sql .= ' '; // SQL実行 Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php (revision 21514) @@ -207,7 +207,7 @@ SC_Helper_Customer_Ex::sfCustomerEntryParam($objFormParam, true); // 検索結果一覧画面への戻り用パラメーター - $objFormParam->addParam("検索用データ", 'search_data', "", "", array(), "", false); + $objFormParam->addParam('検索用データ', 'search_data', "", "", array(), "", false); // 会員購入履歴ページング用 - $objFormParam->addParam("", 'search_pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('', 'search_pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); } @@ -221,5 +221,5 @@ SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam); // 初回受け入れ時用 - $objFormParam->addParam("編集対象会員ID", 'edit_customer_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('編集対象会員ID', 'edit_customer_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); } @@ -245,10 +245,10 @@ //メアド重複チェック(共通ルーチンは使えない) $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = "email, email_mobile, customer_id"; + $col = 'email, email_mobile, customer_id'; $table = 'dtb_customer'; - $where = "del_flg <> 1 AND (email Like ? OR email_mobile Like ?)"; + $where = 'del_flg <> 1 AND (email Like ? OR email_mobile Like ?)'; $arrVal = array($objFormParam->getValue('email'), $objFormParam->getValue('email_mobile')); if ($objFormParam->getValue('customer_id')) { - $where .= " AND customer_id <> ?"; + $where .= ' AND customer_id <> ?'; $arrVal[] = $objFormParam->getValue('customer_id'); } @@ -265,5 +265,5 @@ $arrErr['email_mobile'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用している携帯アドレスです。'; }else if ($arrData['email_mobile'] == $objFormParam->getValue('email')) { - if ($arrErr['email'] == "") { + if ($arrErr['email'] == '') { $arrErr['email'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用している携帯アドレスです。'; } @@ -315,5 +315,5 @@ $page_max = SEARCH_PMAX; $table = 'dtb_order'; - $where = "customer_id = ? AND del_flg <> 1"; + $where = 'customer_id = ? AND del_flg <> 1'; $arrVal = array($customer_id); //購入履歴の件数取得 @@ -324,8 +324,8 @@ $objQuery->setLimitOffset($page_max, $objNavi->start_row); // 表示順序 - $order = "order_id DESC"; + $order = 'order_id DESC'; $objQuery->setOrder($order); //購入履歴情報の取得 - $arrPurchaseHistory = $objQuery->select("*", $table, $where, $arrVal); + $arrPurchaseHistory = $objQuery->select('*', $table, $where, $arrVal); return array($linemax, $arrPurchaseHistory, $objNavi); Index: 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 (revision 21490) +++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 21514) @@ -54,5 +54,5 @@ $this->arrPref = $masterData->getMasterData('mtb_pref'); $this->arrJob = $masterData->getMasterData('mtb_job'); - $this->arrJob["不明"] = "不明"; + $this->arrJob['不明'] = '不明'; $this->arrSex = $masterData->getMasterData('mtb_sex'); $this->arrPageMax = $masterData->getMasterData('mtb_page_max'); @@ -176,5 +176,5 @@ */ function lfDoDeleteCustomer($customer_id) { - $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, "del_flg = 0"); + $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, 'del_flg = 0'); if (SC_Utils_Ex::isBlank($arrData)) { //対象となるデータが見つからない。 @@ -224,5 +224,5 @@ function lfDoCSV($arrParam) { $objSelect = new SC_CustomerList_Ex($arrParam, 'customer'); - $order = "update_date DESC, customer_id DESC"; + $order = 'update_date DESC, customer_id DESC'; $objCSV = new SC_Helper_CSV_Ex(); Index: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php (revision 21514) @@ -103,5 +103,5 @@ $objQuery->update('dtb_mailmaga_template', array('del_flg' =>1), - "template_id = ?", + 'template_id = ?', array($template_id)); } Index: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 21514) @@ -135,5 +135,5 @@ $objQuery->update('dtb_mailmaga_template', $sqlval, - "template_id = ?", + 'template_id = ?', array($template_id)); } else { @@ -152,8 +152,8 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("メール形式", 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK')); + $objFormParam->addParam('メール形式', 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK')); $objFormParam->addParam('Subject', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("本文", 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("テンプレートID", 'template_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('本文', 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('テンプレートID', 'template_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); } Index: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 21514) @@ -54,8 +54,8 @@ $this->arrPref = $masterData->getMasterData('mtb_pref'); $this->arrJob = $masterData->getMasterData('mtb_job'); - $this->arrJob["不明"] = "不明"; + $this->arrJob['不明'] = '不明'; $this->arrSex = $masterData->getMasterData('mtb_sex'); $this->arrPageRows = $masterData->getMasterData('mtb_page_max'); - $this->arrHtmlmail = array("" => "両方", 1 => 'HTML', 2 => 'TEXT'); + $this->arrHtmlmail = array('' => '両方', 1 => 'HTML', 2 => 'TEXT'); $this->arrMailType = $masterData->getMasterData('mtb_mail_type'); @@ -146,5 +146,5 @@ $this->tpl_mainpage = 'mail/index.tpl'; SC_Helper_Mail_Ex::sfSendMailmagazine($this->lfRegisterData($objFormParam)); // DB登録・送信 - SC_Response_Ex::sendRedirect("./history.php"); + SC_Response_Ex::sendRedirect('./history.php'); } break; @@ -160,5 +160,5 @@ if (SC_Utils_Ex::sfIsInt($_GET['send_id'])) { SC_Helper_Mail_Ex::sfSendMailmagazine($_GET['send_id']); // DB登録・送信 - SC_Response_Ex::sendRedirect("./history.php"); + SC_Response_Ex::sendRedirect('./history.php'); } else { $this->tpl_onload = "window.alert('メール送信IDが正しくありません');"; @@ -199,8 +199,8 @@ */ function lfAddParamSelectTemplate(&$objFormParam) { - $objFormParam->addParam("メール形式", 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK')); + $objFormParam->addParam('メール形式', 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK')); $objFormParam->addParam('Subject', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("本文", 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("テンプレートID", 'template_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('本文', 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('テンプレートID', 'template_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); } @@ -214,5 +214,5 @@ if (is_array($arrTemplate)) { foreach ($arrTemplate as $line) { - $return[$line['template_id']] = "【" . $this->arrHtmlmail[$line['mail_method']] . "】" . $line['subject']; + $return[$line['template_id']] = '【' . $this->arrHtmlmail[$line['mail_method']] . "】" . $line['subject']; } } @@ -229,5 +229,5 @@ function lfGetTemplateData(&$objFormParam, $template_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $objQuery->setOrder("template_id DESC"); + $objQuery->setOrder('template_id DESC'); $where = 'template_id = ?'; $arrResults = $objQuery->getRow('*', 'dtb_mailmaga_template', $where, array($template_id)); @@ -287,5 +287,5 @@ // 送信履歴より、送信条件確認画面 - $sql = "SELECT search_data FROM dtb_send_history WHERE send_id = ?"; + $sql = 'SELECT search_data FROM dtb_send_history WHERE send_id = ?'; $searchData = $objQuery->getOne($sql, array($_GET['send_id'])); return unserialize($searchData); Index: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php (revision 21514) @@ -107,19 +107,19 @@ // 該当全体件数の取得 - $linemax = $objQuery->count('dtb_send_history',"del_flg = 0"); + $linemax = $objQuery->count('dtb_send_history','del_flg = 0'); // 一覧データの取得 - $objSelect->setOrder("start_date DESC, send_id DESC"); + $objSelect->setOrder('start_date DESC, send_id DESC'); - $col = "*"; - $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id) AS count_all"; - $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 1) AS count_sent"; - $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 2) AS count_error"; - $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag IS NULL) AS count_unsent"; + $col = '*'; + $col .= ',(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id) AS count_all'; + $col .= ',(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 1) AS count_sent'; + $col .= ',(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 2) AS count_error'; + $col .= ',(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag IS NULL) AS count_unsent'; // ページ送りの取得 $offset = SEARCH_PMAX * ($search_pageno - 1); $objSelect->setLimitOffset(SEARCH_PMAX, $offset); - $arrResult = $objSelect->select($col, 'dtb_send_history', " del_flg = 0"); + $arrResult = $objSelect->select($col, 'dtb_send_history', ' del_flg = 0'); $objNavi = new SC_PageNavi_Ex($search_pageno, @@ -139,5 +139,5 @@ $objQuery->update('dtb_send_history', array('del_flg' =>1), - "send_id = ?", + 'send_id = ?', array($send_id)); } Index: branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php =================================================================== --- branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php (revision 21514) @@ -52,5 +52,5 @@ function init() { parent::init(); - $this->tpl_title = "現在のカゴの中"; + $this->tpl_title = '現在のカゴの中'; $masterData = new SC_DB_MasterData_Ex(); $this->arrProductType = $masterData->getMasterData('mtb_product_type'); @@ -86,5 +86,5 @@ // 商品購入中にカート内容が変更された。 if ($objCartSess->getCancelPurchase($key)) { - $this->tpl_message = "商品購入中にカート内容が変更されましたので、お手数ですが購入手続きをやり直して下さい。"; + $this->tpl_message = '商品購入中にカート内容が変更されましたので、お手数ですが購入手続きをやり直して下さい。'; } } @@ -190,10 +190,10 @@ function lfInitParam($arrRequest) { $objFormParam = new SC_FormParam_Ex(); - $objFormParam->addParam("カートキー", 'cartKey', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("カートナンバー", 'cart_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('カートキー', 'cartKey', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('カートナンバー', 'cart_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); // PC版での値引き継ぎ用 - $objFormParam->addParam("カテゴリID", 'category_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); // スマートフォン版での数量変更用 - $objFormParam->addParam("数量", 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); // 値の取得 $objFormParam->setParam($arrRequest); @@ -210,5 +210,5 @@ function lfUpdateOrderTempid($pre_uniqid,$uniqid) { $sqlval['order_temp_id'] = $uniqid; - $where = "order_temp_id = ?"; + $where = 'order_temp_id = ?'; $objQuery =& SC_Query_Ex::getSingletonInstance(); $res = $objQuery->update('dtb_order_temp', $sqlval, $where, array($pre_uniqid)); @@ -225,10 +225,10 @@ */ function lfGetCartPrevUrl(&$session,$referer) { - if (!preg_match("/cart/", $referer)) { + if (!preg_match('/cart/', $referer)) { if (!empty($session['cart_referer_url'])) { $session['cart_prev_url'] = $session['cart_referer_url']; unset($session['cart_referer_url']); } else { - if (preg_match("/entry/", $referer)) { + if (preg_match('/entry/', $referer)) { $session['cart_prev_url'] = HTTPS_URL . 'entry/kiyaku.php'; } else { @@ -256,5 +256,5 @@ $uniqid = $objSiteSess->getUniqId(); // エラーリトライなどで既にuniqidが存在する場合は、設定を引き継ぐ - if ($pre_uniqid != "") { + if ($pre_uniqid != '') { $this->lfUpdateOrderTempid($pre_uniqid,$uniqid); } Index: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php =================================================================== --- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php (revision 21479) +++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php (revision 21514) @@ -71,18 +71,18 @@ switch ($this->type) { case LOGIN_ERROR: - $this->tpl_error="ＩＤまたはパスワードが正しくありません。
もう一度ご確認のうえ、再度入力してください。"; + $this->tpl_error='ＩＤまたはパスワードが正しくありません。
もう一度ご確認のうえ、再度入力してください。'; break; case ACCESS_ERROR: - $this->tpl_error="ログイン認証の有効期限切れの可能性があります。
もう一度ご確認のうえ、再度ログインしてください。"; + $this->tpl_error='ログイン認証の有効期限切れの可能性があります。
もう一度ご確認のうえ、再度ログインしてください。'; break; case AUTH_ERROR: - $this->tpl_error="このページにはアクセスできません"; + $this->tpl_error='このページにはアクセスできません'; SC_Response_Ex::sendHttpStatus(403); break; case INVALID_MOVE_ERRORR: - $this->tpl_error="不正なページ移動です。
もう一度ご確認のうえ、再度入力してください。"; + $this->tpl_error='不正なページ移動です。
もう一度ご確認のうえ、再度入力してください。'; break; default: - $this->tpl_error="エラーが発生しました。
もう一度ご確認のうえ、再度ログインしてください。"; + $this->tpl_error='エラーが発生しました。
もう一度ご確認のうえ、再度ログインしてください。'; break; } Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php (revision 21514) @@ -73,5 +73,5 @@ */ function action() { - $this->tpl_error = "システムエラーが発生しました。
大変お手数ですが、サイト管理者までご連絡ください。"; + $this->tpl_error = 'システムエラーが発生しました。
大変お手数ですが、サイト管理者までご連絡ください。'; if (DEBUG_MODE) { @@ -184,7 +184,7 @@ $errmsg .= SC_Utils_Ex::sfGetUrl() . "\n"; $errmsg .= "\n"; - $errmsg .= "SERVER_ADDR: " . $_SERVER['SERVER_ADDR'] . "\n"; - $errmsg .= "REMOTE_ADDR: " . $_SERVER['REMOTE_ADDR'] . "\n"; - $errmsg .= "USER_AGENT: " . $_SERVER['HTTP_USER_AGENT'] . "\n"; + $errmsg .= 'SERVER_ADDR: ' . $_SERVER['SERVER_ADDR'] . "\n"; + $errmsg .= 'REMOTE_ADDR: ' . $_SERVER['REMOTE_ADDR'] . "\n"; + $errmsg .= 'USER_AGENT: ' . $_SERVER['HTTP_USER_AGENT'] . "\n"; return $errmsg; Index: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php =================================================================== --- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php (revision 21479) +++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php (revision 21514) @@ -46,5 +46,5 @@ /** エラーメッセージ */ - var $err_msg = ""; + var $err_msg = ''; /** モバイルサイトの場合 true */ @@ -87,43 +87,43 @@ switch ($this->type) { case PRODUCT_NOT_FOUND: - $this->tpl_error="ご指定のページはございません。"; + $this->tpl_error='ご指定のページはございません。'; SC_Response_Ex::sendHttpStatus(404); break; case PAGE_ERROR: - $this->tpl_error="不正なページ移動です。"; + $this->tpl_error='不正なページ移動です。'; break; case CART_EMPTY: - $this->tpl_error="カートに商品ががありません。"; + $this->tpl_error='カートに商品ががありません。'; break; case CART_ADD_ERROR: - $this->tpl_error="購入処理中は、カートに商品を追加することはできません。"; + $this->tpl_error='購入処理中は、カートに商品を追加することはできません。'; break; case CANCEL_PURCHASE: - $this->tpl_error="この手続きは無効となりました。以下の要因が考えられます。
・セッション情報の有効期限が切れてる場合
・購入手続き中に新しい購入手続きを実行した場合
・すでに購入手続きを完了している場合"; + $this->tpl_error='この手続きは無効となりました。以下の要因が考えられます。
・セッション情報の有効期限が切れてる場合
・購入手続き中に新しい購入手続きを実行した場合
・すでに購入手続きを完了している場合'; break; case CATEGORY_NOT_FOUND: - $this->tpl_error="ご指定のカテゴリは存在しません。"; + $this->tpl_error='ご指定のカテゴリは存在しません。'; SC_Response_Ex::sendHttpStatus(404); break; case SITE_LOGIN_ERROR: - $this->tpl_error="メールアドレスもしくはパスワードが正しくありません。"; + $this->tpl_error='メールアドレスもしくはパスワードが正しくありません。'; break; case TEMP_LOGIN_ERROR: - $this->tpl_error="メールアドレスもしくはパスワードが正しくありません。
本登録がお済みでない場合は、仮登録メールに記載されている
URLより本登録を行ってください。"; + $this->tpl_error='メールアドレスもしくはパスワードが正しくありません。
本登録がお済みでない場合は、仮登録メールに記載されている
URLより本登録を行ってください。'; break; case CUSTOMER_ERROR: - $this->tpl_error="不正なアクセスです。"; + $this->tpl_error='不正なアクセスです。'; break; case SOLD_OUT: - $this->tpl_error="申し訳ございませんが、ご購入の直前で売り切れた商品があります。この手続きは無効となりました。"; + $this->tpl_error='申し訳ございませんが、ご購入の直前で売り切れた商品があります。この手続きは無効となりました。'; break; case CART_NOT_FOUND: - $this->tpl_error="申し訳ございませんが、カート内の商品情報の取得に失敗しました。この手続きは無効となりました。"; + $this->tpl_error='申し訳ございませんが、カート内の商品情報の取得に失敗しました。この手続きは無効となりました。'; break; case LACK_POINT: - $this->tpl_error="申し訳ございませんが、ポイントが不足しております。この手続きは無効となりました。"; + $this->tpl_error='申し訳ございませんが、ポイントが不足しております。この手続きは無効となりました。'; break; case FAVORITE_ERROR: - $this->tpl_error="既にお気に入りに追加されている商品です。"; + $this->tpl_error='既にお気に入りに追加されている商品です。'; break; case EXTRACT_ERROR: @@ -131,11 +131,11 @@ break; case FTP_DOWNLOAD_ERROR: - $this->tpl_error="ファイルのFTPダウンロードに失敗しました。"; + $this->tpl_error='ファイルのFTPダウンロードに失敗しました。'; break; case FTP_LOGIN_ERROR: - $this->tpl_error="FTPログインに失敗しました。"; + $this->tpl_error='FTPログインに失敗しました。'; break; case FTP_CONNECT_ERROR: - $this->tpl_error="FTPログインに失敗しました。"; + $this->tpl_error='FTPログインに失敗しました。'; break; case CREATE_DB_ERROR: @@ -146,5 +146,5 @@ break; case FILE_NOT_FOUND: - $this->tpl_error="指定のパスに、設定ファイルが存在しません。"; + $this->tpl_error='指定のパスに、設定ファイルが存在しません。'; break; case WRITE_FILE_ERROR: @@ -152,5 +152,5 @@ break; case DOWNFILE_NOT_FOUND: - $this->tpl_error="ダウンロードファイルが存在しません。
申し訳ございませんが、店舗までお問合わせ下さい。"; + $this->tpl_error='ダウンロードファイルが存在しません。
申し訳ございませんが、店舗までお問合わせ下さい。'; break; case FREE_ERROR_MSG: @@ -158,5 +158,5 @@ break; default: - $this->tpl_error="エラーが発生しました。"; + $this->tpl_error='エラーが発生しました。'; break; } Index: branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php =================================================================== --- branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php (revision 21514) @@ -150,19 +150,19 @@ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("お名前(姓)", 'name01', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(名)", 'name02', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(フリガナ・姓)", 'kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK')); - $objFormParam->addParam("お名前(フリガナ・名)", 'kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK')); - $objFormParam->addParam("郵便番号1", 'zip01', ZIP01_LEN, 'n',array('SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("郵便番号2", 'zip02', ZIP02_LEN, 'n',array('SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); - $objFormParam->addParam("都道府県", 'pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("住所1", 'addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); - $objFormParam->addParam("住所2", 'addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お問い合わせ内容", 'contents', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(フリガナ・姓)', 'kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK')); + $objFormParam->addParam('お名前(フリガナ・名)', 'kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK', 'KANA_CHECK')); + $objFormParam->addParam('郵便番号1', 'zip01', ZIP01_LEN, 'n',array('SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('郵便番号2', 'zip02', ZIP02_LEN, 'n',array('SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK')); + $objFormParam->addParam('都道府県', 'pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('住所1', 'addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); + $objFormParam->addParam('住所2', 'addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お問い合わせ内容', 'contents', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('メールアドレス', 'email', null, 'KVa',array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); $objFormParam->addParam('メールアドレス(確認)', 'email02', null, 'KVa',array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); - $objFormParam->addParam("お電話番号1", 'tel01', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お電話番号2", 'tel02', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お電話番号3", 'tel03', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お電話番号1', 'tel01', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お電話番号2', 'tel02', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お電話番号3', 'tel03', TEL_ITEM_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); } Index: branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php =================================================================== --- branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php (revision 21514) @@ -71,5 +71,5 @@ //-- 入力チェック $this->arrErr = $this->lfErrorCheck($_GET); - if ($this->arrErr) SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", true, $this->arrErr['id']); + if ($this->arrErr) SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', true, $this->arrErr['id']); $registSecretKey = $this->lfRegistData($_GET); //本会員登録（フラグ変更） @@ -80,5 +80,5 @@ //--　それ以外のアクセスは無効とする default: - SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", true, "無効なアクセスです。"); + SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', true, '無効なアクセスです。'); break; } @@ -108,5 +108,5 @@ $objQuery->begin(); - $objQuery->update('dtb_customer', $arrRegist, "secret_key = ? AND status = 1", array($array['id'])); + $objQuery->update('dtb_customer', $arrRegist, 'secret_key = ? AND status = 1', array($array['id'])); $objQuery->commit(); @@ -127,9 +127,9 @@ if (!is_numeric(SC_Helper_Customer_Ex::sfGetCustomerId($array['id'], true))) { - $objErr->arrErr['id'] = "※ 既に会員登録が完了しているか、無効なURLです。
"; + $objErr->arrErr['id'] = '※ 既に会員登録が完了しているか、無効なURLです。
'; } } else { - $objErr->arrErr['id'] = "無効なURLです。メールに記載されている本会員登録用URLを再度ご確認ください。"; + $objErr->arrErr['id'] = '無効なURLです。メールに記載されている本会員登録用URLを再度ご確認ください。'; } return $objErr->arrErr; @@ -150,5 +150,5 @@ //-- 会員データを取得 - $arrCustomer = $objQuery->select("*", 'dtb_customer', "secret_key = ?", array($registSecretKey)); + $arrCustomer = $objQuery->select('*', 'dtb_customer', "secret_key = ?", array($registSecretKey)); $data = $arrCustomer[0]; $objCustomer->setLogin($data['email']); @@ -159,5 +159,5 @@ $objMailText->assign('name01', $data['name01']); $objMailText->assign('name02', $data['name02']); - $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl"); + $toCustomerMail = $objMailText->fetch('mail_templates/customer_regist_mail.tpl'); $subject = $objHelperMail->sfMakesubject('会員登録が完了しました。'); $objMail = new SC_SendMail(); Index: branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php =================================================================== --- branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php (revision 21514) @@ -70,5 +70,5 @@ $this->objSiteInfo->data['pref'] = isset($this->arrPref[$this->objSiteInfo->data['pref']]) - ? $this->arrPref[$this->objSiteInfo->data['pref']] : ""; + ? $this->arrPref[$this->objSiteInfo->data['pref']] : ''; } Index: branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php =================================================================== --- branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 21514) @@ -58,5 +58,5 @@ function init() { parent::init(); - $this->tpl_title = "パスワードを忘れた方"; + $this->tpl_title = 'パスワードを忘れた方'; $this->tpl_mainpage = 'forgot/index.tpl'; $this->tpl_mainno = ''; @@ -148,7 +148,7 @@ $errmsg = NULL; $objQuery =& SC_Query_Ex::getSingletonInstance(); - $where = "(email Like ? OR email_mobile Like ?) AND name01 Like ? AND name02 Like ? AND del_flg = 0"; + $where = '(email Like ? OR email_mobile Like ?) AND name01 Like ? AND name02 Like ? AND del_flg = 0'; $arrVal = array($arrForm['email'], $arrForm['email'], $arrForm['name01'], $arrForm['name02']); - $result = $objQuery->select("reminder, status", 'dtb_customer', $where, $arrVal); + $result = $objQuery->select('reminder, status', 'dtb_customer', $where, $arrVal); if (isset($result[0]['reminder']) and isset($arrReminder[$result[0]['reminder']])) { // 会員状態の確認 @@ -174,6 +174,6 @@ */ function lfInitMailCheckParam(&$objFormParam, $device_type) { - $objFormParam->addParam("お名前(姓)", 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お名前(名)", 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK')); if ($device_type === DEVICE_TYPE_MOBILE) { $objFormParam->addParam('メールアドレス', 'email', null, 'a', array('EXIST_CHECK', 'EMAIL_CHECK', 'NO_SPTAB' ,'EMAIL_CHAR_CHECK', 'MOBILE_EMAIL_CHECK')); @@ -194,9 +194,9 @@ $errmsg = ''; $objQuery =& SC_Query_Ex::getSingletonInstance(); - $cols = "customer_id, reminder, reminder_answer, salt"; + $cols = 'customer_id, reminder, reminder_answer, salt'; $table = 'dtb_customer'; - $where = "(email Like ? OR email_mobile Like ?)" - . " AND name01 Like ? AND name02 Like ?" - . " AND status = 2 AND del_flg = 0"; + $where = '(email Like ? OR email_mobile Like ?)' + . ' AND name01 Like ? AND name02 Like ?' + . ' AND status = 2 AND del_flg = 0'; $arrVal = array($arrForm['email'], $arrForm['email'], $arrForm['name01'], $arrForm['name02']); @@ -238,5 +238,5 @@ //不正なアクセス リマインダー値が前画面と異なる。 // 新リファクタリング基準ではここで遷移は不許可なのでエラー表示 - //SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true); + //SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, '', true); $errmsg = '秘密の質問が一致しませんでした。'; } @@ -255,6 +255,6 @@ $this->lfInitMailCheckParam($objFormParam, $device_type); // 秘密の質問チェックの追加 - $objFormParam->addParam("パスワード確認用の質問", 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK')); - $objFormParam->addParam("パスワード確認用の質問の答え", 'reminder_answer', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('パスワード確認用の質問', 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('パスワード確認用の質問の答え', 'reminder_answer', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); return; } @@ -285,5 +285,5 @@ $objMailText->assign('customer_name', $customer_name); $objMailText->assign('new_password', $new_password); - $toCustomerMail = $objMailText->fetch("mail_templates/forgot_mail.tpl"); + $toCustomerMail = $objMailText->fetch('mail_templates/forgot_mail.tpl'); $objHelperMail = new SC_Helper_Mail_Ex(); // メール送信オブジェクトによる送信処理 @@ -299,5 +299,5 @@ , $CONF['email04'] // errors_to ); - $objMail->setTo($email, $customer_name ." 様"); + $objMail->setTo($email, $customer_name . ' 様'); $objMail->sendMail(); return; Index: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php =================================================================== --- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php (revision 21514) @@ -44,5 +44,5 @@ function init() { parent::init(); - $this->tpl_title = "ご利用規約"; + $this->tpl_title = 'ご利用規約'; } @@ -96,5 +96,5 @@ */ function lfMakeKiyakuText($arrKiyaku, $max, $offset) { - $this->tpl_kiyaku_text = ""; + $this->tpl_kiyaku_text = ''; for ($i = 0; $i < $max; $i++) { if ($offset !== null && ($offset - 1) <> $i) continue; @@ -115,6 +115,6 @@ $objQuery = SC_Query_Ex::getSingletonInstance(); - $objQuery->setOrder("rank DESC"); - $arrKiyaku = $objQuery->select("kiyaku_title, kiyaku_text", 'dtb_kiyaku', "del_flg <> 1"); + $objQuery->setOrder('rank DESC'); + $arrKiyaku = $objQuery->select('kiyaku_title, kiyaku_text', 'dtb_kiyaku', "del_flg <> 1"); return $arrKiyaku; Index: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php =================================================================== --- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php (revision 21514) @@ -121,5 +121,5 @@ // FIXME: lfInitParam() で設定すれば良いように感じる - $objErr->doFunc(array("メールアドレス", 'email_mobile'), array('CHECK_REGIST_CUSTOMER_EMAIL')); + $objErr->doFunc(array('メールアドレス', 'email_mobile'), array('CHECK_REGIST_CUSTOMER_EMAIL')); return $objErr->arrErr; Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php (revision 21514) @@ -83,5 +83,5 @@ // PC時は規約ページからの遷移でなければエラー画面へ遷移する if ($this->lfCheckReferer($arrForm, $_SERVER['HTTP_REFERER']) === false) { - SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true); + SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, '', true); } @@ -219,8 +219,8 @@ if (CUSTOMER_CONFIRM_MAIL == true) { $subject = $objHelperMail->sfMakeSubject('会員登録のご確認'); - $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl"); + $toCustomerMail = $objMailText->fetch('mail_templates/customer_mail.tpl'); } else { $subject = $objHelperMail->sfMakeSubject('会員登録のご完了'); - $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl"); + $toCustomerMail = $objMailText->fetch('mail_templates/customer_regist_mail.tpl'); } Index: branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (revision 21514) @@ -246,5 +246,5 @@ case SITE_LOGIN_ERROR: default: - $msg = "メールアドレスもしくはパスワードが正しくありません。"; + $msg = 'メールアドレスもしくはパスワードが正しくありません。'; } return SC_Utils_Ex::jsonEncode(array('login_error' => $msg)); Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php (revision 21514) @@ -68,5 +68,5 @@ $this->setTemplate($this->tpl_mainpage); - $debug_message = "block：" . $this->tpl_mainpage . "\n"; + $debug_message = 'block：' . $this->tpl_mainpage . "\n"; GC_Utils_Ex::gfDebugLog($debug_message); } Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (revision 21442) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (revision 21514) @@ -163,5 +163,5 @@ foreach ($arrCategoryList as $key => $val) { $truncate_str = SC_Utils_Ex::sfCutString($val, SEARCH_CATEGORY_LEN, false); - $arrCategoryList[$key] = preg_replace('/　/u', "  ", $truncate_str); + $arrCategoryList[$key] = preg_replace('/　/u', '  ', $truncate_str); } } Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (revision 21514) @@ -116,7 +116,7 @@ */ function lfInitNewsParam(&$objFormParam) { - $objFormParam->addParam("現在ページ", 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("表示件数", 'disp_number', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam("新着ID", 'news_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('現在ページ', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('表示件数', 'disp_number', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('新着ID', 'news_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), "", false); } @@ -127,5 +127,5 @@ */ function lfGetNews(&$objQuery) { - $objQuery->setOrder("rank DESC "); + $objQuery->setOrder('rank DESC '); $arrNewsList = $objQuery->select('* , cast(news_date as date) as news_date_disp', 'dtb_news' ,'del_flg = 0'); @@ -186,5 +186,5 @@ $arrData = $objFormParam->getHashArray(); $newsId = $arrData['news_id']; - $arrNewsList = $objQuery->select(" * , cast(news_date as date) as news_date_disp "," dtb_news "," del_flg = '0' AND news_id = ? ", array($newsId)); + $arrNewsList = $objQuery->select(' * , cast(news_date as date) as news_date_disp ',' dtb_news '," del_flg = '0' AND news_id = ? ", array($newsId)); $json = SC_Utils_Ex::jsonEncode($arrNewsList); //JSON形式 Index: branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php =================================================================== --- branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php (revision 21514) @@ -91,11 +91,11 @@ //キャッシュしない(念のため) - header("Paragrama: no-cache"); + header('Paragrama: no-cache'); //XMLテキスト - header("Content-type: application/xml; charset=utf-8"); + header('Content-type: application/xml; charset=utf-8'); // 必ず UTF-8 として出力 - mb_http_output("UTF-8"); + mb_http_output('UTF-8'); ob_start('mb_output_handler'); @@ -157,6 +157,6 @@ * TODO Smarty に移行すべき? */ - function createSitemap($loc, $lastmod = "", $changefreq = "", - $priority = "") { + function createSitemap($loc, $lastmod = '', $changefreq = '', + $priority = '') { printf("\t\n"); printf("\t\t%s\n", htmlentities($loc, ENT_QUOTES, "UTF-8")); @@ -214,5 +214,5 @@ // XXX: 商品登録の無いカテゴリは除外する方が良い気もする $objQuery = SC_Query_Ex::getSingletonInstance(); - $sql = "SELECT category_id FROM dtb_category WHERE del_flg = 0"; + $sql = 'SELECT category_id FROM dtb_category WHERE del_flg = 0'; $result = $objQuery->getAll($sql); @@ -234,5 +234,5 @@ function getAllDetail() { $objQuery = SC_Query_Ex::getSingletonInstance(); - $sql = "SELECT product_id, update_date FROM dtb_products WHERE del_flg = 0 AND status = 1"; + $sql = 'SELECT product_id, update_date FROM dtb_products WHERE del_flg = 0 AND status = 1'; $result = $objQuery->getAll($sql); @@ -257,30 +257,30 @@ function getPageData($where = '', $arrVal = '') { $objQuery = SC_Query_Ex::getSingletonInstance(); // DB操作オブジェクト - $sql = ""; // データ取得SQL生成用 + $sql = ''; // データ取得SQL生成用 $arrRet = array(); // データ取得用 // SQL生成(url と update_date 以外は不要？) - $sql .= " SELECT"; - $sql .= " page_id"; // ページID - $sql .= " ,page_name"; // 名称 - $sql .= " ,url"; // URL - $sql .= " ,filename"; // ファイル名称 - $sql .= " ,header_chk "; // ヘッダー使用FLG - $sql .= " ,footer_chk "; // フッター使用FLG - $sql .= " ,author"; // authorタグ - $sql .= " ,description"; // descriptionタグ - $sql .= " ,keyword"; // keywordタグ - $sql .= " ,update_url"; // 更新URL - $sql .= " ,create_date"; // データ作成日 - $sql .= " ,update_date"; // データ更新日 - $sql .= " FROM "; - $sql .= " dtb_pagelayout"; + $sql .= ' SELECT'; + $sql .= ' page_id'; // ページID + $sql .= ' ,page_name'; // 名称 + $sql .= ' ,url'; // URL + $sql .= ' ,filename'; // ファイル名称 + $sql .= ' ,header_chk '; // ヘッダー使用FLG + $sql .= ' ,footer_chk '; // フッター使用FLG + $sql .= ' ,author'; // authorタグ + $sql .= ' ,description'; // descriptionタグ + $sql .= ' ,keyword'; // keywordタグ + $sql .= ' ,update_url'; // 更新URL + $sql .= ' ,create_date'; // データ作成日 + $sql .= ' ,update_date'; // データ更新日 + $sql .= ' FROM '; + $sql .= ' dtb_pagelayout'; // where句の指定があれば追加 if ($where != '') { - $sql .= " WHERE " . $where; - } - - $sql .= " ORDER BY page_id"; + $sql .= ' WHERE ' . $where; + } + + $sql .= ' ORDER BY page_id'; $arrPageList = $objQuery->getAll($sql, $arrVal); @@ -308,8 +308,8 @@ $arr = array(); // 正規表現で文字列を抽出 - preg_match("/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/", + preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $date, $arr); // :TODO: time zone も取得するべき... - return sprintf("%04d-%02d-%02dT%02d:%02d:%02d+09:00", + return sprintf('%04d-%02d-%02dT%02d:%02d:%02d+09:00', $arr[1], $arr[2], $arr[3], $arr[4], $arr[5], $arr[6]); } Index: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php =================================================================== --- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 21514) @@ -155,5 +155,5 @@ function lfInitParam($arrRequest) { $objFormParam = new SC_FormParam_Ex(); - $objFormParam->addParam("カテゴリID", 'category_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK')); // 値の取得 $objFormParam->setParam($arrRequest); Index: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php =================================================================== --- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php (revision 21514) @@ -147,5 +147,5 @@ $strnavi = $this->objNavi->strnavi; // 表示文字列 - $this->tpl_strnavi = empty($strnavi) ? " " : $strnavi; + $this->tpl_strnavi = empty($strnavi) ? ' ' : $strnavi; // 規格1クラス名 @@ -271,5 +271,5 @@ default: if (strlen($searchCondition['where_category']) >= 1) { - $dtb_product_categories = "(SELECT * FROM dtb_product_categories WHERE ".$searchCondition['where_category'].")"; + $dtb_product_categories = '(SELECT * FROM dtb_product_categories WHERE '.$searchCondition['where_category'].")"; $arrval_order = $searchCondition['arrvalCategory']; } else { @@ -317,12 +317,12 @@ // 複数項目チェック if ($tpl_classcat_find1[$product_id]) { - $objErr->doFunc(array("規格1", 'classcategory_id1', INT_LEN), array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('規格1', 'classcategory_id1', INT_LEN), array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); } if ($tpl_classcat_find2[$product_id]) { - $objErr->doFunc(array("規格2", 'classcategory_id2', INT_LEN), array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - } - - $objErr->doFunc(array("商品規格ID", 'product_class_id', INT_LEN), array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objErr->doFunc(array("数量", 'quantity', INT_LEN), array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('規格2', 'classcategory_id2', INT_LEN), array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + } + + $objErr->doFunc(array('商品規格ID', 'product_class_id', INT_LEN), array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objErr->doFunc(array('数量', 'quantity', INT_LEN), array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); return $objErr->arrErr; @@ -348,7 +348,7 @@ function lfGetPageTitle($mode, $category_id = 0) { if ($mode == 'search') { - return "検索結果"; + return '検索結果'; } elseif ($category_id == 0) { - return "全商品"; + return '全商品'; } else { $arrCat = SC_Helper_DB_Ex::sfGetCat($category_id); @@ -402,7 +402,7 @@ function lfGetSearchCondition($arrSearchData) { $searchCondition = array( - 'where' => "", + 'where' => '', 'arrval' => array(), - 'where_category' => "", + 'where_category' => '', 'arrvalCategory' => array() ); @@ -414,5 +414,5 @@ // ▼対象商品IDの抽出 // 商品検索条件の作成（未削除、表示） - $searchCondition['where'] = "alldtl.del_flg = 0 AND alldtl.status = 1 "; + $searchCondition['where'] = 'alldtl.del_flg = 0 AND alldtl.status = 1 '; if (strlen($searchCondition['where_category']) >= 1) { @@ -423,13 +423,13 @@ // 商品名をwhere文に $name = $arrSearchData['name']; - $name = str_replace(",", "", $name); + $name = str_replace(',', '', $name); // 全角スペースを半角スペースに変換 $name = str_replace('　', ' ', $name); // スペースでキーワードを分割 - $names = preg_split("/ +/", $name); + $names = preg_split('/ +/', $name); // 分割したキーワードを一つずつwhere文に追加 foreach ($names as $val) { if (strlen($val) > 0) { - $searchCondition['where'] .= " AND ( alldtl.name ILIKE ? OR alldtl.comment3 ILIKE ?) "; + $searchCondition['where'] .= ' AND ( alldtl.name ILIKE ? OR alldtl.comment3 ILIKE ?) '; $searchCondition['arrval'][] = "%$val%"; $searchCondition['arrval'][] = "%$val%"; @@ -439,5 +439,5 @@ // メーカーらのWHERE文字列取得 if ($arrSearchData['maker_id']) { - $searchCondition['where'] .= " AND alldtl.maker_id = ? "; + $searchCondition['where'] .= ' AND alldtl.maker_id = ? '; $searchCondition['arrval'][] = $arrSearchData['maker_id']; } @@ -460,5 +460,5 @@ */ function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id) { - $js_fnOnLoad = ""; + $js_fnOnLoad = ''; foreach (array_keys($arrProducts) as $key) { if ($arrProducts[$key]['product_id'] == $product_id) { Index: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php =================================================================== --- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php (revision 21481) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php (revision 21514) @@ -143,12 +143,12 @@ */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("レビューID", 'review_id', INT_LEN, 'aKV'); - $objFormParam->addParam("商品ID", 'product_id', INT_LEN, 'n', array('NUM_CHECK','EXIST_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("投稿者名", 'reviewer_name', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("投稿者URL", 'reviewer_url', MTEXT_LEN, 'a', array('NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'URL_CHECK')); - $objFormParam->addParam("性別", 'sex', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("おすすめレベル", 'recommend_level', INT_LEN, 'n', array('EXIST_CHECK', 'SELECT_CHECK')); - $objFormParam->addParam("タイトル", 'title', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("コメント", 'comment', LTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('レビューID', 'review_id', INT_LEN, 'aKV'); + $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK','EXIST_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('投稿者名', 'reviewer_name', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('投稿者URL', 'reviewer_url', MTEXT_LEN, 'a', array('NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'URL_CHECK')); + $objFormParam->addParam('性別', 'sex', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('おすすめレベル', 'recommend_level', INT_LEN, 'n', array('EXIST_CHECK', 'SELECT_CHECK')); + $objFormParam->addParam('タイトル', 'title', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('コメント', 'comment', LTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); } @@ -166,7 +166,7 @@ // 重複メッセージの判定 $objQuery =& SC_Query_Ex::getSingletonInstance(); - $exists = $objQuery->exists('dtb_review',"product_id = ? AND title = ? ", array($arrForm['product_id'], $arrForm['title'])); + $exists = $objQuery->exists('dtb_review','product_id = ? AND title = ? ', array($arrForm['product_id'], $arrForm['title'])); if ($exists) { - $arrErr['title'] .= "重複したタイトルは登録できません。"; + $arrErr['title'] .= '重複したタイトルは登録できません。'; } Index: 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 (revision 21481) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 21514) @@ -25,5 +25,5 @@ require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php'; -if (file_exists(MODULE_REALDIR . "mdl_gmopg/inc/function.php")) { +if (file_exists(MODULE_REALDIR . 'mdl_gmopg/inc/function.php')) { require_once MODULE_REALDIR . 'mdl_gmopg/inc/function.php'; } @@ -213,10 +213,10 @@ if ($this->tpl_classcat_find1) { // templateの変更 - $this->tpl_mainpage = "products/select_find1.tpl"; + $this->tpl_mainpage = 'products/select_find1.tpl'; break; } // 数量の入力を行う - $this->tpl_mainpage = "products/select_item.tpl"; + $this->tpl_mainpage = 'products/select_item.tpl'; break; @@ -227,5 +227,5 @@ if ($this->tpl_classcat_find1 and $this->arrErr['classcategory_id1']) { // templateの変更 - $this->tpl_mainpage = "products/select_find1.tpl"; + $this->tpl_mainpage = 'products/select_find1.tpl'; break; } @@ -235,5 +235,5 @@ $this->arrErr = array(); - $this->tpl_mainpage = "products/select_find2.tpl"; + $this->tpl_mainpage = 'products/select_find2.tpl'; break; } @@ -245,5 +245,5 @@ if ($this->tpl_classcat_find2 and $this->arrErr['classcategory_id2']) { // templateの変更 - $this->tpl_mainpage = "products/select_find2.tpl"; + $this->tpl_mainpage = 'products/select_find2.tpl'; break; } @@ -262,5 +262,5 @@ // 数量の入力を行う - $this->tpl_mainpage = "products/select_item.tpl"; + $this->tpl_mainpage = 'products/select_item.tpl'; break; @@ -269,10 +269,10 @@ if (count($this->arrErr)) { // 数量の入力を行う - $this->tpl_mainpage = "products/select_item.tpl"; + $this->tpl_mainpage = 'products/select_item.tpl'; } break; default: - $this->tpl_mainpage = "products/detail.tpl"; + $this->tpl_mainpage = 'products/detail.tpl'; break; } @@ -341,5 +341,5 @@ /* ファイル情報の初期化 */ function lfInitFile($objUpFile) { - $objUpFile->addFile("詳細-メイン画像", 'main_image', array('jpg'), IMAGE_SIZE); + $objUpFile->addFile('詳細-メイン画像', 'main_image', array('jpg'), IMAGE_SIZE); for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) { $objUpFile->addFile("詳細-サブ画像$cnt", "sub_image$cnt", array('jpg'), IMAGE_SIZE); @@ -377,5 +377,5 @@ $count = count($arrProductsClass); - $classcat_id1 = ""; + $classcat_id1 = ''; $arrSele1 = array(); @@ -421,11 +421,11 @@ /* パラメーター情報の初期化 */ function lfInitParam(&$objFormParam) { - $objFormParam->addParam("規格1", 'classcategory_id1', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("規格2", 'classcategory_id2', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("数量", 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("管理者ログイン", 'admin', INT_LEN, 'a', array('ALNUM_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam("商品ID", 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("お気に入り商品ID", 'favorite_product_id', INT_LEN, 'n', array('ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); - $objFormParam->addParam("商品規格ID", 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('規格1', 'classcategory_id1', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('規格2', 'classcategory_id2', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('管理者ログイン', 'admin', INT_LEN, 'a', array('ALNUM_CHECK','MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('お気に入り商品ID', 'favorite_product_id', INT_LEN, 'n', array('ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + $objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); // 値の取得 $objFormParam->setParam($_REQUEST); @@ -447,6 +447,6 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $objQuery->setOrder("rank DESC"); - $arrRecommendData = $objQuery->select("recommend_product_id, comment", 'dtb_recommend_products', "product_id = ?", array($product_id)); + $objQuery->setOrder('rank DESC'); + $arrRecommendData = $objQuery->select('recommend_product_id, comment', 'dtb_recommend_products', "product_id = ?", array($product_id)); $arrRecommendProductId = array(); @@ -476,5 +476,5 @@ $customer_id = $objCustomer->getValue('customer_id'); if (SC_Helper_DB_Ex::sfDataExists('dtb_customer_favorite_products', 'customer_id = ? AND product_id = ?', array($customer_id, $favorite_product_id))) { - $objErr->arrErr['add_favorite'.$favorite_product_id] = "※ この商品は既にお気に入りに追加されています。
"; + $objErr->arrErr['add_favorite'.$favorite_product_id] = '※ この商品は既にお気に入りに追加されています。
'; } break; @@ -487,8 +487,8 @@ // 複数項目チェック if ($tpl_classcat_find1) { - $objErr->doFunc(array("規格1", 'classcategory_id1'), array('EXIST_CHECK')); + $objErr->doFunc(array('規格1', 'classcategory_id1'), array('EXIST_CHECK')); } if ($tpl_classcat_find2) { - $objErr->doFunc(array("規格2", 'classcategory_id2'), array('EXIST_CHECK')); + $objErr->doFunc(array('規格2', 'classcategory_id2'), array('EXIST_CHECK')); } break; @@ -502,7 +502,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); //商品ごとのレビュー情報を取得する - $col = "create_date, reviewer_url, reviewer_name, recommend_level, title, comment"; + $col = 'create_date, reviewer_url, reviewer_name, recommend_level, title, comment'; $from = 'dtb_review'; - $where = "del_flg = 0 AND status = 1 AND product_id = ? ORDER BY create_date DESC LIMIT " . REVIEW_REGIST_MAX; + $where = 'del_flg = 0 AND status = 1 AND product_id = ? ORDER BY create_date DESC LIMIT ' . REVIEW_REGIST_MAX; $arrval[] = $id; $arrReview = $objQuery->select($col, $from, $where, $arrval); @@ -541,5 +541,5 @@ } else { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $exists = $objQuery->exists('dtb_customer_favorite_products', "customer_id = ? AND product_id = ?", array($customer_id, $favorite_product_id)); + $exists = $objQuery->exists('dtb_customer_favorite_products', 'customer_id = ? AND product_id = ?', array($customer_id, $favorite_product_id)); if (!$exists) { Index: branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php =================================================================== --- branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php (revision 21490) +++ branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php (revision 21514) @@ -62,5 +62,5 @@ function drawYTitle() { // Y軸にタイトルを入れる - if ($this->YTitle != "") { + if ($this->YTitle != '') { $text_width = $this->getTextWidth($this->YTitle, FONT_SIZE); $x_pos = $this->left - ($text_width / 2); @@ -73,5 +73,5 @@ function drawXTitle() { // Y軸にタイトルを入れる - if ($this->XTitle != "") { + if ($this->XTitle != '') { $text_width = $this->getTextWidth($this->XTitle, FONT_SIZE); $x_pos = $this->left + $this->area_width - ($text_width / 2) + 30; Index: branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php =================================================================== --- branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php (revision 21490) +++ branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php (revision 21514) @@ -23,5 +23,5 @@ /** TTFフォントファイル */ -define('FONT_REALFILE', DATA_REALDIR . "fonts/wlmaru20044.ttf"); +define('FONT_REALFILE', DATA_REALDIR . 'fonts/wlmaru20044.ttf'); /** フォントサイズ */ @@ -240,10 +240,10 @@ // 画像を出力する - function outputGraph($header = true, $filename = "") { + function outputGraph($header = true, $filename = '') { if ($header) { header('Content-type: image/png'); } - if ($filename != "") { + if ($filename != '') { imagepng($this->image, $filename); } else { @@ -290,5 +290,5 @@ * */ - $text = mb_convert_encoding($text, "EUC-JP", CHAR_CODE); + $text = mb_convert_encoding($text, 'EUC-JP', CHAR_CODE); //$text = mb_convert_encoding($text, CHAR_CODE); if ($color != NULL) { @@ -310,5 +310,5 @@ // ログを出力する function debugPrint($text) { - $text = mb_convert_encoding($text, "UTF-8", CHAR_CODE); + $text = mb_convert_encoding($text, 'UTF-8', CHAR_CODE); if (!isset($this->text_top)) { $this->text_top = FONT_SIZE + LINE_PAD; @@ -320,5 +320,5 @@ // カラーラベルを描画 - function drawLegend($legend_max = "", $clabelbg = true) { + function drawLegend($legend_max = '', $clabelbg = true) { // 凡例が登録されていなければ中止 if (count($this->arrLegend) <= 0) { @@ -326,5 +326,5 @@ } - if ($legend_max != "") { + if ($legend_max != '') { $label_max = $legend_max; } else { @@ -450,5 +450,5 @@ function lfImageText($dst_image, $text, $font_size, $left, $top, $font, $arrRGB) { $color = ImageColorAllocate($dst_image, $arrRGB[0], $arrRGB[1], $arrRGB[2]); - $text = mb_convert_encoding($text, "UTF-8", CHAR_CODE); + $text = mb_convert_encoding($text, 'UTF-8', CHAR_CODE); // 表示角度 $angle = 0; Index: branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php =================================================================== --- branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php (revision 21490) +++ branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php (revision 21514) @@ -43,6 +43,6 @@ // データを360°値に変換する function getCircleData($array) { - $total = ""; - $new_total = ""; + $total = ''; + $new_total = ''; if (!is_array($array)) { return; @@ -64,5 +64,5 @@ $arrRet[] = $ret; // パーセント表示用 - $this->arrLabel[] = round($val * $p_rate) . " %"; + $this->arrLabel[] = round($val * $p_rate) . ' %'; $cnt++; } Index: branches/version-2_12-dev/data/class/SC_CustomerList.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CustomerList.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_CustomerList.php (revision 21514) @@ -37,7 +37,7 @@ $dbFactory = SC_DB_DBFactory_Ex::getInstance(); - if ($mode == "") { + if ($mode == '') { // 会員本登録会員で削除していない会員 - $this->setWhere("status = 2 AND del_flg = 0 "); + $this->setWhere('status = 2 AND del_flg = 0 '); // 登録日を示すカラム $regdate_col = 'dtb_customer.update_date'; @@ -45,5 +45,5 @@ if ($mode == 'customer') { - $this->setWhere(" del_flg = 0 "); + $this->setWhere(' del_flg = 0 '); // 登録日を示すカラム $regdate_col = 'dtb_customer.update_date'; @@ -53,5 +53,5 @@ if (!isset($this->arrSql['search_customer_id'])) $this->arrSql['search_customer_id'] = ""; if (strlen($this->arrSql['search_customer_id']) > 0) { - $this->setWhere("customer_id = ?"); + $this->setWhere('customer_id = ?'); $this->arrVal[] = $this->arrSql['search_customer_id']; } @@ -60,7 +60,7 @@ if (!isset($this->arrSql['search_name'])) $this->arrSql['search_name'] = ""; if (strlen($this->arrSql['search_name']) > 0) { - $this->setWhere("(" . $dbFactory->concatColumn(array('name01', 'name02')) . " LIKE ?)"); + $this->setWhere('(' . $dbFactory->concatColumn(array('name01', 'name02')) . " LIKE ?)"); $searchName = $this->addSearchStr($this->arrSql['search_name']); - $this->arrVal[] = mb_ereg_replace("[ 　]+","",$searchName); + $this->arrVal[] = mb_ereg_replace('[ 　]+','',$searchName); } @@ -68,7 +68,7 @@ if (!isset($this->arrSql['search_kana'])) $this->arrSql['search_kana'] = ""; if (strlen($this->arrSql['search_kana']) > 0) { - $this->setWhere("(" . $dbFactory->concatColumn(array('kana01', 'kana02')) . " LIKE ?)"); + $this->setWhere('(' . $dbFactory->concatColumn(array('kana01', 'kana02')) . " LIKE ?)"); $searchKana = $this->addSearchStr($this->arrSql['search_kana']); - $this->arrVal[] = mb_ereg_replace("[ 　]+","",$searchKana); + $this->arrVal[] = mb_ereg_replace('[ 　]+','',$searchKana); } @@ -76,5 +76,5 @@ if (!isset($this->arrSql['search_pref'])) $this->arrSql['search_pref'] = ""; if (strlen($this->arrSql['search_pref']) > 0) { - $this->setWhere("pref = ?"); + $this->setWhere('pref = ?'); $this->arrVal[] = $this->arrSql['search_pref']; } @@ -83,7 +83,7 @@ if (!isset($this->arrSql['search_tel'])) $this->arrSql['search_tel'] = ""; if (is_numeric($this->arrSql['search_tel'])) { - $this->setWhere("(" . $dbFactory->concatColumn(array('tel01', 'tel02', 'tel03')) . " LIKE ?)"); + $this->setWhere('(' . $dbFactory->concatColumn(array('tel01', 'tel02', 'tel03')) . " LIKE ?)"); $searchTel = $this->addSearchStr($this->arrSql['search_tel']); - $this->arrVal[] = ereg_replace("-", "", $searchTel); + $this->arrVal[] = ereg_replace('-', '', $searchTel); } @@ -100,5 +100,5 @@ if (!isset($this->arrSql['search_job'])) $this->arrSql['search_job'] = ""; if (is_array($this->arrSql['search_job'])) { - if (in_array("不明", $this->arrSql['search_job'])) { + if (in_array('不明', $this->arrSql['search_job'])) { $arrJobVal = $this->setItemTermWithNull($this->arrSql['search_job'] ,'job'); } else { @@ -116,20 +116,20 @@ if (strlen($this->arrSql['search_email']) > 0) { //カンマ区切りで複数の条件指定可能に - $this->arrSql['search_email'] = explode(",", $this->arrSql['search_email']); - $sql_where = ""; + $this->arrSql['search_email'] = explode(',', $this->arrSql['search_email']); + $sql_where = ''; foreach ($this->arrSql['search_email'] as $val) { $val = trim($val); //検索条件を含まない if ($this->arrSql['not_emailinc'] == '1') { - if ($sql_where == "") { - $sql_where .= "dtb_customer.email NOT ILIKE ? "; + if ($sql_where == '') { + $sql_where .= 'dtb_customer.email NOT ILIKE ? '; } else { - $sql_where .= "AND dtb_customer.email NOT ILIKE ? "; + $sql_where .= 'AND dtb_customer.email NOT ILIKE ? '; } } else { - if ($sql_where == "") { - $sql_where .= "dtb_customer.email ILIKE ? "; + if ($sql_where == '') { + $sql_where .= 'dtb_customer.email ILIKE ? '; } else { - $sql_where .= "OR dtb_customer.email ILIKE ? "; + $sql_where .= 'OR dtb_customer.email ILIKE ? '; } } @@ -145,20 +145,20 @@ if (strlen($this->arrSql['search_email_mobile']) > 0) { //カンマ区切りで複数の条件指定可能に - $this->arrSql['search_email_mobile'] = explode(",", $this->arrSql['search_email_mobile']); - $sql_where = ""; + $this->arrSql['search_email_mobile'] = explode(',', $this->arrSql['search_email_mobile']); + $sql_where = ''; foreach ($this->arrSql['search_email_mobile'] as $val) { $val = trim($val); //検索条件を含まない if ($this->arrSql['not_email_mobileinc'] == '1') { - if ($sql_where == "") { - $sql_where .= "dtb_customer.email_mobile NOT ILIKE ? "; + if ($sql_where == '') { + $sql_where .= 'dtb_customer.email_mobile NOT ILIKE ? '; } else { - $sql_where .= "AND dtb_customer.email_mobile NOT ILIKE ? "; + $sql_where .= 'AND dtb_customer.email_mobile NOT ILIKE ? '; } } else { - if ($sql_where == "") { - $sql_where .= "dtb_customer.email_mobile ILIKE ? "; + if ($sql_where == '') { + $sql_where .= 'dtb_customer.email_mobile ILIKE ? '; } else { - $sql_where .= "OR dtb_customer.email_mobile ILIKE ? "; + $sql_where .= 'OR dtb_customer.email_mobile ILIKE ? '; } } @@ -174,9 +174,9 @@ if (isset($this->arrSql['search_htmlmail'])) { if (SC_Utils_Ex::sfIsInt($this->arrSql['search_htmlmail'])) { - $this->setWhere("mailmaga_flg = ?"); + $this->setWhere('mailmaga_flg = ?'); $this->arrVal[] = $this->arrSql['search_htmlmail']; } else { //　メルマガ購読拒否は省く - $this->setWhere("mailmaga_flg <> 3"); + $this->setWhere('mailmaga_flg <> 3'); } } @@ -248,5 +248,5 @@ if (!isset($this->arrSql['search_birth_month'])) $this->arrSql['search_birth_month'] = ""; if (is_numeric($this->arrSql['search_birth_month'])) { - $this->setWhere(" EXTRACT(month from birth) = ?"); + $this->setWhere(' EXTRACT(month from birth) = ?'); $this->arrVal[] = $this->arrSql['search_birth_month']; } @@ -289,5 +289,5 @@ if (!isset($this->arrSql['search_buy_product_code'])) $this->arrSql['search_buy_product_code'] = ""; if (strlen($this->arrSql['search_buy_product_code']) > 0) { - $this->setWhere("customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_code LIKE ?) AND del_flg = 0)"); + $this->setWhere('customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_code LIKE ?) AND del_flg = 0)'); $search_buyproduct_code = $this->addSearchStr($this->arrSql['search_buy_product_code']); $this->arrVal[] = $search_buyproduct_code; @@ -297,5 +297,5 @@ if (!isset($this->arrSql['search_buy_product_name'])) $this->arrSql['search_buy_product_name'] = ""; if (strlen($this->arrSql['search_buy_product_name']) > 0) { - $this->setWhere("customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_name LIKE ?) AND del_flg = 0)"); + $this->setWhere('customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_name LIKE ?) AND del_flg = 0)'); $search_buyproduct_name = $this->addSearchStr($this->arrSql['search_buy_product_name']); $this->arrVal[] = $search_buyproduct_name; @@ -309,6 +309,6 @@ // カテゴリで絞込みが可能の場合 - if ($tmp_where != "") { - $this->setWhere(" customer_id IN (SELECT distinct customer_id FROM dtb_order WHERE order_id IN (SELECT distinct order_id FROM dtb_order_detail WHERE product_id IN (SELECT product_id FROM dtb_product_categories WHERE ".$tmp_where.") AND del_flg = 0)) "); + if ($tmp_where != '') { + $this->setWhere(' customer_id IN (SELECT distinct customer_id FROM dtb_order WHERE order_id IN (SELECT distinct order_id FROM dtb_order_detail WHERE product_id IN (SELECT product_id FROM dtb_product_categories WHERE '.$tmp_where.') AND del_flg = 0)) '); $this->arrVal = array_merge((array)$this->arrVal, (array)$tmp_arrval); } @@ -324,10 +324,10 @@ } - $this->setOrder("customer_id DESC"); + $this->setOrder('customer_id DESC'); } // 検索用SQL function getList() { - $this->select = "SELECT customer_id,name01,name02,kana01,kana02,sex,email,email_mobile,tel01,tel02,tel03,pref,status,update_date,mailmaga_flg FROM dtb_customer "; + $this->select = 'SELECT customer_id,name01,name02,kana01,kana02,sex,email,email_mobile,tel01,tel02,tel03,pref,status,update_date,mailmaga_flg FROM dtb_customer '; return $this->getSql(0); } @@ -346,5 +346,5 @@ // 検索総数カウント用SQL function getListCount() { - $this->select = "SELECT COUNT(customer_id) FROM dtb_customer "; + $this->select = 'SELECT COUNT(customer_id) FROM dtb_customer '; return $this->getSql(1); } @@ -355,10 +355,10 @@ $i = 0; foreach ($this->arrColumnCSV as $val) { - if ($i != 0) $state .= ", "; + if ($i != 0) $state .= ', '; $state .= $val['sql']; $i ++; } - $this->select = "SELECT " .$state. " FROM dtb_customer "; + $this->select = 'SELECT ' .$state. ' FROM dtb_customer '; return $this->getSql(2); } Index: branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php =================================================================== --- branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php (revision 21490) +++ branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php (revision 21514) @@ -406,6 +406,6 @@ * セッションのデータ構造は下のようになる. * $_SESSION['pc']=> array( - * ['model'] => "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)" - * ['ip'] => "127.0.0.1" + * ['model'] => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)' + * ['ip'] => '127.0.0.1' * ['expires'] => 1204699031 * ) @@ -439,5 +439,5 @@ return true; } - $msg = sprintf("User agent model mismatch : %s != %s(expected), sid=%s", + $msg = sprintf('User agent model mismatch : %s != %s(expected), sid=%s', $_SERVER['HTTP_USER_AGENT'], $ua, session_id()); GC_Utils_Ex::gfPrintLog($msg); Index: branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php =================================================================== --- branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php (revision 21490) +++ branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php (revision 21514) @@ -47,7 +47,7 @@ function initSession() { ini_set('session.cache_limiter', 'none'); - if (session_id() === "") { - session_set_cookie_params(0, "/", DOMAIN_NAME); - if (!ini_get("session.auto_start")) { + if (session_id() === '') { + session_set_cookie_params(0, '/', DOMAIN_NAME); + if (!ini_get('session.auto_start')) { // セッション開始 session_start(); Index: branches/version-2_12-dev/data/class/SC_Customer.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Customer.php (revision 21481) +++ branches/version-2_12-dev/data/class/SC_Customer.php (revision 21514) @@ -42,5 +42,5 @@ } // 本登録された会員のみ - $sql = "SELECT * FROM dtb_customer WHERE (email = ?" . $sql_mobile . ") AND del_flg = 0 AND status = 2"; + $sql = 'SELECT * FROM dtb_customer WHERE (email = ?' . $sql_mobile . ') AND del_flg = 0 AND status = 2'; $objQuery = new SC_Query_Ex(); $result = $objQuery->getAll($sql, $arrValues); @@ -100,6 +100,6 @@ ) AS addrs __EOS__; - $objQuery->setOrder("other_deliv_id IS NULL DESC, other_deliv_id DESC"); - return $objQuery->select("*", $from, "", array($customer_id, $customer_id)); + $objQuery->setOrder('other_deliv_id IS NULL DESC, other_deliv_id DESC'); + return $objQuery->select('*', $from, '', array($customer_id, $customer_id)); } @@ -122,5 +122,5 @@ // 携帯端末IDが一致し、本登録された会員を検索する。 $objQuery = new SC_Query_Ex(); - $exists = $objQuery->exists('dtb_customer', "mobile_phone_id = ? AND del_flg = 0 AND status = 2", array($_SESSION['mobile']['phone_id'])); + $exists = $objQuery->exists('dtb_customer', 'mobile_phone_id = ? AND del_flg = 0 AND status = 2', array($_SESSION['mobile']['phone_id'])); return $exists; } @@ -183,8 +183,8 @@ function setLogin($email) { // 本登録された会員のみ - $sql = "SELECT * FROM dtb_customer WHERE (email = ? OR email_mobile = ?) AND del_flg = 0 AND status = 2"; + $sql = 'SELECT * FROM dtb_customer WHERE (email = ? OR email_mobile = ?) AND del_flg = 0 AND status = 2'; $objQuery = new SC_Query_Ex(); $result = $objQuery->getAll($sql, array($email, $email)); - $data = isset($result[0]) ? $result[0] : ""; + $data = isset($result[0]) ? $result[0] : ''; $this->customer_data = $data; $this->startSession(); @@ -193,9 +193,9 @@ // セッション情報を最新の情報に更新する function updateSession() { - $sql = "SELECT * FROM dtb_customer WHERE customer_id = ? AND del_flg = 0"; + $sql = 'SELECT * FROM dtb_customer WHERE customer_id = ? AND del_flg = 0'; $customer_id = $this->getValue('customer_id'); $objQuery = new SC_Query_Ex(); $arrRet = $objQuery->getAll($sql, array($customer_id)); - $this->customer_data = isset($arrRet[0]) ? $arrRet[0] : ""; + $this->customer_data = isset($arrRet[0]) ? $arrRet[0] : ''; $_SESSION['customer'] = $this->customer_data; } @@ -205,5 +205,5 @@ $_SESSION['customer'] = $this->customer_data; // セッション情報の保存 - GC_Utils_Ex::gfPrintLog("access : user=".$this->customer_data['customer_id'] ."\t"."ip=". $this->getRemoteHost(), CUSTOMER_LOG_REALFILE); + GC_Utils_Ex::gfPrintLog('access : user='.$this->customer_data['customer_id'] ."\t"."ip=". $this->getRemoteHost(), CUSTOMER_LOG_REALFILE); } @@ -217,5 +217,5 @@ $objSiteSess->unsetUniqId(); // ログに記録する - GC_Utils_Ex::gfPrintLog("logout : user=".$this->customer_data['customer_id'] ."\t"."ip=". $this->getRemoteHost(), CUSTOMER_LOG_REALFILE); + GC_Utils_Ex::gfPrintLog('logout : user='.$this->customer_data['customer_id'] ."\t"."ip=". $this->getRemoteHost(), CUSTOMER_LOG_REALFILE); } @@ -270,5 +270,5 @@ function isBirthMonth() { if (isset($_SESSION['customer']['birth'])) { - $arrRet = preg_split("|[- :/]|", $_SESSION['customer']['birth']); + $arrRet = preg_split('|[- :/]|', $_SESSION['customer']['birth']); $birth_month = intval($arrRet[1]); $now_month = intval(date('m')); @@ -296,5 +296,5 @@ return $_SERVER['REMOTE_ADDR']; } else { - return ""; + return ''; } } @@ -303,6 +303,6 @@ function updateOrderSummary($customer_id) { $objQuery = new SC_Query_Ex(); - $arrOrderSummary = $objQuery->getRow("SUM( payment_total) as buy_total, COUNT(order_id) as buy_times,MAX( create_date) as last_buy_date, MIN(create_date) as first_buy_date",'dtb_order',"customer_id = ? AND del_flg = 0 AND status <> ?",array($customer_id,ORDER_CANCEL)); - $objQuery->update('dtb_customer',$arrOrderSummary,"customer_id = ?",array($customer_id)); + $arrOrderSummary = $objQuery->getRow('SUM( payment_total) as buy_total, COUNT(order_id) as buy_times,MAX( create_date) as last_buy_date, MIN(create_date) as first_buy_date','dtb_order',"customer_id = ? AND del_flg = 0 AND status <> ?",array($customer_id,ORDER_CANCEL)); + $objQuery->update('dtb_customer',$arrOrderSummary,'customer_id = ?',array($customer_id)); } } Index: branches/version-2_12-dev/data/class/util/SC_Utils.php =================================================================== --- branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 21490) +++ branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 21514) @@ -68,7 +68,7 @@ if (SC_Utils_Ex::sfIsHTTPS()) { - $proto = "https://"; - } else { - $proto = "http://"; + $proto = 'https://'; + } else { + $proto = 'http://'; } $host = $proto . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']; @@ -124,5 +124,5 @@ $GLOBAL_ERR.= '
'; $GLOBAL_ERR.= $mess; - $GLOBAL_ERR.= "
"; + $GLOBAL_ERR.= '
'; if ($print) { echo $GLOBAL_ERR; @@ -144,5 +144,5 @@ /* サイトエラーページの表示 */ - function sfDispSiteError($type, $objSiteSess = "", $return_top = false, $err_msg = "") { + function sfDispSiteError($type, $objSiteSess = '', $return_top = false, $err_msg = '') { require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_Ex.php'; @@ -221,7 +221,7 @@ */ function sfPassLen($passlen) { - $ret = ""; + $ret = ''; for ($i=0;$i<$passlen;true) { - $ret.="*"; + $ret.='*'; $i++; } @@ -262,13 +262,13 @@ /* DB用日付文字列取得 */ function sfGetTimestamp($year, $month, $day, $last = false) { - if ($year != "" && $month != "" && $day != "") { + if ($year != '' && $month != '' && $day != "") { if ($last) { - $time = "23:59:59"; + $time = '23:59:59'; } else { - $time = "00:00:00"; - } - $date = $year."-".$month."-".$day." ".$time; - } else { - $date = ""; + $time = '00:00:00'; + } + $date = $year.'-'.$month.'-'.$day." ".$time; + } else { + $date = ''; } return $date; @@ -303,10 +303,10 @@ } - function sfGetCSVData($data, $prefix = "") { - if ($prefix == "") { + function sfGetCSVData($data, $prefix = '') { + if ($prefix == '') { $dir_name = SC_Utils_Ex::sfUpDirName(); - $file_name = $dir_name . date('ymdHis') .".csv"; - } else { - $file_name = $prefix . date('ymdHis') .".csv"; + $file_name = $dir_name . date('ymdHis') .'.csv'; + } else { + $file_name = $prefix . date('ymdHis') .'.csv'; } @@ -322,5 +322,5 @@ function sfUpDirName() { $path = $_SERVER['PHP_SELF']; - $arrVal = explode("/", $path); + $arrVal = explode('/', $path); $cnt = count($arrVal); return $arrVal[($cnt - 2)]; @@ -332,5 +332,5 @@ */ function sfMergeCBValue($keyname, $max) { - $conv = ""; + $conv = ''; $cnt = 1; for ($cnt = 1; $cnt <= $max; $cnt++) { @@ -349,5 +349,5 @@ */ function sfMergeCheckBoxes($array, $max) { - $ret = ""; + $ret = ''; if (is_array($array)) { foreach ($array as $val) { @@ -373,5 +373,5 @@ if (is_array($array)) { foreach ($array as $val) { - if ($ret != "") { + if ($ret != '') { $ret.= "-$val"; } else { @@ -421,5 +421,5 @@ */ function sfMergeCBSearchValue($keyname, $max) { - $conv = ""; + $conv = ''; $cnt = 1; for ($cnt = 1; $cnt <= $max; $cnt++) { @@ -437,10 +437,10 @@ * @deprecated */ - function sfSplitCBValue($val, $keyname = "") { + function sfSplitCBValue($val, $keyname = '') { $arr = array(); $len = strlen($val); $no = 1; for ($cnt = 0; $cnt < $len; $cnt++) { - if ($keyname != "") { + if ($keyname != '') { $arr[$keyname . $no] = substr($val, $cnt, 1); } else { @@ -453,14 +453,14 @@ // キーと値をセットした配列を取得 - function sfArrKeyValue($arrList, $keyname, $valname, $len_max = "", $keysize = "") { + function sfArrKeyValue($arrList, $keyname, $valname, $len_max = '', $keysize = '') { $arrRet = array(); $max = count($arrList); - if ($len_max != "" && $max > $len_max) { + if ($len_max != '' && $max > $len_max) { $max = $len_max; } for ($cnt = 0; $cnt < $max; $cnt++) { - if ($keysize != "") { + if ($keysize != '') { $key = SC_Utils_Ex::sfCutString($arrList[$cnt][$keyname], $keysize); } else { @@ -478,14 +478,14 @@ // キーと値をセットした配列を取得(値が複数の場合) - function sfArrKeyValues($arrList, $keyname, $valname, $len_max = "", $keysize = "", $connect = "") { + function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = "") { $max = count($arrList); - if ($len_max != "" && $max > $len_max) { + if ($len_max != '' && $max > $len_max) { $max = $len_max; } for ($cnt = 0; $cnt < $max; $cnt++) { - if ($keysize != "") { + if ($keysize != '') { $key = SC_Utils_Ex::sfCutString($arrList[$cnt][$keyname], $keysize); } else { @@ -494,5 +494,5 @@ $val = $arrList[$cnt][$valname]; - if ($connect != "") { + if ($connect != '') { $arrRet[$key].= "$val".$connect; } else { @@ -506,11 +506,11 @@ function sfGetCommaList($array, $space=true, $arrPop = array()) { if (count($array) > 0) { - $line = ""; + $line = ''; foreach ($array as $val) { if (!in_array($val, $arrPop)) { if ($space) { - $line .= $val . ", "; + $line .= $val . ', '; } else { - $line .= $val . ","; + $line .= $val . ','; } } @@ -530,5 +530,5 @@ /* 配列の要素をCSVフォーマットで出力する。*/ function sfGetCSVList($array) { - $line = ""; + $line = ''; if (count($array) > 0) { foreach ($array as $key => $val) { @@ -565,6 +565,6 @@ } if (! $error) { - $date1 = $start_year ."/".sprintf("%02d",$start_month) ."/".sprintf("%02d",$start_day) ." 000000"; - $date2 = $end_year ."/".sprintf("%02d",$end_month) ."/".sprintf("%02d",$end_day) ." 235959"; + $date1 = $start_year .'/'.sprintf('%02d',$start_month) ."/".sprintf("%02d",$start_day) ." 000000"; + $date2 = $end_year .'/'.sprintf('%02d',$end_month) ."/".sprintf("%02d",$end_day) ." 235959"; if ($date1 > $date2) $error = 3; } else { @@ -590,8 +590,8 @@ function sfGetErrorColor($val) { - if ($val != "") { - return "background-color:" . ERR_COLOR; - } - return ""; + if ($val != '') { + return 'background-color:' . ERR_COLOR; + } + return ''; } @@ -600,5 +600,5 @@ return " disabled=\"disabled\""; } - return ""; + return ''; } @@ -607,5 +607,5 @@ return "checked=\"checked\""; } - return ""; + return ''; } @@ -681,5 +681,5 @@ /* ポイント付与 */ - function sfPrePoint($price, $point_rate, $rule = POINT_RULE, $product_id = "") { + function sfPrePoint($price, $point_rate, $rule = POINT_RULE, $product_id = '') { $real_point = $point_rate / 100; $ret = $price * $real_point; @@ -707,8 +707,8 @@ /* 規格分類の件数取得 */ function sfGetClassCatCount() { - $sql = "select count(dtb_class.class_id) as count, dtb_class.class_id "; - $sql.= "from dtb_class inner join dtb_classcategory on dtb_class.class_id = dtb_classcategory.class_id "; - $sql.= "where dtb_class.del_flg = 0 AND dtb_classcategory.del_flg = 0 "; - $sql.= "group by dtb_class.class_id, dtb_class.name"; + $sql = 'select count(dtb_class.class_id) as count, dtb_class.class_id '; + $sql.= 'from dtb_class inner join dtb_classcategory on dtb_class.class_id = dtb_classcategory.class_id '; + $sql.= 'where dtb_class.del_flg = 0 AND dtb_classcategory.del_flg = 0 '; + $sql.= 'group by dtb_class.class_id, dtb_class.name'; $objQuery = new SC_Query_Ex(); $arrList = $objQuery->getAll($sql); @@ -720,5 +720,5 @@ function sfGetProductClassId($product_id, $classcategory_id1, $classcategory_id2) { - $where = "product_id = ?"; + $where = 'product_id = ?'; $objQuery = new SC_Query_Ex(); $ret = $objQuery->get('product_class_id', 'dtb_products_class', $where, Array($product_id)); @@ -734,14 +734,14 @@ /* DBから取り出した日付の文字列を調整する。*/ function sfDispDBDate($dbdate, $time = true) { - list($y, $m, $d, $H, $M) = preg_split("/[- :]/", $dbdate); + list($y, $m, $d, $H, $M) = preg_split('/[- :]/', $dbdate); if (strlen($y) > 0 && strlen($m) > 0 && strlen($d) > 0) { if ($time) { - $str = sprintf("%04d/%02d/%02d %02d:%02d", $y, $m, $d, $H, $M); + $str = sprintf('%04d/%02d/%02d %02d:%02d', $y, $m, $d, $H, $M); } else { - $str = sprintf("%04d/%02d/%02d", $y, $m, $d, $H, $M); - } - } else { - $str = ""; + $str = sprintf('%04d/%02d/%02d', $y, $m, $d, $H, $M); + } + } else { + $str = ''; } return $str; @@ -816,5 +816,5 @@ /* 一意かつ予測されにくいID */ - function sfGetUniqRandomId($head = "") { + function sfGetUniqRandomId($head = '') { // 予測されないようにランダム文字列を付与する。 $random = GC_Utils_Ex::gfMakePassword(8); @@ -826,14 +826,14 @@ // 二回以上繰り返されているスラッシュ[/]を一つに変換する。 function sfRmDupSlash($istr) { - if (ereg("^http://", $istr)) { + if (ereg('^http://', $istr)) { $str = substr($istr, 7); - $head = "http://"; - } else if (ereg("^https://", $istr)) { + $head = 'http://'; + } else if (ereg('^https://', $istr)) { $str = substr($istr, 8); - $head = "https://"; + $head = 'https://'; } else { $str = $istr; } - $str = ereg_replace("[/]+", "/", $str); + $str = ereg_replace('[/]+', '/', $str); $ret = $head . $str; return $ret; @@ -866,5 +866,5 @@ $outpath = $out_dir . 'enc_' . $basename; - $ofp = fopen($outpath, "w+"); + $ofp = fopen($outpath, 'w+'); while (!feof($ifp)) { @@ -927,5 +927,5 @@ if ($commadisp) { - $ret = $ret . "..."; + $ret = $ret . '...'; } return $ret; @@ -971,6 +971,6 @@ // 日付の作成 - $start_date = sprintf("%d/%d/%d 00:00:00", $start_year, $start_month, $start_day); - $end_date = sprintf("%d/%d/%d 23:59:59", $end_year, $end_month, $end_day); + $start_date = sprintf('%d/%d/%d 00:00:00', $start_year, $start_month, $start_day); + $end_date = sprintf('%d/%d/%d 23:59:59', $end_year, $end_month, $end_day); return array($start_date, $end_date); @@ -978,9 +978,9 @@ // 再帰的に多段配列を検索して一次元配列(Hidden引渡し用配列)に変換する。 - function sfMakeHiddenArray($arrSrc, $arrDst = array(), $parent_key = "") { + function sfMakeHiddenArray($arrSrc, $arrDst = array(), $parent_key = '') { if (is_array($arrSrc)) { foreach ($arrSrc as $key => $val) { - if ($parent_key != "") { - $keyname = $parent_key . "[". $key . "]"; + if ($parent_key != '') { + $keyname = $parent_key . '['. $key . ']'; } else { $keyname = $key; @@ -1108,5 +1108,5 @@ // ディレクトリ以下のファイルを再帰的にコピー - function sfCopyDir($src, $des, $mess = "", $override = false) { + function sfCopyDir($src, $des, $mess = '', $override = false) { if (!is_dir($src)) { return false; @@ -1123,15 +1123,15 @@ } - $fileArray=glob($src."*"); + $fileArray=glob($src.'*'); if (is_array($fileArray)) { foreach ($fileArray as $key => $data_) { // CVS管理ファイルはコピーしない - if (ereg("/CVS/Entries", $data_)) { + if (ereg('/CVS/Entries', $data_)) { break; } - if (ereg("/CVS/Repository", $data_)) { + if (ereg('/CVS/Repository', $data_)) { break; } - if (ereg("/CVS/Root", $data_)) { + if (ereg('/CVS/Root', $data_)) { break; } @@ -1165,8 +1165,8 @@ // フォルダ内のファイルを削除 while ($file = readdir($dh)) { - if ($file == "." or $file == "..") continue; - $del_file = $dir . "/" . $file; + if ($file == '.' or $file == '..') continue; + $del_file = $dir . '/' . $file; if (is_file($del_file)) { - $ret = unlink($dir . "/" . $file); + $ret = unlink($dir . '/' . $file); }else if (is_dir($del_file)) { $ret = SC_Utils_Ex::sfDelFile($del_file); @@ -1195,5 +1195,5 @@ * 説明　：ファイル書き出し */ - function sfWriteFile($str, $path, $type, $permission = "") { + function sfWriteFile($str, $path, $type, $permission = '') { //ファイルを開く if (!($file = fopen ($path, $type))) { @@ -1210,5 +1210,5 @@ fclose ($file); // 権限を指定 - if ($permission != "") { + if ($permission != '') { chmod($path, $permission); } @@ -1251,6 +1251,6 @@ while (!feof($src_fp)) { $line = fgets($src_fp); - if (ereg("@version", $line)) { - $arrLine = explode(" ", $line); + if (ereg('@version', $line)) { + $arrLine = explode(' ', $line); $version = $arrLine[5]; } @@ -1288,5 +1288,5 @@ function arrayDefineIndexes($array, $defineIndexes) { foreach ($defineIndexes as $key) { - if (!isset($array[$key])) $array[$key] = ""; + if (!isset($array[$key])) $array[$key] = ''; } return $array; @@ -1319,5 +1319,5 @@ function printXMLDeclaration() { $ua = $_SERVER['HTTP_USER_AGENT']; - if (!preg_match("/MSIE/", $ua) || preg_match("/MSIE 7/", $ua)) { + if (!preg_match('/MSIE/', $ua) || preg_match('/MSIE 7/', $ua)) { echo '' . "\n"; } @@ -1343,11 +1343,11 @@ foreach ($arrDir as $file) { // ./ と ../を除くファイルのみを取得 - if ($file != "." && $file != "..") { - - $path = $dir."/".$file; + if ($file != '.' && $file != '..') { + + $path = $dir.'/'.$file; // SELECT内の見た目を整えるため指定文字数で切る $file_name = SC_Utils_Ex::sfCutString($file, FILE_NAME_LEN); $file_size = SC_Utils_Ex::sfCutString(SC_Utils_Ex::sfGetDirSize($path), FILE_NAME_LEN); - $file_time = date("Y/m/d", filemtime($path)); + $file_time = date('Y/m/d', filemtime($path)); // ディレクトリとファイルで格納配列を変える @@ -1389,5 +1389,5 @@ // 行末の/を取り除く $dir = ereg_replace("/$", "", $dir); - $path = $dir."/".$file; + $path = $dir.'/'.$file; if ($file != '..' && $file != '.' && !is_dir($path)) { $bytes += filesize($path); @@ -1403,5 +1403,5 @@ } // ディレクトリ(ファイル)が存在しない場合は0byteを返す - if($bytes == "") $bytes = 0; + if($bytes == '') $bytes = 0; return $bytes; @@ -1460,8 +1460,8 @@ natcasesort($arrDir); foreach ($arrDir as $item) { - if ($item != "." && $item != "..") { + if ($item != '.' && $item != '..') { // 文末の/を取り除く $dir = ereg_replace("/$", "", $dir); - $path = $dir."/".$item; + $path = $dir.'/'.$item; // ディレクトリのみ取得 if (is_dir($path)) { @@ -1503,5 +1503,5 @@ // 行末の/を取り除く $dir = ereg_replace("/$", "", $dir); - $path = $dir."/".$file; + $path = $dir.'/'.$file; if ($file != '..' && $file != '.' && is_dir($path)) { return true; @@ -1536,8 +1536,8 @@ function sfDownloadFile($file) { // ファイルの場合はダウンロードさせる - Header("Content-disposition: attachment; filename=".basename($file)); - Header("Content-type: application/octet-stream; name=".basename($file)); - Header("Cache-Control: "); - Header("Pragma: "); + Header('Content-disposition: attachment; filename='.basename($file)); + Header('Content-type: application/octet-stream; name='.basename($file)); + Header('Cache-Control: '); + Header('Pragma: '); echo (sfReadFile($file)); } @@ -1549,7 +1549,7 @@ * 説明　：ファイル作成 */ - function sfCreateFile($file, $mode = "") { + function sfCreateFile($file, $mode = '') { // 行末の/を取り除く - if ($mode != "") { + if ($mode != '') { $ret = @mkdir($file, $mode); } else { @@ -1566,5 +1566,5 @@ */ function sfReadFile($filename) { - $str = ""; + $str = ''; // バイナリモードでオープン $fp = @fopen($filename, 'rb'); @@ -1588,13 +1588,13 @@ if (is_array($arrayIndex) && 0 < count($arrayIndex)) { for ($j = 0; $j < count($arrayIndex); $j++) { - if ($j > 0) $return .= ","; + if ($j > 0) $return .= ','; $return .= "\""; - $return .= mb_ereg_replace("<","＜",mb_ereg_replace("\"","\"\"",$array[$i][$arrayIndex[$j]])) ."\""; + $return .= mb_ereg_replace('<','＜',mb_ereg_replace("\"","\"\"",$array[$i][$arrayIndex[$j]])) ."\""; } } else { for ($j = 0; $j < count($array[$i]); $j++) { - if ($j > 0) $return .= ","; + if ($j > 0) $return .= ','; $return .= "\""; - $return .= mb_ereg_replace("<","＜",mb_ereg_replace("\"","\"\"",$array[$i][$j])) ."\""; + $return .= mb_ereg_replace('<','＜',mb_ereg_replace("\"","\"\"",$array[$i][$j])) ."\""; } } @@ -1610,19 +1610,19 @@ */ function getTableTag($array) { - $html = ""; - $html.= ""; + $html = '
'; + $html.= ''; foreach ($array[0] as $key => $val) { $html.=""; } - $html.= ""; + $html.= ''; $cnt = count($array); for ($i = 0; $i < $cnt; $i++) { - $html.= ""; + $html.= ''; foreach ($array[$i] as $val) { $html.=""; } - $html.= ""; + $html.= ''; } return $html; @@ -1684,7 +1684,7 @@ if (SC_Utils_Ex::sfIsHTTPS()) { - $url = "https://"; - } else { - $url = "http://"; + $url = 'https://'; + } else { + $url = 'http://'; } @@ -1709,5 +1709,5 @@ } - $string .= $backtrace['file'] . " " . $backtrace['line'] . ":" . $func . "\n"; + $string .= $backtrace['file'] . ' ' . $backtrace['line'] . ":" . $func . "\n"; } @@ -1754,5 +1754,5 @@ // 郵便番号検索文作成 $zipcode = mb_convert_kana($zipcode ,'n'); - $sqlse = "SELECT state, city, town FROM mtb_zip WHERE zipcode = ?"; + $sqlse = 'SELECT state, city, town FROM mtb_zip WHERE zipcode = ?'; $data_list = $objQuery->getAll($sqlse, array($zipcode)); @@ -1767,5 +1767,5 @@ $town = $data_list[0]['town']; $town = ereg_replace("（.*）$","",$town); - $town = ereg_replace("以下に掲載がない場合","",$town); + $town = ereg_replace('以下に掲載がない場合','',$town); $data_list[0]['town'] = $town; $data_list[0]['state'] = $arrREV_PREF[$data_list[0]['state']]; @@ -1876,5 +1876,5 @@ $microtime = microtime(true); if (is_string($microtime)) { - list($usec, $sec) = explode(" ", microtime()); + list($usec, $sec) = explode(' ', microtime()); return (float)$usec + (float)$sec; } @@ -1887,5 +1887,5 @@ * 引数 $val が空白かどうかをチェックする. 空白の場合は true. * 以下の文字は空白と判断する. - * - " " (ASCII 32 (0x20)), 通常の空白 + * - ' ' (ASCII 32 (0x20)), 通常の空白 * - "\t" (ASCII 9 (0x09)), タブ * - "\n" (ASCII 10 (0x0A)), リターン @@ -1900,5 +1900,5 @@ * * @param mixed $val チェック対象の変数 - * @param boolean $greedy "貧欲"にチェックを行う場合 true + * @param boolean $greedy '貧欲'にチェックを行う場合 true * @return boolean $val が空白と判断された場合 true */ @@ -1927,5 +1927,5 @@ if ($greedy) { - $val = preg_replace("/　/", "", $val); + $val = preg_replace('/　/', '', $val); } @@ -1949,5 +1949,5 @@ $host = $netURL->host; if (!$host) return false; - $host = preg_quote($host, "#"); + $host = preg_quote($host, '#'); if (!preg_match("#^(http|https)://{$host}#i", $url)) return false; return true; @@ -1969,5 +1969,5 @@ $res = $str; } else { - $res = hash_hmac(PASSWORD_HASH_ALGOS, $str . ":" . AUTH_MAGIC, $salt); + $res = hash_hmac(PASSWORD_HASH_ALGOS, $str . ':' . AUTH_MAGIC, $salt); } return $res; @@ -1992,5 +1992,5 @@ if (empty($salt)) { // 旧バージョン(2.11未満)からの移行を考慮 - $hash = sha1($pass . ":" . AUTH_MAGIC); + $hash = sha1($pass . ':' . AUTH_MAGIC); } else { $hash = SC_Utils_Ex::sfGetHashString($pass, $salt); @@ -2144,10 +2144,10 @@ // 対象が存在するかを検証. if (file_exists($path) === false) { - GC_Utils_Ex::gfPrintLog($path . " が存在しません."); + GC_Utils_Ex::gfPrintLog($path . ' が存在しません.'); } elseif (is_dir($path)) { // ディレクトリが指定された場合 $handle = opendir($path); if (!$handle) { - GC_Utils_Ex::gfPrintLog($path . " が開けませんでした."); + GC_Utils_Ex::gfPrintLog($path . ' が開けませんでした.'); } while (($item = readdir($handle)) !== false) { @@ -2164,5 +2164,5 @@ closedir($handle); // ディレクトリを削除 - GC_Utils_Ex::gfPrintLog($path . " を削除します."); + GC_Utils_Ex::gfPrintLog($path . ' を削除します.'); if ($del_myself) { $flg = @rmdir($path); @@ -2170,5 +2170,5 @@ } else { // ファイルが指定された場合. - GC_Utils_Ex::gfPrintLog($path . " を削除します."); + GC_Utils_Ex::gfPrintLog($path . ' を削除します.'); $flg = @unlink($path); } Index: branches/version-2_12-dev/data/class/util/GC_Utils.php =================================================================== --- branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21481) +++ branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21514) @@ -41,5 +41,5 @@ function gfDownloadCsv($header, $contents) { - $fiest_name = date('YmdHis') .".csv"; + $fiest_name = date('YmdHis') .'.csv'; /* HTTPヘッダの出力 */ @@ -65,17 +65,17 @@ * [注釈] - *----------------------------------------------------------------------*/ - function gfSetCsv($array, $arrayIndex = "") { + function gfSetCsv($array, $arrayIndex = '') { //引数$arrayIndexは、$arrayが連想配列のときに添え字を指定してやるために使用する - $return = ""; + $return = ''; for ($i=0; $i 0) $return .= ","; + if ($j > 0) $return .= ','; $return .= "\""; if ($arrayIndex) { - $return .= mb_ereg_replace("<","＜",mb_ereg_replace("\"","\"\"",$array[$i][$arrayIndex[$j]])) ."\""; + $return .= mb_ereg_replace('<','＜',mb_ereg_replace("\"","\"\"",$array[$i][$arrayIndex[$j]])) ."\""; } else { - $return .= mb_ereg_replace("<","＜",mb_ereg_replace("\"","\"\"",$array[$i][$j])) ."\""; + $return .= mb_ereg_replace('<','＜',mb_ereg_replace("\"","\"\"",$array[$i][$j])) ."\""; } } @@ -98,5 +98,5 @@ $tm = date('m'); $td = date('d'); - list($by, $bm, $bd) = preg_split("/[-/ ]/", $dbdate); + list($by, $bm, $bd) = preg_split('/[-/ ]/', $dbdate); $age = $ty - $by; if($tm * 100 + $td < $bm * 100 + $bd) $age--; @@ -115,5 +115,5 @@ "*** start Debug ***\n" . print_r($obj, true) . - "*** end Debug ***" + '*** end Debug ***' ); } @@ -139,5 +139,5 @@ } } - $str = $traces[$bklv]['class'] . "::" . $traces[$bklv]['function'] . "(" . $traces[$bklv-1]['line'] . ") "; + $str = $traces[$bklv]['class'] . '::' . $traces[$bklv]['function'] . "(" . $traces[$bklv-1]['line'] . ") "; return $str; } @@ -156,5 +156,5 @@ // ログレベル=Debugの場合は、[Debug]を先頭に付与する if ($log_level === 'Debug') { - $mess = "[Debug]" . $mess; + $mess = '[Debug]' . $mess; } @@ -218,7 +218,7 @@ function gfPrintLog($mess, $path = '') { // 日付の取得 - $today = date("Y/m/d H:i:s"); + $today = date('Y/m/d H:i:s'); // 出力パスの作成 - if ($path == "") { + if ($path == '') { $path = LOG_REALFILE; } @@ -229,7 +229,7 @@ $mess = strtr($mess, $trans_tbl); - $fp = fopen($path, "a+"); + $fp = fopen($path, 'a+'); if ($fp) { - fwrite($fp, $today." [".$_SERVER['PHP_SELF']."] ".$mess." from ". $_SERVER['REMOTE_ADDR']. "\n"); + fwrite($fp, $today.' ['.$_SERVER['PHP_SELF']."] ".$mess." from ". $_SERVER['REMOTE_ADDR']. "\n"); fclose($fp); } @@ -293,7 +293,7 @@ // パスワード文字列の配列を作成 $character = 'abcdefghkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ2345679'; - $pw = preg_split("//", $character, 0, PREG_SPLIT_NO_EMPTY); - - $password = ""; + $pw = preg_split('//', $character, 0, PREG_SPLIT_NO_EMPTY); + + $password = ''; for ($i = 0; $i<$pwLength; $i++) { $password .= $pw[array_rand($pw, 1)]; @@ -313,9 +313,9 @@ function gfMailHeaderAddr($str) { - $addrs = explode(",", $str); //アドレスを配列に入れる + $addrs = explode(',', $str); //アドレスを配列に入れる foreach ($addrs as $addr) { if (preg_match("/^(.+)<(.+)>$/", $addr, $matches)) { //引数が「名前<メールアドレス>」の場合 - $mailaddrs[] = mb_encode_mimeheader(trim($matches[1]))." <".trim($matches[2]).">"; + $mailaddrs[] = mb_encode_mimeheader(trim($matches[1])).' <'.trim($matches[2]).'>'; } else { //メールアドレスのみの場合 @@ -323,5 +323,5 @@ } } - return implode(", ", $mailaddrs); //複数アドレスはカンマ区切りにする + return implode(', ', $mailaddrs); //複数アドレスはカンマ区切りにする } } Index: branches/version-2_12-dev/data/class/SC_Display.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Display.php (revision 21479) +++ branches/version-2_12-dev/data/class/SC_Display.php (revision 21514) @@ -103,5 +103,5 @@ switch ($device) { case DEVICE_TYPE_MOBILE: - $this->response->setContentType("text/html"); + $this->response->setContentType('text/html'); $this->setView(new SC_MobileView_Ex()); break;
$key
$val