Index: branches/version-2_12-dev/data/class/SC_Fpdf.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Fpdf.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_Fpdf.php (revision 21515) @@ -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,8 +113,8 @@ $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 @@ -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); //購入者氏名 @@ -189,5 +189,5 @@ $arrOrder[$i][0] .= ' ]'; } else { - $arrOrder[$i][0] .= $this->lfConvSjis(' * '.$this->arrDisp['classcategory_name2'][$i]." ]"); + $arrOrder[$i][0] .= $this->lfConvSjis(' * '.$this->arrDisp['classcategory_name2'][$i].' ]'); } } @@ -271,5 +271,5 @@ 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'; Index: branches/version-2_12-dev/data/class/SC_Session.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Session.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_Session.php (revision 21515) @@ -58,5 +58,5 @@ // ログに記録する - 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 { // ログに記録する @@ -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_FormParam.php =================================================================== --- branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21515) @@ -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; 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 21514) +++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php (revision 21515) @@ -80,5 +80,5 @@ $objFormParam = new SC_FormParam_Ex(); - $this->arrData = isset($_SESSION['customer']) ? $_SESSION['customer'] : ""; + $this->arrData = isset($_SESSION['customer']) ? $_SESSION['customer'] : ''; switch ($this->getMode()) { 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 21514) +++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php (revision 21515) @@ -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']); @@ -174,5 +174,5 @@ ); // 宛先の設定 - $name = $data['name01'] . $data['name02'] ." 様"; + $name = $data['name01'] . $data['name02'] .' 様'; $objMail->setTo($data['email'], $name); $objMail->sendMail(); 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 21514) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php (revision 21515) @@ -116,5 +116,5 @@ $objQuery->setOrder('rank DESC'); - $arrKiyaku = $objQuery->select('kiyaku_title, kiyaku_text', 'dtb_kiyaku', "del_flg <> 1"); + $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.php =================================================================== --- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php (revision 21514) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php (revision 21515) @@ -239,5 +239,5 @@ // 宛先の設定 $objMail->setTo($arrForm['email'], - $arrForm['name01'] . $arrForm['name02'] ." 様"); + $arrForm['name01'] . $arrForm['name02'] .' 様'); $objMail->sendMail(); 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 21514) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (revision 21515) @@ -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); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php (revision 21515) @@ -183,5 +183,5 @@ // 商品IDの正当性チェック if (!SC_Utils_Ex::sfIsInt($this->arrForm['product_id']) - || !SC_Helper_DB_Ex::sfIsRecord('dtb_products', 'product_id', $this->arrForm['product_id'], "del_flg = 0 AND status = 1")) { + || !SC_Helper_DB_Ex::sfIsRecord('dtb_products', 'product_id', $this->arrForm['product_id'], 'del_flg = 0 AND status = 1')) { SC_Utils_Ex::sfDispSiteError(PRODUCT_NOT_FOUND); } @@ -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 { 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 21514) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php (revision 21515) @@ -190,5 +190,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - return $objQuery->get('name', 'dtb_products', "product_id = ? ", array($product_id)); + return $objQuery->get('name', 'dtb_products', 'product_id = ? ', array($product_id)); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 21515) @@ -448,5 +448,5 @@ $objQuery->setOrder('rank DESC'); - $arrRecommendData = $objQuery->select('recommend_product_id, comment', 'dtb_recommend_products', "product_id = ?", array($product_id)); + $arrRecommendData = $objQuery->select('recommend_product_id, comment', 'dtb_recommend_products', 'product_id = ?', array($product_id)); $arrRecommendProductId = array(); @@ -523,5 +523,5 @@ $subImageFlag = false; for ($i = 1; $i <= PRODUCTSUB_MAX; $i++) { - if ($arrFile['sub_image' . $i]['filepath'] != "") { + if ($arrFile['sub_image' . $i]['filepath'] != '') { $subImageFlag = true; } @@ -536,5 +536,5 @@ function lfRegistFavoriteProduct($favorite_product_id,$customer_id) { // ログイン中のユーザが商品をお気に入りにいれる処理 - if (!SC_Helper_DB_Ex::sfIsRecord('dtb_products', 'product_id', $favorite_product_id, "del_flg = 0 AND status = 1")) { + if (!SC_Helper_DB_Ex::sfIsRecord('dtb_products', 'product_id', $favorite_product_id, 'del_flg = 0 AND status = 1')) { SC_Utils_Ex::sfDispSiteError(PRODUCT_NOT_FOUND); return false; Index: branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php =================================================================== --- branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php (revision 21490) +++ branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php (revision 21515) @@ -68,5 +68,5 @@ } - $objThumb->Main($file, $_GET['width'], $_GET['height'], "", true); + $objThumb->Main($file, $_GET['width'], $_GET['height'], '', true); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php (revision 21515) @@ -76,5 +76,5 @@ // 郵便番号が発見された場合 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; 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 21514) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 21515) @@ -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_Mypage_DownLoad.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php (revision 21514) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php (revision 21515) @@ -215,5 +215,5 @@ header('Content-Disposition: attachment; filename=' . $sdown_filename); header('Accept-Ranges: bytes'); - header('Last-Modified: ' . gmdate('D,d M Y H:i:s') . " GMT"); + header('Last-Modified: ' . gmdate('D,d M Y H:i:s') . ' GMT'); header('Cache-Control: public'); } @@ -330,5 +330,5 @@ //キャッシュ無効化 header('Expires: Mon, 26 Nov 1962 00:00:00 GMT'); - header('Last-Modified: ' . gmdate('D,d M Y H:i:s') . " GMT"); + header('Last-Modified: ' . gmdate('D,d M Y H:i:s') . ' GMT'); //IE6+SSL環境下は、キャッシュ無しでダウンロードできない header('Cache-Control: private'); 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 21514) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (revision 21515) @@ -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)); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 21515) @@ -290,8 +290,8 @@ $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_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')); @@ -321,5 +321,5 @@ $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_pass', PASSWORD_MAX_LEN, '', array('EXIST_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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php (revision 21515) @@ -273,9 +273,9 @@ 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; @@ -307,5 +307,5 @@ 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; 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php (revision 21515) @@ -103,10 +103,10 @@ // 対応状況 - $status = !is_null($objFormParam->getValue('status')) ? $objFormParam->getValue('status') : ""; + $status = !is_null($objFormParam->getValue('status')) ? $objFormParam->getValue('status') : ''; break; case 'search': // 対応状況 - $status = !is_null($_POST['status']) ? $objFormParam->getValue('status') : ""; + $status = !is_null($_POST['status']) ? $objFormParam->getValue('status') : ''; break; 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 21515) @@ -667,5 +667,5 @@ for ($i = 0; $i < $max; $i++) { if (!empty($arrDetail[$i]['product_id'])) { - $arrPreDetail = $objQuery->select('*', 'dtb_order_detail', "order_id = ? AND product_class_id = ?", array($order_id, $arrDetail[$i]['product_class_id'])); + $arrPreDetail = $objQuery->select('*', 'dtb_order_detail', 'order_id = ? AND product_class_id = ?', array($order_id, $arrDetail[$i]['product_class_id'])); if (!empty($arrPreDetail) && $arrPreDetail[0]['quantity'] != $arrDetail[$i]['quantity']) { // 数量が変更された商品 @@ -684,5 +684,5 @@ // 上記の新しい商品のループでDELETEされなかった商品は、注文より削除された商品 - $arrPreDetail = $objQuery->select('*', 'dtb_order_detail', "order_id = ?", array($order_id)); + $arrPreDetail = $objQuery->select('*', 'dtb_order_detail', 'order_id = ?', array($order_id)); foreach ($arrPreDetail AS $key=>$val) { $arrStockData[$k]['product_class_id'] = $val['product_class_id']; 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php (revision 21515) @@ -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 { @@ -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_CsvSql.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 21514) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 21515) @@ -143,6 +143,6 @@ function lfInitParam(&$objFormParam) { $objFormParam->addParam('SQL ID', 'sql_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK')); - $objFormParam->addParam('CSV出力対象SQL ID', 'csv_output_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'), "", false); - $objFormParam->addParam('選択テーブル', 'select_table', STEXT_LEN, 'KVa', array('GRAPH_CHECK','MAX_LENGTH_CHECK'), "", false); + $objFormParam->addParam('CSV出力対象SQL ID', 'csv_output_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'), '', false); + $objFormParam->addParam('選択テーブル', 'select_table', STEXT_LEN, 'KVa', array('GRAPH_CHECK','MAX_LENGTH_CHECK'), '', false); $objFormParam->addParam('名称', 'sql_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK','SPTAB_CHECK')); $objFormParam->addParam('SQL文', 'csv_sql', '30000', 'KVa', array('MAX_LENGTH_CHECK','SPTAB_CHECK')); @@ -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句は追加しないので重いかも 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 21515) @@ -240,5 +240,5 @@ */ function getRegistDate($arrPost) { - $registDate = $arrPost['year'] .'/'. $arrPost['month'] ."/". $arrPost['day']; + $registDate = $arrPost['year'] .'/'. $arrPost['month'] .'/'. $arrPost['day']; return $registDate; } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php (revision 21515) @@ -286,5 +286,5 @@ $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)); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php (revision 21515) @@ -118,5 +118,5 @@ $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('伝票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')); @@ -305,5 +305,5 @@ $objErr->arrErr = $objFormParam->checkError(); - if (!isset($objErr->arrErr['name']) && $arrRet['deliv_id'] == "") { + if (!isset($objErr->arrErr['name']) && $arrRet['deliv_id'] == '') { // 既存チェック $objDb = new SC_Helper_DB_Ex(); 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php (revision 21515) @@ -117,5 +117,5 @@ // 削除 case 'delete': - $objDb->sfDeleteRankRecord('dtb_holiday', 'holiday_id', $post['holiday_id'], "", true); + $objDb->sfDeleteRankRecord('dtb_holiday', 'holiday_id', $post['holiday_id'], '', true); // 再表示 $this->objDisplay->reload(); 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 21515) @@ -108,5 +108,5 @@ // 削除 case 'delete': - $objDb->sfDeleteRankRecord('dtb_kiyaku', 'kiyaku_id', $post['kiyaku_id'], "", true); + $objDb->sfDeleteRankRecord('dtb_kiyaku', 'kiyaku_id', $post['kiyaku_id'], '', true); // 再表示 $this->objDisplay->reload(); @@ -222,5 +222,5 @@ $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']) { 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php (revision 21515) @@ -261,11 +261,11 @@ // 利用条件(下限)チェック - if ($arrRet['rule'] < $arrPaymentData['rule_min'] and $arrPaymentData['rule_min'] != "") { - $objErr->arrErr['rule'] = '利用条件(下限)は' . $arrPaymentData['rule_min'] ."円以上にしてください。
"; + if ($arrRet['rule'] < $arrPaymentData['rule_min'] and $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'] ."円以下にしてください。
"; + if ($arrRet['upper_rule'] > $arrPaymentData['upper_rule_max'] and $arrPaymentData['upper_rule_max'] != '') { + $objErr->arrErr['upper_rule'] = '利用条件(上限)は' . $arrPaymentData['upper_rule_max'] .'円以下にしてください。
'; } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php (revision 21515) @@ -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); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 21515) @@ -155,5 +155,5 @@ $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('テンプレート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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 21515) @@ -202,5 +202,5 @@ $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('テンプレート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']; } } @@ -269,5 +269,5 @@ $dtb_send_customer['send_id'] = $send_id; $dtb_send_customer['email'] = $line[$emailtype]; - $dtb_send_customer['name'] = $line['name01'] . " " . $line['name02']; + $dtb_send_customer['name'] = $line['name01'] . ' ' . $line['name02']; $objQuery->insert('dtb_send_customer', $dtb_send_customer); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php (revision 21515) @@ -70,5 +70,5 @@ $objDb = new SC_Helper_DB_Ex(); - $this->tpl_pageno = isset($_POST['pageno']) ? $_POST['pageno'] : ""; + $this->tpl_pageno = isset($_POST['pageno']) ? $_POST['pageno'] : ''; // 通常時は親カテゴリを0に設定する。 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 21515) @@ -112,7 +112,7 @@ // 移動したデータのrank、level、parent_category_idを取得 - $rank = $objQuery->get('rank', 'dtb_category', "category_id = ?", array($keys[0])); - $level = $objQuery->get('level', 'dtb_category', "category_id = ?", array($keys[0])); - $parent = $objQuery->get('parent_category_id', 'dtb_category', "category_id = ?", array($keys[0])); + $rank = $objQuery->get('rank', 'dtb_category', 'category_id = ?', array($keys[0])); + $level = $objQuery->get('level', 'dtb_category', 'category_id = ?', array($keys[0])); + $parent = $objQuery->get('parent_category_id', 'dtb_category', 'category_id = ?', array($keys[0])); // 同一level内のrank配列を作成 @@ -120,8 +120,8 @@ if ($level == 1) { // 第1階層の時 - $arrRet = $objQuery->select('rank', 'dtb_category', "level = ?", array($level)); + $arrRet = $objQuery->select('rank', 'dtb_category', 'level = ?', array($level)); } else { // 第2階層以下の時 - $arrRet = $objQuery->select('rank', 'dtb_category', "level = ? AND parent_category_id = ?", array($level, $parent)); + $arrRet = $objQuery->select('rank', 'dtb_category', 'level = ? AND parent_category_id = ?', array($level, $parent)); } for ($i = 0; $i < sizeof($arrRet); $i++) { @@ -134,5 +134,5 @@ // データが今の位置より上がった時 $up_count = $rankAry[$keys[1]] - $rank; - $decAry = $objQuery->select('category_id', 'dtb_category', "level = ? AND rank > ? AND rank <= ?", array($level, $rank, $rankAry[$keys[1]])); + $decAry = $objQuery->select('category_id', 'dtb_category', 'level = ? AND rank > ? AND rank <= ?', array($level, $rank, $rankAry[$keys[1]])); foreach ($decAry as $value) { // 上のグループから減算 @@ -144,5 +144,5 @@ // データが今の位置より下がった時 $down_count = 0; - $incAry = $objQuery->select('category_id', 'dtb_category', "level = ? AND rank < ? AND rank >= ?", array($level, $rank, $rankAry[$keys[1]])); + $incAry = $objQuery->select('category_id', 'dtb_category', 'level = ? AND rank < ? AND rank >= ?', array($level, $rank, $rankAry[$keys[1]])); foreach ($incAry as $value) { // 下のグループに加算 @@ -164,5 +164,5 @@ // CSVを送信する $objCSV = new SC_Helper_CSV_Ex(); - $objCSV->sfDownloadCsv('5', '', array(), "", true); + $objCSV->sfDownloadCsv('5', '', array(), '', true); exit; break; @@ -227,5 +227,5 @@ // ランク付きレコードの削除(※処理負荷を考慮してレコードごと削除する。) - $objDb->sfDeleteRankRecord('dtb_category', 'category_id', $category_id, "", true); + $objDb->sfDeleteRankRecord('dtb_category', 'category_id', $category_id, '', true); } @@ -323,5 +323,5 @@ // 階層上限チェック if ($this->isOverLevel($parent_category_id)) { - $arrErr['category_name'] = '※ ' . LEVEL_MAX . "階層以上の登録はできません。
"; + $arrErr['category_name'] = '※ ' . LEVEL_MAX . '階層以上の登録はできません。
'; return $arrErr; } @@ -502,5 +502,5 @@ function isOverLevel($parent_category_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $level = $objQuery->get('level', 'dtb_category', "category_id = ?", array($parent_category_id)); + $level = $objQuery->get('level', 'dtb_category', 'category_id = ?', array($parent_category_id)); return $level >= LEVEL_MAX; } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 21515) @@ -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; @@ -459,5 +459,5 @@ 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'] . ')は、存在しません。'; } // 削除フラグのチェック @@ -494,7 +494,7 @@ if (array_search('parent_category_id', $this->arrFormKeyList) !== FALSE and $item['parent_category_id'] != '') { - $level = $objQuery->get('level', 'dtb_category', "category_id = ?", array($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 . '階層以上の登録はできません。'; } } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 21515) @@ -224,5 +224,5 @@ function lfDelete($maker_id) { $objDb = new SC_Helper_DB_Ex(); - $objDb->sfDeleteRankRecord('dtb_maker', 'maker_id', $maker_id, "", true); + $objDb->sfDeleteRankRecord('dtb_maker', 'maker_id', $maker_id, '', true); } @@ -294,5 +294,5 @@ $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'])); // 編集中のレコード以外に同じ名称が存在する場合 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21515) @@ -326,6 +326,6 @@ $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('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(NORMAL_PRICE_TITLE, 'price01', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); @@ -344,18 +344,18 @@ $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()); - $objFormParam->addParam('save_main_large_image', 'save_main_large_image', '', "", array()); - $objFormParam->addParam('temp_main_list_image', 'temp_main_list_image', '', "", array()); - $objFormParam->addParam('temp_main_image', 'temp_main_image', '', "", array()); - $objFormParam->addParam('temp_main_large_image', 'temp_main_large_image', '', "", array()); + $objFormParam->addParam('save_main_list_image', 'save_main_list_image', '', '', array()); + $objFormParam->addParam('save_main_image', 'save_main_image', '', '', array()); + $objFormParam->addParam('save_main_large_image', 'save_main_large_image', '', '', array()); + $objFormParam->addParam('temp_main_list_image', 'temp_main_list_image', '', '', array()); + $objFormParam->addParam('temp_main_image', 'temp_main_image', '', '', array()); + $objFormParam->addParam('temp_main_large_image', 'temp_main_large_image', '', '', array()); 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('save_sub_image' . $cnt, 'save_sub_image' . $cnt, '', "", array()); - $objFormParam->addParam('save_sub_large_image' . $cnt, 'save_sub_large_image' . $cnt, '', "", array()); - $objFormParam->addParam('temp_sub_image' . $cnt, 'temp_sub_image' . $cnt, '', "", array()); - $objFormParam->addParam('temp_sub_large_image' . $cnt, 'temp_sub_large_image' . $cnt, '', "", array()); + $objFormParam->addParam('save_sub_image' . $cnt, 'save_sub_image' . $cnt, '', '', array()); + $objFormParam->addParam('save_sub_large_image' . $cnt, 'save_sub_large_image' . $cnt, '', '', array()); + $objFormParam->addParam('temp_sub_image' . $cnt, 'temp_sub_image' . $cnt, '', '', array()); + $objFormParam->addParam('temp_sub_large_image' . $cnt, 'temp_sub_large_image' . $cnt, '', '', array()); } @@ -383,5 +383,5 @@ */ function lfInitFormParam_UploadImage(&$objFormParam) { - $objFormParam->addParam('image_key', 'image_key', "", "", array()); + $objFormParam->addParam('image_key', 'image_key', '', '', array()); } @@ -394,5 +394,5 @@ */ function lfInitFormParam_UploadDown(&$objFormParam) { - $objFormParam->addParam('down_key', 'down_key', "", "", array()); + $objFormParam->addParam('down_key', 'down_key', '', '', array()); } @@ -405,5 +405,5 @@ */ function lfInitFormParam_RecommendSelect(&$objFormParam) { - $objFormParam->addParam('anchor_key', 'anchor_key', "", "", array()); + $objFormParam->addParam('anchor_key', 'anchor_key', '', '', array()); $objFormParam->addParam('select_recommend_no', 'select_recommend_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); } @@ -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); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21515) @@ -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(); @@ -491,5 +491,5 @@ $comment_key = 'recommend_comment' . $i; if ($arrList[$keyname] != '') { - $arrProduct = $objQuery->select('product_id', 'dtb_products', "product_id = ?", array($arrList[$keyname])); + $arrProduct = $objQuery->select('product_id', 'dtb_products', 'product_id = ?', array($arrList[$keyname])); if ($arrProduct[0]['product_id'] != '') { $arrval['product_id'] = $product_id; @@ -778,5 +778,5 @@ } $count = count($arrItems); - $where = $tblkey .' IN (' . implode(',', array_fill(0, $count, "?")) . ")"; + $where = $tblkey .' IN (' . implode(',', array_fill(0, $count, '?')) . ')'; $objQuery =& SC_Query_Ex::getSingletonInstance(); 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php (revision 21515) @@ -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); } @@ -345,5 +345,5 @@ $this->tpl_linemax = $linemax; - $this->tpl_pageno = isset($arrForm['search_pageno']) ? $arrForm['search_pageno'] : ""; + $this->tpl_pageno = isset($arrForm['search_pageno']) ? $arrForm['search_pageno'] : ''; // ページ送りの取得 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php (revision 21515) @@ -224,5 +224,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $objDb->sfDeleteRankRecord('dtb_class', 'class_id', $class_id, "", true); + $objDb->sfDeleteRankRecord('dtb_class', 'class_id', $class_id, '', true); $where= 'class_id = ?'; $ret = $objQuery->delete('dtb_classcategory', $where, array($class_id)); 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21515) @@ -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) { @@ -576,5 +576,5 @@ $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]); @@ -606,8 +606,8 @@ } if ($is_error) { - $this->arrErr['down_realfilename'][$index] = '※ ダウンロード販売用ファイル名で許可されている形式は、' . $strExt . "です。
"; - } - - $uniqname = date('mdHi') . '_' . uniqid("")."."; + $this->arrErr['down_realfilename'][$index] = '※ ダウンロード販売用ファイル名で許可されている形式は、' . $strExt . 'です。
'; + } + + $uniqname = date('mdHi') . '_' . uniqid('').'.'; $temp_file = preg_replace("/^.*\./", $uniqname, $_FILES['down_realfilename']['name'][$index]); @@ -615,8 +615,8 @@ $arrDownRealFiles[$index] = $temp_file; $objFormParam->setValue('down_realfilename', $arrDownRealFiles); - GC_Utils_Ex::gfPrintLog($_FILES['down_realfilename']['name'][$index] ." -> ". realpath(DOWN_TEMP_REALDIR . $temp_file)); + GC_Utils_Ex::gfPrintLog($_FILES['down_realfilename']['name'][$index] .' -> '. realpath(DOWN_TEMP_REALDIR . $temp_file)); } else { $objErr->arrErr[$keyname] = '※ ファイルのアップロードに失敗しました。
'; - GC_Utils_Ex::gfPrintLog('File Upload Error!: ' . $_FILES['down_realfilename']['name'][$index] . " -> " . DOWN_TEMP_REALDIR . $temp_file); + GC_Utils_Ex::gfPrintLog('File Upload Error!: ' . $_FILES['down_realfilename']['name'][$index] . ' -> ' . DOWN_TEMP_REALDIR . $temp_file); } } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (revision 21515) @@ -121,6 +121,6 @@ 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('商品名', 'name', '', '', array(), '', false); + $objFormParam->addParam('投稿日', 'create_date', '', '', array(), '', false); // 登録情報 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 21515) @@ -100,5 +100,5 @@ */ function action() { - if (isset($_GET['draw_image']) && $_GET['draw_image'] != "") { + if (isset($_GET['draw_image']) && $_GET['draw_image'] != '') { define('DRAW_IMAGE' , true); } else { @@ -174,5 +174,5 @@ $day = date('d'); - $list = isset($_SESSION['total']) ? $_SESSION['total'] : ""; + $list = isset($_SESSION['total']) ? $_SESSION['total'] : ''; // セッション情報に開始月度が保存されていない。 @@ -275,8 +275,8 @@ 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': @@ -332,6 +332,6 @@ list($sy, $sm, $sd) = preg_split('|[/ ]|' , $sdate); list($ey, $em, $ed) = preg_split('|[/ ]|' , $edate); - $start_date = $sy . '年' . $sm . '月' . $sd . "日"; - $end_date = $ey . '年' . $em . '月' . $ed . "日"; + $start_date = $sy . '年' . $sm . '月' . $sd . '日'; + $end_date = $ey . '年' . $em . '月' . $ed . '日'; $objGraphLine->drawTitle('集計期間：' . $start_date . ' - ' . $end_date); @@ -352,5 +352,5 @@ // 円グラフの作成 - function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = "") { + function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = '') { $ret_path = ''; @@ -376,6 +376,6 @@ list($sy, $sm, $sd) = preg_split('|[/ ]|' , $sdate); list($ey, $em, $ed) = preg_split('|[/ ]|' , $edate); - $start_date = $sy . '年' . $sm . '月' . $sd . "日"; - $end_date = $ey . '年' . $em . '月' . $ed . "日"; + $start_date = $sy . '年' . $sm . '月' . $sd . '日'; + $end_date = $ey . '年' . $em . '月' . $ed . '日'; $objGraphPie->drawTitle('集計期間：' . $start_date . ' - ' . $end_date); @@ -424,6 +424,6 @@ list($sy, $sm, $sd) = preg_split('|[/ ]|' , $sdate); list($ey, $em, $ed) = preg_split('|[/ ]|' , $edate); - $start_date = $sy . '年' . $sm . '月' . $sd . "日"; - $end_date = $ey . '年' . $em . '月' . $ed . "日"; + $start_date = $sy . '年' . $sm . '月' . $sd . '日'; + $end_date = $ey . '年' . $em . '月' . $ed . '日'; $objGraphBar->drawTitle('集計期間：' . $start_date . ' - ' . $end_date); @@ -529,5 +529,5 @@ } - $tpl_image = $this->lfGetGraphPie($arrTotalResults, 'member_name', 'member', "(売上比率)", $sdate, $edate); + $tpl_image = $this->lfGetGraphPie($arrTotalResults, 'member_name', 'member', '(売上比率)', $sdate, $edate); return array($arrTotalResults, $tpl_image); @@ -564,5 +564,5 @@ $arrTotalResults = $objQuery->select($col, $from, $where, $arrval); - $tpl_image = $this->lfGetGraphPie($arrTotalResults, 'product_name', 'products_' . $type, "(売上比率)", $sdate, $edate); + $tpl_image = $this->lfGetGraphPie($arrTotalResults, 'product_name', 'products_' . $type, '(売上比率)', $sdate, $edate); return array($arrTotalResults, $tpl_image); @@ -599,5 +599,5 @@ } - $tpl_image = $this->lfGetGraphPie($arrTotalResults, 'job_name', 'job_' . $type, "(売上比率)", $sdate, $edate); + $tpl_image = $this->lfGetGraphPie($arrTotalResults, 'job_name', 'job_' . $type, '(売上比率)', $sdate, $edate); return array($arrTotalResults, $tpl_image); @@ -636,5 +636,5 @@ } - $tpl_image = $this->lfGetGraphBar($arrTotalResults, 'age_name', 'age_' . $type, "(年齢)", "(売上合計)", $sdate, $edate); + $tpl_image = $this->lfGetGraphBar($arrTotalResults, 'age_name', 'age_' . $type, '(年齢)', '(売上合計)', $sdate, $edate); return array($arrTotalResults, $tpl_image); 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 21515) @@ -130,5 +130,5 @@ // テンプレート再生成. $this->remakeTemplate(); - echo SC_Utils_Ex::jsonEncode(array('message' => $plugin['plugin_name'] . "を有効にしました。")); + echo SC_Utils_Ex::jsonEncode(array('message' => $plugin['plugin_name'] . 'を有効にしました。')); } } @@ -148,5 +148,5 @@ // テンプレート再生成. $this->remakeTemplate(); - echo SC_Utils_Ex::jsonEncode(array('message' => $plugin['plugin_name'] . "を無効にしました。")); + echo SC_Utils_Ex::jsonEncode(array('message' => $plugin['plugin_name'] . 'を無効にしました。')); } } @@ -204,5 +204,5 @@ foreach ($plugins as $key => $plugin) { // 設定ファイルがあるかを判定. - $plugins[$key]['config_flg'] = $this->isContainsFile(PLUGIN_UPLOAD_REALDIR . $plugin['plugin_code'], "config.php"); + $plugins[$key]['config_flg'] = $this->isContainsFile(PLUGIN_UPLOAD_REALDIR . $plugin['plugin_code'], 'config.php'); if ($plugins[$key]['enable'] === PLUGIN_ENABLE_TRUE) { // 競合するプラグインがあるかを判定. @@ -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 . 'が見つかりません。
'; } @@ -873,5 +873,5 @@ 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 21515) @@ -232,5 +232,5 @@ $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')); + $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02') ,array('EQUAL_CHECK')); $arrErr = $objErr->arrErr; 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php (revision 21515) @@ -104,5 +104,5 @@ $admin_dir = str_replace('/','',ADMIN_DIR); - $this->arrForm = array('admin_dir'=>$admin_dir,'admin_force_ssl'=>ADMIN_FORCE_SSL,'admin_allow_hosts'=>""); + $this->arrForm = array('admin_dir'=>$admin_dir,'admin_force_ssl'=>ADMIN_FORCE_SSL,'admin_allow_hosts'=>''); if (defined('ADMIN_ALLOW_HOSTS')) { $allow_hosts = unserialize(ADMIN_ALLOW_HOSTS); 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php (revision 21515) @@ -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_Template.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 21514) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 21515) @@ -317,5 +317,5 @@ function getAllTemplates($device_type_id) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - return $objQuery->select('*', 'dtb_templates', "device_type_id = ?", array($device_type_id)); + return $objQuery->select('*', 'dtb_templates', 'device_type_id = ?', array($device_type_id)); } 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 21514) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (revision 21515) @@ -243,5 +243,5 @@ $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/SC_CustomerList.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CustomerList.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_CustomerList.php (revision 21515) @@ -51,5 +51,5 @@ // 会員ID - if (!isset($this->arrSql['search_customer_id'])) $this->arrSql['search_customer_id'] = ""; + if (!isset($this->arrSql['search_customer_id'])) $this->arrSql['search_customer_id'] = ''; if (strlen($this->arrSql['search_customer_id']) > 0) { $this->setWhere('customer_id = ?'); @@ -58,7 +58,7 @@ // 名前 - if (!isset($this->arrSql['search_name'])) $this->arrSql['search_name'] = ""; + 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); @@ -66,7 +66,7 @@ // 名前(フリガナ) - if (!isset($this->arrSql['search_kana'])) $this->arrSql['search_kana'] = ""; + 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); @@ -74,5 +74,5 @@ // 都道府県 - if (!isset($this->arrSql['search_pref'])) $this->arrSql['search_pref'] = ""; + if (!isset($this->arrSql['search_pref'])) $this->arrSql['search_pref'] = ''; if (strlen($this->arrSql['search_pref']) > 0) { $this->setWhere('pref = ?'); @@ -81,7 +81,7 @@ // 電話番号 - if (!isset($this->arrSql['search_tel'])) $this->arrSql['search_tel'] = ""; + 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); @@ -89,5 +89,5 @@ // 性別 - if (!isset($this->arrSql['search_sex'])) $this->arrSql['search_sex'] = ""; + if (!isset($this->arrSql['search_sex'])) $this->arrSql['search_sex'] = ''; if (is_array($this->arrSql['search_sex'])) { $arrSexVal = $this->setItemTerm($this->arrSql['search_sex'] ,'sex'); @@ -98,5 +98,5 @@ // 職業 - if (!isset($this->arrSql['search_job'])) $this->arrSql['search_job'] = ""; + if (!isset($this->arrSql['search_job'])) $this->arrSql['search_job'] = ''; if (is_array($this->arrSql['search_job'])) { if (in_array('不明', $this->arrSql['search_job'])) { @@ -113,5 +113,5 @@ // E-MAIL - if (!isset($this->arrSql['search_email'])) $this->arrSql['search_email'] = ""; + if (!isset($this->arrSql['search_email'])) $this->arrSql['search_email'] = ''; if (strlen($this->arrSql['search_email']) > 0) { //カンマ区切りで複数の条件指定可能に @@ -141,5 +141,5 @@ // E-MAIL(mobile) - if (!isset($this->arrSql['search_email_mobile'])) $this->arrSql['search_email_mobile'] = ""; + if (!isset($this->arrSql['search_email_mobile'])) $this->arrSql['search_email_mobile'] = ''; if (strlen($this->arrSql['search_email_mobile']) > 0) { @@ -209,6 +209,6 @@ // 購入金額指定 - if (!isset($this->arrSql['search_buy_total_from'])) $this->arrSql['search_buy_total_from'] = ""; - if (!isset($this->arrSql['search_buy_total_to'])) $this->arrSql['search_buy_total_to'] = ""; + if (!isset($this->arrSql['search_buy_total_from'])) $this->arrSql['search_buy_total_from'] = ''; + if (!isset($this->arrSql['search_buy_total_to'])) $this->arrSql['search_buy_total_to'] = ''; if (is_numeric($this->arrSql['search_buy_total_from']) || is_numeric($this->arrSql['search_buy_total_to'])) { $arrBuyTotal = $this->selectRange($this->arrSql['search_buy_total_from'], $this->arrSql['search_buy_total_to'], 'buy_total'); @@ -219,6 +219,6 @@ // 購入回数指定 - if (!isset($this->arrSql['search_buy_times_from'])) $this->arrSql['search_buy_times_from'] = ""; - if (!isset($this->arrSql['search_buy_times_to'])) $this->arrSql['search_buy_times_to'] = ""; + if (!isset($this->arrSql['search_buy_times_from'])) $this->arrSql['search_buy_times_from'] = ''; + if (!isset($this->arrSql['search_buy_times_to'])) $this->arrSql['search_buy_times_to'] = ''; if (is_numeric($this->arrSql['search_buy_times_from']) || is_numeric($this->arrSql['search_buy_times_to'])) { $arrBuyTimes = $this->selectRange($this->arrSql['search_buy_times_from'], $this->arrSql['search_buy_times_to'], 'buy_times'); @@ -229,10 +229,10 @@ // 誕生日期間指定 - if (!isset($this->arrSql['search_b_start_year'])) $this->arrSql['search_b_start_year'] = ""; - if (!isset($this->arrSql['search_b_start_month'])) $this->arrSql['search_b_start_month'] = ""; - if (!isset($this->arrSql['search_b_start_day'])) $this->arrSql['search_b_start_day'] = ""; - if (!isset($this->arrSql['search_b_end_year'])) $this->arrSql['search_b_end_year'] = ""; - if (!isset($this->arrSql['search_b_end_month'])) $this->arrSql['search_b_end_month'] = ""; - if (!isset($this->arrSql['search_b_end_day'])) $this->arrSql['search_b_end_day'] = ""; + if (!isset($this->arrSql['search_b_start_year'])) $this->arrSql['search_b_start_year'] = ''; + if (!isset($this->arrSql['search_b_start_month'])) $this->arrSql['search_b_start_month'] = ''; + if (!isset($this->arrSql['search_b_start_day'])) $this->arrSql['search_b_start_day'] = ''; + if (!isset($this->arrSql['search_b_end_year'])) $this->arrSql['search_b_end_year'] = ''; + if (!isset($this->arrSql['search_b_end_month'])) $this->arrSql['search_b_end_month'] = ''; + if (!isset($this->arrSql['search_b_end_day'])) $this->arrSql['search_b_end_day'] = ''; if ( (strlen($this->arrSql['search_b_start_year']) > 0 && strlen($this->arrSql['search_b_start_month']) > 0 && strlen($this->arrSql['search_b_start_day']) > 0) || strlen($this->arrSql['search_b_end_year']) > 0 && strlen($this->arrSql['search_b_end_month']) > 0 && strlen($this->arrSql['search_b_end_day']) > 0) { @@ -246,5 +246,5 @@ // 誕生月の検索 - if (!isset($this->arrSql['search_birth_month'])) $this->arrSql['search_birth_month'] = ""; + 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) = ?'); @@ -253,10 +253,10 @@ // 登録期間指定 - if (!isset($this->arrSql['search_start_year'])) $this->arrSql['search_start_year'] = ""; - if (!isset($this->arrSql['search_start_month'])) $this->arrSql['search_start_month'] = ""; - if (!isset($this->arrSql['search_start_day'])) $this->arrSql['search_start_day'] = ""; - if (!isset($this->arrSql['search_end_year'])) $this->arrSql['search_end_year'] = ""; - if (!isset($this->arrSql['search_end_month'])) $this->arrSql['search_end_month'] = ""; - if (!isset($this->arrSql['search_end_day'])) $this->arrSql['search_end_day'] = ""; + if (!isset($this->arrSql['search_start_year'])) $this->arrSql['search_start_year'] = ''; + if (!isset($this->arrSql['search_start_month'])) $this->arrSql['search_start_month'] = ''; + if (!isset($this->arrSql['search_start_day'])) $this->arrSql['search_start_day'] = ''; + if (!isset($this->arrSql['search_end_year'])) $this->arrSql['search_end_year'] = ''; + if (!isset($this->arrSql['search_end_month'])) $this->arrSql['search_end_month'] = ''; + if (!isset($this->arrSql['search_end_day'])) $this->arrSql['search_end_day'] = ''; if ( (strlen($this->arrSql['search_start_year']) > 0 && strlen($this->arrSql['search_start_month']) > 0 && strlen($this->arrSql['search_start_day']) > 0) || (strlen($this->arrSql['search_end_year']) > 0 && strlen($this->arrSql['search_end_month']) >0 && strlen($this->arrSql['search_end_day']) > 0)) { @@ -270,10 +270,10 @@ // 最終購入日指定 - if (!isset($this->arrSql['search_buy_start_year'])) $this->arrSql['search_buy_start_year'] = ""; - if (!isset($this->arrSql['search_buy_start_month'])) $this->arrSql['search_buy_start_month'] = ""; - if (!isset($this->arrSql['search_buy_start_day'])) $this->arrSql['search_buy_start_day'] = ""; - if (!isset($this->arrSql['search_buy_end_year'])) $this->arrSql['search_buy_end_year'] = ""; - if (!isset($this->arrSql['search_buy_end_month'])) $this->arrSql['search_buy_end_month'] = ""; - if (!isset($this->arrSql['search_buy_end_day'])) $this->arrSql['search_buy_end_day'] = ""; + if (!isset($this->arrSql['search_buy_start_year'])) $this->arrSql['search_buy_start_year'] = ''; + if (!isset($this->arrSql['search_buy_start_month'])) $this->arrSql['search_buy_start_month'] = ''; + if (!isset($this->arrSql['search_buy_start_day'])) $this->arrSql['search_buy_start_day'] = ''; + if (!isset($this->arrSql['search_buy_end_year'])) $this->arrSql['search_buy_end_year'] = ''; + if (!isset($this->arrSql['search_buy_end_month'])) $this->arrSql['search_buy_end_month'] = ''; + if (!isset($this->arrSql['search_buy_end_day'])) $this->arrSql['search_buy_end_day'] = ''; if ( (strlen($this->arrSql['search_buy_start_year']) > 0 && strlen($this->arrSql['search_buy_start_month']) > 0 && strlen($this->arrSql['search_buy_start_day']) > 0) || @@ -287,5 +287,5 @@ // 購入商品コード - if (!isset($this->arrSql['search_buy_product_code'])) $this->arrSql['search_buy_product_code'] = ""; + 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)'); @@ -295,5 +295,5 @@ // 購入商品名称 - if (!isset($this->arrSql['search_buy_product_name'])) $this->arrSql['search_buy_product_name'] = ""; + 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)'); @@ -303,5 +303,5 @@ // カテゴリを選択している場合のみ絞込検索を行う - if (!isset($this->arrSql['search_category_id'])) $this->arrSql['search_category_id'] = ""; + if (!isset($this->arrSql['search_category_id'])) $this->arrSql['search_category_id'] = ''; if (strlen($this->arrSql['search_category_id']) > 0) { // カテゴリで絞込検索を行うSQL文生成 @@ -316,5 +316,5 @@ // 会員状態 - if (!isset($this->arrSql['search_status'])) $this->arrSql['search_status'] = ""; + if (!isset($this->arrSql['search_status'])) $this->arrSql['search_status'] = ''; if (is_array($this->arrSql['search_status'])) { $arrStatusVal = $this->setItemTerm($this->arrSql['search_status'] ,'status'); Index: branches/version-2_12-dev/data/class/SC_Customer.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Customer.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_Customer.php (revision 21515) @@ -113,5 +113,5 @@ //docomo用にデータを取り出す。 if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') { - if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0) + if($_SESSION['mobile']['phone_id'] == '' && strlen($_SESSION['mobile']['phone_id']) == 0) $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId(); } @@ -137,5 +137,5 @@ //docomo用にデータを取り出す。 if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') { - if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0) + if($_SESSION['mobile']['phone_id'] == '' && strlen($_SESSION['mobile']['phone_id']) == 0) $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId(); } @@ -227,10 +227,10 @@ $objQuery = new SC_Query_Ex(); - $email = $objQuery->get('email', 'dtb_customer', "customer_id = ?", array($_SESSION['customer']['customer_id'])); + $email = $objQuery->get('email', 'dtb_customer', 'customer_id = ?', array($_SESSION['customer']['customer_id'])); if ($email == $_SESSION['customer']['email']) { // モバイルサイトの場合は携帯のメールアドレスが登録されていることもチェックする。 // ただし $dont_check_email_mobile が true の場合はチェックしない。 if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE && !$dont_check_email_mobile) { - $email_mobile = $objQuery->get('email_mobile', 'dtb_customer', "customer_id = ?", array($_SESSION['customer']['customer_id'])); + $email_mobile = $objQuery->get('email_mobile', 'dtb_customer', 'customer_id = ?', array($_SESSION['customer']['customer_id'])); return isset($email_mobile); } @@ -250,5 +250,5 @@ return $point; } else { - return isset($_SESSION['customer'][$keyname]) ? $_SESSION['customer'][$keyname] : ""; + return isset($_SESSION['customer'][$keyname]) ? $_SESSION['customer'][$keyname] : ''; } } @@ -303,5 +303,5 @@ 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)); + $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 21514) +++ branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 21515) @@ -262,5 +262,5 @@ /* DB用日付文字列取得 */ function sfGetTimestamp($year, $month, $day, $last = false) { - if ($year != '' && $month != '' && $day != "") { + if ($year != '' && $month != '' && $day != '') { if ($last) { $time = '23:59:59'; @@ -268,5 +268,5 @@ $time = '00:00:00'; } - $date = $year.'-'.$month.'-'.$day." ".$time; + $date = $year.'-'.$month.'-'.$day.' '.$time; } else { $date = ''; @@ -478,5 +478,5 @@ // キーと値をセットした配列を取得(値が複数の場合) - function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = "") { + function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = '') { $max = count($arrList); @@ -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 { @@ -1709,5 +1709,5 @@ } - $string .= $backtrace['file'] . ' ' . $backtrace['line'] . ":" . $func . "\n"; + $string .= $backtrace['file'] . ' ' . $backtrace['line'] . ':' . $func . "\n"; } Index: branches/version-2_12-dev/data/class/util/GC_Utils.php =================================================================== --- branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21514) +++ branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21515) @@ -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; } @@ -231,5 +231,5 @@ $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); } Index: branches/version-2_12-dev/data/class/SC_SiteSession.php =================================================================== --- branches/version-2_12-dev/data/class/SC_SiteSession.php (revision 21441) +++ branches/version-2_12-dev/data/class/SC_SiteSession.php (revision 21515) @@ -29,10 +29,10 @@ $_SESSION['site']['pre_regist_success'] = isset($_SESSION['site']['regist_success']) - ? $_SESSION['site']['regist_success'] : ""; + ? $_SESSION['site']['regist_success'] : ''; $_SESSION['site']['regist_success'] = false; $_SESSION['site']['pre_page'] = isset($_SESSION['site']['now_page']) - ? $_SESSION['site']['now_page'] : ""; + ? $_SESSION['site']['now_page'] : ''; $_SESSION['site']['now_page'] = $_SERVER['PHP_SELF']; @@ -41,5 +41,5 @@ /* 前ページが正当であるかの判定 */ function isPrePage() { - if ($_SESSION['site']['pre_page'] != "" && $_SESSION['site']['now_page'] != "") { + if ($_SESSION['site']['pre_page'] != '' && $_SESSION['site']['now_page'] != '') { if ($_SESSION['site']['pre_regist_success'] || $_SESSION['site']['pre_page'] == $_SESSION['site']['now_page']) { return true; @@ -61,5 +61,5 @@ function getUniqId() { // ユニークIDがセットされていない場合はセットする。 - if (!isset($_SESSION['site']['uniqid']) || $_SESSION['site']['uniqid'] == "") { + if (!isset($_SESSION['site']['uniqid']) || $_SESSION['site']['uniqid'] == '') { $this->setUniqId(); } @@ -85,5 +85,5 @@ /* ユニークIDの解除 */ function unsetUniqId() { - $_SESSION['site']['uniqid'] = ""; + $_SESSION['site']['uniqid'] = ''; } 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 21514) +++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (revision 21515) @@ -220,5 +220,5 @@ 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 21514) +++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php (revision 21515) @@ -45,5 +45,5 @@ $val = $objQuery->getOne('select version()'); $arrLine = explode(' ' , $val); - return $arrLine[0] . ' ' . str_replace(',', "", $arrLine[1]); + return $arrLine[0] . ' ' . str_replace(',', '', $arrLine[1]); } Index: branches/version-2_12-dev/data/class/SC_UploadFile.php =================================================================== --- branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21515) @@ -116,5 +116,5 @@ // 一意なファイル名を作成する。 if ($rename) { - $uniqname = date('mdHi') . '_' . uniqid("")."."; + $uniqname = date('mdHi') . '_' . uniqid('').'.'; $this->temp_file[$cnt] = ereg_replace("^.*\.",$uniqname, $_FILES[$keyname]['name']); } else { @@ -125,5 +125,5 @@ } else { $objErr->arrErr[$keyname] = '※ ファイルのアップロードに失敗しました。
'; - GC_Utils_Ex::gfPrintLog('File Upload Error!: ' . $_FILES[$keyname]['name']." -> ". $this->temp_dir . $this->temp_file[$cnt]); + GC_Utils_Ex::gfPrintLog('File Upload Error!: ' . $_FILES[$keyname]['name'].' -> '. $this->temp_dir . $this->temp_file[$cnt]); } } @@ -154,5 +154,5 @@ if (!isset($objErr->arrErr[$keyname])) { // 一意なファイル名を作成する。 - $uniqname = date('mdHi') . '_' . uniqid("")."."; + $uniqname = date('mdHi') . '_' . uniqid('').'.'; $this->temp_file[$cnt] = ereg_replace("^.*\.",$uniqname, $_FILES[$keyname]['name']); set_time_limit(0); @@ -404,5 +404,5 @@ // DBで保存されたダウンロードファイル名をセットする function setDBDownFile($arrVal) { - if (isset($arrVal['down_realfilename']) && $arrVal['down_realfilename'] != "") { + if (isset($arrVal['down_realfilename']) && $arrVal['down_realfilename'] != '') { $this->save_file[0] = $arrVal['down_realfilename']; } @@ -503,5 +503,5 @@ if ($rename === true) { // 一意なIDを取得し、画像名をリネームし保存 - $uniqname = date('mdHi') . '_' . uniqid(""); + $uniqname = date('mdHi') . '_' . uniqid(''); } else { // アップロードした画像名で保存 Index: branches/version-2_12-dev/data/class/SC_CheckError.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21515) @@ -73,5 +73,5 @@ if (!$find) { - $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に許可されていないタグ[' . strtoupper($val) . "]が含まれています。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に許可されていないタグ[' . strtoupper($val) . ']が含まれています。
'; return; } @@ -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] . 'は、同じ値を使用できません。
'; } } @@ -227,5 +227,5 @@ // 文字数の取得 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] . "より大きい値を入力できません。
"; + $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] . '以上で入力してください。
'; } } @@ -383,5 +383,5 @@ 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 . 'は数字で入力してください。
'; @@ -392,5 +392,5 @@ // 合計値チェック if ($total_count > $telLen) { - $this->arrErr[$value[3]] .= '※ ' . $value[0] . 'は' . $telLen . "文字以内で入力してください。
"; + $this->arrErr[$value[3]] .= '※ ' . $value[0] . 'は' . $telLen . '文字以内で入力してください。
'; } } @@ -754,5 +754,5 @@ } if ($errFlag == 1) { - $this->arrErr[$value[1]] = '※ ' . $value[0] . 'で許可されている形式は、' . $strExt . "です。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'で許可されている形式は、' . $strExt . 'です。
'; } } @@ -808,5 +808,5 @@ $byte = 'MB'; } - $this->arrErr[$value[1]] = '※ ' . $value[0] . 'のファイルサイズは' . $value[2] . $byte . "以下のものを使用してください。
"; + $this->arrErr[$value[1]] = '※ ' . $value[0] . 'のファイルサイズは' . $value[2] . $byte . '以下のものを使用してください。
'; } } @@ -972,5 +972,5 @@ if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[5]] == '') && $date1 > $date2) { - $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. "の期間指定が不正です。
"; + $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. 'の期間指定が不正です。
'; } } @@ -1019,12 +1019,12 @@ 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]]); + $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]. "の期間指定が不正です。
"; + $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]. 'の期間指定が不正です。
'; } @@ -1067,5 +1067,5 @@ if (($this->arrErr[$value[2]] == '' && $this->arrErr[$value[5]] == '') && $date1 > $date2) { - $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. "の期間指定が不正です。
"; + $this->arrErr[$value[2]] = '※ ' .$value[0]. 'と' .$value[1]. 'の期間指定が不正です。
'; } } Index: branches/version-2_12-dev/data/class/SC_Initial.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Initial.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_Initial.php (revision 21515) @@ -88,5 +88,5 @@ /** サイト用DB */ define ('DEFAULT_DSN', - DB_TYPE . '://' . DB_USER . ':' . DB_PASSWORD . "@" + DB_TYPE . '://' . DB_USER . ':' . DB_PASSWORD . '@' . DB_SERVER . ':' .DB_PORT . '/' . DB_NAME); } Index: branches/version-2_12-dev/data/class/SC_SendMail.php =================================================================== --- branches/version-2_12-dev/data/class/SC_SendMail.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_SendMail.php (revision 21515) @@ -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); Index: branches/version-2_12-dev/data/class/SC_CartSession.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CartSession.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_CartSession.php (revision 21515) @@ -273,5 +273,5 @@ // 前頁のURLを取得する function getPrevURL() { - return isset($_SESSION['prev_url']) ? $_SESSION['prev_url'] : ""; + return isset($_SESSION['prev_url']) ? $_SESSION['prev_url'] : ''; } Index: branches/version-2_12-dev/data/class/SC_Plugin.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Plugin.php (revision 21514) +++ branches/version-2_12-dev/data/class/SC_Plugin.php (revision 21515) @@ -48,5 +48,5 @@ $objQuery = new SC_Query_Ex(); $name = preg_replace('/.php/', '', __FILE__); // XXX 正規表現エスケープ漏れでは? - $objQuery->update('dtb_plugin', array('enable'=>'0'), "plugin_name = ?", array($name)); + $objQuery->update('dtb_plugin', array('enable'=>'0'), 'plugin_name = ?', array($name)); } @@ -54,5 +54,5 @@ $objQuery = new SC_Query_Ex(); $name = preg_replace('/.php/', '', __FILE__); // XXX 正規表現エスケープ漏れでは? - $objQuery->update('dtb_plugin', array('enable'=>'0'), "plugin_name = ?", array($name)); + $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 21514) +++ branches/version-2_12-dev/data/class/SC_SelectSql.php (revision 21515) @@ -45,5 +45,5 @@ //-- SQL分生成 function getSql($mode = '') { - $this->sql = $this->select .' '. $this->where .' '. $this->group ." "; + $this->sql = $this->select .' '. $this->where .' '. $this->group .' '; // $mode == 1 は limit & offset無し @@ -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; @@ -137,5 +137,5 @@ } - if( count($arr) > 1) $item = '(' . rtrim($item, ' OR ') . ")"; + if( count($arr) > 1) $item = '(' . rtrim($item, ' OR ') . ')'; $this->setWhere($item); return $return; @@ -191,8 +191,8 @@ for ($i = 0; $i < $count; $i++) { - if( isset($arrWhere[$i]['value'])) $statement .= $arrWhere[$i]['column'] ." = " . SC_Utils_Ex::sfQuoteSmart($arrWhere[$i]['value']) ." OR " ; - } - - $statement = '(' . rtrim($statement, ' OR ') . ")"; + if( isset($arrWhere[$i]['value'])) $statement .= $arrWhere[$i]['column'] .' = ' . SC_Utils_Ex::sfQuoteSmart($arrWhere[$i]['value']) .' OR ' ; + } + + $statement = '(' . rtrim($statement, ' OR ') . ')'; if ($this->where) { 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 21514) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php (revision 21515) @@ -414,5 +414,5 @@ // 指定されたフォルダ内に解凍する $result = $tar->extractModify($dir. '/', $unpacking_name); - GC_Utils_Ex::gfPrintLog('解凍：' . $dir.'/'.$file_name."->".$dir."/".$unpacking_name); + GC_Utils_Ex::gfPrintLog('解凍：' . $dir.'/'.$file_name.'->'.$dir.'/'.$unpacking_name); // フォルダ削除 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 21514) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php (revision 21515) @@ -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)); } @@ -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 ごとの配列を生成する 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 21514) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php (revision 21515) @@ -102,5 +102,5 @@ krsort($this->arrRegistedPluginActions[$hook_point]); foreach ($this->arrRegistedPluginActions[$hook_point] as $priority => $arrFuncs) { - + foreach ($arrFuncs as $func) { if (!is_null($func['function'])) { @@ -304,5 +304,5 @@ // プラグインのsetTemplateTransformerを実行します. foreach ($this->arrPluginInstances as $objPlugin) { - if(method_exists($objPlugin, 'setTemplateTransformer') === true) { + if (method_exists($objPlugin, 'setTemplateTransformer') === true) { // SC_Plugin_TemplateTransformList::arrConfsByTemplatesにトランスフォーム情報をセットします $objPlugin->setTemplateTransformer(); 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 21514) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21515) @@ -48,5 +48,5 @@ // salt値の生成(insert時)または取得(update時)。 if (is_numeric($customer_id)) { - $salt = $objQuery->get('salt', 'dtb_customer', "customer_id = ? ", array($customer_id)); + $salt = $objQuery->get('salt', 'dtb_customer', 'customer_id = ? ', array($customer_id)); // 旧バージョン(2.11未満)からの移行を考慮 @@ -57,5 +57,5 @@ } //-- パスワードの更新がある場合は暗号化 - if ($array['password'] == DEFAULT_PASSWORD or $array['password'] == "") { + if ($array['password'] == DEFAULT_PASSWORD or $array['password'] == '') { //更新しない unset($array['password']); @@ -71,5 +71,5 @@ } //-- 秘密の質問の更新がある場合は暗号化 - if ($array['reminder_answer'] == DEFAULT_PASSWORD or $array['reminder_answer'] == "") { + if ($array['reminder_answer'] == DEFAULT_PASSWORD or $array['reminder_answer'] == '') { //更新しない unset($array['reminder_answer']); @@ -78,5 +78,5 @@ if ($old_version_flag && $is_password_updated) { // パスワードが更新される場合は、平文になっている秘密の質問を暗号化する - $reminder_answer = $objQuery->get('reminder_answer', 'dtb_customer', "customer_id = ? ", array($customer_id)); + $reminder_answer = $objQuery->get('reminder_answer', 'dtb_customer', 'customer_id = ? ', array($customer_id)); $array['reminder_answer'] = SC_Utils_Ex::sfGetHashString($reminder_answer, $salt); } @@ -122,9 +122,9 @@ function sfGetCustomerPoint($order_id, $use_point, $add_point) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - $arrRet = $objQuery->select('customer_id', 'dtb_order', "order_id = ?", array($order_id)); + $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 (USE_POINT !== false) { - $arrRet = $objQuery->select('point', 'dtb_customer', "customer_id = ?", array($customer_id)); + $arrRet = $objQuery->select('point', 'dtb_customer', 'customer_id = ?', array($customer_id)); $point = $arrRet[0]['point']; $total_point = $arrRet[0]['point'] - $use_point + $add_point; @@ -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]; @@ -231,5 +231,5 @@ if (isset($arrForm['birth'])) { $birth = explode(' ', $arrForm['birth']); - list($arrForm['year'], $arrForm['month'], $arrForm['day']) = explode("-",$birth[0]); + list($arrForm['year'], $arrForm['month'], $arrForm['day']) = explode('-',$birth[0]); } @@ -341,5 +341,5 @@ if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) { $objFormParam->addParam('携帯メールアドレス', 'email_mobile', null, 'a', array('NO_SPTAB', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK', 'MOBILE_EMAIL_CHECK')); - $objFormParam->addParam('携帯メールアドレス(確認)', 'email_mobile02', null, 'a', array('NO_SPTAB', 'EMAIL_CHECK','SPTAB_CHECK' , 'EMAIL_CHAR_CHECK', 'MOBILE_EMAIL_CHECK'), "", false); + $objFormParam->addParam('携帯メールアドレス(確認)', 'email_mobile02', null, 'a', array('NO_SPTAB', 'EMAIL_CHECK','SPTAB_CHECK' , 'EMAIL_CHAR_CHECK', 'MOBILE_EMAIL_CHECK'), '', false); } else { $objFormParam->addParam('携帯メールアドレス', 'email_mobile', null, 'a', array('EXIST_CHECK', 'NO_SPTAB', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK', 'MOBILE_EMAIL_CHECK')); @@ -396,7 +396,7 @@ $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('年', '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')); @@ -406,7 +406,7 @@ $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); + $objFormParam->addParam('パスワード(確認)', 'password02', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK' ,'ALNUM_CHECK'), '', false); if (!$isAdmin) { - $objFormParam->addParam('メールアドレス(確認)', 'email02', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK','SPTAB_CHECK' , 'EMAIL_CHAR_CHECK'), "", false); + $objFormParam->addParam('メールアドレス(確認)', 'email02', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK','SPTAB_CHECK' , 'EMAIL_CHAR_CHECK'), '', false); } } else { @@ -516,5 +516,5 @@ } $objErr->doFunc(array('FAX番号', 'fax01', 'fax02', 'fax03') ,array('TEL_CHECK')); - $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02') ,array('EQUAL_CHECK')); + $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02') ,array('EQUAL_CHECK')); } 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 21514) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php (revision 21515) @@ -44,5 +44,5 @@ /* 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(); @@ -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,5 +83,5 @@ $objQuery = new SC_Query_Ex(); - if ($subject == '' && $header == '' && $footer == "") { + if ($subject == '' && $header == '' && $footer == '') { // メールテンプレート情報の取得 $where = 'template_id = ?'; @@ -105,8 +105,8 @@ $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) { @@ -125,5 +125,5 @@ $customer_id = $arrOrder['customer_id']; $objQuery->setOrder('customer_id'); - $arrRet = $objQuery->select('point', 'dtb_customer', "customer_id = ?", array($customer_id)); + $arrRet = $objQuery->select('point', 'dtb_customer', 'customer_id = ?', array($customer_id)); $arrCustomer = isset($arrRet[0]) ? $arrRet[0] : ''; @@ -167,5 +167,5 @@ $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc); - $objSendMail->setTo($arrOrder['order_email'], $arrOrder['order_name01'] . " ". $arrOrder['order_name02'] ." 様"); + $objSendMail->setTo($arrOrder['order_email'], $arrOrder['order_name01'] . ' '. $arrOrder['order_name02'] .' 様'); // 送信フラグ:trueの場合は、送信する。 @@ -235,5 +235,5 @@ $sqlval['template_id'] = $template_id; $sqlval['send_date'] = 'CURRENT_TIMESTAMP'; - if (!isset($_SESSION['member_id'])) $_SESSION['member_id'] = ""; + if (!isset($_SESSION['member_id'])) $_SESSION['member_id'] = ''; if ($_SESSION['member_id'] != '') { $sqlval['creator_id'] = $_SESSION['member_id']; @@ -320,5 +320,5 @@ $to_addr = $arrCustomerData['email']; } - $objMail->setTo($to_addr, $arrCustomerData['name01'] . $arrCustomerData['name02'] ." 様"); + $objMail->setTo($to_addr, $arrCustomerData['name01'] . $arrCustomerData['name02'] .' 様'); $objMail->sendMail(); 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 21514) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php (revision 21515) @@ -66,5 +66,5 @@ function sfSessRead($id) { $objQuery = new SC_Query_Ex(); - $arrRet = $objQuery->select('sess_data', 'dtb_session', "sess_id = ?", array($id)); + $arrRet = $objQuery->select('sess_data', 'dtb_session', 'sess_id = ?', array($id)); if (empty($arrRet)) { return ''; 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 21514) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (revision 21515) @@ -179,6 +179,6 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - if (!isset($_GET['product_id'])) $_GET['product_id'] = ""; - if (!isset($_GET['category_id'])) $_GET['category_id'] = ""; + if (!isset($_GET['product_id'])) $_GET['product_id'] = ''; + if (!isset($_GET['category_id'])) $_GET['category_id'] = ''; if (!empty($_GET['product_id']) || !empty($_GET['category_id'])) { @@ -212,8 +212,8 @@ function sfGetRollbackPoint($order_id, $use_point, $add_point, $order_status) { $objQuery = new SC_Query_Ex(); - $arrRet = $objQuery->select('customer_id', 'dtb_order', "order_id = ?", array($order_id)); + $arrRet = $objQuery->select('customer_id', 'dtb_order', 'order_id = ?', array($order_id)); $customer_id = $arrRet[0]['customer_id']; if ($customer_id != '' && $customer_id >= 1) { - $arrRet = $objQuery->select('point', 'dtb_customer', "customer_id = ?", array($customer_id)); + $arrRet = $objQuery->select('point', 'dtb_customer', 'customer_id = ?', array($customer_id)); $point = $arrRet[0]['point']; $rollback_point = $arrRet[0]['point']; @@ -522,5 +522,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $where = 'product_id = ?'; - $category_id = $objQuery->getCol('category_id', 'dtb_product_categories', "product_id = ?", array($product_id)); + $category_id = $objQuery->getCol('category_id', 'dtb_product_categories', 'product_id = ?', array($product_id)); } else { // 不正な場合は、空の配列を返す。 @@ -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); @@ -1316,5 +1316,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $where = 'product_id = ?'; - $maker_id = $objQuery->getCol('maker_id', 'dtb_products', "product_id = ?", array($product_id)); + $maker_id = $objQuery->getCol('maker_id', 'dtb_products', 'product_id = ?', array($product_id)); $this->g_maker_id = $maker_id; } else {