Index: branches/version-2_12-dev/data/class/SC_View.php =================================================================== --- branches/version-2_12-dev/data/class/SC_View.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_View.php (revision 21441) @@ -59,5 +59,5 @@ $this->_smarty->default_modifiers = array('script_escape'); - if(ADMIN_MODE == '1') { + if (ADMIN_MODE == '1') { $this->time_start = SC_Utils_Ex::sfMicrotimeFloat(); } @@ -82,7 +82,7 @@ */ function getResponse($template, $no_error = false) { - if(!$no_error) { + if (!$no_error) { global $GLOBAL_ERR; - if(!defined('OUTPUT_ERR')) { + if (!defined('OUTPUT_ERR')) { // GLOBAL_ERR を割り当て $this->assign("GLOBAL_ERR", $GLOBAL_ERR); @@ -91,5 +91,5 @@ } $res = $this->_smarty->fetch($template); - if(ADMIN_MODE == '1') { + if (ADMIN_MODE == '1') { $time_end = SC_Utils_Ex::sfMicrotimeFloat(); $time = $time_end - $this->time_start; @@ -101,7 +101,7 @@ // テンプレートの処理結果を表示 function display($template, $no_error = false) { - if(!$no_error) { + if (!$no_error) { global $GLOBAL_ERR; - if(!defined('OUTPUT_ERR')) { + if (!defined('OUTPUT_ERR')) { // GLOBAL_ERR を割り当て $this->assign("GLOBAL_ERR", $GLOBAL_ERR); @@ -111,5 +111,5 @@ $this->_smarty->display($template); - if(ADMIN_MODE == '1') { + if (ADMIN_MODE == '1') { $time_end = SC_Utils_Ex::sfMicrotimeFloat(); $time = $time_end - $this->time_start; @@ -122,5 +122,5 @@ $data = get_object_vars($obj); - foreach ($data as $key => $value){ + foreach ($data as $key => $value) { $this->_smarty->assign($key, $value); } Index: branches/version-2_12-dev/data/class/SC_MobileImage.php =================================================================== --- branches/version-2_12-dev/data/class/SC_MobileImage.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_MobileImage.php (revision 21441) @@ -72,5 +72,5 @@ // auはHTMLのbyte数上限に画像ファイルサイズが含まれないのでimageFileSizeのまま。 if ($carrier == 'docomo' or $carrier == 'softbank') { - if( $result != false && $result > 0){ + if ($result != false && $result > 0) { // 計算式：(利用端末で表示可能なcacheサイズ - HTMLのバイト数 - 変換後の画像名のバイト数(目安値) ) / HTML中の画像数 $temp_imagefilesize = ($cacheSize - strlen($buffer) - (140 * $result) ) / $result; Index: branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php =================================================================== --- branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php (revision 21420) +++ branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php (revision 21441) @@ -67,6 +67,6 @@ */ function getDSN($dsn = "") { - if(empty($dsn)) { - if(defined('DEFAULT_DSN')) { + if (empty($dsn)) { + if (defined('DEFAULT_DSN')) { $dsn = DEFAULT_DSN; } else { 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 21420) +++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (revision 21441) @@ -153,5 +153,5 @@ */ function getOrderTotalDaysWhereSql($type) { - switch($type){ + switch ($type) { case 'month': $format = '%m'; @@ -273,8 +273,8 @@ */ function sfChangeArrayToString($sql){ - if(strpos(strtoupper($sql), 'ARRAY_TO_STRING') !== FALSE) { + if (strpos(strtoupper($sql), 'ARRAY_TO_STRING') !== FALSE) { preg_match_all('/ARRAY_TO_STRING.*?\(.*?ARRAY\(.*?SELECT (.+?) FROM (.+?) WHERE (.+?)\).*?\,.*?\'(.+?)\'.*?\)/is', $sql, $match, PREG_SET_ORDER); - foreach($match as $item) { + foreach ($match as $item) { $replace = 'GROUP_CONCAT(' . $item[1] . ' SEPARATOR \'' . $item[4] . '\') FROM ' . $item[2] . ' WHERE ' . $item[3]; $sql = str_replace($item[0], $replace, $sql); @@ -296,7 +296,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $arrTblInfo = $objQuery->getTableInfo($table); - foreach($arrTblInfo as $fieldInfo) { - if(array_key_exists($fieldInfo['name'], $definition['fields'])) { - if($fieldInfo['nativetype'] == 'text') { + foreach ($arrTblInfo as $fieldInfo) { + if (array_key_exists($fieldInfo['name'], $definition['fields'])) { + if ($fieldInfo['nativetype'] == 'text') { // TODO: text型フィールドの場合に255文字以内決めうちでインデックス列のサイズとして // 指定して良いか確認は必要。 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 21420) +++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php (revision 21441) @@ -136,5 +136,5 @@ */ function getOrderTotalDaysWhereSql($type) { - switch($type){ + switch ($type) { case 'month': $format = 'MM'; Index: branches/version-2_12-dev/data/class/SC_Date.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Date.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_Date.php (revision 21441) @@ -114,5 +114,5 @@ $month_array = array(); - for ($i=1; $i <= 12; $i++){ + for ($i=1; $i <= 12; $i++) { $val = sprintf("%02d", $i); $month_array[$val] = $val; @@ -126,5 +126,5 @@ if ($default) $month_array[''] = '--'; - for ($i=0; $i < 12; $i++){ + for ($i=0; $i < 12; $i++) { $month_array[$i + 1 ] = $i + 1; } @@ -137,5 +137,5 @@ if ($default) $day_array[''] = '--'; - for ($i=0; $i < 31; $i++){ + for ($i=0; $i < 31; $i++) { $day_array[ $i + 1 ] = $i + 1; } @@ -147,5 +147,5 @@ $day_array = array(); - for ($i=0; $i<=23; $i++){ + for ($i=0; $i<=23; $i++) { $hour_array[$i] = $i; } @@ -157,5 +157,5 @@ $minutes_array = array(); - for ($i=0; $i<=59; $i++){ + for ($i=0; $i<=59; $i++) { $minutes_array[$i] = $i; } Index: branches/version-2_12-dev/data/class/SC_Fpdf.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Fpdf.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_Fpdf.php (revision 21441) @@ -120,5 +120,5 @@ $this->lfText(125, 80, $text, 8); //TEL・FAX - if ( strlen($arrInfo['law_email']) > 0 ) { + if (strlen($arrInfo['law_email']) > 0 ) { $text = "Email: ".$arrInfo['law_email']; $this->lfText(125, 83, $text, 8); //Email @@ -299,5 +299,5 @@ // 受注データの取得 function lfGetOrderData($order_id) { - if(SC_Utils_Ex::sfIsInt($order_id)) { + if (SC_Utils_Ex::sfIsInt($order_id)) { // DBから受注情報を読み込む $objQuery = new SC_Query_Ex(); Index: branches/version-2_12-dev/data/class/SC_Image.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Image.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_Image.php (revision 21441) @@ -100,9 +100,9 @@ if ($tmpMH) $MH = $tmpMH; // $MHに最大縦幅セット - if (empty($FromImgPath) || empty($ToImgPath)){ + if (empty($FromImgPath) || empty($ToImgPath)) { return array(0,"出力元画像パス、または出力先フォルダが指定されていません。"); } - if (!file_exists($FromImgPath)){ + if (!file_exists($FromImgPath)) { return array(0,"出力元画像が見つかりません。"); } @@ -118,16 +118,16 @@ $tmp_w = $size[0] / $MW; - if ($MH != 0){ + if ($MH != 0) { $tmp_h = $size[1] / $MH; } - if ($tmp_w > 1 || $tmp_h > 1){ - if ($MH == 0){ - if ($tmp_w > 1){ + if ($tmp_w > 1 || $tmp_h > 1) { + if ($MH == 0) { + if ($tmp_w > 1) { $re_size[0] = $MW; $re_size[1] = $size[1] * $MW / $size[0]; } } else { - if ($tmp_w > $tmp_h){ + if ($tmp_w > $tmp_h) { $re_size[0] = $MW; $re_size[1] = $size[1] * $MW / $size[0]; @@ -146,10 +146,10 @@ $ImgNew = imagecreatetruecolor($re_size[0],$re_size[1]); - switch($size[2]) { + switch ($size[2]) { case "1": //gif形式 - if ($tmp_w <= 1 && $tmp_h <= 1){ + if ($tmp_w <= 1 && $tmp_h <= 1) { if ($newFileName) { $ToFile = $newFileName; - } elseif ($ext) { + } elseif ($ext) { $ToFile .= "." . $ext; } else { Index: branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transformer.php =================================================================== --- branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transformer.php (revision 21420) +++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transformer.php (revision 21441) @@ -226,5 +226,5 @@ if (method_exists($element, 'getAttribute')) { // id属性を持つ場合. - if ($element->hasAttribute('id')){ + if ($element->hasAttribute('id')) { // idの値を配列に格納(ex: [0] => #hoge) $arrAttr[] = '#'.$element->getAttribute('id'); @@ -237,5 +237,5 @@ } // name属性を持つ場合. - if ($element->hasAttribute('name')){ + if ($element->hasAttribute('name')) { $this->arrDomHash['name'][$element->getAttribute('name')][] = $element; } @@ -295,5 +295,5 @@ // エレメントツリーのセレクタを先ほど作成した正規表現で順に検索. - for($iLoop=$startIndex; $iLoop < count($this->arrElementTree); $iLoop++){ + for ($iLoop=$startIndex; $iLoop < count($this->arrElementTree); $iLoop++) { if (preg_match($regex, $this->arrElementTree[$iLoop][0])) { @@ -338,5 +338,5 @@ $objElement = false; - if(isset($this->arrElementTree[$target_key]) && $this->arrElementTree[$target_key][0]){ + if (isset($this->arrElementTree[$target_key]) && $this->arrElementTree[$target_key][0]) { $objElement = &$this->arrElementTree[$target_key][1]; } Index: branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transform_List.php =================================================================== --- branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transform_List.php (revision 21420) +++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transform_List.php (revision 21441) @@ -165,5 +165,5 @@ */ function setHeadNaviBlocs(&$arrBlocs){ - foreach($this->arrHeadNaviBlocsByPlugin as $key => $value){ + foreach ($this->arrHeadNaviBlocsByPlugin as $key => $value) { $arrBlocs[] = array( 'target_id' =>$value, Index: branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php =================================================================== --- branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php (revision 21441) @@ -70,5 +70,5 @@ //商品IDを取得 - if ( isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id']) ) { + if (isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id']) ) { $product_id = $_GET['product_id']; } else { @@ -83,5 +83,5 @@ break; case 'list': - if ( $product_id != '' && is_numeric($product_id) ) { + if ($product_id != '' && is_numeric($product_id) ) { $arrProduct = $this->lfGetProductsDetailData($mode, $product_id); } else { @@ -90,5 +90,5 @@ break; default: - if ( $product_id != '' && is_numeric($product_id) ) { + if ($product_id != '' && is_numeric($product_id) ) { $arrProduct = $this->lfGetProductsDetailData($mode, $product_id); } else { @@ -135,5 +135,5 @@ $objQuery = SC_Query_Ex::getSingletonInstance(); //商品詳細を取得 - if ( $mode == 'all' ) { + if ($mode == 'all' ) { $arrProduct = $this->lfGetProductsDetail($objQuery, $mode); } else { @@ -145,5 +145,5 @@ $arrProduct[$key]['price02'] = SC_Helper_DB_Ex::sfCalcIncTax($arrProduct[$key]['price02']); // 画像ファイルのURLセット - if ( file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_list_image']) ) { + if (file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_list_image']) ) { $dir = IMAGE_SAVE_RSS_URL; } else { @@ -151,5 +151,5 @@ } $arrProduct[$key]['main_list_image'] = $dir . $arrProduct[$key]['main_list_image']; - if ( file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_image']) ){ + if (file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_image']) ) { $dir = IMAGE_SAVE_RSS_URL; } else { @@ -157,5 +157,5 @@ } $arrProduct[$key]['main_image'] = $dir . $arrProduct[$key]['main_image']; - if ( file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_large_image']) ) { + if (file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_large_image']) ) { $dir = IMAGE_SAVE_RSS_URL; } else { @@ -169,5 +169,5 @@ ); // 在庫無制限 - if ( $arrProduct[$key]['stock_unlimited'] == 1 ) { + if ($arrProduct[$key]['stock_unlimited'] == 1 ) { $arrProduct[$key]['stock_unlimited'] = '在庫無制限'; } else { @@ -205,5 +205,5 @@ $arrProduct[$key]['price02_min'] = SC_Helper_DB_Ex::sfCalcIncTax($arrProduct[$key]['price02_min']); // 画像ファイルのURLセット - if ( file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_list_image']) ) { + if (file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_list_image']) ) { $dir = IMAGE_SAVE_RSS_URL; } else { @@ -211,5 +211,5 @@ } $arrProduct[$key]['main_list_image'] = $dir . $arrProduct[$key]['main_list_image']; - if ( file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_image']) ) { + if (file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_image']) ) { $dir = IMAGE_SAVE_RSS_URL; } else { @@ -217,5 +217,5 @@ } $arrProduct[$key]['main_image'] = $dir . $arrProduct[$key]['main_image']; - if ( file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_large_image']) ) { + if (file_exists(IMAGE_SAVE_REALDIR . $arrProduct[$key]['main_large_image']) ) { $dir = IMAGE_SAVE_RSS_URL; } else { @@ -256,5 +256,5 @@ // 各商品のカテゴリIDとランクの取得 $arrProduct = array(); - foreach( $arrProductLsit as $key => $val ) { + foreach ($arrProductLsit as $key => $val ) { $sql = ''; $sql .= ' SELECT'; @@ -271,5 +271,5 @@ $sql .= ' product_id = ?'; $arrCategory = $objQuery->getAll($sql, array($val['product_id'])); - if ( !empty($arrCategory) ) { + if (!empty($arrCategory) ) { $arrProduct[$key] = array_merge($val, $arrCategory[0]); } @@ -291,5 +291,5 @@ // 各商品のカテゴリIDとランクの取得 $arrProduct = array(); - foreach( $arrProductLsit as $key => $val ) { + foreach ($arrProductLsit as $key => $val ) { $sql = ''; $sql .= ' SELECT'; @@ -306,5 +306,5 @@ $sql .= ' product_id = ?'; $arrCategory = $objQuery->getAll($sql, array($val['product_id'])); - if ( !empty($arrCategory) ) { + if (!empty($arrCategory) ) { $arrProduct[$key] = array_merge($val, $arrCategory[0]); } @@ -322,5 +322,5 @@ $arrProductKeys = array(); $arrProduct = SC_Utils_Ex::sfSwapArray($arrProduct); - if ( is_array($arrProduct) ) { + if (is_array($arrProduct) ) { $arrProductKeys = array_keys($arrProduct); } Index: branches/version-2_12-dev/data/class/pages/LC_Page.php =================================================================== --- branches/version-2_12-dev/data/class/pages/LC_Page.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/LC_Page.php (revision 21441) @@ -218,5 +218,5 @@ if ($useSSL === true) { $url = HTTPS_URL . $rootPath; - } elseif ($useSSL === false){ + } elseif ($useSSL === false) { $url = HTTP_URL . $rootPath; } elseif ($useSSL == 'escape') { 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 21420) +++ branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php (revision 21441) @@ -58,7 +58,7 @@ $arrErr = $this->fnErrorCheck($_GET); // 入力エラーの場合は終了 - if(count($arrErr) > 0) { + if (count($arrErr) > 0) { $tpl_message = ""; - foreach($arrErr as $key => $val) { + foreach ($arrErr as $key => $val) { $tpl_message .= preg_replace("/
/", "\n", $val); } @@ -75,5 +75,5 @@ // 郵便番号が発見された場合 - if(!empty($arrAdsList)) { + if (!empty($arrAdsList)) { $data = $arrAdsList[0]['state']. "|". $arrAdsList[0]['city']. "|". $arrAdsList[0]['town']; echo $data; @@ -112,8 +112,8 @@ $arrErr = $objFormParam->checkError(); // 親ウィンドウの戻り値を格納するinputタグのnameのエラーチェック - if ( !$this->lfInputNameCheck($arrRequest['input1']) ) { + if (!$this->lfInputNameCheck($arrRequest['input1']) ) { $arrErr['input1'] = "※ 入力形式が不正です。
"; } - if ( !$this->lfInputNameCheck($arrRequest['input2']) ) { + if (!$this->lfInputNameCheck($arrRequest['input2']) ) { $arrErr['input2'] = "※ 入力形式が不正です。
"; } @@ -130,5 +130,5 @@ function lfInputNameCheck($value) { // 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー - if(strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) { + if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) { return false; } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php (revision 20953) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php (revision 21441) @@ -61,10 +61,10 @@ // ログインしていない場合は必ずログインページを表示する - if($objCustomer->isLoginSuccess(true) === false) { + if ($objCustomer->isLoginSuccess(true) === false) { // クッキー管理クラス $objCookie = new SC_Cookie_Ex(COOKIE_EXPIRE); // クッキー判定(メールアドレスをクッキーに保存しているか） $this->tpl_login_email = $objCookie->getCookie('login_email'); - if($this->tpl_login_email != "") { + if ($this->tpl_login_email != "") { $this->tpl_login_memory = "1"; } @@ -77,5 +77,5 @@ // 携帯端末IDが一致する会員が存在するかどうかをチェックする。 - if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE){ + if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { $this->tpl_valid_phone_id = $objCustomer->checkMobilePhoneId(); } 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 21420) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php (revision 21441) @@ -81,5 +81,5 @@ // ログインチェック $objCustomer = new SC_Customer_Ex(); - if (!$objCustomer->isLoginSuccess(true)){ + if (!$objCustomer->isLoginSuccess(true)) { SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); } @@ -92,5 +92,5 @@ $objFormParam->setParam($_GET); $this->arrErr = $this->lfCheckError($objFormParam); - if (count($this->arrErr)!=0){ + if (count($this->arrErr)!=0) { SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); } @@ -116,15 +116,15 @@ //ファイル情報が無い場合はNG - if ($arrForm["down_realfilename"] == "" ){ + if ($arrForm["down_realfilename"] == "" ) { SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); } //ファイルそのものが無い場合もとりあえずNG $realpath = DOWN_SAVE_REALDIR . $arrForm["down_realfilename"]; - if (!file_exists($realpath)){ + if (!file_exists($realpath)) { SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true); } //ファイル名をエンコードする Safariの対策はUTF-8で様子を見る $encoding = "Shift_JIS"; - if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'Safari')) { + if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'Safari')) { $encoding = "UTF-8"; } @@ -135,14 +135,14 @@ // ダウンロード実行 モバイル端末はダウンロード方法が異なる - if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE){ + if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { // キャリアがAUのモバイル端末はさらにダウンロード方法が異なる - if (SC_MobileUserAgent::getCarrier() == 'ezweb'){ + if (SC_MobileUserAgent::getCarrier() == 'ezweb') { // AUモバイル $this->lfMobileAuDownload($realpath,$sdown_filename); - }else{ + } else { // AU以外のモバイル $this->lfMobileDownload($realpath,$sdown_filename); } - }else{ + } else { // PC、スマフォ $this->lfDownload($realpath,$sdown_filename); @@ -320,5 +320,5 @@ $contentType = $this->defaultContentType; // 拡張ContentType判定（拡張子をキーに拡張ContentType対象か判断） - if(isset($this->arrContentType[$extension])){ + if (isset($this->arrContentType[$extension])) { // 拡張ContentType対象の場合は、ContentTypeを変更 $contentType = $this->arrContentType[$extension]; Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php (revision 21070) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php (revision 21441) @@ -46,5 +46,5 @@ $this->tpl_title = 'MYページ'; - if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE){ + if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { $this->tpl_title .= '/退会手続き(完了ページ)'; } else { Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php (revision 20764) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php (revision 21441) @@ -67,5 +67,5 @@ //ログインしていない、またはDBに情報が無い場合 - if (empty($arrOrderDetail)){ + if (empty($arrOrderDetail)) { SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR); } @@ -106,5 +106,5 @@ $objCartSess = new SC_CartSession_Ex(); - foreach($arrOrderDetail as $order_row) { + foreach ($arrOrderDetail as $order_row) { $objCartSess->addProduct($order_row['product_class_id'], Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php (revision 21150) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php (revision 21441) @@ -63,5 +63,5 @@ function action() { $objCustomer = new SC_Customer_Ex(); - if(!SC_Utils_Ex::sfIsInt($_GET['send_id'])) { + if (!SC_Utils_Ex::sfIsInt($_GET['send_id'])) { SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR); } @@ -76,5 +76,5 @@ $this->tpl_body = $arrMailView[0]['mail_body']; - if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_PC){ + if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_PC) { $this->setTemplate('mypage/mail_view.tpl'); } else { 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 21420) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (revision 21441) @@ -87,5 +87,5 @@ * TODO 購入遷移とMyPageで別クラスにすべき */ - if (!$objCustomer->isLoginSuccess(true) && $ParentPage != MULTIPLE_URLPATH){ + if (!$objCustomer->isLoginSuccess(true) && $ParentPage != MULTIPLE_URLPATH) { $this->tpl_onload = "fnUpdateParent('". $this->getLocation($_POST['ParentPage']) ."'); window.close();"; } @@ -105,5 +105,5 @@ $this->arrErr = SC_Helper_Customer_Ex::sfCustomerOtherDelivErrorCheck($objFormParam); // 入力エラーなし - if(empty($this->arrErr)) { + if (empty($this->arrErr)) { // TODO ここでやるべきではない @@ -120,5 +120,5 @@ } - if(SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { + if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { // モバイルの場合、元のページに遷移 SC_Response_Ex::sendRedirect($this->getLocation($_POST['ParentPage'])); @@ -132,5 +132,5 @@ default : - if ($_GET['other_deliv_id'] != ""){ + if ($_GET['other_deliv_id'] != "") { $arrOtherDeliv = $this->lfGetOtherDeliv($objCustomer->getValue("customer_id"), $_SESSION['other_deliv_id']); Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 21376) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 21441) @@ -146,9 +146,9 @@ //取得している並び順で並び替え $arrProducts2 = array(); - foreach($arrProducts as $item) { + foreach ($arrProducts as $item) { $arrProducts2[ $item['product_id'] ] = $item; } $arrProductsList = array(); - foreach($arrProductId as $product_id) { + foreach ($arrProductId as $product_id) { $arrProductsList[] = $arrProducts2[$product_id]; } Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 21441) @@ -50,5 +50,5 @@ parent::init(); $this->tpl_mypageno = 'index'; - if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE){ + if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { $this->tpl_subtitle = 'MYページ'; } else { @@ -88,5 +88,5 @@ $this->arrOrder = $this->lfGetOrderHistory($customer_id, $this->objNavi->start_row); - switch($this->getMode()){ + switch ($this->getMode()) { case "getList": echo SC_Utils_Ex::jsonEncode($this->arrOrder); Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 21441) @@ -83,5 +83,5 @@ $this->tpl_arrOrderData = $objPurchase->getOrder($order_id, $objCustomer->getValue('customer_id')); - if (empty($this->tpl_arrOrderData)){ + if (empty($this->tpl_arrOrderData)) { SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR); } @@ -137,7 +137,7 @@ $arrShipping = $objPurchase->getShippings($order_id); - foreach($arrShipping as $shipping_index => $shippingData) { - foreach($shippingData as $key => $val) { - if($key == 'shipping_date' && SC_Utils_Ex::isBlank($val) == false) { + foreach ($arrShipping as $shipping_index => $shippingData) { + foreach ($shippingData as $key => $val) { + if ($key == 'shipping_date' && SC_Utils_Ex::isBlank($val) == false) { // お届け日を整形 list($y, $m, $d, $w) = explode(" ", date("Y m d w" , strtotime($val))); @@ -197,5 +197,5 @@ $this->isAU = false; // モバイル端末かつ、キャリアがAUの場合に処理を行う - if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE && SC_MobileUserAgent::getCarrier() == 'ezweb'){ + if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE && SC_MobileUserAgent::getCarrier() == 'ezweb') { // MIMETYPE、ファイル名のセット $this->tpl_arrOrderDetail = $this->lfSetMimetype($arrOrderDetails); Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 21185) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 21441) @@ -64,5 +64,5 @@ function action() { - switch ($this->getMode()){ + switch ($this->getMode()) { case 'confirm': $this->tpl_mainpage = 'mypage/refusal_confirm.tpl'; 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 21420) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 21441) @@ -74,5 +74,5 @@ $objFormParam->convParam(); - switch($this->getMode()) { + switch ($this->getMode()) { // お届け先の削除 @@ -171,5 +171,5 @@ function setPref($arrOtherDeliv, $arrPref) { if (is_array($arrOtherDeliv)) { - foreach($arrOtherDeliv as $key => $arrDeliv) { + foreach ($arrOtherDeliv as $key => $arrDeliv) { $arrOtherDeliv[$key]['prefname'] = $arrPref[$arrDeliv['pref']]; } Index: branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php =================================================================== --- branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php (revision 21441) @@ -109,5 +109,5 @@ $objLog->log('* http request start'); - switch($mode) { + switch ($mode) { case 'patch_download': $arrPostData = array( Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (revision 21441) @@ -121,5 +121,5 @@ // 会員ログインチェック - if($objCustomer->isLoginSuccess(true)) { + if ($objCustomer->isLoginSuccess(true)) { $this->tpl_login = '1'; $this->tpl_user_point = $objCustomer->getValue('point'); @@ -129,5 +129,5 @@ $this->use_module = $this->useModule($this->arrForm['payment_id']); - switch($this->getMode()) { + switch ($this->getMode()) { // 前のページに戻る case 'return': Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 21441) @@ -129,5 +129,5 @@ $this->arrDelivDate = $objPurchase->getDelivDate($objCartSess, $cart_key); - switch($this->getMode()) { + switch ($this->getMode()) { /* * 配送業者選択時のアクション @@ -292,15 +292,15 @@ } - if($arrForm['point_check'] == '1') { + if ($arrForm['point_check'] == '1') { $objErr->doFunc(array("ポイントを使用する", "point_check"), array("EXIST_CHECK")); $objErr->doFunc(array("ポイント", "use_point"), array("EXIST_CHECK")); - if($max_point == "") { + if ($max_point == "") { $max_point = 0; } // FIXME mobile 互換のため br は閉じない... - if($arrForm['use_point'] > $max_point) { + if ($arrForm['use_point'] > $max_point) { $objErr->arrErr['use_point'] = "※ ご利用ポイントが所持ポイントを超えています。
"; } - if(($arrForm['use_point'] * POINT_VALUE) > $subtotal) { + if (($arrForm['use_point'] * POINT_VALUE) > $subtotal) { $objErr->arrErr['use_point'] = "※ ご利用ポイントがご購入金額を超えています。
"; } @@ -346,5 +346,5 @@ $arrForm['update_date'] = 'CURRENT_TIMESTAMP'; - if($arrForm['point_check'] != '1') { + if ($arrForm['point_check'] != '1') { $arrForm['use_point'] = 0; } @@ -444,5 +444,5 @@ */ function getMobileMainpage($is_single_deliv = true, $mode) { - switch($mode) { + switch ($mode) { case 'select_deliv': return 'shopping/payment.tpl'; 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 21437) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 21441) @@ -126,6 +126,6 @@ // モバイルサイトで携帯アドレスの登録が無い場合、携帯アドレス登録ページへ遷移 - if(SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { - if($this->hasEmailMobile($objCustomer) == false) { + if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { + if ($this->hasEmailMobile($objCustomer) == false) { SC_Response_Ex::sendRedirectFromUrlPath('entry/email_mobile.php'); exit; @@ -150,5 +150,5 @@ else { // 仮登録の場合 - if($this->checkTempCustomer($objFormParam->getValue('login_email'))) { + if ($this->checkTempCustomer($objFormParam->getValue('login_email'))) { if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_SMARTPHONE) { echo $this->lfGetErrorMessage(TEMP_LOGIN_ERROR); @@ -510,5 +510,5 @@ case DEVICE_TYPE_PC: default: - if(!$objCustomer->getCustomerDataFromEmailPass($login_pass, $login_email)) { + if (!$objCustomer->getCustomerDataFromEmailPass($login_pass, $login_email)) { return false; } else { Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php =================================================================== --- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php (revision 21437) +++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php (revision 21441) @@ -105,5 +105,5 @@ $arrForm = $objFormParam->getHashArray(); - switch($this->getMode()) { + switch ($this->getMode()) { // 削除 case 'delete': 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php (revision 21441) @@ -54,6 +54,6 @@ //SSL制限チェック - if(ADMIN_FORCE_SSL == TRUE){ - if (SC_Utils_Ex::sfIsHTTPS() === false){ + if (ADMIN_FORCE_SSL == TRUE) { + if (SC_Utils_Ex::sfIsHTTPS() === false) { SC_Response_Ex::sendRedirect($_SERVER["REQUEST_URI"], $_GET, FALSE, TRUE); } Index: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (revision 21441) @@ -88,5 +88,5 @@ $css_path = $css_dir . $this->css_name . '.css'; - switch($this->getMode()) { + switch ($this->getMode()) { // データ更新処理 case 'confirm': @@ -239,5 +239,5 @@ $is_error = false; // 重複チェック - if(!SC_Utils_Ex::isBlank(($objErr->arrErr['css_name']))) { + if (!SC_Utils_Ex::isBlank(($objErr->arrErr['css_name']))) { $arrCSSList = $this->getCSSList($this->getCSSDir()); foreach ($arrCSSList as $val) { Index: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 21441) @@ -112,5 +112,5 @@ default: - if (isset($_GET['msg']) && $_GET['msg'] == 'on'){ + if (isset($_GET['msg']) && $_GET['msg'] == 'on') { $this->tpl_onload = "alert('登録が完了しました。');"; } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 21441) @@ -83,5 +83,5 @@ $template_code = $objFormParam->getValue('template_code'); - switch($this->getMode()) { + switch ($this->getMode()) { // 登録ボタン押下時 @@ -203,5 +203,5 @@ $sql_split = explode(";", $sql); $objQuery =& SC_Query_Ex::getSingletonInstance(); - foreach($sql_split as $val){ + foreach ($sql_split as $val) { if (trim($val) != "") { $objQuery->query($val); 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (revision 21441) @@ -83,5 +83,5 @@ $this->device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC); - switch($this->getMode()) { + switch ($this->getMode()) { // アップロードボタン押下時の処理 case 'upload': Index: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 21441) @@ -84,5 +84,5 @@ $objLayout = new SC_Helper_PageLayout_Ex(); - switch($this->getMode()) { + switch ($this->getMode()) { // 登録/更新 case 'confirm': Index: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php (revision 21441) @@ -179,5 +179,5 @@ // レイアウト済みのブロックデータを追加 $arrBlocPos = $objLayout->getBlocPositions($device_type_id, $page_id); - foreach($arrBlocPos as $arrBloc){ + foreach ($arrBlocPos as $arrBloc) { $this->copyBloc($arrResults, $arrBloc, $i); $i++; @@ -186,5 +186,5 @@ // 未使用のブロックデータを追加 $arrBloc = $objLayout->getBlocs($device_type_id); - foreach($arrBloc as $arrBloc){ + foreach ($arrBloc as $arrBloc) { if (!$this->existsBloc($arrBloc, $arrResults)) { $arrBloc['target_id'] = TARGET_ID_UNUSED; @@ -220,5 +220,5 @@ */ function existsBloc($arrBloc, $arrToBlocs) { - foreach($arrToBlocs as $arrToBloc){ + foreach ($arrToBlocs as $arrToBloc) { if ($arrBloc['bloc_id'] === $arrToBloc['bloc_id'] ) { return true; Index: branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php (revision 21441) @@ -78,5 +78,5 @@ */ function action() { - switch($this->getMode()) { + switch ($this->getMode()) { // 入力内容をDBへ登録する case 'register': 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php (revision 21441) @@ -87,5 +87,5 @@ $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method"); - switch ($this->getMode()){ + switch ($this->getMode()) { case 'update': switch ($objFormParam->getValue('change_status')) { @@ -144,10 +144,10 @@ $arrRet = $objFormParam->getHashArray(); $arrErr = $objFormParam->checkError(); - if(is_null($objFormParam->getValue('search_pageno'))){ + if (is_null($objFormParam->getValue('search_pageno'))) { $objFormParam->setValue('search_pageno', 1); } - if($this->getMode() == 'change'){ - if(is_null($objFormParam->getValue('change_status'))){ + if ($this->getMode() == 'change') { + if (is_null($objFormParam->getValue('change_status'))) { $objFormParam->setValue('change_status',""); } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 21441) @@ -152,5 +152,5 @@ $this->arrSearchHidden = $objFormParam->getSearchArray(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'pre_edit': case 'order_id': @@ -564,5 +564,5 @@ $totalpoint = 0; $totaltax = 0; - for($i = 0; $i < $max; $i++) { + for ($i = 0; $i < $max; $i++) { // 小計の計算 $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i]) * $arrValues['quantity'][$i]; @@ -665,5 +665,5 @@ $k = 0; $arrStockData = array(); - for($i = 0; $i < $max; $i++) { + 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'])); Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 21441) @@ -94,10 +94,10 @@ // どんな状態の時に isset($arrRet) == trueになるんだ? これ以前に$arrRet無いが、、、、 if (!isset($arrRet)) $arrRet = array(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'confirm': $status = $this->createPdf($this->objFormParam); - if($status === true){ + if ($status === true) { exit; - }else{ + } else { $this->arrErr = $status; } @@ -131,5 +131,5 @@ // 注文番号があったら、セットする - if(SC_Utils_Ex::sfIsInt($order_id)) { + if (SC_Utils_Ex::sfIsInt($order_id)) { $arrForm['order_id'][0] = $order_id; } elseif (is_array($pdf_order_id)) { @@ -164,5 +164,5 @@ $objFpdf->createPdf(); return true; - }else{ + } else { return $arrErr; } @@ -211,12 +211,12 @@ $year = $objFormParam->getValue('year'); - if(!is_numeric($year)){ + if (!is_numeric($year)) { $arrErr['year'] = "発行年は数値で入力してください。"; } $month = $objFormParam->getValue('month'); - if(!is_numeric($month)){ + if (!is_numeric($month)) { $arrErr['month'] = "発行月は数値で入力してください。"; - }else if(0 >= $month && 12 < $month){ + }else if (0 >= $month && 12 < $month) { $arrErr['month'] = "発行月は1〜12の間で入力してください。"; @@ -224,7 +224,7 @@ $day = $objFormParam->getValue('day'); - if(!is_numeric($day)){ + if (!is_numeric($day)) { $arrErr['day'] = "発行日は数値で入力してください。"; - }else if(0 >= $day && 31 < $day){ + }else if (0 >= $day && 31 < $day) { $arrErr['day'] = "発行日は1〜31の間で入力してください。"; Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php (revision 21441) @@ -66,5 +66,5 @@ function action() { $send_id = $_GET['send_id']; - if(SC_Utils_Ex::sfIsInt($send_id)) { + if (SC_Utils_Ex::sfIsInt($send_id)) { $mailHistory = $this->getMailHistory($send_id); $this->tpl_subject = $mailHistory[0]['subject']; 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php (revision 21441) @@ -98,5 +98,5 @@ $this->arrForm = $objFormParam->getFormParamList(); - switch($this->getMode()) { + switch ($this->getMode()) { // 削除 case 'delete': @@ -119,5 +119,5 @@ $where = "del_flg = 0"; foreach ($arrParam as $key => $val) { - if($val == "") { + if ($val == "") { continue; } @@ -130,5 +130,5 @@ * 処理を実行 * ----------------------------------------------- */ - switch($this->getMode()) { + switch ($this->getMode()) { // CSVを送信する。 case 'csv': @@ -290,7 +290,7 @@ case 'search_order_sex': $tmp_where = ""; - foreach($objFormParam->getValue($key) as $element) { - if($element != "") { - if(SC_Utils_Ex::isBlank($tmp_where)) { + foreach ($objFormParam->getValue($key) as $element) { + if ($element != "") { + if (SC_Utils_Ex::isBlank($tmp_where)) { $tmp_where .= " AND (order_sex = ?"; } else { @@ -301,5 +301,5 @@ } - if(!SC_Utils_Ex::isBlank($tmp_where)) { + if (!SC_Utils_Ex::isBlank($tmp_where)) { $tmp_where .= ")"; $where .= " $tmp_where "; @@ -316,7 +316,7 @@ case 'search_payment_id': $tmp_where = ""; - foreach($objFormParam->getValue($key) as $element) { - if($element != "") { - if($tmp_where == "") { + foreach ($objFormParam->getValue($key) as $element) { + if ($element != "") { + if ($tmp_where == "") { $tmp_where .= " AND (payment_id = ?"; } else { @@ -327,5 +327,5 @@ } - if(!SC_Utils_Ex::isBlank($tmp_where)) { + if (!SC_Utils_Ex::isBlank($tmp_where)) { $tmp_where .= ")"; $where .= " $tmp_where "; @@ -417,5 +417,5 @@ function doOutputCSV($where, $arrVal, $order) { require_once CLASS_EX_REALDIR . 'helper_extends/SC_Helper_CSV_Ex.php'; - if($where != "") { + if ($where != "") { $where = " WHERE $where "; } Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (revision 21424) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (revision 21441) @@ -205,5 +205,5 @@ $bind = array(); foreach ($arrForm as $key => $val) { - if($val == "") { + if ($val == "") { continue; } @@ -216,5 +216,5 @@ case 'search_category_id': list($tmp_where, $tmp_bind) = $objDb->sfGetCatWhere($val); - if($tmp_where != "") { + if ($tmp_where != "") { $where.= " AND alldtl.product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; $bind = array_merge((array)$bind, (array)$tmp_bind); @@ -241,6 +241,6 @@ */ function getNo($globalParams){ - foreach ($globalParams as $params){ - if(isset($params['no']) && $params['no']!= ''){ + foreach ($globalParams as $params) { + if (isset($params['no']) && $params['no']!= '') { return intval($params['no']); } @@ -256,9 +256,9 @@ function sortProducts($arrProduct_id,$productList){ $products = array(); - foreach($productList as $item) { + foreach ($productList as $item) { $products[ $item['product_id'] ] = $item; } $arrProducts = array(); - foreach($arrProduct_id as $product_id) { + foreach ($arrProduct_id as $product_id) { $arrProducts[] = $products[$product_id]; } Index: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php (revision 21441) @@ -84,5 +84,5 @@ $this->arrSearchHidden = $objFormParam->getSearchArray(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'pre_edit': break; @@ -91,16 +91,16 @@ case 'send': $sendStatus = $this->doSend($objFormParam); - if($sendStatus === true){ + if ($sendStatus === true) { SC_Response_Ex::sendRedirect(ADMIN_ORDER_URLPATH); exit; - }else{ + } else { $this->arrErr = $sendStatus; } case 'confirm': $status = $this->confirm($objFormParam); - if($status === true){ + if ($status === true) { $this->arrHidden = $objFormParam->getHashArray(); return ; - }else{ + } else { $this->arrErr = $status; } @@ -111,5 +111,5 @@ } - if(SC_Utils_Ex::sfIsInt($objFormParam->getValue('order_id'))) { + if (SC_Utils_Ex::sfIsInt($objFormParam->getValue('order_id'))) { $this->arrMailHistory = $this->getMailHistory($objFormParam->getValue('order_id')); } @@ -185,16 +185,16 @@ */ function changeData(&$objFormParam){ - if(SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) { + if (SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) { $objQuery =& SC_Query_Ex::getSingletonInstance(); $where = "template_id = ?"; $mailTemplates = $objQuery->select("subject, header, footer", "dtb_mailtemplate", $where, array($objFormParam->getValue('template_id'))); - if(!is_null($mailTemplates )){ - foreach(array('subject','header','footer') as $key){ + if (!is_null($mailTemplates )) { + foreach (array('subject','header','footer') as $key) { $objFormParam->setValue($key,$mailTemplates[$key]); } } $objFormParam->setParam($mailTemplates[0]); - }else{ - foreach(array('subject','header','footer') as $key){ + } else { + foreach (array('subject','header','footer') as $key) { $objFormParam->setValue($key,""); } Index: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 21441) @@ -83,5 +83,5 @@ $this->insertRecommendProduct($arrPost,$member_id); $arrItems = $this->getRecommendProducts(); - }else{ + } else { $arrItems = $this->setProducts($arrPost, $arrItems); $this->checkRank = $arrPost['rank']; @@ -164,5 +164,5 @@ $arrReturnProducts = array(); - foreach( $arrProducts as $data ){ + foreach ($arrProducts as $data ) { $arrReturnProducts[$data['rank']] = $data; } @@ -228,5 +228,5 @@ if (count($arrProduct) > 0) { $rank = $arrPost['rank']; - foreach( $arrProduct as $key => $val){ + foreach ($arrProduct as $key => $val) { $arrItems[$rank][$key] = $val; } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php (revision 21441) @@ -84,5 +84,5 @@ $objFileManager = new SC_Helper_FileManager_Ex(); - switch($this->getMode()) { + switch ($this->getMode()) { // フォルダ移動 case 'move': @@ -108,5 +108,5 @@ $this->arrErr = $objFormParam->checkError(); if (SC_Utils_Ex::isBlank($this->arrErr)) { - if($this->tryView($objFormParam)){ + if ($this->tryView($objFormParam)) { $file_url = htmlspecialchars(ereg_replace($objFormParam->getValue('top_dir'), "", $objFormParam->getValue('select_file'))); $tpl_onload = "win02('./file_view.php?file=". $file_url ."', 'user_data', '600', '400');"; @@ -125,5 +125,5 @@ $this->arrErr = $objFormParam->checkError(); if (SC_Utils_Ex::isBlank($this->arrErr)) { - if(is_dir($objFormParam->getValue('select_file'))) { + if (is_dir($objFormParam->getValue('select_file'))) { $disp_error = "※ ディレクトリをダウンロードすることは出来ません。
"; $this->setDispError('select_file', $disp_error); @@ -156,5 +156,5 @@ $this->arrErr = $objFormParam->checkError(); if (SC_Utils_Ex::isBlank($this->arrErr)) { - if(!$this->tryCreateDir($objFileManager, $objFormParam)){ + if (!$this->tryCreateDir($objFileManager, $objFormParam)) { $disp_error = "※ ".htmlspecialchars($objFormParam->getValue('create_file'), ENT_QUOTES)."の作成に失敗しました。
"; $this->setDispError('create_file', $disp_error); @@ -317,5 +317,5 @@ $create_dir = ereg_replace("/$", "", $objFormParam->getValue('now_dir')); // ファイル作成 - if($objFileManager->sfCreateFile($create_dir."/".$objFormParam->getValue('create_file'), 0755)) { + if ($objFileManager->sfCreateFile($create_dir."/".$objFormParam->getValue('create_file'), 0755)) { $create_dir_flg = true; } @@ -426,5 +426,5 @@ $arrDir = explode('/', $dir); array_pop($arrDir); - foreach($arrDir as $val) { + foreach ($arrDir as $val) { $parent_dir .= "$val/"; } @@ -455,5 +455,5 @@ $arrTree = $objFileManager->sfGetFileTree($objFormParam->getValue('top_dir'), $objFormParam->getValue('tree_status')); $tpl_javascript .= "arrTree = new Array();\n"; - foreach($arrTree as $arrVal) { + foreach ($arrTree as $arrVal) { $tpl_javascript .= "arrTree[".$arrVal['count']."] = new Array(".$arrVal['count'].", '".$arrVal['type']."', '".$arrVal['path']."', ".$arrVal['rank'].","; if ($arrVal['open']) { Index: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php (revision 21441) @@ -63,5 +63,5 @@ */ function action() { - switch($this->getMode()){ + switch ($this->getMode()) { default: // フォーム操作クラス Index: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (revision 21441) @@ -89,5 +89,5 @@ // 入力パラメーターチェック $this->arrErr = $objFormParam->checkError(); - if(SC_Utils_Ex::isBlank($this->arrErr)) { + if (SC_Utils_Ex::isBlank($this->arrErr)) { // 更新 $this->tpl_is_update = $this->lfUpdCsvOutput($this->tpl_csv_id, $objFormParam->getValue('output_list')); @@ -132,12 +132,12 @@ function lfGetCSVColumn($csv_id, $csv_status_flg = '', $order ='rank, no') { $objCSV = new SC_Helper_CSV_Ex(); - if(SC_Utils_Ex::sfIsInt($csv_id)) { - if($csv_status_flg !="") { + if (SC_Utils_Ex::sfIsInt($csv_id)) { + if ($csv_status_flg !="") { $arrData = $objCSV->sfGetCsvOutput($csv_id, 'status = ?' , array($csv_status_flg), $order); - }else{ + } else { $arrData = $objCSV->sfGetCsvOutput($csv_id, '', array(), $order); } $arrData = SC_Utils_Ex::sfSwapArray($arrData); - }else{ + } else { $arrData = array(); } @@ -194,5 +194,5 @@ $arrKey = array_keys($objCSV->arrSubnavi,$subno_csv); $csv_id = $arrKey[0]; - if(!SC_Utils_Ex::sfIsInt($csv_id)) { + if (!SC_Utils_Ex::sfIsInt($csv_id)) { //初期値取りだし $arrKey = array_keys($objCSV->arrSubnavi); @@ -237,5 +237,5 @@ $where .= " AND no = ?"; $arrUpdVal = array('status' => '1'); - foreach($arrData as $key => $val){ + foreach ($arrData as $key => $val) { $arrWhereVal = array($csv_id, $val); $arrUpdVal['rank'] = $key + 1; 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 21441) @@ -76,9 +76,9 @@ $objFormParam->convParam(); $this->arrForm = $objFormParam->getHashArray(); - switch($this->getMode()) { + switch ($this->getMode()) { // データの登録 case 'confirm': $this->arrErr = $this->lfCheckConfirmError($objFormParam); - if(SC_Utils_Ex::isBlank($this->arrErr)) { + if (SC_Utils_Ex::isBlank($this->arrErr)) { // データの更新 $this->arrForm['sql_id'] = $this->lfUpdData($objFormParam->getValue('sql_id'), $objFormParam->getDbArray()); @@ -90,5 +90,5 @@ case 'preview': $this->arrErr = $this->lfCheckPreviewError($objFormParam); - if(SC_Utils_Ex::isBlank($this->arrErr)) { + if (SC_Utils_Ex::isBlank($this->arrErr)) { $this->sqlerr = $this->lfCheckSQL($objFormParam->getValue('csv_sql')); } @@ -104,5 +104,5 @@ case 'delete': $this->arrErr = $this->lfCheckDeleteError($objFormParam); - if(SC_Utils_Ex::isBlank($this->arrErr)) { + if (SC_Utils_Ex::isBlank($this->arrErr)) { $this->lfDelData($objFormParam->getValue('sql_id')); SC_Response_Ex::reload(); @@ -113,5 +113,5 @@ case "csv_output": $this->arrErr = $this->lfCheckOutputError($objFormParam); - if(SC_Utils_Ex::isBlank($this->arrErr)) { + if (SC_Utils_Ex::isBlank($this->arrErr)) { $this->lfDoCsvOutput($objFormParam->getValue('csv_output_id')); exit; @@ -120,5 +120,5 @@ default: $this->arrErr = $objFormParam->checkError(); - if(SC_Utils_Ex::isBlank($this->arrErr)) { + if (SC_Utils_Ex::isBlank($this->arrErr)) { // 設定内容を取得する $this->arrForm = $this->lfGetSqlData($objFormParam); @@ -163,11 +163,11 @@ $objErr->doFunc( array("SQL文", "csv_sql", "30000"), array("EXIST_CHECK", "MAX_LENGTH_CHECK") ); $objErr->doFunc( array('SQL文には読み込み関係以外のSQLコマンドおよび";"記号', 'csv_sql', $this->lfGetSqlDenyList()), array("PROHIBITED_STR_CHECK")); - if(!SC_Utils_Ex::isBlank($objErr->arrErr)) { + if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { $arrErr = array_merge($arrErr, $objErr->arrErr); } // SQL文自体の確認、エラーが無い時のみ実行 - if(SC_Utils_Ex::isBlank($arrErr)) { + if (SC_Utils_Ex::isBlank($arrErr)) { $sql_error = $this->lfCheckSQL($objFormParam->getValue('csv_sql')); - if(!SC_Utils_Ex::isBlank($sql_error)) { + if (!SC_Utils_Ex::isBlank($sql_error)) { $arrErr["csv_sql"] = "※ SQL文が不正です。SQL文を見直してください"; } @@ -189,5 +189,5 @@ $objErr->doFunc( array("SQL文", "csv_sql", "30000"), array("EXIST_CHECK", "MAX_LENGTH_CHECK") ); $objErr->doFunc( array('SQL文には読み込み関係以外のSQLコマンドおよび";"記号', 'csv_sql', $this->lfGetSqlDenyList()), array("PROHIBITED_STR_CHECK")); - if(!SC_Utils_Ex::isBlank($objErr->arrErr)) { + if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { $arrErr = array_merge($arrErr, $objErr->arrErr); } @@ -207,5 +207,5 @@ $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); $objErr->doFunc( array("SQL ID", "sql_id"), array("EXIST_CHECK") ); - if(!SC_Utils_Ex::isBlank($objErr->arrErr)) { + if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { $arrErr = array_merge($arrErr, $objErr->arrErr); } @@ -225,5 +225,5 @@ $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); $objErr->doFunc( array("CSV出力対象SQL ID", "csv_output_id"), array("EXIST_CHECK") ); - if(!SC_Utils_Ex::isBlank($objErr->arrErr)) { + if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { $arrErr = array_merge($arrErr, $objErr->arrErr); } @@ -249,14 +249,14 @@ // 実テーブル上のカラム設定を見に行く仕様に変更 ref #476 $arrTable = $objQuery->listTables(); - if(SC_Utils_Ex::isBlank($arrTable)) { + if (SC_Utils_Ex::isBlank($arrTable)) { return array(); } $arrRet = array(); - foreach($arrTable as $table) { - if(substr($table, 0, 4) == 'dtb_') { + foreach ($arrTable as $table) { + if (substr($table, 0, 4) == 'dtb_') { $arrRet[ $table ] = 'データテーブル: ' . $table; - }else if(substr($table, 0, 4) == 'mtb_') { + }else if (substr($table, 0, 4) == 'mtb_') { $arrRet[ $table ] = 'マスターテーブル: ' . $table; - }else if(substr($table, 0, 3) == 'vw_') { + }else if (substr($table, 0, 3) == 'vw_') { $arrRet[ $table ] = 'ビュー: ' . $table; } @@ -272,5 +272,5 @@ */ function lfGetColList($table){ - if(SC_Utils_Ex::isBlank($table)) { + if (SC_Utils_Ex::isBlank($table)) { return array(); } @@ -308,5 +308,5 @@ $sql = "SELECT " . $sql . " "; $objErrMsg = $objQuery->query($sql); - if (PEAR::isError($objErrMsg)){ + if (PEAR::isError($objErrMsg)) { $err = $objErrMsg->message . "\n" . $objErrMsg->userinfo; } @@ -327,5 +327,5 @@ } $sql_id = $objFormParam->getValue('sql_id'); - if(!SC_Utils_Ex::isBlank($sql_id)) { + if (!SC_Utils_Ex::isBlank($sql_id)) { $arrData = $this->lfGetSqlList('sql_id = ?', array($sql_id)); return $arrData[0]; @@ -348,12 +348,12 @@ $arrHeader = array(); - if(!preg_match("/ LIMIT /", $sql)) { + if (!preg_match("/ LIMIT /", $sql)) { $head_sql = $sql . " LIMIT 0"; - }else{ + } else { $head_sql = $sql; } $arrData = $objQuery->getQueryDefsFields($head_sql, array(), true); - if(!SC_Utils_Ex::isBlank($arrData)) { - foreach($arrData as $key => $val) { + if (!SC_Utils_Ex::isBlank($arrData)) { + foreach ($arrData as $key => $val) { $arrHeader[] = $key; } @@ -380,5 +380,5 @@ $where = "sql_id = ?"; $objQuery->update($table, $arrSqlVal, $where, array($sql_id)); - }else{ + } else { //新規作成 $sql_id = $objQuery->nextVal('dtb_csv_sql_sql_id'); @@ -400,5 +400,5 @@ $table = "dtb_csv_sql"; $where = "sql_id = ?"; - if(SC_Utils_Ex::sfIsInt($sql_id)) { + if (SC_Utils_Ex::sfIsInt($sql_id)) { $objQuery->delete($table, $where, array($sql_id)); return true; Index: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php (revision 21423) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php (revision 21441) @@ -147,5 +147,5 @@ $bind = array(); foreach ($arrForm as $key => $val) { - if($val == "") { + if ($val == "") { continue; } @@ -158,5 +158,5 @@ case 'search_category_id': list($tmp_where, $tmp_bind) = $objDb->sfGetCatWhere($val); - if($tmp_where != "") { + if ($tmp_where != "") { $where.= " AND alldtl.product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; $bind = array_merge((array)$bind, (array)$tmp_bind); 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 21441) @@ -137,5 +137,5 @@ //----　指定表示順位移動 $input_pos = $this->getPostRank($news_id); - if(SC_Utils_Ex::sfIsInt($input_pos)) { + if (SC_Utils_Ex::sfIsInt($input_pos)) { $objDb->sfMoveRank("dtb_news", "news_id", $news_id, $input_pos); $this->objDisplay->reload(); @@ -250,5 +250,5 @@ */ function checkLinkMethod($link_method){ - if(strlen($link_method) == 0){ + if (strlen($link_method) == 0) { $link_method = 1; } @@ -265,8 +265,8 @@ $table = 'dtb_news'; $order = 'rank DESC'; - if(strlen($news_id) == 0){ + if (strlen($news_id) == 0) { $where = 'del_flg = 0'; $arrval = array(); - }else{ + } else { $where = 'del_flg = 0 AND news_id = ?'; $arrval = array($news_id); @@ -343,5 +343,5 @@ */ function getPostRank($news_id){ - if(strlen($news_id) > 0 && is_numeric($news_id) == true){ + if (strlen($news_id) > 0 && is_numeric($news_id) == true) { $key = "pos-".$news_id; $input_pos = $_POST[$key]; Index: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php (revision 21441) @@ -85,5 +85,5 @@ $this->lfDoLogin($objFormParam->getValue('login_id')); SC_Response_Ex::sendRedirect(ADMIN_HOME_URLPATH); - }else{ + } else { SC_Utils_Ex::sfDispError(LOGIN_ERROR); } @@ -119,8 +119,8 @@ // 書式チェック $arrErr = $objFormParam->checkError(); - if(SC_Utils_Ex::isBlank($arrErr)) { + if (SC_Utils_Ex::isBlank($arrErr)) { $arrForm = $objFormParam->getHashArray(); // ログインチェック - if(!$this->lfIsLoginMember($arrForm['login_id'], $arrForm['password'])) { + if (!$this->lfIsLoginMember($arrForm['login_id'], $arrForm['password'])) { $arrErr['password'] = "ログイン出来ません。"; $this->lfSetIncorrectData($arrForm['login_id']); @@ -192,7 +192,7 @@ $objSess->SetSession('login_name', $login_name); $objSess->SetSession('uniqid', $objSess->getUniqId()); - if(SC_Utils_Ex::isBlank($last_login)) { + if (SC_Utils_Ex::isBlank($last_login)) { $objSess->SetSession('last_login', date("Y-m-d H:i:s")); - }else{ + } else { $objSess->SetSession('last_login', $last_login); } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php (revision 21441) @@ -284,5 +284,5 @@ ) AS ord"; $arrNewOrder = $objQuery->getAll($sql); - foreach ($arrNewOrder as $key => $val){ + foreach ($arrNewOrder as $key => $val) { $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.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 21441) @@ -88,5 +88,5 @@ } - if(!empty($_POST)) { + if (!empty($_POST)) { $objFormParam = new SC_FormParam_Ex(); @@ -100,6 +100,6 @@ $this->arrForm = $post; - if(count($this->arrErr) == 0) { - switch($this->getMode()) { + if (count($this->arrErr) == 0) { + switch ($this->getMode()) { // 既存編集 case 'update': @@ -115,5 +115,5 @@ $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "'); window.alert('SHOPマスターの登録が完了しました。');"; } - if( empty($this->arrForm['regular_holiday_ids']) ) { + if (empty($this->arrForm['regular_holiday_ids']) ) { $this->arrSel = array(); } else { @@ -182,7 +182,7 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $arrCol = $this->lfGetCol(); - foreach($arrCol as $val) { + foreach ($arrCol as $val) { //配列の場合は、パイプ区切りの文字列に変換 - if(is_array($array[$val])) { + if (is_array($array[$val])) { $sqlval[$val] = implode("|", $array[$val]); } else { @@ -200,5 +200,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $arrCol = $this->lfGetCol(); - foreach($arrCol as $val) { + foreach ($arrCol as $val) { $sqlval[$val] = $array[$val]; } @@ -249,5 +249,5 @@ $objFormParam->addParam("メッセージ", 'message', LLTEXT_LEN, '', array("MAX_LENGTH_CHECK")); - if(!isset($post['downloadable_days_unlimited']) && $post['downloadable_days_unlimited'] != "1") { + if (!isset($post['downloadable_days_unlimited']) && $post['downloadable_days_unlimited'] != "1") { $objFormParam->addParam("ダウンロード可能日数", "downloadable_days", DOWNLOAD_DAYS_LEN, 'n', array("EXIST_CHECK", "ZERO_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); } else { Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php (revision 21441) @@ -86,5 +86,5 @@ case 'id_set': $result = $this->lfGetMailTemplateByTemplateID($post['template_id']); - if ($result){ + if ($result) { $this->arrForm = $result[0]; } else { @@ -95,5 +95,5 @@ $this->arrForm = $post; - if ($this->arrErr){ + if ($this->arrErr) { // エラーメッセージ $this->tpl_msg = "エラーが発生しました"; @@ -137,8 +137,8 @@ $sql = "SELECT * FROM dtb_mailtemplate WHERE template_id = ?"; $template_data = $objQuery->getAll($sql, array($post['template_id'])); - if ($template_data){ + if ($template_data) { $sql_where = "template_id = ?"; $objQuery->update("dtb_mailtemplate", $post, $sql_where, array(addslashes($post['template_id']))); - }else{ + } else { $objQuery->insert("dtb_mailtemplate", $post); } Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php (revision 21441) @@ -84,5 +84,5 @@ } - switch($mode) { + switch ($mode) { case 'delete': // ランク付きレコードの削除 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php (revision 21441) @@ -122,10 +122,10 @@ $objFormParam->addParam("取扱支払方法", "payment_ids", INT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); - for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { + for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { $objFormParam->addParam("お届け時間$cnt", "deliv_time$cnt", STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK")); } - if(INPUT_DELIV_FEE) { - for($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { + if (INPUT_DELIV_FEE) { + for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { $objFormParam->addParam("配送料金$cnt", "fee$cnt", PRICE_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); } @@ -161,5 +161,5 @@ // deliv_id が決まっていた場合 - if($arrRet['deliv_id'] != "") { + if ($arrRet['deliv_id'] != "") { $deliv_id = $arrRet['deliv_id']; $where = "deliv_id = ?"; @@ -169,5 +169,5 @@ $table = "dtb_delivtime"; $where = "deliv_id = ? AND time_id = ?"; - for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { + for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { $sqlval = array(); $keyname = "deliv_time".$cnt; @@ -176,9 +176,9 @@ $curData = $objQuery->select("*", $table, $where, $arrval); - if(strcmp($arrRet[$keyname], "") != 0) { + if (strcmp($arrRet[$keyname], "") != 0) { $sqlval['deliv_time'] = $arrRet[$keyname]; // 入力が空ではなく、DBに情報があれば更新 - if(count($curData)) { + if (count($curData)) { $objQuery->update($table, $sqlval, $where, $arrval); } @@ -191,5 +191,5 @@ } // 入力が空で、DBに情報がある場合は削除 - else if(count($curData)) { + else if (count($curData)) { $objQuery->delete($table, $where, $arrval); } @@ -197,8 +197,8 @@ // 配送料の登録 - if(INPUT_DELIV_FEE) { - for($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { + if (INPUT_DELIV_FEE) { + for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { $keyname = 'fee'.$cnt; - if(strcmp($arrRet[$keyname], "") != 0) { + if (strcmp($arrRet[$keyname], "") != 0) { $sqlval = array('fee' => $arrRet[$keyname]); $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND fee_id = ?", array($deliv_id, $cnt)); @@ -206,6 +206,5 @@ } } - } - else { + } else { // 登録する配送業者IDの取得 $deliv_id = $objQuery->nextVal('dtb_deliv_deliv_id'); @@ -218,7 +217,7 @@ $sqlval = array(); // お届け時間の設定 - for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { + for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { $keyname = "deliv_time$cnt"; - if($arrRet[$keyname] != "") { + if ($arrRet[$keyname] != "") { $sqlval['deliv_id'] = $deliv_id; $sqlval['time_id'] = $cnt; @@ -229,10 +228,10 @@ } - if(INPUT_DELIV_FEE) { + if (INPUT_DELIV_FEE) { $sqlval = array(); // 配送料金の設定 - for($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { + for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) { $keyname = "fee$cnt"; - if($arrRet[$keyname] != "") { + if ($arrRet[$keyname] != "") { $sqlval['deliv_id'] = $deliv_id; $sqlval['fee'] = $arrRet[$keyname]; @@ -306,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_Tradelaw.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php (revision 21441) @@ -82,11 +82,11 @@ } - if(!empty($_POST)) { + if (!empty($_POST)) { // 入力値の変換 $objFormParam->convParam(); $this->arrErr = $this->lfCheckError($objFormParam); - if(count($this->arrErr) == 0) { - switch($this->getMode()) { + if (count($this->arrErr) == 0) { + switch ($this->getMode()) { case 'update': $this->lfUpdateData($objFormParam->getHashArray()); // 既存編集 Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php (revision 21441) @@ -101,5 +101,5 @@ // エラーがなければデータを更新 - if(count($this->arrErr[$device_type_id][$page_id]) == 0) { + if (count($this->arrErr[$device_type_id][$page_id]) == 0) { $arrMETA = $objFormParam->getHashArray(); @@ -108,5 +108,5 @@ // データ更新 $this->lfUpdPageData($arrUpdData); - }else{ + } else { // POSTのデータを再表示 $arrPageData = $this->lfSetData($this->arrPageData, $_POST['meta']); @@ -119,5 +119,5 @@ // エラーがなければデータの取得 - if(count($this->arrErr[$device_type_id][$page_id]) == 0) { + if (count($this->arrErr[$device_type_id][$page_id]) == 0) { // データの取得 $this->arrPageData = $this->lfGetSeoPageData(); @@ -179,6 +179,6 @@ function lfSetData($arrPageData, $arrDispData){ - foreach($arrPageData as $device_key => $arrVal){ - foreach($arrVal as $key => $val) { + foreach ($arrPageData as $device_key => $arrVal) { + foreach ($arrVal as $key => $val) { $device_type_id = $val['device_type_id']; $page_id = $val['page_id']; 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php (revision 21441) @@ -93,5 +93,5 @@ // 要求判定 - switch($mode) { + switch ($mode) { // 編集処理 case 'edit': @@ -99,7 +99,7 @@ $this->arrForm = $this->arrForm = $_POST; - if(count($this->arrErr) <= 0) { + if (count($this->arrErr) <= 0) { // 新規作成 - if($post['holiday_id'] == "") { + if ($post['holiday_id'] == "") { $this->lfInsertClass($this->arrForm, $_SESSION['member_id']); } @@ -237,5 +237,5 @@ $post = $objFormParam->getHashArray(); - if(!isset($arrErr['date'])) { + if (!isset($arrErr['date'])) { $objQuery =& SC_Query_Ex::getSingletonInstance(); $where = "del_flg = 0 AND month = ? AND day = ?"; Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php (revision 21441) @@ -82,11 +82,11 @@ } - if(!empty($_POST)) { + if (!empty($_POST)) { // 入力値の変換 $objFormParam->convParam(); $this->arrErr = $objFormParam->checkError(); - if(count($this->arrErr) == 0) { - switch($this->getMode()) { + if (count($this->arrErr) == 0) { + switch ($this->getMode()) { case 'update': $this->lfUpdateData($objFormParam->getHashArray()); // 既存編集 Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php (revision 21441) @@ -262,5 +262,5 @@ // $disp_line件ごとに進捗表示する - if($cntCurrentLine % $disp_line == 0 && $img_cnt < IMAGE_MAX) { + if ($cntCurrentLine % $disp_line == 0 && $img_cnt < IMAGE_MAX) { echo ''; SC_Utils_Ex::sfFlush(); 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 21441) @@ -87,5 +87,5 @@ // 要求判定 - switch($mode) { + switch ($mode) { // 編集処理 case 'edit': @@ -93,6 +93,6 @@ $this->arrForm = $_POST; - if(count($this->arrErr) <= 0) { - if($post['kiyaku_id'] == "") { + if (count($this->arrErr) <= 0) { + if ($post['kiyaku_id'] == "") { $this->lfInsertClass($this->arrForm, $_SESSION['member_id']); // 新規作成 } else { @@ -219,5 +219,5 @@ function lfCheckError($mode, $objFormParam) { $arrErr = $objFormParam->checkError(); - if(!isset($arrErr['name']) && $mode == 'edit') { + if (!isset($arrErr['name']) && $mode == 'edit') { $post = $objFormParam->getHashArray(); $objQuery =& SC_Query_Ex::getSingletonInstance(); Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php (revision 21441) @@ -85,5 +85,5 @@ } - switch($this->getMode()) { + switch ($this->getMode()) { case 'delete': // ランク付きレコードの削除 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php (revision 21441) @@ -83,5 +83,5 @@ $this->objUpFile->setHiddenFileList($_POST); - switch($mode) { + switch ($mode) { case 'edit': $objFormParam->setParam($_REQUEST); @@ -90,5 +90,5 @@ $this->arrErr = $this->lfCheckError($post, $objFormParam); $this->charge_flg = $post["charge_flg"]; - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { $this->lfRegistData($post['payment_id'], $_SESSION['member_id'], $objFormParam); $this->objUpFile->moveTempFile(); @@ -114,5 +114,5 @@ $this->arrErr = $objFormParam->checkError(); $post = $objFormParam->getHashArray(); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { $this->objUpFile->deleteFile($post['image_key']); } @@ -125,5 +125,5 @@ $this->arrErr = $objFormParam->checkError(); $post = $objFormParam->getHashArray(); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { $arrRet = $this->lfGetData($post['payment_id']); @@ -225,10 +225,10 @@ $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - if($sqlval['fix'] != '1') { + if ($sqlval['fix'] != '1') { $sqlval['fix'] = 2; // 自由設定 } // 新規登録 - if($payment_id == "") { + if ($payment_id == "") { // INSERTの実行 $sqlval['creator_id'] = $member_id; @@ -261,10 +261,10 @@ // 利用条件(下限)チェック - if($arrRet['rule'] < $arrPaymentData["rule_min"] and $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"] != ""){ + 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.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 21441) @@ -110,5 +110,5 @@ // 入力パラメーターチェック $this->arrErr = $this->lfCheckError($objFormParam); - if(!SC_Utils_Ex::isBlank($this->arrErr)) { + if (!SC_Utils_Ex::isBlank($this->arrErr)) { return; } @@ -177,5 +177,5 @@ function lfDoDeleteCustomer($customer_id) { $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, "del_flg = 0"); - if(SC_Utils_Ex::isBlank($arrData)) { + if (SC_Utils_Ex::isBlank($arrData)) { //対象となるデータが見つからない。 return false; @@ -196,5 +196,5 @@ function lfDoResendMail($customer_id) { $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id); - if(SC_Utils_Ex::isBlank($arrData) or $arrData['del_flg'] == 1) { + if (SC_Utils_Ex::isBlank($arrData) or $arrData['del_flg'] == 1) { //対象となるデータが見つからない、または削除済み return false; 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php (revision 21441) @@ -99,5 +99,5 @@ $this->arrErr = $this->lfCheckErrorSearchParam($objFormSearchParam); $this->arrSearchData = $objFormSearchParam->getSearchArray(); - if(!SC_Utils_Ex::isBlank($this->arrErr)) { + if (!SC_Utils_Ex::isBlank($this->arrErr)) { return; } @@ -123,5 +123,5 @@ $this->arrSearchErr = $this->lfCheckErrorSearchParam($objFormSearchParam); $this->arrSearchData = $objFormSearchParam->getSearchArray(); - if(!SC_Utils_Ex::isBlank($this->arrErr) or !SC_Utils_Ex::isBlank($this->arrSearchErr)) { + if (!SC_Utils_Ex::isBlank($this->arrErr) or !SC_Utils_Ex::isBlank($this->arrSearchErr)) { return; } @@ -142,5 +142,5 @@ $this->arrSearchErr = $this->lfCheckErrorSearchParam($objFormSearchParam); $this->arrSearchData = $objFormSearchParam->getSearchArray(); - if(!SC_Utils_Ex::isBlank($this->arrErr) or !SC_Utils_Ex::isBlank($this->arrSearchErr)) { + if (!SC_Utils_Ex::isBlank($this->arrErr) or !SC_Utils_Ex::isBlank($this->arrSearchErr)) { return; } @@ -166,5 +166,5 @@ $this->arrSearchErr = $this->lfCheckErrorSearchParam($objFormSearchParam); $this->arrSearchData = $objFormSearchParam->getSearchArray(); - if(!SC_Utils_Ex::isBlank($this->arrErr) or !SC_Utils_Ex::isBlank($this->arrSearchErr)) { + if (!SC_Utils_Ex::isBlank($this->arrErr) or !SC_Utils_Ex::isBlank($this->arrSearchErr)) { return; } @@ -180,5 +180,5 @@ $this->arrSearchErr = $this->lfCheckErrorSearchParam($objFormSearchParam); $this->arrSearchData = $objFormSearchParam->getSearchArray(); - if(!SC_Utils_Ex::isBlank($this->arrSearchErr)) { + if (!SC_Utils_Ex::isBlank($this->arrSearchErr)) { return; } @@ -249,20 +249,20 @@ $where = "del_flg <> 1 AND (email Like ? OR email_mobile Like ?)"; $arrVal = array($objFormParam->getValue('email'), $objFormParam->getValue('email_mobile')); - if($objFormParam->getValue("customer_id")) { + if ($objFormParam->getValue("customer_id")) { $where .= " AND customer_id <> ?"; $arrVal[] = $objFormParam->getValue("customer_id"); } $arrData = $objQuery->getRow($col, $table, $where, $arrVal); - if(!SC_Utils_Ex::isBlank($arrData['email'])) { - if($arrData['email'] == $objFormParam->getValue('email')) { + if (!SC_Utils_Ex::isBlank($arrData['email'])) { + if ($arrData['email'] == $objFormParam->getValue('email')) { $arrErr['email'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用しているアドレスです。'; - }else if($arrData['email'] == $objFormParam->getValue('email_mobile')) { + }else if ($arrData['email'] == $objFormParam->getValue('email_mobile')) { $arrErr['email_mobile'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用しているアドレスです。'; } } - if(!SC_Utils_Ex::isBlank($arrData['email_mobile'])) { - if($arrData['email_mobile'] == $objFormParam->getValue('email_mobile')) { + if (!SC_Utils_Ex::isBlank($arrData['email_mobile'])) { + if ($arrData['email_mobile'] == $objFormParam->getValue('email_mobile')) { $arrErr['email_mobile'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用している携帯アドレスです。'; - }else if($arrData['email_mobile'] == $objFormParam->getValue('email')) { + }else if ($arrData['email_mobile'] == $objFormParam->getValue('email')) { if ($arrErr['email'] == "") { $arrErr['email'] = '※ すでに他の会員(ID:' . $arrData['customer_id'] . ')が使用している携帯アドレスです。'; @@ -284,5 +284,5 @@ $arrData = $objFormParam->getDbArray(); // 足りないものを作る - if(!SC_Utils_Ex::isBlank($objFormParam->getValue('year'))) { + if (!SC_Utils_Ex::isBlank($objFormParam->getValue('year'))) { $arrData['birth'] = $objFormParam->getValue('year') . '/' . $objFormParam->getValue('month') . '/' @@ -291,9 +291,9 @@ } - if(!is_numeric($arrData['customer_id'])) { + if (!is_numeric($arrData['customer_id'])) { $arrData['secret_key'] = SC_Utils_Ex::sfGetUniqRandomId('r'); - }else { + } else { $arrOldCustomerData = SC_Helper_Customer_Ex::sfGetCustomerData($arrData['customer_id']); - if($arrOldCustomerData['status'] != $arrData['status']) { + if ($arrOldCustomerData['status'] != $arrData['status']) { $arrData['secret_key'] = SC_Utils_Ex::sfGetUniqRandomId('r'); } @@ -309,5 +309,5 @@ */ function lfPurchaseHistory($customer_id, $pageno = 0){ - if(SC_Utils_Ex::isBlank($customer_id)) { + if (SC_Utils_Ex::isBlank($customer_id)) { return array('0', array(), NULL); } Index: branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php (revision 21441) @@ -76,5 +76,5 @@ // 入力パラメーターチェック $this->arrErr = $this->lfCheckError($objFormParam); - if(!SC_Utils_Ex::isBlank($this->arrErr)) { + if (!SC_Utils_Ex::isBlank($this->arrErr)) { return; } Index: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php (revision 21441) @@ -74,5 +74,5 @@ switch ($this->getMode()) { case 'delete': - if ( SC_Utils_Ex::sfIsInt($_GET['id'])===true ){ + if (SC_Utils_Ex::sfIsInt($_GET['id'])===true ) { $this->lfDeleteMailTemplate($_GET['id']); $this->objDisplay->reload(null, true); 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 21441) @@ -75,5 +75,5 @@ case 'edit': // 編集 - if ( SC_Utils_Ex::sfIsInt($_GET['template_id'])===true ){ + if (SC_Utils_Ex::sfIsInt($_GET['template_id'])===true ) { $arrMail = $objMailHelper->sfGetMailmagaTemplate($_GET['template_id']); $this->arrForm = $arrMail[0]; @@ -131,5 +131,5 @@ $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - if ( SC_Utils_Ex::sfIsInt($template_id) ){ + if (SC_Utils_Ex::sfIsInt($template_id) ) { // 更新時 $objQuery->update("dtb_mailmaga_template", 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 21441) @@ -143,5 +143,5 @@ $objFormParam->setParam($_POST); $this->arrErr = $objFormParam->checkError(); - if (SC_Utils_Ex::isBlank($this->arrErr)){ + if (SC_Utils_Ex::isBlank($this->arrErr)) { $this->tpl_mainpage = 'mail/index.tpl'; SC_Helper_Mail_Ex::sfSendMailmagazine($this->lfRegisterData($objFormParam)); // DB登録・送信 @@ -212,6 +212,6 @@ */ function lfGetMailTemplateList($arrTemplate){ - if ( is_array($arrTemplate) ){ - foreach( $arrTemplate as $line ){ + if (is_array($arrTemplate) ) { + foreach ($arrTemplate as $line ) { $return[$line['template_id']] = "【" . $this->arrHtmlmail[$line['mail_method']] . "】" . $line['subject']; } @@ -263,6 +263,6 @@ $searchmailtype = $objFormParam->getValue('search_mail_type'); if($searchmailtype==2||$searchmailtype==4)$emailtype="email_mobile"; - if ( is_array( $arrSendCustomer ) ){ - foreach( $arrSendCustomer as $line ){ + if (is_array( $arrSendCustomer ) ) { + foreach ($arrSendCustomer as $line ) { $dtb_send_customer = array(); $dtb_send_customer["customer_id"] = $line["customer_id"]; Index: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php (revision 21441) @@ -69,5 +69,5 @@ switch ($this->getMode()) { case 'template': - if (SC_Utils_Ex::sfIsInt($_GET['template_id'])){ + if (SC_Utils_Ex::sfIsInt($_GET['template_id'])) { $arrMail = $objMailHelper->sfGetMailmagaTemplate($_GET['template_id']); $this->mail = $arrMail[0]; @@ -75,5 +75,5 @@ break; case 'history'; - if (SC_Utils_Ex::sfIsInt($_GET['send_id'])){ + if (SC_Utils_Ex::sfIsInt($_GET['send_id'])) { $arrMail = $objMailHelper->sfGetSendHistory($_GET['send_id']); $this->mail = $arrMail[0]; 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 21441) @@ -85,5 +85,5 @@ // モードによる処理切り替え - switch($this->getMode()) { + switch ($this->getMode()) { // 編集処理 @@ -93,6 +93,6 @@ // エラーチェック $this->arrErr = $this->lfErrorCheck($this->arrForm); - if(count($this->arrErr) <= 0) { - if($this->arrForm['maker_id'] == "") { + if (count($this->arrErr) <= 0) { + if ($this->arrForm['maker_id'] == "") { // メーカー情報新規登録 $this->lfInsert($this->arrForm); @@ -237,5 +237,5 @@ $objDb = new SC_Helper_DB_Ex(); - switch($mode) { + switch ($mode) { case 'up': $objDb->sfRankUp("dtb_maker", "maker_id", $maker_id); @@ -281,5 +281,5 @@ // maker_id の正当性チェック - if(!empty($arrForm['maker_id'])) { + if (!empty($arrForm['maker_id'])) { $objDb = new SC_Helper_DB_Ex(); if(!SC_Utils_Ex::sfIsInt($arrForm['maker_id']) @@ -291,5 +291,5 @@ } } - if(!isset($objErr->arrErr['name'])) { + if (!isset($objErr->arrErr['name'])) { $objQuery =& SC_Query_Ex::getSingletonInstance(); $arrMaker = array(); Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 21441) @@ -122,5 +122,5 @@ $where = "del_flg = 0"; foreach ($arrParam as $key => $val) { - if($val == "") { + if ($val == "") { continue; } @@ -133,5 +133,5 @@ * 処理を実行 * ----------------------------------------------- */ - switch($this->getMode()) { + switch ($this->getMode()) { // CSVを送信する。 case 'csv': @@ -301,5 +301,5 @@ case 'search_category_id': list($tmp_where, $tmp_Values) = $objDb->sfGetCatWhere($objFormParam->getValue($key)); - if($tmp_where != "") { + if ($tmp_where != "") { $where.= " AND product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; $arrValues = array_merge((array)$arrValues, (array)$tmp_Values); @@ -309,7 +309,7 @@ case 'search_status': $tmp_where = ""; - foreach($objFormParam->getValue($key) as $element) { - if($element != "") { - if(SC_Utils_Ex::isBlank($tmp_where)) { + foreach ($objFormParam->getValue($key) as $element) { + if ($element != "") { + if (SC_Utils_Ex::isBlank($tmp_where)) { $tmp_where .= " AND (status = ?"; } else { @@ -320,5 +320,5 @@ } - if(!SC_Utils_Ex::isBlank($tmp_where)) { + if (!SC_Utils_Ex::isBlank($tmp_where)) { $tmp_where .= ")"; $where .= " $tmp_where "; @@ -343,7 +343,7 @@ // 商品ステータス case 'search_product_statuses': - if(count($objFormParam->getValue($key)) > 0) { + if (count($objFormParam->getValue($key)) > 0) { $where .= " AND product_id IN (SELECT product_id FROM dtb_product_status WHERE product_status_id IN ("; - foreach($objFormParam->getValue($key) as $param) { + foreach ($objFormParam->getValue($key) as $param) { $where .= "?,"; $arrValues[] = $param; 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 21440) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21441) @@ -93,5 +93,5 @@ $mode = $this->getMode(); - switch($mode) { + switch ($mode) { case 'pre_edit': case 'copy' : @@ -100,5 +100,5 @@ // エラーチェック $this->arrErr = $objFormParam->checkError(); - if(count($this->arrErr) > 0) { + if (count($this->arrErr) > 0) { SC_Utils_Ex::sfDispException(); } @@ -122,5 +122,5 @@ // 商品複製の場合、画像ファイルコピー - if($mode == 'copy') { + if ($mode == 'copy') { $this->arrForm["copy_product_id"] = $this->arrForm["product_id"]; $this->arrForm["product_id"] = ""; @@ -139,5 +139,5 @@ // エラーチェック $this->arrErr = $this->lfCheckError_Edit($objFormParam, $objUpFile, $objDownFile, $arrForm); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { // 確認画面表示設定 $this->tpl_mainpage = 'products/confirm.tpl'; @@ -158,5 +158,5 @@ // エラーチェック $this->arrErr = $this->lfCheckError_Edit($objFormParam, $objUpFile, $objDownFile, $arrForm); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { // DBへデータ登録 $product_id = $this->lfRegistProduct($objUpFile, $objDownFile, $arrForm); @@ -195,9 +195,9 @@ $arrForm = $objFormParam->getHashArray(); - switch($mode) { + switch ($mode) { case 'upload_image': // ファイルを一時ディレクトリにアップロード $this->arrErr[$arrForm['image_key']] = $objUpFile->makeTempFile($arrForm['image_key'], IMAGE_RENAME); - if($this->arrErr[$arrForm['image_key']] == "") { + if ($this->arrErr[$arrForm['image_key']] == "") { // 縮小画像作成 $this->lfSetScaleImage($objUpFile, $arrForm['image_key']); @@ -225,5 +225,5 @@ $arrForm = $objFormParam->getHashArray(); - switch($mode) { + switch ($mode) { case 'upload_down': // ファイルを一時ディレクトリにアップロード @@ -321,5 +321,5 @@ $objFormParam->addParam("商品ステータス", "product_status", INT_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK")); - if($this->lfGetProductClassFlag($arrPost['has_product_class']) == false) { + if ($this->lfGetProductClassFlag($arrPost['has_product_class']) == false) { // 新規登録, 規格なし商品の編集の場合 $objFormParam->addParam("商品種別", "product_type_id", INT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); @@ -463,5 +463,5 @@ // 規格情報がない商品の場合のチェック - if($arrForm['has_product_class'] != true) { + if ($arrForm['has_product_class'] != true) { // 在庫必須チェック(在庫無制限ではない場合) if ($arrForm['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { @@ -469,5 +469,5 @@ } // ダウンロード商品ファイル必須チェック(ダウンロード商品の場合) - if($arrForm['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) { + if ($arrForm['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) { $arrErr = array_merge((array)$arrErr, (array)$objDownFile->checkEXISTS()); $objErr->doFunc(array("ダウンロード商品ファイル名", 'down_filename'), array("EXIST_CHECK")); @@ -492,11 +492,11 @@ $select_recommend_id = $arrForm['recommend_id' . $select_recommend_no]; - foreach(array_keys($arrForm) as $key) { - if(preg_match('/^recommend_id/', $key)) { - if($select_recommend_no == preg_replace('/^recommend_id/', '', $key)) { + foreach (array_keys($arrForm) as $key) { + if (preg_match('/^recommend_id/', $key)) { + if ($select_recommend_no == preg_replace('/^recommend_id/', '', $key)) { continue; } - if($select_recommend_id == $arrForm[$key]) { + if ($select_recommend_id == $arrForm[$key]) { // 重複した場合、選択されたデータをリセットする $arrForm['recommend_id' . $select_recommend_no] = ''; @@ -579,8 +579,8 @@ $arrForm['category_id'] = unserialize($arrForm['category_id']); } - if($arrForm['status'] == "") { + if ($arrForm['status'] == "") { $arrForm['status'] = DEFAULT_PRODUCT_DISP; } - if($arrForm['product_type_id'] == "") { + if ($arrForm['product_type_id'] == "") { $arrForm['product_type_id'] = DEFAULT_PRODUCT_DOWN; } @@ -635,5 +635,5 @@ function lfSetScaleImage(&$objUpFile, $image_key){ $subno = str_replace("sub_large_image", "", $image_key); - switch ($image_key){ + switch ($image_key) { case "main_large_image": // 詳細メイン画像 @@ -662,5 +662,5 @@ $arrSaveFile = $objUpFile->save_file; - foreach($arrSaveFile as $key => $val){ + foreach ($arrSaveFile as $key => $val) { $this->lfMakeScaleImage($objUpFile, $arrKey[$key], $arrKey[$key], true); } @@ -680,11 +680,11 @@ $from_path = ""; - if($objUpFile->temp_file[$arrImageKey[$from_key]]) { + if ($objUpFile->temp_file[$arrImageKey[$from_key]]) { $from_path = $objUpFile->temp_dir . $objUpFile->temp_file[$arrImageKey[$from_key]]; - } elseif($objUpFile->save_file[$arrImageKey[$from_key]]){ + } elseif ($objUpFile->save_file[$arrImageKey[$from_key]]) { $from_path = $objUpFile->save_dir . $objUpFile->save_file[$arrImageKey[$from_key]]; } - if(file_exists($from_path)) { + if (file_exists($from_path)) { // 生成先の画像サイズを取得 $to_w = $objUpFile->width[$arrImageKey[$to_key]]; @@ -716,12 +716,12 @@ $arrKeyName = $objUpFile->keyname; - foreach($arrKeyName as $key => $keyname) { + foreach ($arrKeyName as $key => $keyname) { if($keyname != $image_key) continue; - if(!empty($arrTempFile[$key])) { + if (!empty($arrTempFile[$key])) { $temp_file = $arrTempFile[$key]; $arrTempFile[$key] = ''; - if(!in_array($temp_file, $arrTempFile)) { + if (!in_array($temp_file, $arrTempFile)) { $objUpFile->deleteFile($image_key); } else { @@ -751,6 +751,6 @@ $arrSaveFile = $objUpFile->save_file; $arrImageKey = array(); - foreach($arrTempFile as $key => $temp_file) { - if($temp_file) { + foreach ($arrTempFile as $key => $temp_file) { + if ($temp_file) { $objImage->moveTempImage($temp_file, $objUpFile->save_dir); $arrImageKey[] = $arrKeyName[$key]; @@ -903,5 +903,5 @@ $arrRecommend = array(); - for($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { + for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { $keyname = "recommend_id" . $i; $delkey = "recommend_delete" . $i; @@ -910,5 +910,5 @@ if (!isset($arrForm[$delkey])) $arrForm[$delkey] = null; - if((isset($arrForm[$keyname]) && !empty($arrForm[$keyname])) && $arrForm[$delkey] != 1) { + if ((isset($arrForm[$keyname]) && !empty($arrForm[$keyname])) && $arrForm[$delkey] != 1) { $objProduct = new SC_Product_Ex(); $arrRecommend[$i] = $objProduct->getDetail($arrForm[$keyname]); @@ -946,5 +946,5 @@ */ function lfGetProductClassFlag($has_product_class) { - if($has_product_class == '1') { + if ($has_product_class == '1') { return true; } else { @@ -1004,5 +1004,5 @@ $sqlval = array_merge($sqlval, $arrRet); - for($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) { + for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) { $sqlval['sub_title'.$cnt] = $arrList['sub_title'.$cnt]; $sqlval['sub_comment'.$cnt] = $arrList['sub_comment'.$cnt]; @@ -1012,5 +1012,5 @@ // 新規登録(複製時を含む) - if($arrList['product_id'] == "") { + if ($arrList['product_id'] == "") { $product_id = $objQuery->nextVal("dtb_products_product_id"); $sqlval['product_id'] = $product_id; @@ -1026,6 +1026,6 @@ // 複製商品の場合には規格も複製する - if($arrList["copy_product_id"] != "" && SC_Utils_Ex::sfIsInt($arrList["copy_product_id"])) { - if($this->lfGetProductClassFlag($arrList["has_product_class"]) == false) { + if ($arrList["copy_product_id"] != "" && SC_Utils_Ex::sfIsInt($arrList["copy_product_id"])) { + if ($this->lfGetProductClassFlag($arrList["has_product_class"]) == false) { //規格なしの場合、複製は価格等の入力が発生しているため、その内容で追加登録を行う $this->lfCopyProductClass($arrList, $objQuery); @@ -1055,5 +1055,5 @@ // 規格データ登録 $objQuery =& SC_Query_Ex::getSingletonInstance(); - foreach($arrProductsClass as $arrData) { + foreach ($arrProductsClass as $arrData) { $sqlval = array(); $sqlval['product_class_id'] = $objQuery->nextVal('dtb_products_class_product_class_id'); @@ -1108,5 +1108,5 @@ // 商品登録の時は規格を生成する。複製の場合は規格も複製されるのでこの処理は不要。 - if($arrList["copy_product_id"] == "") { + if ($arrList["copy_product_id"] == "") { // 規格登録 if ($objDb->sfHasProductClass($product_id)) { @@ -1195,5 +1195,5 @@ $sqlval['product_id'] = $product_id; $rank = RECOMMEND_PRODUCT_MAX; - for($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { + for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { $keyname = "recommend_id" . $i; $commentkey = "recommend_comment" . $i; @@ -1202,5 +1202,5 @@ if (!isset($arrList[$deletekey])) $arrList[$deletekey] = null; - if($arrList[$keyname] != "" && $arrList[$deletekey] != '1') { + if ($arrList[$keyname] != "" && $arrList[$deletekey] != '1') { $sqlval['recommend_product_id'] = $arrList[$keyname]; $sqlval['comment'] = $arrList[$commentkey]; @@ -1233,8 +1233,8 @@ $err_flag = false; //非編集項目は複製、編集項目は上書きして登録 - foreach($arrProductClass as $records) { - foreach($records as $key => $value) { - if(isset($arrList[$key])) { - switch($key) { + foreach ($arrProductClass as $records) { + foreach ($records as $key => $value) { + if (isset($arrList[$key])) { + switch ($key) { case 'stock_unlimited': $records[$key] = (int)$arrList[$key]; @@ -1252,5 +1252,5 @@ $objQuery->insert($table, $records); //エラー発生時は中断 - if($objQuery->isError()) { + if ($objQuery->isError()) { $err_flag = true; continue; @@ -1258,5 +1258,5 @@ } //トランザクション終了 - if($err_flag) { + if ($err_flag) { $objQuery->rollback(); } else { @@ -1282,5 +1282,5 @@ // 規格組み合わせデータを複製登録 - if($has_class2 == true) { + if ($has_class2 == true) { // 規格2を持っている場合、規格1の組み合わせデータも取得 $arrClassCombinationParent = $this->lfGetClassCombination($arrClassCombination, true); @@ -1307,6 +1307,6 @@ $has_class2 = false; - foreach($arrClassCombination as $arrVal) { - if($arrVal['level'] == '2') { + foreach ($arrClassCombination as $arrVal) { + if ($arrVal['level'] == '2') { $has_class2 = true; break; @@ -1327,5 +1327,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $key = 'class_combination_id'; - if($is_parent == true) { + if ($is_parent == true) { $key = 'parent_class_combination_id'; } @@ -1333,6 +1333,6 @@ $where = 'class_combination_id IN ('; $arrParam = array(); - foreach($arrData as $arrVal) { - if(SC_Utils_Ex::isBlank($arrVal[$key]) == true) { + foreach ($arrData as $arrVal) { + if (SC_Utils_Ex::isBlank($arrVal[$key]) == true) { continue; } @@ -1358,11 +1358,11 @@ // 親組み合わせIDの指定がある場合、指定された親組み合わせIDで複製登録 - if(count($arrParentCombinationId) > 0) { - foreach($arrClassCombination as $key => $arrVal) { + if (count($arrParentCombinationId) > 0) { + foreach ($arrClassCombination as $key => $arrVal) { $arrClassCombination[$key]['parent_class_combination_id'] = $arrParentCombinationId[$arrVal['parent_class_combination_id']]; } } - foreach($arrClassCombination as $arrVal) { + foreach ($arrClassCombination as $arrVal) { $sqlval = array(); $sqlval['class_combination_id'] = $objQuery->nextVal('dtb_class_combination_class_combination_id'); @@ -1389,5 +1389,5 @@ // 自動生成される画像名 $dist_name = ""; - switch($to_key) { + switch ($to_key) { case "main_list_image": $dist_name = '_s'; @@ -1414,5 +1414,5 @@ $has_subproduct_data = false; - for($i = 1; $i <= PRODUCTSUB_MAX; $i++) { + for ($i = 1; $i <= PRODUCTSUB_MAX; $i++) { if(SC_Utils_Ex::isBlank($arrSubProductData['sub_title'.$i]) == false || SC_Utils_Ex::isBlank($arrSubProductData['sub_comment'.$i]) == false @@ -1437,5 +1437,5 @@ */ function getAnchorHash($anchor_key) { - if($anchor_key != "") { + if ($anchor_key != "") { return "location.hash='#" . htmlspecialchars($anchor_key) . "'"; } else { Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php (revision 21441) @@ -127,5 +127,5 @@ case 'search_category_id': list($tmp_where, $tmp_arrval) = $objDb->sfGetCatWhere($val); - if($tmp_where != "") { + if ($tmp_where != "") { $where.= " AND product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; $arrval = array_merge((array)$arrval, (array)$tmp_arrval); 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 21425) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21441) @@ -106,5 +106,5 @@ // CSV構造がインポート可能かのチェック - if(!$objCSV->sfIsImportCSVFrame($arrCSVFrame) ) { + if (!$objCSV->sfIsImportCSVFrame($arrCSVFrame) ) { // 無効なフォーマットなので初期状態に強制変更 $arrCSVFrame = $objCSV->sfGetCsvOutput($this->csv_id, '', array(), 'no'); @@ -125,5 +125,5 @@ $this->arrTitle = $objFormParam->getHtmlDispNameArray(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'csv_upload': $this->doUploadCsv($objFormParam, $objUpFile); @@ -301,24 +301,24 @@ $arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame); // CSV項目毎の処理 - foreach($arrCSVFrame as $item) { + foreach ($arrCSVFrame as $item) { if($item['status'] == CSV_COLUMN_STATUS_FLG_DISABLE) continue; //サブクエリ構造の場合は AS名 を使用 - if(preg_match_all('/\(.+\)\s+as\s+(.+)$/i', $item['col'], $match, PREG_SET_ORDER)) { + if (preg_match_all('/\(.+\)\s+as\s+(.+)$/i', $item['col'], $match, PREG_SET_ORDER)) { $col = $match[0][1]; - }else{ + } else { $col = $item['col']; } // HTML_TAG_CHECKは別途実行なので除去し、別保存しておく - if(strpos(strtoupper($item['error_check_types']), 'HTML_TAG_CHECK') !== FALSE) { + if (strpos(strtoupper($item['error_check_types']), 'HTML_TAG_CHECK') !== FALSE) { $this->arrTagCheckItem[] = $item; $error_check_types = str_replace('HTML_TAG_CHECK', '', $item['error_check_types']); - }else{ + } else { $error_check_types = $item['error_check_types']; } $arrErrorCheckTypes = explode(',', $error_check_types); - foreach($arrErrorCheckTypes as $key => $val) { - if(trim($val) == "") { + foreach ($arrErrorCheckTypes as $key => $val) { + if (trim($val) == "") { unset($arrErrorCheckTypes[$key]); - }else{ + } else { $arrErrorCheckTypes[$key] = trim($val); } @@ -348,9 +348,9 @@ $objErr->arrErr = $objFormParam->checkError(false); // HTMLタグチェックの実行 - foreach($this->arrTagCheckItem as $item) { + foreach ($this->arrTagCheckItem as $item) { $objErr->doFunc(array( $item['disp_name'], $item['col'], $this->arrAllowedTag), array("HTML_TAG_CHECK")); } // このフォーム特有の複雑系のエラーチェックを行う - if(count($objErr->arrErr) == 0) { + if (count($objErr->arrErr) == 0) { $objErr->arrErr = $this->lfCheckErrorDetail($arrRet, $objErr->arrErr); } @@ -392,5 +392,5 @@ $sqlval = $this->lfSetProductDefaultData($sqlval); - if($sqlval['product_id'] != "") { + if ($sqlval['product_id'] != "") { // 同じidが存在すればupdate存在しなければinsert $where = "product_id = ?"; @@ -404,5 +404,5 @@ // シーケンスの調整 $seq_count = $objQuery->currVal('dtb_products_product_id'); - if($seq_count < $sqlval['product_id']){ + if ($seq_count < $sqlval['product_id']) { $objQuery->setVal('dtb_products_product_id', $sqlval['product_id'] + 1); } @@ -455,5 +455,5 @@ $sqlval = $this->lfSetProductClassDefaultData($sqlval); - if($product_class_id == "") { + if ($product_class_id == "") { // 新規登録 $sqlval['product_id'] = $product_id; @@ -469,5 +469,5 @@ } // 支払い方法登録 - if($arrList['product_payment_ids'] != "") { + if ($arrList['product_payment_ids'] != "") { $arrPayment_id = explode(',', $arrList['product_payment_ids']); $objProduct->setPaymentOptions($product_class_id, $arrPayment_id); @@ -488,10 +488,10 @@ function lfRegistReccomendProducts($objQuery, $arrList, $product_id) { $objQuery->delete("dtb_recommend_products", "product_id = ?", array($product_id)); - for($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { + for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { $keyname = "recommend_product_id" . $i; $comment_key = "recommend_comment" . $i; - if($arrList[$keyname] != "") { + if ($arrList[$keyname] != "") { $arrProduct = $objQuery->select("product_id", "dtb_products", "product_id = ?", array($arrList[$keyname])); - if($arrProduct[0]['product_id'] != "") { + if ($arrProduct[0]['product_id'] != "") { $arrval['product_id'] = $product_id; $arrval['recommend_product_id'] = $arrProduct[0]['product_id']; @@ -514,6 +514,6 @@ */ function lfSetParamDefaultValue(&$arrCSVFrame) { - foreach($arrCSVFrame as $key => $val) { - switch($val['col']) { + foreach ($arrCSVFrame as $key => $val) { + switch ($val['col']) { case 'status': $arrCSVFrame[$key]['default'] = DEFAULT_PRODUCT_DISP; @@ -548,14 +548,14 @@ function lfSetProductDefaultData(&$sqlval) { //新規登録時のみ設定する項目 - if( $sqlval['product_id'] == "") { - if($sqlval['status'] == "") { + if ($sqlval['product_id'] == "") { + if ($sqlval['status'] == "") { $sqlval['status'] = DEFAULT_PRODUCT_DISP; } } //共通で空欄時に上書きする項目 - if($sqlval['del_flg'] == ""){ + if ($sqlval['del_flg'] == "") { $sqlval['del_flg'] = '0'; //有効 } - if($sqlval['creator_id'] == "") { + if ($sqlval['creator_id'] == "") { $sqlval['creator_id'] = $_SESSION['member_id']; } @@ -571,13 +571,13 @@ function lfSetProductClassDefaultData(&$sqlval) { //新規登録時のみ設定する項目 - if($sqlval['product_class_id'] == "") { - if($sqlval['point_rate'] == "") { + if ($sqlval['product_class_id'] == "") { + if ($sqlval['point_rate'] == "") { $sqlval['point_rate'] = $this->arrInfo['point_rate']; } - if($sqlval['product_type_id'] == "") { + if ($sqlval['product_type_id'] == "") { $sqlval['product_type_id'] = DEFAULT_PRODUCT_DOWN; } // TODO: 在庫数、無制限フラグの扱いについて仕様がぶれているので要調整 - if($sqlval['stock'] == "" and $sqlval['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { + if ($sqlval['stock'] == "" and $sqlval['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { //在庫数設定がされておらず、かつ無制限フラグが設定されていない場合、強制無制限 $sqlval['stock_unlimited'] = UNLIMITED_FLG_UNLIMITED; @@ -589,15 +589,15 @@ $sqlval['stock'] = ''; } - }else{ + } else { //更新時のみ設定する項目 - if(array_key_exists('stock_unlimited', $sqlval) and $sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) { + if (array_key_exists('stock_unlimited', $sqlval) and $sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) { $sqlval['stock'] = ''; } } //共通で設定する項目 - if($sqlval['del_flg'] == ""){ + if ($sqlval['del_flg'] == "") { $sqlval['del_flg'] = '0'; //有効 } - if($sqlval['creator_id'] == "") { + if ($sqlval['creator_id'] == "") { $sqlval['creator_id'] = $_SESSION['member_id']; } @@ -614,5 +614,5 @@ function lfCheckErrorDetail($item, $arrErr) { // 規格IDの存在チェック - if(!$this->lfIsDbRecord('dtb_products_class', 'product_class_id', $item)) { + if (!$this->lfIsDbRecord('dtb_products_class', 'product_class_id', $item)) { $arrErr['product_class_id'] = "※ 指定の商品規格IDは、登録されていません。"; } @@ -620,7 +620,7 @@ if(array_search('product_class_id', $this->arrFormKeyList) !== FALSE and $item['product_class_id'] != "") { - if($item['product_id'] == "") { + if ($item['product_id'] == "") { $arrErr['product_class_id'] = "※ 商品規格ID指定時には商品IDの指定が必須です。"; - }else{ + } else { if(!$this->objDb->sfIsRecord('dtb_products_class', 'product_id, product_class_id' , array($item['product_id'], $item['product_class_id']))) { @@ -630,5 +630,5 @@ } // 規格組合せIDの存在チェック -// if(!$this->lfIsDbRecord('dtb_class_combination', 'class_combination_id', $item)) { +// if (!$this->lfIsDbRecord('dtb_class_combination', 'class_combination_id', $item)) { // SC_Utils::sfIsRecord が del_flg が無いと使えない為、個別処理 if(array_search('class_combination_id', $this->arrFormKeyList) !== FALSE @@ -636,26 +636,26 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $ret = $objQuery->get('class_combination_id', 'dtb_class_combination', 'class_combination_id = ?', array($item['class_combination_id'])); - if($ret == "") { + if ($ret == "") { $arrErr['class_combination_id'] = "※ 指定の規格組合せIDは、登録されていません。"; } } // 表示ステータスの存在チェック - if(!$this->lfIsArrayRecord($this->arrDISP, 'status', $item)) { + if (!$this->lfIsArrayRecord($this->arrDISP, 'status', $item)) { $arrErr['status'] = "※ 指定の表示ステータスは、登録されていません。"; } // メーカーIDの存在チェック - if(!$this->lfIsArrayRecord($this->arrMaker, 'maker_id', $item)) { + if (!$this->lfIsArrayRecord($this->arrMaker, 'maker_id', $item)) { $arrErr['maker_id'] = "※ 指定のメーカーIDは、登録されていません。"; } // 発送日目安IDの存在チェック - if(!$this->lfIsArrayRecord($this->arrDELIVERYDATE, 'deliv_date_id', $item)) { + if (!$this->lfIsArrayRecord($this->arrDELIVERYDATE, 'deliv_date_id', $item)) { $arrErr['deliv_date_id'] = "※ 指定の発送日目安IDは、登録されていません。"; } // 発送日目安IDの存在チェック - if(!$this->lfIsArrayRecord($this->arrProductType, 'product_type_id', $item)) { + if (!$this->lfIsArrayRecord($this->arrProductType, 'product_type_id', $item)) { $arrErr['product_type_id'] = "※ 指定の商品種別IDは、登録されていません。"; } // 関連商品IDの存在チェック - for($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { + for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) { if(array_search('recommend_product_id' . $i, $this->arrFormKeyList) !== FALSE and $item['recommend_product_id' . $i] != "" @@ -665,13 +665,13 @@ } // カテゴリIDの存在チェック - if(!$this->lfIsDbRecordMulti('dtb_category', 'category_id', 'category_ids', $item, ',')) { + if (!$this->lfIsDbRecordMulti('dtb_category', 'category_id', 'category_ids', $item, ',')) { $arrErr['category_ids'] = "※ 指定のカテゴリIDは、登録されていません。"; } // 商品ステータスIDの存在チェック - if(!$this->lfIsArrayRecordMulti($this->arrSTATUS, 'product_statuses', $item, ',')) { + if (!$this->lfIsArrayRecordMulti($this->arrSTATUS, 'product_statuses', $item, ',')) { $arrErr['product_statuses'] = "※ 指定の商品ステータスIDは、登録されていません。"; } // 支払い方法IDの存在チェック - if(!$this->lfIsArrayRecordMulti($this->arrPayments, 'product_payment_ids', $item, ',')) { + if (!$this->lfIsArrayRecordMulti($this->arrPayments, 'product_payment_ids', $item, ',')) { $arrErr['product_payment_ids'] = "※ 指定の支払い方法IDは、登録されていません。"; } @@ -679,5 +679,5 @@ if(array_search('del_flg', $this->arrFormKeyList) !== FALSE and $item['del_flg'] != "") { - if(!($item['del_flg'] == "0" or $item['del_flg'] == "1")) { + if (!($item['del_flg'] == "0" or $item['del_flg'] == "1")) { $arrErr['del_flg'] = "※ 削除フラグは「0」(有効)、「1」(削除)のみが有効な値です。"; } @@ -686,8 +686,8 @@ TODO: 在庫数の扱いが2.4仕様ではぶれているのでどうするか・・ // 在庫数/在庫無制限フラグの有効性に関するチェック - if($item['stock'] == "") { - if(array_search('stock_unlimited', $this->arrFormKeyList) === FALSE) { + if ($item['stock'] == "") { + if (array_search('stock_unlimited', $this->arrFormKeyList) === FALSE) { $arrErr['stock'] = "※ 在庫数は必須です（無制限フラグ項目がある場合のみ空欄許可）。"; - }else if($item['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { + }else if ($item['stock_unlimited'] != UNLIMITED_FLG_UNLIMITED) { $arrErr['stock'] = "※ 在庫数または在庫無制限フラグのいずれかの入力が必須です。"; } @@ -698,8 +698,8 @@ and $item['product_type_id'] == PRODUCT_TYPE_NORMAL) { //実商品の場合 - if( $item['down_filename'] != "") { + if ($item['down_filename'] != "") { $arrErr['down_filename'] = "※ 実商品の場合はダウンロードファイル名は入力できません。"; } - if( $item['down_realfilename'] != "") { + if ($item['down_realfilename'] != "") { $arrErr['down_realfilename'] = "※ 実商品の場合はダウンロード商品用ファイルアップロードは入力できません。"; } @@ -707,8 +707,8 @@ and $item['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) { //ダウンロード商品の場合 - if( $item['down_filename'] == "") { + if ($item['down_filename'] == "") { $arrErr['down_filename'] = "※ ダウンロード商品の場合はダウンロードファイル名は必須です。"; } - if( $item['down_realfilename'] == "") { + if ($item['down_realfilename'] == "") { $arrErr['down_realfilename'] = "※ ダウンロード商品の場合はダウンロード商品用ファイルアップロードは必須です。"; } @@ -729,5 +729,5 @@ $time = date("Y-m-d H:i:s"); // 秒以下を生成 - if($line_no != '') { + if ($line_no != '') { $microtime = sprintf("%06d", $line_no); $time .= ".$microtime"; @@ -746,18 +746,18 @@ */ function lfIsArrayRecordMulti($arr, $keyname, $item, $delimiter = ',') { - if(array_search($keyname, $this->arrFormKeyList) === FALSE) { + if (array_search($keyname, $this->arrFormKeyList) === FALSE) { return true; } - if($item[$keyname] == "") { + if ($item[$keyname] == "") { return true; } $arrItems = explode($delimiter, $item[$keyname]); //空項目のチェック 1つでも空指定があったら不正とする。 - if(array_search("", $arrItems) !== FALSE) { + if (array_search("", $arrItems) !== FALSE) { return false; } //キー項目への存在チェック - foreach($arrItems as $item) { - if(!array_key_exists($item, $arr)) { + foreach ($arrItems as $item) { + if (!array_key_exists($item, $arr)) { return false; } @@ -777,13 +777,13 @@ */ function lfIsDbRecordMulti($table, $tblkey, $keyname, $item, $delimiter = ',') { - if(array_search($keyname, $this->arrFormKeyList) === FALSE) { + if (array_search($keyname, $this->arrFormKeyList) === FALSE) { return true; } - if($item[$keyname] == "") { + if ($item[$keyname] == "") { return true; } $arrItems = explode($delimiter, $item[$keyname]); //空項目のチェック 1つでも空指定があったら不正とする。 - if(array_search("", $arrItems) !== FALSE) { + if (array_search("", $arrItems) !== FALSE) { return false; } @@ -793,5 +793,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $db_count = $objQuery->count($table, $where, $arrItems); - if($count != $db_count) { + if ($count != $db_count) { return false; } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php (revision 21441) @@ -106,5 +106,5 @@ // エラーチェック $this->arrErr = $this->lfCheckError($objFormParam); - if (!$this->arrErr){ + if (!$this->arrErr) { // 検索条件を取得 list($where, $arrval) = $this->lfGetWhere($this->arrForm); @@ -146,5 +146,5 @@ $objErr->arrErr = $objFormParam->checkError(); - switch ($this->getMode()){ + switch ($this->getMode()) { case 'search': $objErr->doFunc(array("投稿者", "search_startyear", "search_startmonth", "search_startday"), array("CHECK_DATE")); @@ -185,8 +185,8 @@ foreach ($arrForm AS $key=>$val) { if (preg_match("/^search_/", $key)) { - switch ($key){ + switch ($key) { case 'search_sex': $arrHidden[$key] = SC_Utils_Ex::sfMergeParamCheckBoxes($val); - if(!is_array($val)) { + if (!is_array($val)) { $arrForm[$key] = explode("-", $val); } @@ -234,5 +234,5 @@ function lfDoOutputCsv($where, $arrVal) { $objCSV = new SC_Helper_CSV_Ex(); - if($where != ""){ + if ($where != "") { $where = "WHERE " . $where; } @@ -250,8 +250,8 @@ $where = "A.del_flg = 0 AND B.del_flg = 0"; - foreach ($arrForm AS $key=>$val){ + foreach ($arrForm AS $key=>$val) { if (empty($val)) continue; - switch ($key){ + switch ($key) { case 'search_reviewer_name': $val = preg_replace("/ /", "%", $val); @@ -281,8 +281,8 @@ $tmp_where = ""; //$val=配列の中身,$element=各キーの値(1,2) - if (is_array($val)){ - foreach($val as $element) { - if($element != "") { - if($tmp_where == "") { + if (is_array($val)) { + foreach ($val as $element) { + if ($element != "") { + if ($tmp_where == "") { $tmp_where .= " AND (sex = ?"; } else { @@ -292,5 +292,5 @@ } } - if($tmp_where != "") { + if ($tmp_where != "") { $tmp_where .= ")"; $where .= " $tmp_where "; @@ -306,5 +306,5 @@ case 'search_startyear': - if (isset($_POST['search_startyear']) && isset($_POST['search_startmonth']) && isset($_POST['search_startday'])){ + if (isset($_POST['search_startyear']) && isset($_POST['search_startmonth']) && isset($_POST['search_startday'])) { $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_startyear'], $_POST['search_startmonth'], $_POST['search_startday']); $where.= " AND A.create_date >= ? "; @@ -314,5 +314,5 @@ case 'search_endyear': - if (isset($_POST['search_startyear']) && isset($_POST['search_startmonth']) && isset($_POST['search_startday'])){ + if (isset($_POST['search_startyear']) && isset($_POST['search_startmonth']) && isset($_POST['search_startday'])) { $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_endyear'], $_POST['search_endmonth'], $_POST['search_endday']); $end_date = date("Y/m/d",strtotime("1 day" ,strtotime($date))); Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php (revision 21441) @@ -75,5 +75,5 @@ $classcategory_id = $objFormParam->getValue('classcategory_id'); - switch($this->getMode()) { + switch ($this->getMode()) { // 登録ボタン押下 // 新規作成 or 編集 @@ -86,5 +86,5 @@ //新規規格追加かどうかを判定する $is_insert = $this->lfCheckInsert($classcategory_id); - if($is_insert) { + if ($is_insert) { //新規追加 $this->lfInsertClass($this->arrForm); @@ -205,5 +205,5 @@ $where = "del_flg <> 1 AND class_id = ?"; $class_id = $objQuery->get("class_id", "dtb_class", $where, array($arrForm['class_id'])); - if(!SC_Utils_Ex::isBlank($class_id)) { + if (!SC_Utils_Ex::isBlank($class_id)) { // INSERTする値を作成する。 $sqlval['name'] = $arrForm['name']; @@ -251,5 +251,5 @@ if (!SC_Utils_Ex::isBlank($arrErr)) { return $arrErr; - }else{ + } else { $arrForm = $objFormParam->getHashArray(); } @@ -272,7 +272,7 @@ function lfCheckInsert($classcategory_id) { //classcategory_id のあるなしで新規規格分類化かどうかを判定 - if (empty($classcategory_id)){ + if (empty($classcategory_id)) { return true; - }else{ + } else { return false; } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php (revision 21441) @@ -75,5 +75,5 @@ // 要求判定 - switch($this->getMode()) { + switch ($this->getMode()) { // 編集処理 case 'edit': @@ -85,5 +85,5 @@ //新規規格追加かどうかを判定する $is_insert = $this->lfCheckInsert($this->arrForm); - if($is_insert) { + if ($is_insert) { $this->lfInsertClass($this->arrForm); // 新規作成 } else { @@ -243,5 +243,5 @@ if (!SC_Utils_Ex::isBlank($arrErr)) { return $arrErr; - }else{ + } else { $arrForm = $objFormParam->getHashArray(); } @@ -264,7 +264,7 @@ function lfCheckInsert($arrForm) { //class_id のあるなしで新規商品かどうかを判定 - if (empty($arrForm['class_id'])){ + if (empty($arrForm['class_id'])) { return true; - }else{ + } else { return false; } 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 21319) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21441) @@ -383,5 +383,5 @@ * ダウンロード商品の必須チェック */ - if($arrValues['product_type_id'][$i] == PRODUCT_TYPE_DOWNLOAD) { + if ($arrValues['product_type_id'][$i] == PRODUCT_TYPE_DOWNLOAD) { if (SC_Utils_Ex::isBlank($arrValues['down_filename'][$i])) { $arrErr['down_filename'][$i] = "※ ダウンロード商品の場合はダウンロードファイル名を入力してください。
"; @@ -464,5 +464,5 @@ // 規格2が選択されていない場合、規格2名称初期化 $class_id2 = $objFormParam->getValue('class_id2'); - if(SC_Utils_Ex::isBlank($class_id2) == true) { + if (SC_Utils_Ex::isBlank($class_id2) == true) { $objFormParam->setValue('classcategory_name2', ''); } @@ -627,5 +627,5 @@ // チェック拡張子のピリオドの数を取得('tar.gz'の場合1個、'jpg'のように通常は0個) $count_period = substr_count($checkExt, "."); - if($count_period > 0) { + if ($count_period > 0) { for ($i = max(array_keys($array_ext)) - $count_period; $i < count($array_ext); $i++) { $ext .= $array_ext[$i] . "."; @@ -640,5 +640,5 @@ $is_error = false; } - if($strExt == "") { + if ($strExt == "") { $strExt .= $checkExt; } else { @@ -713,5 +713,5 @@ $table = ''; $arrParams = array(); - if(SC_Utils_Ex::isBlank($class_id2)) { + if (SC_Utils_Ex::isBlank($class_id2)) { $table = "dtb_classcategory T1 "; $objQuery->setWhere("T1.class_id = ?"); @@ -760,6 +760,6 @@ $results = array(); if (!SC_Utils_Ex::isBlank($arrClass)) { - foreach($arrClass as $key => $val) { - if($arrClassCatCount[$key] > 0) { + foreach ($arrClass as $key => $val) { + if ($arrClassCatCount[$key] > 0) { $results[$key] = $arrClass[$key]; } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php (revision 21441) @@ -78,5 +78,5 @@ isset($_POST['product_id']) ? $_POST['product_id'] : ''; - switch($this->getMode()) { + switch ($this->getMode()) { case 'up': $this->lfRankUp($objDb, $this->arrForm['parent_category_id'], $this->arrForm['product_id']); @@ -187,5 +187,5 @@ $key = "pos-".$product_id; $input_pos = mb_convert_kana($_POST[$key], 'n'); - if(SC_Utils_Ex::sfIsInt($input_pos)) { + if (SC_Utils_Ex::sfIsInt($input_pos)) { $where = "category_id = " . SC_Utils_Ex::sfQuoteSmart($parent_category_id); $objDb->sfMoveRank("dtb_product_categories", "product_id", $product_id, $input_pos, $where); Index: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 21376) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 21441) @@ -79,5 +79,5 @@ $objFormParam->convParam(); - switch($this->getMode()) { + switch ($this->getMode()) { // カテゴリ登録/編集実行 case 'edit': @@ -132,5 +132,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]])); - foreach($decAry as $value){ + foreach ($decAry as $value) { // 上のグループから減算 $this->lfDownRankChilds($objQuery, "dtb_category", "parent_category_id", "category_id", $value["category_id"], $my_count); @@ -138,5 +138,5 @@ // 自分のグループに加算 $this->lfUpRankChilds($objQuery, "dtb_category", "parent_category_id", "category_id", $keys[0], $up_count); - } else if($rankAry[$keys[1]] < $rank) { + } else if ($rankAry[$keys[1]] < $rank) { // データが今の位置より下がった時 $down_count = 0; @@ -520,6 +520,6 @@ $max = count($arrRet); $down_id = ""; - for($cnt = 0; $cnt < $max; $cnt++) { - if($arrRet[$cnt][$id_name] == $id) { + for ($cnt = 0; $cnt < $max; $cnt++) { + if ($arrRet[$cnt][$id_name] == $id) { $down_id = $arrRet[($cnt + 1)][$id_name]; break; @@ -541,6 +541,6 @@ $max = count($arrRet); $up_id = ""; - for($cnt = 0; $cnt < $max; $cnt++) { - if($arrRet[$cnt][$id_name] == $id) { + for ($cnt = 0; $cnt < $max; $cnt++) { + if ($arrRet[$cnt][$id_name] == $id) { $up_id = $arrRet[($cnt - 1)][$id_name]; break; 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 21376) +++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 21441) @@ -103,5 +103,5 @@ // CSV構造がインポート可能かのチェック - if(!$objCSV->sfIsImportCSVFrame($arrCSVFrame) ) { + if (!$objCSV->sfIsImportCSVFrame($arrCSVFrame) ) { // 無効なフォーマットなので初期状態に強制変更 $arrCSVFrame = $objCSV->sfGetCsvOutput($this->csv_id, '', array(), 'no'); @@ -122,5 +122,5 @@ $this->arrTitle = $objFormParam->getHtmlDispNameArray(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'csv_upload': $this->doUploadCsv($objFormParam, $objUpFile); @@ -282,24 +282,24 @@ $arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame); // CSV項目毎の処理 - foreach($arrCSVFrame as $item) { + foreach ($arrCSVFrame as $item) { if($item['status'] == CSV_COLUMN_STATUS_FLG_DISABLE) continue; //サブクエリ構造の場合は AS名 を使用 - if(preg_match_all('/\(.+\) as (.+)$/i', $item['col'], $match, PREG_SET_ORDER)) { + if (preg_match_all('/\(.+\) as (.+)$/i', $item['col'], $match, PREG_SET_ORDER)) { $col = $match[0][1]; - }else{ + } else { $col = $item['col']; } // HTML_TAG_CHECKは別途実行なので除去し、別保存しておく - if(strpos(strtoupper($item['error_check_types']), 'HTML_TAG_CHECK') !== FALSE) { + if (strpos(strtoupper($item['error_check_types']), 'HTML_TAG_CHECK') !== FALSE) { $this->arrTagCheckItem[] = $item; $error_check_types = str_replace('HTML_TAG_CHECK', '', $item['error_check_types']); - }else{ + } else { $error_check_types = $item['error_check_types']; } $arrErrorCheckTypes = explode(',', $error_check_types); - foreach($arrErrorCheckTypes as $key => $val) { - if(trim($val) == "") { + foreach ($arrErrorCheckTypes as $key => $val) { + if (trim($val) == "") { unset($arrErrorCheckTypes[$key]); - }else{ + } else { $arrErrorCheckTypes[$key] = trim($val); } @@ -329,9 +329,9 @@ $objErr->arrErr = $objFormParam->checkError(false); // HTMLタグチェックの実行 - foreach($this->arrTagCheckItem as $item) { + foreach ($this->arrTagCheckItem as $item) { $objErr->doFunc(array( $item['disp_name'], $item['col'], $this->arrAllowedTag), array("HTML_TAG_CHECK")); } // このフォーム特有の複雑系のエラーチェックを行う - if(count($objErr->arrErr) == 0) { + if (count($objErr->arrErr) == 0) { $objErr->arrErr = $this->lfCheckErrorDetail($arrRet, $objErr->arrErr); } @@ -371,5 +371,5 @@ $sqlval = $this->lfSetCategoryDefaultData($sqlval); - if($sqlval['category_id'] != "") { + if ($sqlval['category_id'] != "") { // 同じidが存在すればupdate存在しなければinsert $where = "category_id = ?"; @@ -389,5 +389,5 @@ $category_id = $sqlval['category_id']; // TODO: 削除時処理 - }else{ + } else { // 新規登録 $category_id = $this->registerCategory($sqlval['parent_category_id'], @@ -405,6 +405,6 @@ */ function lfSetParamDefaultValue(&$arrCSVFrame) { - foreach($arrCSVFrame as $key => $val) { - switch($val['col']) { + foreach ($arrCSVFrame as $key => $val) { + switch ($val['col']) { case 'parent_category_id': $arrCSVFrame[$key]['default'] = '0'; @@ -427,11 +427,11 @@ */ function lfSetCategoryDefaultData(&$sqlval) { - if($sqlval['del_flg'] == ""){ + if ($sqlval['del_flg'] == "") { $sqlval['del_flg'] = '0'; //有効 } - if($sqlval['creator_id'] == "") { + if ($sqlval['creator_id'] == "") { $sqlval['creator_id'] = $_SESSION['member_id']; } - if($sqlval['parent_category_id'] == "") { + if ($sqlval['parent_category_id'] == "") { $sqlval['parent_category_id'] = (string)"0"; } @@ -450,5 +450,5 @@ /* // カテゴリIDの存在チェック - if(!$this->lfIsDbRecord('dtb_category', 'category_id', $item)) { + if (!$this->lfIsDbRecord('dtb_category', 'category_id', $item)) { $arrErr['category_id'] = "※ 指定のカテゴリIDは、登録されていません。"; } @@ -465,5 +465,5 @@ if(array_search('del_flg', $this->arrFormKeyList) !== FALSE and $item['del_flg'] != "") { - if(!($item['del_flg'] == "0" or $item['del_flg'] == "1")) { + if (!($item['del_flg'] == "0" or $item['del_flg'] == "1")) { $arrErr['del_flg'] = "※ 削除フラグは「0」(有効)、「1」(削除)のみが有効な値です。"; } @@ -473,5 +473,5 @@ and $item['category_name'] != "") { $parent_category_id = $item['parent_category_id']; - if($parent_category_id == '') { + if ($parent_category_id == '') { $parent_category_id = (string)'0'; } @@ -496,5 +496,5 @@ and $item['parent_category_id'] != "") { $level = $objQuery->get('level', "dtb_category", "category_id = ?", array($parent_category_id)); - if($level >= LEVEL_MAX) { + if ($level >= LEVEL_MAX) { $arrErr['parent_category_id'] = "※ " . LEVEL_MAX . "階層以上の登録はできません。"; } @@ -542,12 +542,12 @@ $arrCategory['level'] = $level; //カテゴリIDが指定されていればそれを利用する - if(isset($category_id)){ + if (isset($category_id)) { $arrCategory['category_id'] = $category_id; // シーケンスの調整 $seq_count = $objQuery->currVal('dtb_category_category_id'); - if($seq_count < $arrCategory['category_id']){ + if ($seq_count < $arrCategory['category_id']) { $objQuery->setVal('dtb_category_category_id', $arrCategory['category_id'] + 1); } - }else{ + } else { $arrCategory['category_id'] = $objQuery->nextVal('dtb_category_category_id'); } @@ -567,5 +567,5 @@ $time = date("Y-m-d H:i:s"); // 秒以下を生成 - if($line_no != '') { + if ($line_no != '') { $microtime = sprintf("%06d", $line_no); $time .= ".$microtime"; 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 21441) @@ -103,7 +103,7 @@ */ function action() { - if(isset($_GET['draw_image']) && $_GET['draw_image'] != ""){ + if (isset($_GET['draw_image']) && $_GET['draw_image'] != "") { define('DRAW_IMAGE' , true); - }else{ + } else { define('DRAW_IMAGE' , false); } @@ -119,5 +119,5 @@ $this->arrHidden = $objFormParam->getSearchArray(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'csv': case 'search': @@ -138,5 +138,5 @@ list($this->arrResults, $this->tpl_image) = call_user_func_array(array($this, 'lfGetOrder'.$page), array($type, $sdate, $edate)); - if($this->getMode() == 'csv') { + if ($this->getMode() == 'csv') { // CSV出力タイトル行の取得 list($arrTitleCol, $arrDataCol) = $this->lfGetCSVColum($page); @@ -180,5 +180,5 @@ // セッション情報に開始月度が保存されていない。 - if(empty($_SESSION['total']['startyear_m'])) { + if (empty($_SESSION['total']['startyear_m'])) { $list['startyear_m'] = $year; $list['startmonth_m'] = $month; @@ -186,5 +186,5 @@ // セッション情報に開始日付、終了日付が保存されていない。 - if(empty($_SESSION['total']['startyear']) && empty($_SESSION['total']['endyear'])) { + if (empty($_SESSION['total']['startyear']) && empty($_SESSION['total']['endyear'])) { $list['startyear'] = $year; $list['startmonth'] = $month; @@ -229,9 +229,9 @@ // 特殊項目チェック - if($objFormParam->getValue('form') == 1) { + if ($objFormParam->getValue('form') == 1) { $objErr->doFunc(array("月度", "search_startyear_m"), array("ONE_EXIST_CHECK")); } - if($objFormParam->getValue('form') == 2) { + if ($objFormParam->getValue('form') == 2) { $objErr->doFunc(array("期間", "search_startyear", "search_startmonth", "search_startday", "search_endyear", "search_endmonth", "search_endday"), array("FULL_EXIST_CHECK")); } @@ -273,5 +273,5 @@ foreach ($arrRet as $key => $val) { - if($val == "") { + if ($val == "") { continue; } @@ -302,5 +302,5 @@ // 結果が0行以上ある場合のみグラフを生成する。 - if(count($arrResults) > 0 && $this->install_GD) { + if (count($arrResults) > 0 && $this->install_GD) { // グラフの生成 @@ -314,5 +314,5 @@ // ラベル表示インターバルを求める $interval = intval(count($arrList) / 20); - if($interval < 1) { + if ($interval < 1) { $interval = 1; } @@ -324,5 +324,5 @@ // ラベル回転(日本語不可) - if($keyname == "key_day"){ + if ($keyname == "key_day") { $objGraphLine->setXLabelAngle(45); } @@ -343,5 +343,5 @@ // グラフの出力 - if(DRAW_IMAGE){ + if (DRAW_IMAGE) { $objGraphLine->outputGraph(); exit(); @@ -359,5 +359,5 @@ $ret_path = ""; // 結果が0行以上ある場合のみグラフを生成する。 - if(count($arrResults) > 0 && $this->install_GD) { + if (count($arrResults) > 0 && $this->install_GD) { // グラフの生成 $arrList = SC_Utils_Ex::sfArrKeyValue($arrResults, $keyname, @@ -387,5 +387,5 @@ // グラフの出力 - if(DRAW_IMAGE){ + if (DRAW_IMAGE) { $objGraphPie->outputGraph(); exit(); @@ -403,5 +403,5 @@ // 結果が0行以上ある場合のみグラフを生成する。 - if(count($arrResults) > 0 && $this->install_GD) { + if (count($arrResults) > 0 && $this->install_GD) { // グラフの生成 $arrList = SC_Utils_Ex::sfArrKeyValue($arrResults, $keyname, 'total', GRAPH_PIE_MAX, GRAPH_LABEL_MAX); @@ -413,5 +413,5 @@ $objGraphBar = new SC_GraphBar(); - foreach(array_keys($arrList) as $val) { + foreach (array_keys($arrList) as $val) { $arrKey[] = ereg_replace("～", "-", $val); } @@ -433,5 +433,5 @@ $objGraphBar->drawGraph(); - if(DRAW_IMAGE){ + if (DRAW_IMAGE) { $objGraphBar->outputGraph(); exit(); @@ -447,5 +447,5 @@ function lfGetGraphPng($keyname) { - if($_POST['search_startyear_m'] != "") { + if ($_POST['search_startyear_m'] != "") { $pngname = sprintf("%s_%02d%02d.png", $keyname, substr($_POST['search_startyear_m'],2), $_POST['search_startmonth_m']); } else { @@ -459,5 +459,5 @@ $where = ""; // 取得日付の指定 - if($sdate != "") { + if ($sdate != "") { if ($where != "") { $where.= " AND "; @@ -466,5 +466,5 @@ } - if($edate != "") { + if ($edate != "") { if ($where != "") { $where.= " AND "; @@ -475,5 +475,5 @@ // 会員、非会員の判定 - switch($type) { + switch ($type) { // 全体 case 'all': @@ -522,8 +522,8 @@ $arrTotalResults = $objQuery->select($col, $from, $where, $arrval); - foreach(array_keys($arrTotalResults) as $key) { + foreach (array_keys($arrTotalResults) as $key) { $arrResult =& $arrTotalResults[$key]; $member_key = $arrResult['order_sex']; - if($member_key != "") { + if ($member_key != "") { $arrResult['member_name'] = (($arrResult['member']) ? '会員' : '非会員') . $this->arrSex[$member_key]; } else { @@ -557,5 +557,5 @@ /* - if($mode != 'csv') { + if ($mode != 'csv') { $sql.= "LIMIT " . PRODUCTS_TOTAL_MAX; }*/ @@ -592,8 +592,8 @@ $arrTotalResults = $objQuery->select($col, $from, $where, $arrval); - foreach(array_keys($arrTotalResults) as $key) { + foreach (array_keys($arrTotalResults) as $key) { $arrResult =& $arrTotalResults[$key]; $job_key = $arrResult['job']; - if($job_key != "") { + if ($job_key != "") { $arrResult['job_name'] = $this->arrJob[$job_key]; } else { @@ -629,8 +629,8 @@ $arrTotalResults = $objQuery->select($col, $from, $where, $arrval); - foreach(array_keys($arrTotalResults) as $key) { + foreach (array_keys($arrTotalResults) as $key) { $arrResult =& $arrTotalResults[$key]; $age_key = $arrResult['age']; - if($age_key != "") { + if ($age_key != "") { $arrResult['age_name'] = $arrResult['age'] . '代'; } else { @@ -652,5 +652,5 @@ $where .= " AND del_flg = 0 AND status <> " . ORDER_CANCEL; - switch($type){ + switch ($type) { case 'month': $xtitle = "(月別)"; @@ -705,5 +705,5 @@ $arrDateList = $this->lfDateTimeArray($type, $st, $ed); - foreach($arrResults as $arrResult) { + foreach ($arrResults as $arrResult) { $strdate = $arrResult['str_date']; $arrDateResults[$strdate] = $arrResult; @@ -712,5 +712,5 @@ foreach ($arrDateList as $date) { - if(array_key_exists($date, $arrDateResults)) { + if (array_key_exists($date, $arrDateResults)) { $arrRet[] = $arrDateResults[$date]; @@ -728,5 +728,5 @@ */ function lfDateTimeArray($type, $st, $ed) { - switch($type){ + switch ($type) { case 'month': $format = 'm'; @@ -754,7 +754,7 @@ $nAday = 60*60*24; $edx = strtotime($ed); - while( $tmp <= $edx ){ + while ($tmp <= $edx ) { $sDate = date($format, $tmp); - if( !in_array($sDate, $arrDateList) ){ + if (!in_array($sDate, $arrDateList) ) { $arrDateList[] = $sDate; } @@ -770,9 +770,9 @@ function lfAddTotalLine($arrResults) { // 検索結果が0でない場合 - if(count($arrResults) > 0) { + if (count($arrResults) > 0) { // 合計の計算 foreach ($arrResults as $arrResult) { - foreach(array_keys($arrResult) as $value) { + foreach (array_keys($arrResult) as $value) { $arrTotal[$value] += $arrResult[$value]; } @@ -790,6 +790,6 @@ $max = count($arrData); $csv_data = ""; - for($i = 0; $i < $max; $i++) { - foreach($arrDataCol as $val) { + for ($i = 0; $i < $max; $i++) { + foreach ($arrDataCol as $val) { $arrRet[$i][$val] = $arrData[$i][$val]; } @@ -800,5 +800,5 @@ function lfGetCSVColum($page) { - switch($page) { + switch ($page) { // 商品別集計 case 'products': Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php (revision 21376) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php (revision 21441) @@ -73,5 +73,5 @@ $this->initForm($objFormParam, $_POST); - switch($this->getMode()) { + switch ($this->getMode()) { case 'confirm' : $message = $this->lfDoChange($objFormParam); @@ -119,18 +119,18 @@ $arrTarget = $this->lfGetTargetData($objFormParam); $message = ""; - if(is_array($arrTarget) && count($arrTarget) == 0) { + if (is_array($arrTarget) && count($arrTarget) == 0) { $message = "window.alert('変更対象となるデータはありませんでした。');"; return $message; - } elseif(!is_array($arrTarget) && $arrTarget != "") { + } elseif (!is_array($arrTarget) && $arrTarget != "") { return $arrTarget; // window.alert が返ってきているはず。 } // 変更対象の設定変更 - foreach($arrTarget as $item) { + foreach ($arrTarget as $item) { $index_name = $item['table_name'] . '_' . $item['column_name'] . "_key"; $arrField = array( 'fields' => array($item['column_name'] => array())); - if($item['indexflag_new'] == '1') { + if ($item['indexflag_new'] == '1') { $objQuery->createIndex($item['table_name'], $index_name, $arrField); - }else{ + } else { $objQuery->dropIndex($item['table_name'], $index_name); } @@ -150,5 +150,5 @@ // 変更されている対象を走査 - for($i = 1; $i <= count($arrIndexFlag); $i++) { + for ($i = 1; $i <= count($arrIndexFlag); $i++) { //入力値チェック $param = array('indexflag' => $arrIndexFlag[$i], @@ -163,10 +163,10 @@ $objErr->doFunc(array("カラム名(" . $i . ")", 'column_name', STEXT_LEN), array("GRAPH_CHECK", "EXIST_CHECK", "MAX_LENGTH_CHECK")); $arrErr = $objErr->arrErr; - if(count($arrErr) != 0) { + if (count($arrErr) != 0) { // 通常の送信ではエラーにならないはずです。 $message = "window.alert('不正なデータがあったため処理を中断しました。');"; return $message; } - if($param['indexflag'] != $param['indexflag_new']) { + if ($param['indexflag'] != $param['indexflag_new']) { // 入力値がデータにある対象テーブルかのチェック if ($objQuery->exists('dtb_index_list', 'table_name = ? and column_name = ?', array($param['table_name'], $param['column_name']))) { @@ -191,7 +191,7 @@ $table = ""; - foreach($arrIndexList as $key => $arrIndex) { + foreach ($arrIndexList as $key => $arrIndex) { // テーブルに対するインデックス一覧を取得 - if($table !== $arrIndex["table_name"]) { + if ($table !== $arrIndex["table_name"]) { $table = $arrIndex["table_name"]; $arrIndexes = $objQuery->listTableIndexes($table); @@ -199,5 +199,5 @@ // インデックスが設定されているかを取得 $idx_name = $table . "_" . $arrIndex["column_name"] . "_key"; - if(array_search($idx_name, $arrIndexes) === false) { + if (array_search($idx_name, $arrIndexes) === false) { $arrIndexList[$key]['indexflag'] = ''; } else { Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php (revision 21441) @@ -65,5 +65,5 @@ // $_GET['move'] が想定値かどうかチェック - switch($_GET['move']) { + switch ($_GET['move']) { case 'up': case 'down': @@ -79,5 +79,5 @@ $arrClean['id'] = $_GET['id']; - switch($arrClean['move']) { + switch ($arrClean['move']) { case 'up': $this->lfRunkUp($arrClean['id']); @@ -121,5 +121,5 @@ $maxno = $objQuery->getOne("SELECT max(rank) FROM dtb_member"); // ランクが最大値よりも小さい場合に実行する。 - if($rank < $maxno) { + if ($rank < $maxno) { // ランクがひとつ上のIDを取得する。 $sqlse = "SELECT member_id FROM dtb_member WHERE rank = ?"; @@ -150,5 +150,5 @@ $minno = $objQuery->getOne("SELECT min(rank) FROM dtb_member"); // ランクが最大値よりも大きい場合に実行する。 - if($rank > $minno) { + if ($rank > $minno) { // ランクがひとつ下のIDを取得する。 $sqlse = "SELECT member_id FROM dtb_member WHERE rank = ?"; 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 21185) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 21441) @@ -76,5 +76,5 @@ $mode = $this->getMode(); - switch($mode) { + switch ($mode) { case 'install': case 'uninstall': @@ -84,5 +84,5 @@ $this->arrErr = $objFormParam->checkError(); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { $plugin_id = $objFormParam->getValue('plugin_id'); $plugin_code = $objFormParam->getValue('plugin_code'); @@ -104,14 +104,14 @@ $this->arrErr = $this->lfCheckErrorUploadFile($plugin_code, $plugin_dir); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { // 一時ディレクトリへアップロード $this->arrErr['plugin_file'] = $objUpFile->makeTempFile('plugin_file', false); - if($this->arrErr['plugin_file'] == "") { + if ($this->arrErr['plugin_file'] == "") { // プラグイン保存ディレクトリへ解凍 $this->arrErr = $this->lfUploadPlugin($objUpFile, $plugin_dir, $plugin_code, $_FILES['plugin_file']['name']); // 完了メッセージアラート設定 - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { $this->tpl_onload = "alert('プラグインをアップロードしました。');"; } @@ -121,5 +121,5 @@ case 'up': $this->arrErr = $objFormParam->checkError(); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { $plugin_id = $objFormParam->getValue('plugin_id'); SC_Helper_DB_Ex::sfRankUp("dtb_plugin", "plugin_id", $plugin_id); @@ -129,5 +129,5 @@ case 'down': $this->arrErr = $objFormParam->checkError(); - if(count($this->arrErr) == 0) { + if (count($this->arrErr) == 0) { $plugin_id = $objFormParam->getValue('plugin_id'); SC_Helper_DB_Ex::sfRankDown("dtb_plugin", "plugin_id", $plugin_id); @@ -189,6 +189,6 @@ // プラグイン重複チェック $plugins = SC_Helper_Plugin_Ex::getAllPlugin(); - foreach($plugins as $val) { - if($val['plugin_code'] == $plugin_code) { + foreach ($plugins as $val) { + if ($val['plugin_code'] == $plugin_code) { $arrErr['plugin_file'] = "※ 同名のプラグインがすでに登録されています。
"; } @@ -249,7 +249,7 @@ $arrErr = $objUpFile->checkEXISTS('plugin_file'); - if(count($arrErr) == 0) { + if (count($arrErr) == 0) { // プラグイン保存ディレクトリ作成 - if(file_exists($plugin_dir)) { + if (file_exists($plugin_dir)) { $arrErr['plugin_file'] = "※ 同名のディレクトリがすでに存在します。
"; } else { @@ -257,5 +257,5 @@ } - if(count($arrErr) == 0) { + if (count($arrErr) == 0) { // 一時ディレクトリからプラグイン保存ディレクトリへ移動 $objUpFile->moveTempFile(); @@ -303,5 +303,5 @@ $plugin_file_path = $this->lfGetPluginFilePath($plugin_code); - if(file_exists($plugin_file_path)) { + if (file_exists($plugin_file_path)) { require_once $plugin_file_path; } else { @@ -327,5 +327,5 @@ $arrErr = $this->lfRequirePluginFile($plugin_code); - if(count($arrErr) == 0) { + if (count($arrErr) == 0) { $plugin = new $plugin_code(); $arrErr = $plugin->$exec_mode($plugin_id); 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 21441) @@ -78,5 +78,5 @@ $arrForm = array(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'new': // パラメーターの初期化 @@ -87,5 +87,5 @@ $this->arrForm = $objFormParam->getHashArray(); - if(SC_Utils_Ex::isBlank($arrErr)) { + if (SC_Utils_Ex::isBlank($arrErr)) { $this->insertMemberData($this->arrForm); @@ -115,5 +115,5 @@ $this->arrForm = $objFormParam->getHashArray(); - if(SC_Utils_Ex::isBlank($arrErr)) { + if (SC_Utils_Ex::isBlank($arrErr)) { $this->updateMemberData($this->arrForm['member_id'], $this->arrForm); @@ -150,5 +150,5 @@ } - switch($clean_mode_flg) { + switch ($clean_mode_flg) { case 'edit': $this->tpl_mode = $clean_mode_flg; @@ -221,8 +221,8 @@ // ログインID・パスワードの文字数チェック $objErr = new SC_CheckError_Ex(); - if($mode == 'new') { + if ($mode == 'new') { $objErr->doFunc(array("パスワード", 'password', ID_MIN_LEN, ID_MAX_LEN), array("NUM_RANGE_CHECK")); $objErr->doFunc(array("ログインID", 'login_id', ID_MIN_LEN, ID_MAX_LEN), array("NUM_RANGE_CHECK")); - } elseif($mode == 'edit') { + } elseif ($mode == 'edit') { $objErr->doFunc(array("パスワード", 'password', ID_MIN_LEN, ID_MAX_LEN), array("SPTAB_CHECK" ,"NUM_RANGE_CHECK")); $objErr->doFunc(array("ログインID", 'login_id', ID_MIN_LEN, ID_MAX_LEN), array("SPTAB_CHECK" ,"NUM_RANGE_CHECK")); @@ -231,5 +231,5 @@ $arrErr = $objErr->arrErr; - switch($mode) { + switch ($mode) { case 'new': // 管理者名が登録済みでないか @@ -299,5 +299,5 @@ // $pagenoが0以上の整数かチェック - if(SC_Utils_Ex::sfIsInt($pageno) && $pageno > 0) { + if (SC_Utils_Ex::sfIsInt($pageno) && $pageno > 0) { $clean_pageno = $pageno; } @@ -358,5 +358,5 @@ $sqlVal['work'] = $arrMemberData['work']; $sqlVal['update_date'] = 'CURRENT_TIMESTAMP'; - if($arrMemberData['password'] != DEFAULT_PASSWORD) { + if ($arrMemberData['password'] != DEFAULT_PASSWORD) { $salt = SC_Utils_Ex::sfGetRandomString(10); $sqlVal['salt'] = $salt; Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php (revision 21441) @@ -151,5 +151,5 @@ // $pagenoが0以上の整数かチェック - if(SC_Utils_Ex::sfIsInt($pageno) && $pageno > 0) { + if (SC_Utils_Ex::sfIsInt($pageno) && $pageno > 0) { $clean_pageno = $pageno; } 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 21420) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php (revision 21441) @@ -69,5 +69,5 @@ function action() { - if(strpos(HTTPS_URL,"https://") !== FALSE){ + if (strpos(HTTPS_URL,"https://") !== FALSE) { $this->tpl_enable_ssl = TRUE; } @@ -78,5 +78,5 @@ $this->initParam($objFormParam, $_POST); - if(count($_POST) > 0 ) { + if (count($_POST) > 0 ) { // エラーチェック @@ -86,5 +86,5 @@ //設定ファイルの権限チェック - if(!is_writable(CONFIG_REALFILE)){ + if (!is_writable(CONFIG_REALFILE)) { $arrErr['all'] = CONFIG_REALFILE . ' を変更する権限がありません。'; } @@ -93,8 +93,8 @@ $this->lfCheckAdminArea($this->arrForm, $arrErr); - if(SC_Utils_Ex::isBlank($arrErr) && $this->lfUpdateAdminData($this->arrForm)) { + if (SC_Utils_Ex::isBlank($arrErr) && $this->lfUpdateAdminData($this->arrForm)) { $this->tpl_onload = "window.alert('管理機能の設定を変更しました。URLを変更した場合は、新しいURLにアクセスしてください。');"; - }else{ + } else { $this->tpl_onload = "window.alert('設定内容に誤りがあります。設定内容を確認してください。');"; $this->arrErr = array_merge($arrErr, $this->arrErr); @@ -105,5 +105,5 @@ $admin_dir = str_replace("/","",ADMIN_DIR); $this->arrForm = array("admin_dir"=>$admin_dir,"admin_force_ssl"=>ADMIN_FORCE_SSL,"admin_allow_hosts"=>""); - if(defined("ADMIN_ALLOW_HOSTS")){ + if (defined("ADMIN_ALLOW_HOSTS")) { $allow_hosts = unserialize(ADMIN_ALLOW_HOSTS); $this->arrForm["admin_allow_hosts"] = implode("\n",$allow_hosts); @@ -150,12 +150,12 @@ $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES); - foreach($installData as $key=>$line){ - if(strpos($line,"ADMIN_DIR") !== false and ADMIN_DIR != $admin_dir){ + foreach ($installData as $key=>$line) { + if (strpos($line,"ADMIN_DIR") !== false and ADMIN_DIR != $admin_dir) { //既存ディレクトリのチェック - if(file_exists(HTML_REALDIR.$admin_dir) and $admin_dir != "admin/"){ + if (file_exists(HTML_REALDIR.$admin_dir) and $admin_dir != "admin/") { $arrErr["admin_dir"] .= ROOT_URLPATH.$admin_dir."は既に存在しています。別のディレクトリ名を指定してください。"; } //権限チェック - if(!is_writable(HTML_REALDIR . ADMIN_DIR)){ + if (!is_writable(HTML_REALDIR . ADMIN_DIR)) { $arrErr["admin_dir"] .= ROOT_URLPATH.ADMIN_DIR."のディレクトリ名を変更する権限がありません。"; } @@ -168,13 +168,13 @@ $admin_dir = trim($arrForm['admin_dir'])."/"; $admin_force_ssl = 'FALSE'; - if($arrForm['admin_force_ssl'] == 1){ + if ($arrForm['admin_force_ssl'] == 1) { $admin_force_ssl = 'TRUE'; } $admin_allow_hosts = explode("\n",$arrForm['admin_allow_hosts']); - foreach($admin_allow_hosts as $key=>$host){ + foreach ($admin_allow_hosts as $key=>$host) { $host = trim($host); - if(strlen($host) >= 8){ + if (strlen($host) >= 8) { $admin_allow_hosts[$key] = $host; - }else{ + } else { unset($admin_allow_hosts[$key]); } @@ -185,6 +185,6 @@ $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES); $diff = 0; - foreach($installData as $key=>$line){ - if(strpos($line,"ADMIN_DIR") !== false and ADMIN_DIR != $admin_dir){ + foreach ($installData as $key=>$line) { + if (strpos($line,"ADMIN_DIR") !== false and ADMIN_DIR != $admin_dir) { $installData[$key] = 'define("ADMIN_DIR","'.$admin_dir.'");'; //管理機能ディレクトリのリネーム @@ -196,9 +196,9 @@ } - if(strpos($line,"ADMIN_FORCE_SSL") !== false){ + if (strpos($line,"ADMIN_FORCE_SSL") !== false) { $installData[$key] = 'define("ADMIN_FORCE_SSL",'.$admin_force_ssl.');'; $diff ++; } - if(strpos($line,"ADMIN_ALLOW_HOSTS") !== false and ADMIN_ALLOW_HOSTS != $admin_allow_hosts) { + if (strpos($line,"ADMIN_ALLOW_HOSTS") !== false and ADMIN_ALLOW_HOSTS != $admin_allow_hosts) { $installData[$key] = "define('ADMIN_ALLOW_HOSTS','".$admin_allow_hosts."');"; $diff ++; @@ -206,5 +206,5 @@ } - if($diff > 0) { + if ($diff > 0) { $fp = fopen(CONFIG_REALFILE,'wb'); $installData = implode("\n",$installData); Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 21427) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 21441) @@ -80,5 +80,5 @@ $arrForm = array(); - switch($this->getMode()) { + switch ($this->getMode()) { // バックアップを作成する @@ -89,5 +89,5 @@ // データ型に問題がない場合 - if(SC_Utils_Ex::isBlank($arrErrTmp[1])) { + if (SC_Utils_Ex::isBlank($arrErrTmp[1])) { // データ型以外のエラーチェック $arrErrTmp[2] = $this->lfCheckError($objFormParam->getHashArray(), $this->getMode()); @@ -115,5 +115,5 @@ if (SC_Utils_Ex::isBlank($arrErrTmp[3])) { $this->lfUpdBkupData($arrData); - }else{ + } else { $arrForm = $arrData; $arrErr = $arrErrTmp[3]; @@ -234,5 +234,5 @@ $arrVal = array(); - switch($mode) { + switch ($mode) { case 'bkup': $arrVal[] = $arrForm['bkup_name']; @@ -325,6 +325,6 @@ // 自動採番をCSV出力 $fp = fopen($csv_autoinc_file,'w'); - if($fp) { - if($csv_autoinc != ""){ + if ($fp) { + if ($csv_autoinc != "") { $success = fwrite($fp, $csv_autoinc); if (!$success) { @@ -377,5 +377,5 @@ $arrSequences = $objQuery->listSequences(); - foreach($arrSequences as $val){ + foreach ($arrSequences as $val) { $seq = $objQuery->currVal($val); @@ -456,5 +456,5 @@ $this->restore_msg = "リストア終了しました。"; $this->restore_err = true; - }else{ + } else { $objQuery->rollback(); $this->restore_msg = "リストアに失敗しました。"; @@ -504,5 +504,5 @@ // csvファイルからデータの取得 $fp = fopen($file_path, 'r'); - if($fp === false) { + if ($fp === false) { SC_Utils_Ex::sfDispException($file_name . ' のファイルオープンに失敗しました。'); } @@ -536,5 +536,5 @@ $arrCsvData = file($csv); - foreach($arrCsvData as $val){ + foreach ($arrCsvData as $val) { $arrData = explode(",", trim($val)); @@ -549,5 +549,5 @@ $arrTableList = $objQuery->listTables(); - foreach($arrTableList as $val){ + foreach ($arrTableList as $val) { // バックアップテーブルは削除しない // XXX mtb_zip も削除不要では? @@ -567,5 +567,5 @@ $del_file = $bkup_dir.$arrForm['list_name'] . $bkup_ext; // ファイルの削除 - if(is_file($del_file)){ + if (is_file($del_file)) { $ret = unlink($del_file); } Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php =================================================================== --- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php (revision 20970) +++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php (revision 21441) @@ -71,5 +71,5 @@ $this->initForm($objFormParam, $_GET); - switch($this->getMode()) { + switch ($this->getMode()) { // PHP INFOを表示 Index: branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php =================================================================== --- branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php (revision 21441) @@ -85,5 +85,5 @@ foreach ($this->cartKeys as $key) { // 商品購入中にカート内容が変更された。 - if($objCartSess->getCancelPurchase($key)) { + if ($objCartSess->getCancelPurchase($key)) { $this->tpl_message = "商品購入中にカート内容が変更されましたので、お手数ですが購入手続きをやり直して下さい。"; } @@ -93,10 +93,10 @@ $cartKey = $objFormParam->getValue('cartKey'); - switch($this->mode) { + switch ($this->mode) { case 'confirm': // カート内情報の取得 $cartList = $objCartSess->getCartList($cartKey); // カート商品が1件以上存在する場合 - if(count($cartList) > 0) { + if (count($cartList) > 0) { // カートを購入モードに設定 $this->lfSetCurrentCart($objSiteSess, $objCartSess, $cartKey); @@ -159,5 +159,5 @@ // ログイン判定 - if($objCustomer->isLoginSuccess(true)) { + if ($objCustomer->isLoginSuccess(true)) { $this->tpl_login = true; $this->tpl_user_point = $objCustomer->getValue('point'); @@ -213,5 +213,5 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); $res = $objQuery->update("dtb_order_temp", $sqlval, $where, array($pre_uniqid)); - if($res != 1){ + if ($res != 1) { return false; } @@ -256,5 +256,5 @@ $uniqid = $objSiteSess->getUniqId(); // エラーリトライなどで既にuniqidが存在する場合は、設定を引き継ぐ - if($pre_uniqid != "") { + if ($pre_uniqid != "") { $this->lfUpdateOrderTempid($pre_uniqid,$uniqid); } Index: branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php =================================================================== --- branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 21441) @@ -90,5 +90,5 @@ $objFormParam = new SC_FormParam_Ex(); - switch($this->getMode()) { + switch ($this->getMode()) { case 'mail_check': $this->lfInitMailCheckParam($objFormParam, $this->device_type); @@ -100,5 +100,5 @@ if (SC_Utils_Ex::isBlank($this->arrErr)) { $this->errmsg = $this->lfCheckForgotMail($this->arrForm, $this->arrReminder); - if(SC_Utils_Ex::isBlank($this->errmsg)) { + if (SC_Utils_Ex::isBlank($this->errmsg)) { $this->tpl_mainpage = 'forgot/secret.tpl'; } @@ -114,14 +114,14 @@ if (SC_Utils_Ex::isBlank($this->arrErr)) { $this->errmsg = $this->lfCheckForgotSecret($this->arrForm, $this->arrReminder); - if(SC_Utils_Ex::isBlank($this->errmsg)) { + if (SC_Utils_Ex::isBlank($this->errmsg)) { // 完了ページへ移動する $this->tpl_mainpage = 'forgot/complete.tpl'; // transactionidを更新させたいので呼び出し元(ログインフォーム側)をリロード。 $this->tpl_onload .= 'opener.location.reload(true);'; - }else{ + } else { // 秘密の答えが一致しなかった $this->tpl_mainpage = 'forgot/secret.tpl'; } - }else{ + } else { // 入力値エラー $this->tpl_mainpage = 'forgot/secret.tpl'; @@ -133,5 +133,5 @@ // ポップアップ用テンプレート設定 - if($this->device_type == DEVICE_TYPE_PC) { + if ($this->device_type == DEVICE_TYPE_PC) { $this->setTemplate($this->tpl_mainpage); } @@ -153,5 +153,5 @@ if (isset($result[0]['reminder']) and isset($arrReminder[$result[0]['reminder']])) { // 会員状態の確認 - if($result[0]['status'] == '2') { + if ($result[0]['status'] == '2') { // 正会員 $arrForm['reminder'] = $result[0]['reminder']; @@ -176,5 +176,5 @@ $objFormParam->addParam("お名前(姓)", 'name01', STEXT_LEN, 'aKV', array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK")); $objFormParam->addParam("お名前(名)", 'name02', STEXT_LEN, 'aKV', array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" , "MAX_LENGTH_CHECK")); - if ($device_type === DEVICE_TYPE_MOBILE){ + if ($device_type === DEVICE_TYPE_MOBILE) { $objFormParam->addParam('メールアドレス', 'email', null, 'a', array("EXIST_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK", "MOBILE_EMAIL_CHECK")); } else { @@ -221,5 +221,5 @@ // 新しいパスワードを設定する $new_password = GC_Utils_Ex::gfMakePassword(8); - if(FORGOT_MAIL == 1) { + if (FORGOT_MAIL == 1) { // メールで変更通知をする $objDb = new SC_Helper_DB_Ex(); Index: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php =================================================================== --- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php (revision 21441) @@ -76,5 +76,5 @@ // メインテンプレートを設定 - if(CUSTOMER_CONFIRM_MAIL == true) { + if (CUSTOMER_CONFIRM_MAIL == true) { // 仮会員登録完了 $this->tpl_mainpage = 'entry/complete.tpl'; 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 21420) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php (revision 21441) @@ -70,5 +70,5 @@ $offset = ''; // mobile時はGETでページ指定 - if ( SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ){ + if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ) { $this->offset = $this->lfSetOffset($_GET['offset']); } 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 21314) +++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php (revision 21441) @@ -97,5 +97,5 @@ $this->arrForm = $objFormParam->getHashArray(); // 入力エラーなし - if(empty($this->arrErr)) { + if (empty($this->arrErr)) { //パスワード表示 $this->passlen = SC_Utils_Ex::sfPassLen(strlen($this->arrForm['password'])); @@ -109,5 +109,5 @@ $this->arrErr = SC_Helper_Customer_Ex::sfCustomerEntryErrorCheck($objFormParam); $this->arrForm = $objFormParam->getHashArray(); - if(empty($this->arrErr)) { + if (empty($this->arrErr)) { $uniqid = $this->lfRegistCustomerData($this->lfMakeSqlVal($objFormParam)); @@ -118,5 +118,5 @@ // 仮会員が無効の場合 - if(CUSTOMER_CONFIRM_MAIL == false) { + if (CUSTOMER_CONFIRM_MAIL == false) { // ログイン状態にする $objCustomer = new SC_Customer_Ex(); @@ -217,5 +217,5 @@ // 仮会員が有効の場合 - if(CUSTOMER_CONFIRM_MAIL == true) { + if (CUSTOMER_CONFIRM_MAIL == true) { $subject = $objHelperMail->sfMakeSubject('会員登録のご確認'); $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl"); Index: branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (revision 21441) @@ -113,5 +113,5 @@ // ログイン判定 $loginFailFlag = false; - if(SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { + if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { // モバイルサイト if(!$objCustomer->getCustomerDataFromMobilePhoneIdPass($arrForm['login_pass']) && @@ -121,5 +121,5 @@ } else { // モバイルサイト以外 - if(!$objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'])) { + if (!$objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'])) { $loginFailFlag = true; } @@ -128,5 +128,5 @@ // ログイン処理 if ($loginFailFlag == false) { - if(SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { + if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) { // ログインが成功した場合は携帯端末IDを保存する。 $objCustomer->updateMobilePhoneId(); 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 21420) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (revision 21441) @@ -64,5 +64,5 @@ $objFormParam = new SC_FormParam_Ex(); - switch($this->getMode()){ + switch ($this->getMode()) { case "getList": $this->lfInitNewsParam($objFormParam); @@ -70,5 +70,5 @@ $objFormParam->convParam(); $this->arrErr = $objFormParam->checkError(false); - if(empty($this->arrErr)){ + if (empty($this->arrErr)) { $json = $this->lfGetNewsForJson($objFormParam); echo $json; @@ -84,5 +84,5 @@ $objFormParam->convParam(); $this->arrErr = $objFormParam->checkError(false); - if(empty($this->arrErr)){ + if (empty($this->arrErr)) { $json = $this->lfGetNewsDetailForJson($objFormParam); echo $json; @@ -159,5 +159,5 @@ $dispNumber = $arrData['disp_number']; $pageNo = $arrData['pageno']; - if(!empty($dispNumber) && !empty($pageNo)){ + if (!empty($dispNumber) && !empty($pageNo)) { $objQuery->setLimitOffset($dispNumber, (($pageNo - 1) * $dispNumber)); } Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 21441) @@ -63,5 +63,5 @@ function action() { // モバイル判定 - switch ( SC_Display_Ex::detectDevice() ) { + switch (SC_Display_Ex::detectDevice() ) { case DEVICE_TYPE_MOBILE: // メインカテゴリの取得 @@ -95,10 +95,10 @@ // 商品ID取得 $product_id = ''; - if ( isset($arrRequest['product_id']) && $arrRequest['product_id'] != '' && is_numeric($arrRequest['product_id']) ) { + if (isset($arrRequest['product_id']) && $arrRequest['product_id'] != '' && is_numeric($arrRequest['product_id']) ) { $product_id = $arrRequest['product_id']; } // カテゴリID取得 $category_id = ''; - if ( isset($arrRequest['category_id']) && $arrRequest['category_id'] != '' && is_numeric($arrRequest['category_id']) ) { + if (isset($arrRequest['category_id']) && $arrRequest['category_id'] != '' && is_numeric($arrRequest['category_id']) ) { $category_id = $arrRequest['category_id']; } @@ -125,5 +125,5 @@ $from = 'dtb_category left join dtb_category_total_count using (category_id)'; // 登録商品数のチェック - if($count_check) { + if ($count_check) { $where = 'del_flg = 0 AND product_count > 0'; } else { @@ -153,7 +153,7 @@ $this->root_parent_id[] = $arrParentID[0]; $arrDispID = array_merge($arrBrothersID, $arrChildrenID); - foreach($arrRet as $key => $array) { - foreach($arrDispID as $val) { - if($array['category_id'] == $val) { + foreach ($arrRet as $key => $array) { + foreach ($arrDispID as $val) { + if ($array['category_id'] == $val) { $arrRet[$key]['display'] = 1; break; @@ -178,5 +178,5 @@ $where = 'level <= 2 AND del_flg = 0'; // 登録商品数のチェック - if($count_check) { + if ($count_check) { $where .= ' AND product_count > 0'; } Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php (revision 21441) @@ -70,5 +70,5 @@ // ログイン判定 - if($objCustomer->isLoginSuccess()) { + if ($objCustomer->isLoginSuccess()) { $this->tpl_login = true; $this->tpl_user_point = $objCustomer->getValue('point'); @@ -78,9 +78,9 @@ // クッキー判定 $this->tpl_login_email = $objCookie->getCookie('login_email'); - if($this->tpl_login_email != '') { + if ($this->tpl_login_email != '') { $this->tpl_login_memory = '1'; } // POSTされてきたIDがある場合は優先する。 - if( isset($_POST['login_email']) && $_POST['login_email'] != '') { + if (isset($_POST['login_email']) && $_POST['login_email'] != '') { $this->tpl_login_email = $_POST['login_email']; } @@ -112,6 +112,6 @@ $current_page = $_SERVER['PHP_SELF']; - foreach($arrDisableLogout as $val) { - if($current_page == $val) { + foreach ($arrDisableLogout as $val) { + if ($current_page == $val) { return true; } Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (revision 21441) @@ -93,7 +93,7 @@ $arrAllProductID = $objCart->getAllProductID($cart_key); // 商品が1つ以上入っている場合には商品名称を取得 - if (count($arrCartList) > 0){ + if (count($arrCartList) > 0) { - foreach($arrCartList['productsClass'] as $key => $val){ + foreach ($arrCartList['productsClass'] as $key => $val) { $arrCartList[$key]['product_name'] = $val['name']; } Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (revision 21441) @@ -94,5 +94,5 @@ function lfGetProductId() { $product_id = ''; - if ( isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id']) ) { + if (isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id']) ) { $product_id = $_GET['product_id']; } @@ -107,5 +107,5 @@ function lfGetCategoryId() { $category_id = ''; - if ( isset($_GET['category_id']) && $_GET['category_id'] != '' && is_numeric($_GET['category_id']) ) { + if (isset($_GET['category_id']) && $_GET['category_id'] != '' && is_numeric($_GET['category_id']) ) { $category_id = $_GET['category_id']; } @@ -120,5 +120,5 @@ function lfGetMakerId() { $maker_id = ''; - if ( isset($_GET['maker_id']) && $_GET['maker_id'] != '' && is_numeric($_GET['maker_id']) ) { + if (isset($_GET['maker_id']) && $_GET['maker_id'] != '' && is_numeric($_GET['maker_id']) ) { $maker_id = $_GET['maker_id']; } @@ -161,5 +161,5 @@ if (is_array($arrCategoryList)) { // 文字サイズを制限する - foreach($arrCategoryList as $key => $val) { + foreach ($arrCategoryList as $key => $val) { $truncate_str = SC_Utils_Ex::sfCutString($val, SEARCH_CATEGORY_LEN, false); $arrCategoryList[$key] = preg_replace('/　/u', "  ", $truncate_str); @@ -180,5 +180,5 @@ if (is_array($arrMakerList)) { // 文字サイズを制限する - foreach($arrMakerList as $key => $val) { + foreach ($arrMakerList as $key => $val) { $arrMakerList[$key] = SC_Utils_Ex::sfCutString($val, SEARCH_CATEGORY_LEN, false); } Index: branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php =================================================================== --- branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php (revision 21441) @@ -167,5 +167,5 @@ printf("\t\t%s\n", $changefreq); } - if(!empty($priority)) { + if (!empty($priority)) { printf("\t\t%01.1f\n", $priority); } 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 21420) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php (revision 21441) @@ -84,5 +84,5 @@ $objFormParam->convParam(); - switch ($this->getMode()){ + switch ($this->getMode()) { case 'confirm': $this->arrErr = $this->lfCheckError($objFormParam); 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 21420) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 21441) @@ -140,5 +140,5 @@ // モバイル用 規格選択セレクトボックスの作成 - if(SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { + if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { $this->lfMakeSelectMobile($this, $product_id,$this->objFormParam->getValue('classcategory_id1')); } @@ -166,6 +166,6 @@ if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0 ) { $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam); - if(count($this->arrErr) == 0){ - if(!$this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'),$objCustomer->getValue('customer_id'))){ + if (count($this->arrErr) == 0) { + if (!$this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'),$objCustomer->getValue('customer_id'))) { exit; } @@ -178,6 +178,6 @@ if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0 ) { $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam); - if(count($this->arrErr) == 0){ - if($this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'),$objCustomer->getValue('customer_id'))){ + if (count($this->arrErr) == 0) { + if ($this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'),$objCustomer->getValue('customer_id'))) { print "true"; exit; @@ -207,9 +207,9 @@ // モバイル用 ポストバック処理 - if(SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { - switch($this->mode) { + if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { + switch ($this->mode) { case 'select': // 規格1が設定されている場合 - if($this->tpl_classcat_find1) { + if ($this->tpl_classcat_find1) { // templateの変更 $this->tpl_mainpage = "products/select_find1.tpl"; @@ -225,5 +225,5 @@ // 規格1が設定されていて、エラーを検出した場合 - if($this->tpl_classcat_find1 and $this->arrErr['classcategory_id1']) { + if ($this->tpl_classcat_find1 and $this->arrErr['classcategory_id1']) { // templateの変更 $this->tpl_mainpage = "products/select_find1.tpl"; @@ -232,5 +232,5 @@ // 規格2が設定されている場合 - if($this->tpl_classcat_find2) { + if ($this->tpl_classcat_find2) { $this->arrErr = array(); @@ -243,5 +243,5 @@ // 規格2が設定されていて、エラーを検出した場合 - if($this->tpl_classcat_find2 and $this->arrErr['classcategory_id2']) { + if ($this->tpl_classcat_find2 and $this->arrErr['classcategory_id2']) { // templateの変更 $this->tpl_mainpage = "products/select_find2.tpl"; @@ -384,10 +384,10 @@ for ($i = 0; $i < $count; $i++) { // 在庫のチェック - if($arrProductsClass[$i]['stock'] <= 0 && $arrProductsClass[$i]['stock_unlimited'] != '1') { + if ($arrProductsClass[$i]['stock'] <= 0 && $arrProductsClass[$i]['stock_unlimited'] != '1') { continue; } // 規格1のセレクトボックス用 - if($classcat_id1 != $arrProductsClass[$i]['classcategory_id1']){ + if ($classcat_id1 != $arrProductsClass[$i]['classcategory_id1']) { $classcat_id1 = $arrProductsClass[$i]['classcategory_id1']; $arrSele1[$classcat_id1] = $arrClassCatName[$classcat_id1]; @@ -395,5 +395,5 @@ // 規格2のセレクトボックス用 - if($arrProductsClass[$i]['classcategory_id1'] == $request_classcategory_id1 and $classcat_id2 != $arrProductsClass[$i]['classcategory_id2']) { + if ($arrProductsClass[$i]['classcategory_id1'] == $request_classcategory_id1 and $classcat_id2 != $arrProductsClass[$i]['classcategory_id2']) { $classcat_id2 = $arrProductsClass[$i]['classcategory_id2']; $arrSele2[$classcat_id2] = $arrClassCatName[$classcat_id2]; @@ -406,10 +406,10 @@ // 規格1が設定されている - if(isset($arrProductsClass[0]['classcategory_id1']) && $arrProductsClass[0]['classcategory_id1'] != '0') { + if (isset($arrProductsClass[0]['classcategory_id1']) && $arrProductsClass[0]['classcategory_id1'] != '0') { $classcat_find1 = true; } // 規格2が設定されている - if(isset($arrProductsClass[0]['classcategory_id2']) && $arrProductsClass[0]['classcategory_id2'] != '0') { + if (isset($arrProductsClass[0]['classcategory_id2']) && $arrProductsClass[0]['classcategory_id2'] != '0') { $classcat_find2 = true; } @@ -451,5 +451,5 @@ $arrRecommendProductId = array(); - foreach($arrRecommendData as $recommend){ + foreach ($arrRecommendData as $recommend) { $arrRecommendProductId[] = $recommend["recommend_product_id"]; } @@ -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/products/LC_Page_Products_CategoryList.php =================================================================== --- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 21420) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 21441) @@ -84,5 +84,5 @@ /* カテゴリIDの正当性チェック */ function lfCheckCategoryId($category_id) { - if ($category_id && !SC_Helper_DB_Ex::sfIsRecord('dtb_category', 'category_id', (array)$category_id, 'del_flg = 0')){ + if ($category_id && !SC_Helper_DB_Ex::sfIsRecord('dtb_category', 'category_id', (array)$category_id, 'del_flg = 0')) { return 0; } 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 21433) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php (revision 21441) @@ -127,5 +127,5 @@ $this->arrProducts = $this->lfGetProductsList($arrSearchCondition, $this->disp_number, $this->objNavi->start_row, $this->tpl_linemax, $objProduct); - switch($this->getMode()){ + switch ($this->getMode()) { case "json": @@ -180,5 +180,5 @@ //カート処理 $target_product_id = intval($this->arrForm['product_id']); - if ( $target_product_id > 0) { + if ($target_product_id > 0) { // 商品IDの正当性チェック if (!SC_Utils_Ex::sfIsInt($this->arrForm['product_id']) @@ -427,5 +427,5 @@ // 分割したキーワードを一つずつwhere文に追加 foreach ($names as $val) { - if ( strlen($val) > 0 ) { + if (strlen($val) > 0 ) { $searchCondition['where'] .= " AND ( alldtl.name ILIKE ? OR alldtl.comment3 ILIKE ?) "; $searchCondition['arrval'][] = "%$val%"; @@ -494,5 +494,5 @@ foreach ($arrProducts['productStatus'] as $product_id => $arrValues) { - for ($i = 0; $i < count($arrValues); $i++){ + for ($i = 0; $i < count($arrValues); $i++) { $product_status_id = $arrValues[$i]; if (!empty($product_status_id)) { 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 21420) +++ branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php (revision 21441) @@ -90,5 +90,5 @@ $pattern = '|\./|'; $file = trim($_GET['image']); - if ( preg_match_all($pattern, $file, $matches) ) { + if (preg_match_all($pattern, $file, $matches) ) { return false; } else { Index: branches/version-2_12-dev/data/class/graph/SC_GraphBar.php =================================================================== --- branches/version-2_12-dev/data/class/graph/SC_GraphBar.php (revision 21420) +++ branches/version-2_12-dev/data/class/graph/SC_GraphBar.php (revision 21441) @@ -40,10 +40,10 @@ // 棒グラフの描画 - for($i = 0; $i < $this->line_max; $i++) { + for ($i = 0; $i < $this->line_max; $i++) { $this->drawBar($i); } // ラベルの描画 - for($i = 0; $i < $this->line_max; $i++) { + for ($i = 0; $i < $this->line_max; $i++) { $this->drawLabel($i); } @@ -66,5 +66,5 @@ // 色数の取得 $c_max = count($this->arrColor); - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { $left = $arrPointList[$i][0] - $half_scale + BAR_PAD + ($bar_width * $line_no); $top = $arrPointList[$i][1]; @@ -73,5 +73,5 @@ // 影の描画 - if($this->shade_on) { + if ($this->shade_on) { imagefilledrectangle($this->image, $left + 2, $top + 2, $right + 2, $bottom, $this->shade_color); } @@ -87,5 +87,5 @@ $arrPointList = $this->arrPointList[$line_no]; $count = count($arrPointList); - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { $x = $arrPointList[$i][0]; $y = $arrPointList[$i][1]; Index: branches/version-2_12-dev/data/class/graph/SC_GraphLine.php =================================================================== --- branches/version-2_12-dev/data/class/graph/SC_GraphLine.php (revision 21420) +++ branches/version-2_12-dev/data/class/graph/SC_GraphLine.php (revision 21441) @@ -65,5 +65,5 @@ function drawYTitle() { // Y軸にタイトルを入れる - if($this->YTitle != "") { + if ($this->YTitle != "") { $text_width = $this->getTextWidth($this->YTitle, FONT_SIZE); $x_pos = $this->left - ($text_width / 2); @@ -76,5 +76,5 @@ function drawXTitle() { // Y軸にタイトルを入れる - if($this->XTitle != "") { + if ($this->XTitle != "") { $text_width = $this->getTextWidth($this->XTitle, FONT_SIZE); $x_pos = $this->left + $this->area_width - ($text_width / 2) + 30; @@ -91,9 +91,9 @@ // 上から目盛りを入れていく $pos = 0; - for($i = 0; $i < (LINE_Y_SCALE * 2); $i++) { + for ($i = 0; $i < (LINE_Y_SCALE * 2); $i++) { // 目盛り幅 - if(($i % 2) == 0) { + if (($i % 2) == 0) { $sw = LINE_SCALE_SIZE; - if($this->ygrid_on) { + if ($this->ygrid_on) { imageline($this->image, $this->left, $this->top + $pos, $this->left + $this->area_width, $this->top + $pos, $this->grid_color); } @@ -116,5 +116,5 @@ // 棒グラフの場合は半目盛りずらす - if($bar) { + if ($bar) { $half_scale = intval($this->area_width / ($count + 1) / 2); } else { @@ -124,5 +124,5 @@ // ラベルの表示インターバルを算出 $interval = ceil($count / LINE_XLABEL_MAX); // 切り上げ - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { // X軸に目盛りを入れる $x = $arrPointList[$i][0]; @@ -130,5 +130,5 @@ imageline($this->image, $x - $half_scale, $pos, $x - $half_scale, $pos - LINE_SCALE_SIZE, $this->flame_color); // ラベルを入れる - if(($i % $interval) == 0) { + if (($i % $interval) == 0) { $text_width = $this->getTextWidth($this->arrXLabel[$i], FONT_SIZE); $x_pos = $x; @@ -145,5 +145,5 @@ // 棒グラフの場合は最後の目盛りを一つ追加する - if($bar) { + if ($bar) { imageline($this->image, $x + $half_scale, $pos, $x + $half_scale, $pos - LINE_SCALE_SIZE, $this->flame_color); } @@ -179,5 +179,5 @@ $size = $this->area_height / LINE_Y_SCALE; $pos = 0; - for($i = 0; $i <= LINE_Y_SCALE; $i++) { + for ($i = 0; $i <= LINE_Y_SCALE; $i++) { $snumber = $number * (LINE_Y_SCALE - $i); $disp_number = number_format($snumber); @@ -199,5 +199,5 @@ $this->graph_max = $tenval * (intval($data_max / $tenval) + 1); // 最大値が10未満の場合の対応 - if($this->graph_max < 10) { + if ($this->graph_max < 10) { $this->graph_max = 10; } @@ -211,15 +211,15 @@ // 折れ線グラフ描画 - for($i = 0; $i < $this->line_max; $i++) { + for ($i = 0; $i < $this->line_max; $i++) { $this->drawLine($i); } // マークを描画 - for($i = 0; $i < $this->line_max; $i++) { + for ($i = 0; $i < $this->line_max; $i++) { $this->drawMark($i); } // ラベルを描画 - for($i = 0; $i < $this->line_max; $i++) { + for ($i = 0; $i < $this->line_max; $i++) { $this->drawLabel($i); } @@ -234,8 +234,8 @@ $count = count($arrPointList); - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { $x = $arrPointList[$i][0]; $y = $arrPointList[$i][1]; - if(isset($arrPointList[$i + 1])) { + if (isset($arrPointList[$i + 1])) { $next_x = $arrPointList[$i + 1][0]; $next_y = $arrPointList[$i + 1][1]; @@ -249,5 +249,5 @@ $arrPointList = $this->arrPointList[$line_no]; $count = count($arrPointList); - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { $x = $arrPointList[$i][0]; $y = $arrPointList[$i][1]; @@ -261,5 +261,5 @@ $arrPointList = $this->arrPointList[$line_no]; $count = count($arrPointList); - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { $x = $arrPointList[$i][0]; $y = $arrPointList[$i][1]; @@ -281,5 +281,5 @@ $scale_width = $this->area_width / ($count + 1); $this->arrPointList[$this->line_max] = array(); - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { // X座標を求める $x = intval($this->left + ($scale_width * ($i + 1))); Index: branches/version-2_12-dev/data/class/graph/SC_GraphBase.php =================================================================== --- branches/version-2_12-dev/data/class/graph/SC_GraphBase.php (revision 21420) +++ branches/version-2_12-dev/data/class/graph/SC_GraphBase.php (revision 21441) @@ -215,5 +215,5 @@ $new_height = $this->bgh * 0.8; $tmp_image = imagecreatetruecolor($new_width, $new_height); - if(imagecopyresampled($tmp_image, $this->image, 0, 0, 0, 0, $new_width, $new_height, $this->bgw, $this->bgh)) { + if (imagecopyresampled($tmp_image, $this->image, 0, 0, 0, 0, $new_width, $new_height, $this->bgw, $this->bgh)) { $this->image = $tmp_image; } @@ -225,9 +225,9 @@ $count = count($this->arrRGB); // 通常色の設定 - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { $this->arrColor[$i] = $this->lfGetImageColor($this->image, $this->arrRGB[$i]); } // 暗色の設定 - for($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i++) { $this->arrDarkColor[$i] = $this->lfGetImageDarkColor($this->image, $this->arrRGB[$i]); } @@ -241,5 +241,5 @@ // 画像を出力する function outputGraph($header = true, $filename = "") { - if($header) { + if ($header) { header('Content-type: image/png'); } @@ -247,5 +247,5 @@ if ($filename != "") { imagepng($this->image, $filename); - }else{ + } else { imagepng($this->image); } @@ -272,5 +272,5 @@ $angle = -$angle; // ラベル背景 - if($labelbg) { + if ($labelbg) { $text_width = $this->getTextWidth($text, $font_size); imagefilledrectangle($this->image, $left - 2, $top - 2, $left + $text_width + 2, $top + $font_size + 2, $this->labelbg_color); @@ -292,5 +292,5 @@ $text = mb_convert_encoding($text, "EUC-JP", CHAR_CODE); //$text = mb_convert_encoding($text, CHAR_CODE); - if($color != NULL) { + if ($color != NULL) { ImageTTFText($this->image, $font_size, $angle, $left, $top + $font_size, $color, FONT_REALFILE, $text); } else { @@ -311,5 +311,5 @@ function debugPrint($text) { $text = mb_convert_encoding($text, "UTF-8", CHAR_CODE); - if(!isset($this->text_top)) { + if (!isset($this->text_top)) { $this->text_top = FONT_SIZE + LINE_PAD; } @@ -322,9 +322,9 @@ function drawLegend($legend_max = "", $clabelbg = true) { // 凡例が登録されていなければ中止 - if(count($this->arrLegend) <= 0) { + if (count($this->arrLegend) <= 0) { return; } - if($legend_max != "") { + if ($legend_max != "") { $label_max = $legend_max; } else { @@ -337,7 +337,7 @@ // 一番文字数が多いものを取得 - for($i = 0; $i < $label_max; $i++) { + for ($i = 0; $i < $label_max; $i++) { $text_len = strlen($this->arrLegend[$i]); - if($text_max < $text_len) { + if ($text_max < $text_len) { $text_max = $text_len; } @@ -351,5 +351,5 @@ $top = LEGEND_TOP; // カラーラベル背景の描画 - if($clabelbg) { + if ($clabelbg) { $this->drawClabelBG($left - LINE_PAD, $top, $left + $width_max, $top + $height_max + LINE_PAD); } @@ -358,5 +358,5 @@ // 色数の取得 $c_max = count($this->arrColor); - for($i = 0; $i < $label_max; $i++) { + for ($i = 0; $i < $label_max; $i++) { // カラーアイコンの表示 imagerectangle($this->image, $left, $top, $left + FONT_SIZE, $top + FONT_SIZE, $this->flame_color); @@ -371,5 +371,5 @@ function drawClabelBG($left, $top, $right, $bottom) { // 影の描画 - if($this->shade_on) { + if ($this->shade_on) { imagefilledrectangle($this->image, $left + 2, $top + 2, $right + 2, $bottom + 2, $this->shade_color); } @@ -459,5 +459,5 @@ /** 表示色の取得 */ function lfGetImageColor($image, $array) { - if(count($array) != 3) { + if (count($array) != 3) { return NULL; } @@ -468,11 +468,11 @@ /** 影用表示色の取得 */ function lfGetImageDarkColor($image, $array) { - if(count($array) != 3) { + if (count($array) != 3) { return NULL; } $i = 0; - foreach($array as $val) { + foreach ($array as $val) { $dark[$i] = $val - 45; - if($dark[$i] < 0) { + if ($dark[$i] < 0) { $dark[$i] = 0; } Index: branches/version-2_12-dev/data/class/graph/SC_GraphPie.php =================================================================== --- branches/version-2_12-dev/data/class/graph/SC_GraphPie.php (revision 21420) +++ branches/version-2_12-dev/data/class/graph/SC_GraphPie.php (revision 21441) @@ -48,12 +48,12 @@ $total = ""; $new_total = ""; - if(!is_array($array)) { + if (!is_array($array)) { return; } $arrRet = array(); - foreach($array as $val) { + foreach ($array as $val) { $total += $val; } - if($total <= 0) { + if ($total <= 0) { return; } @@ -62,5 +62,5 @@ $p_rate = 100 / $total; $cnt = 0; - foreach($array as $val) { + foreach ($array as $val) { $ret = round($val * $rate); $new_total+= $ret; @@ -91,5 +91,5 @@ function drawShade() { $move = 1; - for($i = ($this->cy + $this->cz); $i <= ($this->cy + $this->cz + ($this->cz * PIE_SHADE_IMPACT)); $i++) { + for ($i = ($this->cy + $this->cz); $i <= ($this->cy + $this->cz + ($this->cz * PIE_SHADE_IMPACT)); $i++) { imagefilledarc($this->image, $this->cx + $move, $i, $this->cw, $this->ch, 0, 360, $this->shade_color, IMG_ARC_PIE); $move += 0.5; @@ -115,10 +115,10 @@ // データが存在しない場合 - if($rd_max <= 0) { + if ($rd_max <= 0) { return; } // 影の描画 - if($this->shade_on) { + if ($this->shade_on) { $this->drawShade(); } @@ -131,9 +131,9 @@ for ($i = ($y + $z - 1); $i >= $y; $i--) { $start = 0; - for($j = 0; $j < $rd_max; $j++) { + for ($j = 0; $j < $rd_max; $j++) { // 角度が0度以上の場合のみ側面を描画する。 - if($arrRad[$j] > 0) { + if ($arrRad[$j] > 0) { $end = $start + $arrRad[$j]; - if($start == 0 && $end == 360) { + if ($start == 0 && $end == 360) { // -90~270で指定すると円が描画できないので0~360に指定 imagearc($this->image, $x, $i, $w, $h, 0, 360, $this->arrDarkColor[($j % $dc_max)]); @@ -151,7 +151,7 @@ // 上面の描画 $start = 0; - for($i = 0; $i < $rd_max; $i++) { - $end = $start + $arrRad[$i]; - if($start == 0 && $end == 360) { + for ($i = 0; $i < $rd_max; $i++) { + $end = $start + $arrRad[$i]; + if ($start == 0 && $end == 360) { // -90~270で指定すると円が描画できないので0~360に指定 imagefilledarc($this->image, $x, $y, $w, $h, 0, 360, $this->arrColor[($i % $c_max)], IMG_ARC_PIE); @@ -165,7 +165,7 @@ // 上面の縁取り $start = 0; - for($i = 0; $i < $rd_max; $i++) { - $end = $start + $arrRad[$i]; - if($start == 0 && $end == 360) { + for ($i = 0; $i < $rd_max; $i++) { + $end = $start + $arrRad[$i]; + if ($start == 0 && $end == 360) { // -90~270で指定すると円が描画できないので0~360に指定 imagearc($this->image, $x, $y, $w, $h, 0, 360 , $this->flame_color); @@ -180,11 +180,11 @@ imageline($this->image, $x - ($w / 2), $y, $x - ($w / 2), $y + $z, $this->flame_color); $start = 0; - for($i = 0; $i < $rd_max; $i++) { + for ($i = 0; $i < $rd_max; $i++) { $end = $start + $arrRad[$i]; // 前面のみ - if($end > 90 && $end < 270) { + if ($end > 90 && $end < 270) { list($ax, $ay) = $this->lfGetArcPos($x, $y, $w, $h, $end); // ラインのずれを補正する - if($end > 180) { + if ($end > 180) { $ax = $ax + 1; } @@ -204,5 +204,5 @@ $rd_max = count($arrRad); $start = 0; - for($i = 0; $i < $rd_max; $i++) { + for ($i = 0; $i < $rd_max; $i++) { $center = $start + ($arrRad[$i] / 2); $end = $start + $arrRad[$i]; Index: branches/version-2_12-dev/data/class/SC_Initial.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Initial.php (revision 21422) +++ branches/version-2_12-dev/data/class/SC_Initial.php (revision 21441) @@ -132,5 +132,5 @@ //ロケールを明示的に設定 $res = setlocale(LC_ALL, LOCALE); - if($res === FALSE) { + if ($res === FALSE) { // TODO: Windows上のロケール設定が正常に働かない場合があることに暫定的に対応 // ''を指定するとApache実行環境の環境変数が使われる Index: branches/version-2_12-dev/data/class/SC_CartSession.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CartSession.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_CartSession.php (revision 21441) @@ -47,10 +47,10 @@ $this->key_tmp = "savecart_" . $key_tmp; // すでに情報がなければ現状のカート情報を記録しておく - if(count($_SESSION[$this->key_tmp]) == 0) { + if (count($_SESSION[$this->key_tmp]) == 0) { $_SESSION[$this->key_tmp] = $this->cartSession[$productTypeId]; } // 1世代古いコピー情報は、削除しておく - foreach($_SESSION as $k => $val) { - if($k != $this->key_tmp && preg_match("/^savecart_/", $k)) { + foreach ($_SESSION as $k => $val) { + if ($k != $this->key_tmp && preg_match("/^savecart_/", $k)) { unset($this->cartSession[$productTypeId][$k]); } @@ -70,5 +70,5 @@ $change = false; $max = $this->getMax($productTypeId); - for($i = 1; $i <= $max; $i++) { + for ($i = 1; $i <= $max; $i++) { if ($this->cartSession[$productTypeId][$i]['quantity'] != $_SESSION[$this->key_tmp][$i]['quantity']) { @@ -96,5 +96,5 @@ // 次に割り当てるカートのIDを取得する function getNextCartID($productTypeId) { - foreach($this->cartSession[$productTypeId] as $key => $val){ + foreach ($this->cartSession[$productTypeId] as $key => $val) { $arrRet[] = $this->cartSession[$productTypeId][$key]['cart_no']; } @@ -112,5 +112,5 @@ function getProductTotal($id, $productTypeId) { $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { if(isset($this->cartSession[$productTypeId][$i]['id']) && $this->cartSession[$productTypeId][$i]['id'] == $id) { @@ -130,5 +130,5 @@ function setProductValue($id, $key, $val, $productTypeId) { $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { if(isset($this->cartSession[$productTypeId][$i]['id']) && $this->cartSession[$productTypeId][$i]['id'] == $id) { @@ -141,8 +141,8 @@ function getMax($productTypeId) { $max = 0; - if (count($this->cartSession[$productTypeId]) > 0){ - foreach($this->cartSession[$productTypeId] as $key => $val) { + if (count($this->cartSession[$productTypeId]) > 0) { + foreach ($this->cartSession[$productTypeId] as $key => $val) { if (is_numeric($key)) { - if($max < $key) { + if ($max < $key) { $max = $key; } @@ -157,5 +157,5 @@ $total = 0; $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { $total+= $this->cartSession[$productTypeId][$i]['quantity']; } @@ -168,5 +168,5 @@ $total = 0; $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { if (!isset($this->cartSession[$productTypeId][$i]['price'])) { @@ -192,5 +192,5 @@ $total = 0; $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { $price = $this->cartSession[$productTypeId][$i]['price']; $quantity = $this->cartSession[$productTypeId][$i]['quantity']; @@ -207,5 +207,5 @@ if (USE_POINT !== false) { $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { $price = $this->cartSession[$productTypeId][$i]['price']; $quantity = $this->cartSession[$productTypeId][$i]['quantity']; @@ -233,9 +233,9 @@ $find = false; $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { - - if($this->cartSession[$productTypeId][$i]['id'] == $product_class_id) { + for ($i = 0; $i <= $max; $i++) { + + if ($this->cartSession[$productTypeId][$i]['id'] == $product_class_id) { $val = $this->cartSession[$productTypeId][$i]['quantity'] + $quantity; - if(strlen($val) <= INT_LEN) { + if (strlen($val) <= INT_LEN) { $this->cartSession[$productTypeId][$i]['quantity'] += $quantity; } @@ -243,5 +243,5 @@ } } - if(!$find) { + if (!$find) { $this->cartSession[$productTypeId][$max+1]['id'] = $product_class_id; $this->cartSession[$productTypeId][$max+1]['quantity'] = $quantity; @@ -259,6 +259,6 @@ $exclude = false; // ページチェックを行う。 - foreach($arrExclude as $val) { - if(preg_match("|" . preg_quote($val) . "|", $url)) { + foreach ($arrExclude as $val) { + if (preg_match("|" . preg_quote($val) . "|", $url)) { $exclude = true; break; @@ -266,5 +266,5 @@ } // 除外ページでない場合は、前頁として記録する。 - if(!$exclude) { + if (!$exclude) { $_SESSION['prev_url'] = $url; } @@ -279,6 +279,6 @@ function delProductKey($keyname, $val, $productTypeId) { $max = count($this->cartSession[$productTypeId]); - for($i = 0; $i < $max; $i++) { - if($this->cartSession[$productTypeId][$i][$keyname] == $val) { + for ($i = 0; $i < $max; $i++) { + if ($this->cartSession[$productTypeId][$i][$keyname] == $val) { unset($this->cartSession[$productTypeId][$i]); } @@ -335,5 +335,5 @@ $max = $this->getMax($productTypeId); $arrRet = array(); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { if(isset($this->cartSession[$productTypeId][$i]['cart_no']) && $this->cartSession[$productTypeId][$i]['cart_no'] != "") { @@ -391,6 +391,6 @@ function getAllProductID($productTypeId) { $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { - if($this->cartSession[$productTypeId][$i]['cart_no'] != "") { + for ($i = 0; $i <= $max; $i++) { + if ($this->cartSession[$productTypeId][$i]['cart_no'] != "") { $arrRet[] = $this->cartSession[$productTypeId][$i]['id'][0]; } @@ -407,6 +407,6 @@ function getAllProductClassID($productTypeId) { $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { - if($this->cartSession[$productTypeId][$i]['cart_no'] != "") { + for ($i = 0; $i <= $max; $i++) { + if ($this->cartSession[$productTypeId][$i]['cart_no'] != "") { $arrRet[] = $this->cartSession[$productTypeId][$i]['id']; } @@ -423,5 +423,5 @@ function delAllProducts($productTypeId) { $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { + for ($i = 0; $i <= $max; $i++) { unset($this->cartSession[$productTypeId][$i]); } @@ -431,6 +431,6 @@ function delProduct($cart_no, $productTypeId) { $max = $this->getMax($productTypeId); - for($i = 0; $i <= $max; $i++) { - if($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) { + for ($i = 0; $i <= $max; $i++) { + if ($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) { unset($this->cartSession[$productTypeId][$i]); } @@ -578,5 +578,5 @@ $total_quantity = $this->getTotalQuantity($productTypeId); - if($total_quantity >= DELIV_FREE_AMOUNT) { + if ($total_quantity >= DELIV_FREE_AMOUNT) { return true; } @@ -587,5 +587,5 @@ if ($arrInfo['free_rule'] > 0) { // 小計が無料条件を超えている場合 - if($subtotal >= $arrInfo['free_rule']) { + if ($subtotal >= $arrInfo['free_rule']) { return true; } @@ -659,12 +659,12 @@ $results['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($total_point, $use_point); - if($objCustomer != "") { + if ($objCustomer != "") { // 誕生日月であった場合 - if($objCustomer->isBirthMonth()) { + if ($objCustomer->isBirthMonth()) { $results['birth_point'] = BIRTH_MONTH_POINT; $results['add_point'] += $results['birth_point']; } } - if($results['add_point'] < 0) { + if ($results['add_point'] < 0) { $results['add_point'] = 0; } Index: branches/version-2_12-dev/data/class/SC_CustomerList.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CustomerList.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_CustomerList.php (revision 21441) @@ -37,5 +37,5 @@ $dbFactory = SC_DB_DBFactory_Ex::getInstance(); - if($mode == "") { + if ($mode == "") { // 会員本登録会員で削除していない会員 $this->setWhere("status = 2 AND del_flg = 0 "); @@ -44,5 +44,5 @@ } - if($mode == 'customer') { + if ($mode == 'customer') { $this->setWhere( " del_flg = 0 "); // 登録日を示すカラム @@ -52,5 +52,5 @@ // 会員ID if (!isset($this->arrSql['search_customer_id'])) $this->arrSql['search_customer_id'] = ""; - if ( strlen($this->arrSql['search_customer_id']) > 0 ) { + if (strlen($this->arrSql['search_customer_id']) > 0 ) { $this->setWhere( "customer_id = ?" ); $this->arrVal[] = $this->arrSql['search_customer_id']; @@ -59,5 +59,5 @@ // 名前 if (!isset($this->arrSql['search_name'])) $this->arrSql['search_name'] = ""; - if ( strlen($this->arrSql['search_name']) > 0 ) { + if (strlen($this->arrSql['search_name']) > 0 ) { $this->setWhere("(" . $dbFactory->concatColumn(array("name01", "name02")) . " LIKE ?)" ); $searchName = $this->addSearchStr($this->arrSql['search_name']); @@ -67,5 +67,5 @@ // 名前(フリガナ) if (!isset($this->arrSql['search_kana'])) $this->arrSql['search_kana'] = ""; - if ( strlen($this->arrSql['search_kana']) > 0 ) { + if (strlen($this->arrSql['search_kana']) > 0 ) { $this->setWhere("(" . $dbFactory->concatColumn(array("kana01", "kana02")) . " LIKE ?)" ); $searchKana = $this->addSearchStr($this->arrSql['search_kana']); @@ -75,5 +75,5 @@ // 都道府県 if (!isset($this->arrSql['search_pref'])) $this->arrSql['search_pref'] = ""; - if ( strlen($this->arrSql['search_pref']) > 0 ) { + if (strlen($this->arrSql['search_pref']) > 0 ) { $this->setWhere( "pref = ?" ); $this->arrVal[] = $this->arrSql['search_pref']; @@ -82,5 +82,5 @@ // 電話番号 if (!isset($this->arrSql['search_tel'])) $this->arrSql['search_tel'] = ""; - if ( is_numeric( $this->arrSql['search_tel'] ) ) { + if (is_numeric( $this->arrSql['search_tel'] ) ) { $this->setWhere("(" . $dbFactory->concatColumn(array("tel01", "tel02", "tel03")) . " LIKE ?)" ); $searchTel = $this->addSearchStr($this->arrSql['search_tel']); @@ -90,5 +90,5 @@ // 性別 if (!isset($this->arrSql['search_sex'])) $this->arrSql['search_sex'] = ""; - if ( is_array( $this->arrSql['search_sex'] ) ){ + if (is_array( $this->arrSql['search_sex'] ) ) { $arrSexVal = $this->setItemTerm( $this->arrSql['search_sex'] ,'sex' ); foreach ($arrSexVal as $data) { @@ -99,6 +99,6 @@ // 職業 if (!isset($this->arrSql['search_job'])) $this->arrSql['search_job'] = ""; - if ( is_array( $this->arrSql['search_job'] ) ){ - if ( in_array("不明", $this->arrSql['search_job'] ) ) { + if (is_array( $this->arrSql['search_job'] ) ) { + if (in_array("不明", $this->arrSql['search_job'] ) ) { $arrJobVal = $this->setItemTermWithNull( $this->arrSql['search_job'] ,'job' ); } else { @@ -118,9 +118,9 @@ $this->arrSql['search_email'] = explode(",", $this->arrSql['search_email']); $sql_where = ""; - foreach($this->arrSql['search_email'] as $val) { + foreach ($this->arrSql['search_email'] as $val) { $val = trim($val); //検索条件を含まない - if($this->arrSql['not_emailinc'] == '1') { - if($sql_where == "") { + if ($this->arrSql['not_emailinc'] == '1') { + if ($sql_where == "") { $sql_where .= "dtb_customer.email NOT ILIKE ? "; } else { @@ -128,5 +128,5 @@ } } else { - if($sql_where == "") { + if ($sql_where == "") { $sql_where .= "dtb_customer.email ILIKE ? "; } else { @@ -147,9 +147,9 @@ $this->arrSql['search_email_mobile'] = explode(",", $this->arrSql['search_email_mobile']); $sql_where = ""; - foreach($this->arrSql['search_email_mobile'] as $val) { + foreach ($this->arrSql['search_email_mobile'] as $val) { $val = trim($val); //検索条件を含まない - if($this->arrSql['not_email_mobileinc'] == '1') { - if($sql_where == "") { + if ($this->arrSql['not_email_mobileinc'] == '1') { + if ($sql_where == "") { $sql_where .= "dtb_customer.email_mobile NOT ILIKE ? "; } else { @@ -157,5 +157,5 @@ } } else { - if($sql_where == "") { + if ($sql_where == "") { $sql_where .= "dtb_customer.email_mobile ILIKE ? "; } else { @@ -170,8 +170,8 @@ // メールマガジンの場合 - if($mode == 'customer') { + if ($mode == 'customer') { // メルマガ受け取りの選択項目がフォームに存在する場合 - if ( isset($this->arrSql['search_htmlmail'])){ - if (SC_Utils_Ex::sfIsInt($this->arrSql['search_htmlmail'])){ + if (isset($this->arrSql['search_htmlmail'])) { + if (SC_Utils_Ex::sfIsInt($this->arrSql['search_htmlmail'])) { $this->setWhere("mailmaga_flg = ?"); $this->arrVal[] = $this->arrSql['search_htmlmail']; @@ -184,6 +184,6 @@ // 配信メールアドレス種別 - if ( $mode == 'customer' ){ - if (isset($this->arrSql['search_mail_type'])){ + if ($mode == 'customer' ) { + if (isset($this->arrSql['search_mail_type'])) { $sqlEmailMobileIsEmpty = "(dtb_customer.email_mobile IS NULL OR dtb_customer.email_mobile = '')"; switch ($this->arrSql['search_mail_type']) { @@ -211,5 +211,5 @@ 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"] ) ) { + 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"); foreach ($arrBuyTotal as $data) { @@ -221,5 +221,5 @@ 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"] ) ) { + 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"); foreach ($arrBuyTimes as $data) { @@ -288,5 +288,5 @@ // 購入商品コード if (!isset($this->arrSql['search_buy_product_code'])) $this->arrSql['search_buy_product_code'] = ""; - if ( strlen($this->arrSql['search_buy_product_code']) > 0 ) { + 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)"); $search_buyproduct_code = $this->addSearchStr($this->arrSql['search_buy_product_code']); @@ -296,5 +296,5 @@ // 購入商品名称 if (!isset($this->arrSql['search_buy_product_name'])) $this->arrSql['search_buy_product_name'] = ""; - if ( strlen($this->arrSql['search_buy_product_name']) > 0 ) { + 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)"); $search_buyproduct_name = $this->addSearchStr($this->arrSql['search_buy_product_name']); @@ -304,10 +304,10 @@ // カテゴリを選択している場合のみ絞込検索を行う if (!isset($this->arrSql['search_category_id'])) $this->arrSql['search_category_id'] = ""; - if ( strlen($this->arrSql['search_category_id']) > 0){ + if (strlen($this->arrSql['search_category_id']) > 0) { // カテゴリで絞込検索を行うSQL文生成 list($tmp_where, $tmp_arrval) = $objDb->sfGetCatWhere($this->arrSql['search_category_id']); // カテゴリで絞込みが可能の場合 - if($tmp_where != "") { + if ($tmp_where != "") { $this->setWhere( " customer_id IN (SELECT distinct customer_id FROM dtb_order WHERE order_id IN (SELECT distinct order_id FROM dtb_order_detail WHERE product_id IN (SELECT product_id FROM dtb_product_categories WHERE ".$tmp_where." ) AND del_flg = 0)) "); $this->arrVal = array_merge((array)$this->arrVal, (array)$tmp_arrval); @@ -317,5 +317,5 @@ // 会員状態 if (!isset($this->arrSql['search_status'])) $this->arrSql['search_status'] = ""; - if ( is_array( $this->arrSql['search_status'] ) ){ + if (is_array( $this->arrSql['search_status'] ) ) { $arrStatusVal = $this->setItemTerm( $this->arrSql['search_status'] ,'status' ); foreach ($arrStatusVal as $data) { Index: branches/version-2_12-dev/data/class/SC_SelectSql.php =================================================================== --- branches/version-2_12-dev/data/class/SC_SelectSql.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_SelectSql.php (revision 21441) @@ -67,13 +67,13 @@ // ある単位のみ検索($from = $to) - if( $from == $to ) { + if ($from == $to ) { $this->setWhere( $column ." = ?" ); $return = array($from); //　~$toまで検索 - } elseif( strlen($from) == 0 && strlen($to) > 0 ) { + } elseif (strlen($from) == 0 && strlen($to) > 0 ) { $this->setWhere( $column ." <= ? "); $return = array($to); //　~$from以上を検索 - } elseif( strlen($from) > 0 && strlen($to) == 0 ) { + } elseif (strlen($from) > 0 && strlen($to) == 0 ) { $this->setWhere( $column ." >= ? "); $return = array($from); @@ -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; @@ -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; @@ -127,7 +127,7 @@ function setItemTerm( $arr, $ItemStr ) { - foreach( $arr as $data ) { - - if( count( $arr ) > 1 ) { + foreach ($arr as $data ) { + + if (count( $arr ) > 1 ) { if( ! is_null( $data ) ) $item .= $ItemStr . " = ? OR "; } else { @@ -147,6 +147,6 @@ $item = " ${ItemStr} IS NULL "; - if ( $arr ){ - foreach( $arr as $data ) { + if ($arr ) { + foreach ($arr as $data ) { if ($data != "不明") { $item .= " OR ${ItemStr} = ?"; @@ -165,6 +165,6 @@ $item = " ${ItemStr} IS NULL OR ${ItemStr} = '' "; $i = 1; - if ( $arr ){ - foreach( $arr as $data ) { + if ($arr ) { + foreach ($arr as $data ) { if ($i == $count) break; $item .= " OR ${ItemStr} = ?"; @@ -189,5 +189,5 @@ $count = count( $arrWhere ); - for( $i = 0; $i < $count; $i++ ) { + for ($i = 0; $i < $count; $i++ ) { if( isset( $arrWhere[$i]['value'] ) ) $statement .= $arrWhere[$i]['column'] ." = " . SC_Utils_Ex::sfQuoteSmart($arrWhere[$i]['value']) ." OR " ; @@ -196,5 +196,5 @@ $statement = "( " . rtrim( $statement, " OR " ) . " )"; - if( $this->where ) { + if ($this->where ) { $this->where .= " AND " . $statement; @@ -208,5 +208,5 @@ function setWhere($where){ if ($where != "") { - if( $this->where ) { + if ($this->where ) { $this->where .= " AND " . $where; @@ -233,5 +233,5 @@ function setLimitOffset( $limit, $offset ){ - if ( is_numeric($limit) and is_numeric($offset) ){ + if (is_numeric($limit) and is_numeric($offset) ) { $this->limit = " LIMIT " .$limit; Index: branches/version-2_12-dev/data/class/SC_Customer.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Customer.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_Customer.php (revision 21441) @@ -52,5 +52,5 @@ // パスワードが合っていれば会員情報をcustomer_dataにセットしてtrueを返す - if ( SC_Utils_Ex::sfIsMatchHashPassword($pass, $data['password'], $data['salt']) ) { + if (SC_Utils_Ex::sfIsMatchHashPassword($pass, $data['password'], $data['salt']) ) { $this->customer_data = $data; $this->startSession(); @@ -112,5 +112,5 @@ function checkMobilePhoneId() { //docomo用にデータを取り出す。 - if(SC_MobileUserAgent_Ex::getCarrier() == 'docomo'){ + if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') { if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0) $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId(); @@ -136,5 +136,5 @@ function getCustomerDataFromMobilePhoneIdPass($pass) { //docomo用にデータを取り出す。 - if(SC_MobileUserAgent_Ex::getCarrier() == 'docomo'){ + if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') { if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0) $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId(); @@ -150,5 +150,5 @@ // パスワードが合っている場合は、会員情報をcustomer_dataに格納してtrueを返す。 - if ( SC_Utils_Ex::sfIsMatchHashPassword($pass, $data['password'], $data['salt']) ) { + if (SC_Utils_Ex::sfIsMatchHashPassword($pass, $data['password'], $data['salt']) ) { $this->customer_data = $data; $this->startSession(); @@ -228,5 +228,5 @@ $objQuery = new SC_Query_Ex(); $email = $objQuery->get('email', "dtb_customer", "customer_id = ?", array($_SESSION['customer']['customer_id'])); - if($email == $_SESSION['customer']['email']) { + if ($email == $_SESSION['customer']['email']) { // モバイルサイトの場合は携帯のメールアドレスが登録されていることもチェックする。 // ただし $dont_check_email_mobile が true の場合はチェックしない。 @@ -274,5 +274,5 @@ $now_month = intval(date('m')); - if($birth_month == $now_month) { + if ($birth_month == $now_month) { return true; } Index: branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (revision 21425) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (revision 21441) @@ -74,5 +74,5 @@ // 正常に接続されている場合 - if(!$objQuery->isError()) { + if (!$objQuery->isError()) { list($db_type) = explode(":", $dsn); @@ -80,5 +80,5 @@ $columns = $objQuery->listTableFields($table_name); - if(in_array($col_name, $columns)){ + if (in_array($col_name, $columns)) { return true; } @@ -86,5 +86,5 @@ // カラムを追加する - if($add){ + if ($add) { $objQuery->query("ALTER TABLE $table_name ADD $col_name $col_type "); return true; @@ -112,5 +112,5 @@ // データを追加する - if(!$exists && $add) { + if (!$exists && $add) { $objQuery->exec($sql); } @@ -175,5 +175,5 @@ function sfGetRootId() { - if(!$this->g_root_on) { + if (!$this->g_root_on) { $this->g_root_on = true; $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -182,9 +182,9 @@ if (!isset($_GET['category_id'])) $_GET['category_id'] = ""; - if(!empty($_GET['product_id']) || !empty($_GET['category_id'])) { + if (!empty($_GET['product_id']) || !empty($_GET['category_id'])) { // 選択中のカテゴリIDを判定する $category_id = $this->sfGetCategoryId($_GET['product_id'], $_GET['category_id']); // ROOTカテゴリIDの取得 - if(count($category_id) > 0) { + if (count($category_id) > 0) { $arrRet = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id); $root_id = isset($arrRet[0]) ? $arrRet[0] : ""; @@ -214,5 +214,5 @@ $arrRet = $objQuery->select("customer_id", "dtb_order", "order_id = ?", array($order_id)); $customer_id = $arrRet[0]['customer_id']; - if($customer_id != "" && $customer_id >= 1) { + if ($customer_id != "" && $customer_id >= 1) { $arrRet = $objQuery->select('point', "dtb_customer", "customer_id = ?", array($customer_id)); $point = $arrRet[0]['point']; @@ -257,5 +257,5 @@ $from = "dtb_category as cat left join dtb_category_total_count as ttl on ttl.category_id = cat.category_id"; // 登録商品数のチェック - if($count_check) { + if ($count_check) { $where = "del_flg = 0 AND product_count > 0"; } else { @@ -267,7 +267,7 @@ $arrParentID = SC_Helper_DB_Ex::sfGetParents('dtb_category', 'parent_category_id', 'category_id', $parent_category_id); - foreach($arrRet as $key => $array) { - foreach($arrParentID as $val) { - if($array['category_id'] == $val) { + foreach ($arrRet as $key => $array) { + foreach ($arrParentID as $val) { + if ($array['category_id'] == $val) { $arrRet[$key]['display'] = 1; break; @@ -325,5 +325,5 @@ $from = "dtb_category as cat left join dtb_category_total_count as ttl on ttl.category_id = cat.category_id"; // 登録商品数のチェック - if($count_check) { + if ($count_check) { $where = "del_flg = 0 AND product_count > 0"; } else { @@ -339,7 +339,7 @@ $arrParentID = SC_Helper_DB_Ex::sfGetParents('dtb_category', 'parent_category_id', 'category_id', $parent_category_id); - foreach($arrParentID as $pid) { - foreach($arrRet as $key => $array) { - if($array['category_id'] == $pid) { + foreach ($arrParentID as $pid) { + foreach ($arrRet as $key => $array) { + if ($array['category_id'] == $pid) { $arrCatTree[$pkey][] = $arrRet[$key]; break; @@ -365,5 +365,5 @@ // カテゴリ名称を取得する - foreach($arrCatID as $key => $val){ + foreach ($arrCatID as $key => $val) { $sql = "SELECT category_name FROM dtb_category WHERE category_id = ?"; $arrVal = array($val); @@ -428,5 +428,5 @@ $where = "del_flg = 0"; - if($addwhere != "") { + if ($addwhere != "") { $where.= " AND $addwhere"; } @@ -434,5 +434,5 @@ $objQuery->setOption("ORDER BY rank DESC"); - if($products_check) { + if ($products_check) { $col = "T1.category_id, category_name, level"; $from = "dtb_category AS T1 LEFT JOIN dtb_category_total_count AS T2 ON T1.category_id = T2.category_id"; @@ -446,5 +446,5 @@ $max = count($arrRet); - for($cnt = 0; $cnt < $max; $cnt++) { + for ($cnt = 0; $cnt < $max; $cnt++) { $id = $arrRet[$cnt]['category_id']; $name = $arrRet[$cnt]['category_name']; @@ -484,7 +484,7 @@ $max = count($arrRet); - for($cnt = 0; $cnt < $max; $cnt++) { - if($parent_zero) { - if($arrRet[$cnt]['level'] == LEVEL_MAX) { + for ($cnt = 0; $cnt < $max; $cnt++) { + if ($parent_zero) { + if ($arrRet[$cnt]['level'] == LEVEL_MAX) { $arrValue[$cnt] = $arrRet[$cnt]['category_id']; } else { @@ -651,10 +651,10 @@ $objProduct = new SC_Product_Ex(); - if($objQuery == NULL) { + if ($objQuery == NULL) { $objQuery =& SC_Query_Ex::getSingletonInstance(); } $is_out_trans = false; - if(!$objQuery->inTransaction()){ + if (!$objQuery->inTransaction()) { $objQuery->begin(); $is_out_trans = true; @@ -667,5 +667,5 @@ $where_products_class = '(stock >= 1 OR stock_unlimited = 1)'; $from = $objProduct->alldtlSQL($where_products_class); - }else{ + } else { $from = 'dtb_products as alldtl'; } @@ -675,7 +675,7 @@ //まずテーブル内容の元を取得 - if(!$is_force_all_count) { + if (!$is_force_all_count) { $arrCategoryCountOld = $objQuery->select('category_id,product_count','dtb_category_count'); - }else{ + } else { $arrCategoryCountOld = array(); } @@ -700,10 +700,10 @@ //古いデータの構造入れ替え $arrOld = array(); - foreach($arrCategoryCountOld as $item){ + foreach ($arrCategoryCountOld as $item) { $arrOld[$item['category_id']] = $item['product_count']; } //新しいデータの構造入れ替え $arrNew = array(); - foreach($arrCategoryCountNew as $item){ + foreach ($arrCategoryCountNew as $item) { $arrNew[$item['category_id']] = $item['product_count']; } @@ -711,12 +711,12 @@ $arrDiffCategory_id = array(); //新しいカテゴリ一覧から見て商品数が異なるデータが無いか確認 - foreach($arrNew as $cid => $count){ - if($arrOld[$cid] != $count){ + foreach ($arrNew as $cid => $count) { + if ($arrOld[$cid] != $count) { $arrDiffCategory_id[] = $cid; } } //削除カテゴリを想定して、古いカテゴリ一覧から見て商品数が異なるデータが無いか確認。 - foreach($arrOld as $cid => $count){ - if($arrNew[$cid] != $count && $count > 0){ + foreach ($arrOld as $cid => $count) { + if ($arrNew[$cid] != $count && $count > 0) { $arrDiffCategory_id[] = $cid; } @@ -724,6 +724,6 @@ //対象IDが無ければ終了 - if(count($arrDiffCategory_id) == 0){ - if($is_out_trans) { + if (count($arrDiffCategory_id) == 0) { + if ($is_out_trans) { $objQuery->commit(); } @@ -735,14 +735,14 @@ //dtb_category_countの更新 差分のあったカテゴリだけ更新する。 - foreach($arrDiffCategory_id as $cid) { + foreach ($arrDiffCategory_id as $cid) { $sqlval = array(); $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; $sqlval['product_count'] = (string)$arrNew[$cid]; - if($sqlval['product_count'] =="") { + if ($sqlval['product_count'] =="") { $sqlval['product_count'] = (string)'0'; } - if(isset($arrOld[$cid])) { + if (isset($arrOld[$cid])) { $objQuery->update('dtb_category_count', $sqlval, 'category_id = ?', array($cid)); - }else{ + } else { if ($is_force_all_count) { $ret = $objQuery->update('dtb_category_count', $sqlval, 'category_id = ?', array($cid)); @@ -791,13 +791,13 @@ } // 更新対象だけを更新。 - foreach($arrUpdateData as $cid => $count) { + foreach ($arrUpdateData as $cid => $count) { $sqlval = array(); $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; $sqlval['product_count'] = $count; - if($sqlval['product_count'] =="") { + if ($sqlval['product_count'] =="") { $sqlval['product_count'] = (string)'0'; } $ret = $objQuery->update('dtb_category_total_count', $sqlval, 'category_id = ?', array($cid)); - if(!$ret) { + if (!$ret) { $sqlval['category_id'] = $cid; $ret = $objQuery->insert('dtb_category_total_count', $sqlval); @@ -805,5 +805,5 @@ } // トランザクション終了処理 - if($is_out_trans) { + if ($is_out_trans) { $objQuery->commit(); } @@ -837,5 +837,5 @@ $arrRet = array($id); - while(count($arrRet) > 0) { + while (count($arrRet) > 0) { $arrChildren = array_merge($arrChildren, $arrRet); $arrRet = SC_Helper_DB_Ex::sfGetChildrenArraySub($table, $pid_name, $id_name, $arrRet); @@ -897,5 +897,5 @@ $ret = $id; - while($ret != "0" && !SC_Utils_Ex::isBlank($ret)) { + while ($ret != "0" && !SC_Utils_Ex::isBlank($ret)) { $arrParents[] = $ret; $ret = SC_Helper_DB_Ex::sfGetParentsArraySub($table, $pid_name, $id_name, $ret); @@ -909,9 +909,9 @@ /* 子ID所属する親IDを取得する */ function sfGetParentsArraySub($table, $pid_name, $id_name, $child) { - if(SC_Utils_Ex::isBlank($child)) { + if (SC_Utils_Ex::isBlank($child)) { return false; } $objQuery =& SC_Query_Ex::getSingletonInstance(); - if(!is_array($child)) { + if (!is_array($child)) { $child = array($child); } @@ -952,5 +952,5 @@ $arrList = $objQuery->select($col, $table, $where, $arrVal); $count = count($arrList); - for($cnt = 0; $cnt < $count; $cnt++) { + for ($cnt = 0; $cnt < $count; $cnt++) { $key = $arrList[$cnt][$keyname]; $val = $arrList[$cnt][$valname]; @@ -973,5 +973,5 @@ $objQuery->begin(); $where = "$colname = ?"; - if($andwhere != "") { + if ($andwhere != "") { $where.= " AND $andwhere"; } @@ -981,8 +981,8 @@ $maxrank = $objQuery->max('rank', $table, $andwhere); // ランクが最大値よりも小さい場合に実行する。 - if($rank < $maxrank) { + if ($rank < $maxrank) { // ランクが一つ上のIDを取得する。 $where = "rank = ?"; - if($andwhere != "") { + if ($andwhere != "") { $where.= " AND $andwhere"; } @@ -991,5 +991,5 @@ // ランク入れ替えの実行 $sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?"; - if($andwhere != "") { + if ($andwhere != "") { $sqlup.= " AND $andwhere"; } @@ -1013,5 +1013,5 @@ $objQuery->begin(); $where = "$colname = ?"; - if($andwhere != "") { + if ($andwhere != "") { $where.= " AND $andwhere"; } @@ -1020,8 +1020,8 @@ // ランクが1(最小値)よりも大きい場合に実行する。 - if($rank > 1) { + if ($rank > 1) { // ランクが一つ下のIDを取得する。 $where = "rank = ?"; - if($andwhere != "") { + if ($andwhere != "") { $where.= " AND $andwhere"; } @@ -1030,5 +1030,5 @@ // ランク入れ替えの実行 $sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?"; - if($andwhere != "") { + if ($andwhere != "") { $sqlup.= " AND $andwhere"; } @@ -1054,5 +1054,5 @@ // 自身のランクを取得する - if($where != "") { + if ($where != "") { $getWhere = "$keyIdColumn = ? AND " . $where; } else { @@ -1064,7 +1064,7 @@ // 値の調整（逆順） - if($pos > $max) { + if ($pos > $max) { $position = 1; - } else if($pos < 1) { + } else if ($pos < 1) { $position = $max; } else { @@ -1083,5 +1083,5 @@ // 指定した順位の商品から移動させる商品までのrankを１つずらす $sql = "UPDATE $tableName SET rank = $term WHERE rank BETWEEN ? AND ?"; - if($where != "") { + if ($where != "") { $sql.= " AND $where"; } @@ -1092,5 +1092,5 @@ // 指定した順位へrankを書き換える。 $sql = "UPDATE $tableName SET rank = ? WHERE $keyIdColumn = ? "; - if($where != "") { + if ($where != "") { $sql.= " AND $where"; } @@ -1119,10 +1119,10 @@ // 削除レコードのランクを取得する。 $where = "$colname = ?"; - if($andwhere != "") { + if ($andwhere != "") { $where.= " AND $andwhere"; } $rank = $objQuery->get('rank', $table, $where, array($id)); - if(!$delete) { + if (!$delete) { // ランクを最下位にする、DELフラグON $sqlup = "UPDATE $table SET rank = 0, del_flg = 1 "; @@ -1136,5 +1136,5 @@ // 追加レコードのランクより上のレコードを一つずらす。 $where = "rank > ?"; - if($andwhere != "") { + if ($andwhere != "") { $where.= " AND $andwhere"; } @@ -1159,6 +1159,6 @@ $where = ""; - for($cnt = 0; $cnt < $len; $cnt++) { - if($where == "") { + for ($cnt = 0; $cnt < $len; $cnt++) { + if ($where == "") { $where = "$id_name = ?"; } else { @@ -1249,11 +1249,11 @@ $where = "del_flg = 0"; - if($addwhere != "") { + if ($addwhere != "") { $where.= " AND $addwhere"; } - foreach($arrCol as $val) { - if($val != "") { - if($where == "") { + foreach ($arrCol as $val) { + if ($val != "") { + if ($where == "") { $where = "$val = ?"; } else { @@ -1264,5 +1264,5 @@ $ret = $objQuery->get($col, $table, $where, $arrval); - if($ret != "") { + if ($ret != "") { return true; } @@ -1339,5 +1339,5 @@ $where = "del_flg = 0"; - if($addwhere != "") { + if ($addwhere != "") { $where.= " AND $addwhere"; } @@ -1345,5 +1345,5 @@ $objQuery->setOption("ORDER BY rank DESC"); - if($products_check) { + if ($products_check) { $col = "T1.maker_id, name"; $from = "dtb_maker AS T1 LEFT JOIN dtb_maker_count AS T2 ON T1.maker_id = T2.maker_id"; @@ -1357,5 +1357,5 @@ $max = count($arrRet); - for($cnt = 0; $cnt < $max; $cnt++) { + for ($cnt = 0; $cnt < $max; $cnt++) { $id = $arrRet[$cnt]['maker_id']; $name = $arrRet[$cnt]['name']; Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php (revision 21439) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php (revision 21441) @@ -100,5 +100,5 @@ function lfMobileConvertInputValue(&$value) { if (is_array($value)) { - foreach($value as $key => $val ){ + foreach ($value as $key => $val ) { $this->lfMobileConvertInputValue($value[$key]); } @@ -467,5 +467,5 @@ $file_extension = strtolower(substr(strrchr($filename,"."),1)); $mime_type = $this->defaultMimeType; - if(array_key_exists($file_extension, $this->arrMimetypes)){ + if (array_key_exists($file_extension, $this->arrMimetypes)) { $mime_type = $this->arrMimetypes[$file_extension]; } 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 21420) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php (revision 21441) @@ -52,7 +52,7 @@ // アルファベットと数字でソート natcasesort($arrDir); - foreach($arrDir as $file) { + foreach ($arrDir as $file) { // ./ と ../を除くファイルのみを取得 - if($file != "." && $file != "..") { + if ($file != "." && $file != "..") { $path = $dir."/".$file; @@ -63,5 +63,5 @@ // ディレクトリとファイルで格納配列を変える - if(is_dir($path)) { + if (is_dir($path)) { $arrDirList[$cnt]['file_name'] = $file; $arrDirList[$cnt]['file_path'] = $path; @@ -95,5 +95,5 @@ function sfGetDirSize($dir) { $bytes = 0; - if(file_exists($dir)) { + if (file_exists($dir)) { // ディレクトリの場合下層ファイルの総量を取得 if (is_dir($dir)) { @@ -129,5 +129,5 @@ function sfDeleteDir($dir) { $arrResult = array(); - if(file_exists($dir)) { + if (file_exists($dir)) { // ディレクトリかチェック if (is_dir($dir)) { @@ -176,5 +176,5 @@ $dir = ereg_replace("/$", "", $dir); // 最上位層を格納(user_data/) - if($this->sfDirChildExists($dir)) { + if ($this->sfDirChildExists($dir)) { $arrTree[$cnt]['type'] = "_parent"; } else { @@ -185,5 +185,5 @@ $arrTree[$cnt]['count'] = $cnt; // 初期表示はオープン - if($_POST['mode'] != '') { + if ($_POST['mode'] != '') { $arrTree[$cnt]['open'] = $this->lfIsFileOpen($dir, $tree_status); } else { @@ -210,10 +210,10 @@ function sfGetFileTreeSub($dir, $default_rank, &$cnt, &$arrTree, $tree_status) { - if(file_exists($dir)) { + if (file_exists($dir)) { if ($handle = opendir("$dir")) { while (false !== ($item = readdir($handle))) $arrDir[] = $item; // アルファベットと数字でソート natcasesort($arrDir); - foreach($arrDir as $item) { + foreach ($arrDir as $item) { if ($item != "." && $item != "..") { // 文末の/を取り除く @@ -223,5 +223,5 @@ if (is_dir($path)) { $arrTree[$cnt]['path'] = $path; - if($this->sfDirChildExists($path)) { + if ($this->sfDirChildExists($path)) { $arrTree[$cnt]['type'] = "_parent"; } else { @@ -254,5 +254,5 @@ */ function sfDirChildExists($dir) { - if(file_exists($dir)) { + if (file_exists($dir)) { if (is_dir($dir)) { $handle = opendir($dir); @@ -281,5 +281,5 @@ function lfIsFileOpen($dir, $tree_status) { $arrTreeStatus = explode('|', $tree_status); - if(in_array($dir, $arrTreeStatus)) { + if (in_array($dir, $arrTreeStatus)) { return true; } @@ -312,5 +312,5 @@ function sfCreateFile($file, $mode = "") { // 行末の/を取り除く - if($mode != "") { + if ($mode != "") { $ret = @mkdir($file, $mode); } else { @@ -332,5 +332,5 @@ $fp = @fopen($filename, 'rb' ); //ファイル内容を全て変数に読み込む - if($fp) { + if ($fp) { $str = @fread($fp, filesize($filename)+1); } @@ -375,5 +375,5 @@ // ファイル一覧取得 $arrFileHash = SC_Utils_Ex::sfGetFileList($dir); - foreach($arrFileHash as $val) { + foreach ($arrFileHash as $val) { $arrFileList[] = $val['file_name']; $debug_message.= "圧縮：".$val['file_name']."\n"; 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 21420) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php (revision 21441) @@ -86,5 +86,5 @@ //会員情報の最終購入日、購入合計を更新 - if($customerId > 0){ + if ($customerId > 0) { SC_Customer_Ex::updateOrderSummary($customerId); } @@ -212,5 +212,5 @@ *(ユニークIDがPOSTされていない場合はスルー) */ - if(!SC_SiteSession_Ex::checkUniqId()) { + if (!SC_SiteSession_Ex::checkUniqId()) { SC_Utils_Ex::sfDispSiteError(CANCEL_PURCHASE); exit; @@ -219,5 +219,5 @@ // 購入ボタンを押してから変化がないか $quantity = $objCartSession->getTotalQuantity($cartKey); - if($objCartSession->checkChangeCart($cartKey) || !($quantity > 0)) { + if ($objCartSession->checkChangeCart($cartKey) || !($quantity > 0)) { SC_Response_Ex::sendRedirect(CART_URLPATH); exit; @@ -509,5 +509,5 @@ // 下限のみ設定されている elseif (strlen($data['rule']) != 0) { - if($data['rule'] <= $total) { + if ($data['rule'] <= $total) { $arrPayment[] = $data; } @@ -515,5 +515,5 @@ // 上限のみ設定されている elseif (strlen($data['upper_rule']) != 0) { - if($data['upper_rule'] >= $total) { + if ($data['upper_rule'] >= $total) { $arrPayment[] = $data; } @@ -538,5 +538,5 @@ $max_date = max($delivDateIds); //発送目安 - switch($max_date) { + switch ($max_date) { //即日発送 case '1': @@ -591,5 +591,5 @@ $arrWDAY = $masterData->getMasterData("mtb_wday"); //お届け可能日のスタート値がセットされていれば - if($start_day >= 1) { + if ($start_day >= 1) { $now_time = time(); $max_day = $start_day + $end_day; @@ -771,5 +771,5 @@ // 対応状況の指定が無い場合は新規受付 - if(SC_Utils_Ex::isBlank($orderParams['status'])) { + if (SC_Utils_Ex::isBlank($orderParams['status'])) { $orderParams['status'] = ORDER_NEW; } @@ -1174,5 +1174,5 @@ //会員情報の最終購入日、購入合計を更新 - if($arrOrderOld['customer_id'] > 0 and $arrOrderOld['status'] != $newStatus){ + if ($arrOrderOld['customer_id'] > 0 and $arrOrderOld['status'] != $newStatus) { SC_Customer_Ex::updateOrderSummary($arrOrderOld['customer_id']); } Index: branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php (revision 21420) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php (revision 21441) @@ -84,5 +84,5 @@ // TODO: 固有処理 なんかエレガントな処理にしたい - if($csv_id == '1') { + if ($csv_id == '1') { //商品の場合 $objProduct = new SC_Product_Ex(); @@ -90,14 +90,14 @@ $inner_where = 'dtb_products_class.del_flg = 0'; $sql = $objQuery->getSql($cols, $objProduct->prdclsSQL($inner_where),$where); - }else if($csv_id == '2') { + }else if ($csv_id == '2') { // 会員の場合 $sql = "SELECT " . $cols . " FROM dtb_customer " . $where; - }else if($csv_id == '3') { + }else if ($csv_id == '3') { // 注文の場合 $sql = "SELECT " . $cols . " FROM dtb_order " . $where; - }else if($csv_id == '4') { + }else if ($csv_id == '4') { // レビューの場合 $sql = "SELECT " . $cols . " FROM dtb_review AS A INNER JOIN dtb_products AS B on A.product_id = B.product_id " . $where; - }else if($csv_id == '5') { + }else if ($csv_id == '5') { // カテゴリの場合 $sql = "SELECT " . $cols . " FROM dtb_category " . $where; @@ -122,8 +122,8 @@ $table = 'dtb_csv'; - if(SC_Utils_Ex::sfIsInt($csv_id)){ - if($where == "") { + if (SC_Utils_Ex::sfIsInt($csv_id)) { + if ($where == "") { $where = "csv_id = ?"; - }else{ + } else { $where = "$where AND csv_id = ?"; } @@ -144,5 +144,5 @@ function sfIsImportCSVFrame(&$arrCSVFrame) { $result = true; - foreach($arrCSVFrame as $key => $val) { + foreach ($arrCSVFrame as $key => $val) { if($val['status'] != CSV_COLUMN_STATUS_FLG_ENABLE and $val['rw_flg'] == CSV_COLUMN_RW_FLG_READ_WRITE @@ -164,5 +164,5 @@ function sfIsUpdateCSVFrame(&$arrCSVFrame) { $result = true; - foreach($arrCSVFrame as $key => $val) { + foreach ($arrCSVFrame as $key => $val) { if($val['status'] != CSV_COLUMN_STATUS_FLG_ENABLE and $val['rw_flg'] == CSV_COLUMN_RW_FLG_KEY_FIELD) { @@ -182,5 +182,5 @@ function sfGetCSVRecordCount($fp) { $count = 0; - while(!feof($fp)) { + while (!feof($fp)) { $arrCSV = fgetcsv($fp, CSV_LINE_MAX); $count++; @@ -224,5 +224,5 @@ @set_time_limit(0); // ヘッダ構築 - if(is_array($arrHeader)) { + if (is_array($arrHeader)) { $header = $this->sfArrayToCSV($arrHeader); $header = mb_convert_encoding($header, 'SJIS-Win'); @@ -241,9 +241,9 @@ fclose($this->fpOutput); - if($is_download) { + if ($is_download) { // CSVを送信する。 $this->lfDownloadCSVFile($tmp_filename, $file_head . "_"); $res = true; - }else{ + } else { $res = SC_Utils_Ex::sfReadFile($tmp_filename); } @@ -265,10 +265,10 @@ */ function sfArrayToCsv($fields, $delimiter = ',', $enclosure = '"', $arrayDelimiter = '|') { - if( strlen($delimiter) != 1 ) { + if (strlen($delimiter) != 1 ) { trigger_error('delimiter must be a single character', E_USER_WARNING); return ""; } - if( strlen($enclosure) < 1 ) { + if (strlen($enclosure) < 1 ) { trigger_error('enclosure must be a single character', E_USER_WARNING); return ""; @@ -304,5 +304,5 @@ function lfDownloadCsv($arrData, $prefix = ""){ - if($prefix == "") { + if ($prefix == "") { $dir_name = SC_Utils_Ex::sfUpDirName(); $file_name = $dir_name . date('ymdHis') .".csv"; 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 21420) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php (revision 21441) @@ -92,5 +92,5 @@ */ function doAction($hook_point, $arrArgs = array()) { - if(is_array($arrArgs) === false) { + if (is_array($arrArgs) === false) { array(&$arrArgs); } @@ -173,5 +173,5 @@ function registSuperHookPoint($objPlugin, $hook_point, $function_name, $priority) { // スーパープラグイン関数を定義しているかを検証. - if(method_exists($objPlugin, $function_name) === true){ + if (method_exists($objPlugin, $function_name) === true) { // アクションの登録 $this->addAction($hook_point, array($objPlugin, $function_name), $priority); @@ -187,5 +187,5 @@ function registLocalHookPoint($objPlugin, $priority) { // ローカルプラグイン関数を定義しているかを検証. - if(method_exists($objPlugin, 'regist') === true){ + if (method_exists($objPlugin, 'regist') === true) { // アクションの登録（プラグイン側に記述） $objPluginHelper =& SC_Helper_Plugin::getSingletonInstance(); @@ -203,5 +203,5 @@ */ function addAction($hook_point, $function, $priority) { - if (!is_callable($function)){ + if (!is_callable($function)) { // TODO エラー処理;　コール可能な形式ではありません } @@ -247,5 +247,5 @@ return $obj_idx; } - } else if ( is_string($function[0]) ) { + } else if (is_string($function[0]) ) { return $function[0].$function[1]; } @@ -340,7 +340,7 @@ foreach ($arrBlocs as $key => $value) { // 有効なpluginのブロック以外. - if(!in_array($value['plugin_id'] , $this->arrPluginIds)) { + if (!in_array($value['plugin_id'] , $this->arrPluginIds)) { // 通常ブロック以外. - if($value['plugin_id'] != ""){ + if ($value['plugin_id'] != "") { //　ブロック配列から削除する unset ($arrBlocs[$key]); Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php =================================================================== --- branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21432) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21441) @@ -47,10 +47,10 @@ // salt値の生成(insert時)または取得(update時)。 - if(is_numeric($customer_id)) { + if (is_numeric($customer_id)) { $salt = $objQuery->get('salt', "dtb_customer", "customer_id = ? ", array($customer_id)); // 旧バージョン(2.11未満)からの移行を考慮 if (empty($salt)) $old_version_flag = true; - }else{ + } else { $salt = SC_Utils_Ex::sfGetRandomString(10); $array['salt'] = $salt; @@ -92,5 +92,5 @@ //-- 編集登録実行 - if (is_numeric($customer_id)){ + if (is_numeric($customer_id)) { // 編集 $objQuery->update("dtb_customer", $array, "customer_id = ? ", array($customer_id)); @@ -102,5 +102,5 @@ $array['customer_id'] = $customer_id; // 作成日 - if (is_null($array["create_date"])){ + if (is_null($array["create_date"])) { $array["create_date"] = 'CURRENT_TIMESTAMP'; } @@ -176,5 +176,5 @@ // 退会から何時間-経過しているか判定する。 $limit_time = ENTRY_LIMIT_HOUR * 3600; - if($pass_time < $limit_time) { + if ($pass_time < $limit_time) { // 再登録制限期間内削除ユーザー return 2; @@ -229,5 +229,5 @@ // 誕生日を年月日に分ける - if (isset($arrForm['birth'])){ + if (isset($arrForm['birth'])) { $birth = explode(" ", $arrForm['birth']); list($arrForm['year'], $arrForm['month'], $arrForm['day']) = explode("-",$birth[0]); @@ -255,10 +255,10 @@ function sfGetCustomerDataFromId($customer_id, $add_where = '', $arrAddVal = array()) { $objQuery =& SC_Query_Ex::getSingletonInstance(); - if($add_where == '') { + if ($add_where == '') { $where = 'customer_id = ?'; $arrData = $objQuery->getRow("*", "dtb_customer", $where, array($customer_id)); - }else{ + } else { $where = $add_where; - if(SC_Utils_Ex::sfIsInt($customer_id)) { + if (SC_Utils_Ex::sfIsInt($customer_id)) { $where .= ' AND customer_id = ?'; $arrAddVal[] = $customer_id; @@ -339,5 +339,5 @@ SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam); SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, false, true); - if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE){ + 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); @@ -401,10 +401,10 @@ $objFormParam->addParam("メールマガジン", "mailmaga_flg", INT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); - if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE){ + if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) { $objFormParam->addParam("FAX番号1", 'fax01', TEL_ITEM_LEN, 'n', array("SPTAB_CHECK")); $objFormParam->addParam("FAX番号2", 'fax02', TEL_ITEM_LEN, 'n', array("SPTAB_CHECK")); $objFormParam->addParam("FAX番号3", 'fax03', TEL_ITEM_LEN, 'n', array("SPTAB_CHECK")); $objFormParam->addParam('メールアドレス', 'email', null, 'a', array("NO_SPTAB", "EXIST_CHECK", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK")); - if(!$isAdmin) { + if (!$isAdmin) { $objFormParam->addParam("パスワード(確認)", 'password02', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK" ,"ALNUM_CHECK"), "", false); $objFormParam->addParam('メールアドレス(確認)', "email02", null, 'a', array("NO_SPTAB", "EXIST_CHECK", "EMAIL_CHECK","SPTAB_CHECK" , "EMAIL_CHAR_CHECK"), "", false); @@ -612,5 +612,5 @@ $objErr->arrErr["search_buy_times_from"] .= "※ 購入回数の指定範囲が不正です。"; } - if(!SC_Utils_Ex::isBlank($objErr->arrErr)) { + if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { $arrErr = array_merge($arrErr, $objErr->arrErr); } @@ -630,5 +630,5 @@ $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_max']); $disp_pageno = $arrParam['search_pageno']; - if($disp_pageno == 0) { + if ($disp_pageno == 0) { $disp_pageno = 1; } 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 21420) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php (revision 21441) @@ -83,5 +83,5 @@ $objQuery = new SC_Query_Ex(); - if($subject == "" && $header == "" && $footer == "") { + if ($subject == "" && $header == "" && $footer == "") { // メールテンプレート情報の取得 $where = "template_id = ?"; @@ -132,9 +132,9 @@ //その他決済情報 - if($arrOrder['memo02'] != "") { + if ($arrOrder['memo02'] != "") { $arrOther = unserialize($arrOrder['memo02']); - foreach($arrOther as $other_key => $other_val){ - if(SC_Utils_Ex::sfTrim($other_val['value']) == ""){ + foreach ($arrOther as $other_key => $other_val) { + if (SC_Utils_Ex::sfTrim($other_val['value']) == "") { $arrOther[$other_key]['value'] = ""; } @@ -170,5 +170,5 @@ // 送信フラグ:trueの場合は、送信する。 - if($send) { + if ($send) { if ($objSendMail->sendMail()) { $this->sfSaveMailHistory($order_id, $template_id, $tosubject, $body); @@ -236,5 +236,5 @@ $sqlval['send_date'] = 'CURRENT_TIMESTAMP'; if (!isset($_SESSION['member_id'])) $_SESSION['member_id'] = ""; - if($_SESSION['member_id'] != "") { + if ($_SESSION['member_id'] != "") { $sqlval['creator_id'] = $_SESSION['member_id']; } else { @@ -256,5 +256,5 @@ $arrRet = $objQuery->select($col, $from, $where, array($email)); // 会員のメールアドレスが登録されている - if(!empty($arrRet[0]['customer_id'])) { + if (!empty($arrRet[0]['customer_id'])) { return true; } @@ -272,10 +272,10 @@ function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false) { // 会員データの取得 - if(SC_Utils_Ex::sfIsInt($customer_id)) { + if (SC_Utils_Ex::sfIsInt($customer_id)) { $arrCustomerData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id); - }else{ + } else { $arrCustomerData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId('', "secret_key = ?", array($secret_key)); } - if(SC_Utils_Ex::isBlank($arrCustomerData)) { + if (SC_Utils_Ex::isBlank($arrCustomerData)) { return false; } @@ -294,5 +294,5 @@ // 仮会員が有効の場合 - if(CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) { + if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) { $subject = $objHelperMail->sfMakeSubject('会員登録のご確認', $objMailText); $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl"); @@ -315,7 +315,7 @@ ); // 宛先の設定 - if($is_mobile) { + if ($is_mobile) { $to_addr = $arrCustomerData["email_mobile"]; - }else{ + } else { $to_addr = $arrCustomerData['email']; } 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 21420) +++ branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php (revision 21441) @@ -93,5 +93,5 @@ } else { // セッションデータがある場合は、レコード作成 - if(strlen($sess_data) > 0) { + if (strlen($sess_data) > 0) { $sqlval['sess_id'] = $id; $sqlval['sess_data'] = $sess_data; Index: branches/version-2_12-dev/data/class/SC_Query.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Query.php (revision 21430) +++ branches/version-2_12-dev/data/class/SC_Query.php (revision 21441) @@ -58,5 +58,5 @@ // 常時ONにするとメモリが解放されない。 // 連続クエリ実行時に問題が生じる。 - if(DEBUG_MODE) { + if (DEBUG_MODE) { $options['debug'] = PEAR_DB_DEBUG; } else { @@ -112,5 +112,5 @@ */ function isError() { - if(PEAR::isError($this->conn)) { + if (PEAR::isError($this->conn)) { return true; } @@ -247,7 +247,7 @@ } - while($data = $affected->fetchRow($fetchmode)) { + while ($data = $affected->fetchRow($fetchmode)) { $result = call_user_func($cbFunc, $data); - if($result === false) { + if ($result === false) { break; } @@ -342,5 +342,5 @@ */ function setLimitOffset($limit, $offset = 0) { - if (is_numeric($limit) && is_numeric($offset)){ + if (is_numeric($limit) && is_numeric($offset)) { $option = " LIMIT " . $limit; @@ -377,5 +377,5 @@ */ function andWhere($str) { - if($this->where != "") { + if ($this->where != "") { $this->where .= " AND " . $str; } else { @@ -394,5 +394,5 @@ */ function orWhere($str) { - if($this->where != "") { + if ($this->where != "") { $this->where .= " OR " . $str; } else { @@ -443,5 +443,5 @@ */ function setLimit($limit){ - if ( is_numeric($limit)){ + if (is_numeric($limit)) { $this->option = " LIMIT " .$limit; } @@ -458,5 +458,5 @@ */ function setOffset($offset) { - if ( is_numeric($offset)){ + if (is_numeric($offset)) { $this->offset = " OFFSET " .$offset; } @@ -482,7 +482,7 @@ foreach ($sqlval as $key => $val) { $strcol .= $key . ','; - if(strcasecmp("Now()", $val) === 0) { + if (strcasecmp("Now()", $val) === 0) { $strval .= 'Now(),'; - } else if(strcasecmp('CURRENT_TIMESTAMP', $val) === 0) { + } else if (strcasecmp('CURRENT_TIMESTAMP', $val) === 0) { $strval .= 'CURRENT_TIMESTAMP,'; } else { @@ -493,5 +493,5 @@ } - foreach($arrSql as $key => $val) { + foreach ($arrSql as $key => $val) { $strcol .= $key . ','; $strval .= $val . ','; @@ -500,5 +500,5 @@ $arrVal = array_merge($arrVal, $arrSqlVal); - if(!$find) { + if (!$find) { return false; } @@ -532,5 +532,5 @@ if (strcasecmp("Now()", $val) === 0) { $arrCol[] = $key . '= Now()'; - } else if(strcasecmp('CURRENT_TIMESTAMP', $val) === 0) { + } else if (strcasecmp('CURRENT_TIMESTAMP', $val) === 0) { $arrCol[] = $key . '= CURRENT_TIMESTAMP'; } else { @@ -542,5 +542,5 @@ if ($arrRawSql != "") { - foreach($arrRawSql as $key => $val) { + foreach ($arrRawSql as $key => $val) { $arrCol[] = "$key = $val"; } @@ -719,5 +719,5 @@ */ function delete($table, $where = "", $arrval = array()) { - if(strlen($where) <= 0) { + if (strlen($where) <= 0) { $sqlde = "DELETE FROM $table"; } else { @@ -939,8 +939,8 @@ // 一定以上時間かかったSQLの場合、ログ出力する。 - if(defined('SQL_QUERY_LOG_MODE') && SQL_QUERY_LOG_MODE == true) { + if (defined('SQL_QUERY_LOG_MODE') && SQL_QUERY_LOG_MODE == true) { $timeEnd = SC_Utils_Ex::sfMicrotimeFloat();; $timeExecTime = $timeEnd - $timeStart; - if(defined('SQL_QUERY_LOG_MIN_EXEC_TIME') && $timeExecTime >= (float)SQL_QUERY_LOG_MIN_EXEC_TIME) { + if (defined('SQL_QUERY_LOG_MIN_EXEC_TIME') && $timeExecTime >= (float)SQL_QUERY_LOG_MIN_EXEC_TIME) { $logMsg = sprintf("SQL_LOG [%.2fsec]\n%s", $timeExecTime, $sth->query) . "\n"; error_log($logMsg, 3, LOG_REALFILE); Index: branches/version-2_12-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php =================================================================== --- branches/version-2_12-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php (revision 21420) +++ branches/version-2_12-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php (revision 21441) @@ -50,5 +50,5 @@ */ function setState($state = 'pc') { - switch($state) { + switch ($state) { case 'mobile': $this->state = new LC_UseRequest_State_Mobile; Index: branches/version-2_12-dev/data/class/session/SC_SessionFactory.php =================================================================== --- branches/version-2_12-dev/data/class/session/SC_SessionFactory.php (revision 21420) +++ branches/version-2_12-dev/data/class/session/SC_SessionFactory.php (revision 21441) @@ -62,5 +62,5 @@ : ''; - switch($type) { + switch ($type) { // セッションの維持にリクエストパラメーターを使用する case 'useRequest': Index: branches/version-2_12-dev/data/class/SC_Product.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Product.php (revision 21436) +++ branches/version-2_12-dev/data/class/SC_Product.php (revision 21441) @@ -77,5 +77,5 @@ __EOS__; $objQuery->setGroupBy('alldtl.product_id'); - if(is_array($this->arrOrderData) and $objQuery->order == ""){ + if (is_array($this->arrOrderData) and $objQuery->order == "") { $o_col = $this->arrOrderData['col']; $o_table = $this->arrOrderData['table']; @@ -182,5 +182,5 @@ // 配列のキーを商品IDに $arrTmp = array(); - foreach($arrProducts as $arrProduct) { + foreach ($arrProducts as $arrProduct) { $arrTmp[$arrProduct['product_id']] = $arrProduct; } Index: branches/version-2_12-dev/data/class/SC_Session.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Session.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_Session.php (revision 21441) @@ -46,5 +46,5 @@ function SC_Session() { // セッション情報の保存 - if(isset($_SESSION['cert'])) { + if (isset($_SESSION['cert'])) { $this->sid = session_id(); $this->cert = $_SESSION['cert']; @@ -100,5 +100,5 @@ function getUniqId() { // ユニークIDがセットされていない場合はセットする。 - if( empty($_SESSION['uniqid']) ) { + if (empty($_SESSION['uniqid']) ) { $this->setUniqId(); } Index: branches/version-2_12-dev/data/class/SC_UploadFile.php =================================================================== --- branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21441) @@ -83,5 +83,5 @@ $ret = $objThumb->Main($src_file, $width, $height, $dst_file); - if($ret[0] != 1) { + if ($ret[0] != 1) { // エラーメッセージの表示 echo $ret[1]; @@ -98,8 +98,8 @@ $arrKeyname = array_flip($this->keyname); - if(!($_FILES[$keyname]['size'] > 0)) { + if (!($_FILES[$keyname]['size'] > 0)) { $objErr->arrErr[$keyname] = "※ " . $this->disp_name[$arrKeyname[$keyname]] . "がアップロードされていません。
"; } else { - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { // 一致したキーのファイルに情報を保存する。 if ($val == $keyname) { @@ -109,7 +109,7 @@ $objErr->doFunc(array($this->disp_name[$cnt], $keyname, $this->size[$cnt]), array("FILE_SIZE_CHECK")); // エラーがない場合 - if(!isset($objErr->arrErr[$keyname])) { + if (!isset($objErr->arrErr[$keyname])) { // 画像ファイルの場合 - if($this->image[$cnt]) { + if ($this->image[$cnt]) { // 保存用の画像名を取得する $dst_file = $this->lfGetTmpImageName($rename, $keyname); @@ -118,5 +118,5 @@ } else { // 一意なファイル名を作成する。 - if($rename) { + if ($rename) { $uniqname = date('mdHi') . "_" . uniqid("")."."; $this->temp_file[$cnt] = ereg_replace("^.*\.",$uniqname, $_FILES[$keyname]['name']); @@ -144,8 +144,8 @@ $cnt = 0; $arrKeyname = array_flip($this->keyname); - if(!($_FILES[$keyname]['size'] > 0)) { + if (!($_FILES[$keyname]['size'] > 0)) { $objErr->arrErr[$keyname] = "※ " . $this->disp_name[$arrKeyname[$keyname]] . "がアップロードされていません。(ファイルがアップロードできない場合は、.htaccessファイルのphp_value upload_max_filesizeを調整してください)
"; } else { - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { // 一致したキーのファイルに情報を保存する。 if ($val == $keyname) { @@ -155,5 +155,5 @@ $objErr->doFunc(array($this->disp_name[$cnt], $keyname, $this->size[$cnt]), array("FILE_SIZE_CHECK")); // エラーがない場合 - if(!isset($objErr->arrErr[$keyname])) { + if (!isset($objErr->arrErr[$keyname])) { // 一意なファイル名を作成する。 $uniqname = date('mdHi') . "_" . uniqid("")."."; @@ -174,8 +174,8 @@ $objImage = new SC_Image_Ex($this->temp_dir); $cnt = 0; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { if ($val == $keyname) { // 一時ファイルの場合削除する。 - if($this->temp_file[$cnt] != "") { + if ($this->temp_file[$cnt] != "") { $objImage->deleteImage($this->temp_file[$cnt], $this->temp_dir); } @@ -191,8 +191,8 @@ $objImage = new SC_Image_Ex($this->temp_dir); $cnt = 0; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { if ($val == $keyname) { // 一時ファイルの場合削除する。 - if($this->temp_file[$cnt] != "") { + if ($this->temp_file[$cnt] != "") { $objImage->deleteImage($this->temp_file[$cnt], $this->temp_dir); } @@ -208,7 +208,7 @@ $cnt = 0; $filepath = ""; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { if ($val == $keyname) { - if($this->temp_file[$cnt] != "") { + if ($this->temp_file[$cnt] != "") { $filepath = $this->temp_dir . $this->temp_file[$cnt]; } @@ -224,6 +224,6 @@ $objImage = new SC_Image_Ex($this->temp_dir); - foreach($this->keyname as $val) { - if(isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { $objImage->moveTempImage($this->temp_file[$cnt], $this->save_dir); @@ -245,6 +245,6 @@ $cnt = 0; $objImage = new SC_Image_Ex($this->temp_dir); - foreach($this->keyname as $val) { - if(isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { $objImage->moveTempImage($this->temp_file[$cnt], $this->save_dir); // すでに保存ファイルがあった場合は削除する。 @@ -264,9 +264,9 @@ $cnt = 0; $arrRet = array(); - foreach($this->keyname as $val) { - if(isset($this->temp_file[$cnt])) { + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt])) { $arrRet["temp_" . $val] = $this->temp_file[$cnt]; } - if(isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { + if (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { $arrRet["save_" . $val] = $this->save_file[$cnt]; } @@ -279,11 +279,11 @@ function setHiddenFileList($arrPOST) { $cnt = 0; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { $key = "temp_" . $val; - if(isset($arrPOST[$key]) && !empty($arrPOST[$key])) { + if (isset($arrPOST[$key]) && !empty($arrPOST[$key])) { $this->temp_file[$cnt] = $arrPOST[$key]; } $key = "save_" . $val; - if(isset($arrPOST[$key]) && !empty($arrPOST[$key])) { + if (isset($arrPOST[$key]) && !empty($arrPOST[$key])) { $this->save_file[$cnt] = $arrPOST[$key]; } @@ -294,11 +294,11 @@ function setHiddenKikakuFileList($arrPOST) { $cnt = 0; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { $key = "temp_" . $val; - if(isset($arrPOST[$key])) { + if (isset($arrPOST[$key])) { $this->temp_file[$cnt] = $arrPOST[$key]; } $key = "save_" . $val; - if(isset($arrPOST[$key]) && !empty($arrPOST[$key])) { + if (isset($arrPOST[$key]) && !empty($arrPOST[$key])) { $this->save_file[$cnt] = $arrPOST[$key]; } @@ -311,8 +311,8 @@ $arrRet = array(); $cnt = 0; - foreach($this->keyname as $val) { - if(isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { // ファイルパスチェック(パスのスラッシュ/が連続しないようにする。) - if(ereg("/$", $temp_url)) { + if (ereg("/$", $temp_url)) { $arrRet[$val]['filepath'] = $temp_url . $this->temp_file[$cnt]; } else { @@ -322,5 +322,5 @@ } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { // ファイルパスチェック(パスのスラッシュ/が連続しないようにする。) - if(ereg("/$", $save_url)) { + if (ereg("/$", $save_url)) { $arrRet[$val]['filepath'] = $save_url . $this->save_file[$cnt]; } else { @@ -329,7 +329,7 @@ $arrRet[$val]['real_filepath'] = $this->save_dir . $this->save_file[$cnt]; } - if(isset($arrRet[$val]['filepath']) && !empty($arrRet[$val]['filepath'])) { - if($real_size){ - if(is_file($arrRet[$val]['real_filepath'])) { + if (isset($arrRet[$val]['filepath']) && !empty($arrRet[$val]['filepath'])) { + if ($real_size) { + if (is_file($arrRet[$val]['real_filepath'])) { list($width, $height) = getimagesize($arrRet[$val]['real_filepath']); } @@ -338,5 +338,5 @@ // ファイル縦幅 $arrRet[$val]['height'] = $height; - }else{ + } else { // ファイル横幅 $arrRet[$val]['width'] = $this->width[$cnt]; @@ -356,6 +356,6 @@ $arrRet = ""; $cnt = 0; - foreach($this->keyname as $val) { - if(isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { $arrRet = $this->temp_file[$cnt]; } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { @@ -369,6 +369,6 @@ $arrRet = array(); $cnt = 0; - foreach($this->keyname as $val) { - if(isset($this->temp_file[$cnt])) { + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt])) { $arrRet[$val] = $this->temp_file[$cnt]; } elseif (isset($this->save_file[$cnt]) && $this->save_file[$cnt] != "") { @@ -383,8 +383,8 @@ function getDBFileList() { $cnt = 0; - foreach($this->keyname as $val) { - if(isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { + foreach ($this->keyname as $val) { + if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != "") { $arrRet[$val] = $this->temp_file[$cnt]; - } else { + } else { $arrRet[$val] = isset($this->save_file[$cnt]) ? $this->save_file[$cnt] : ""; } @@ -397,6 +397,6 @@ function setDBFileList($arrVal) { $cnt = 0; - foreach($this->keyname as $val) { - if(isset($arrVal[$val]) && $arrVal[$val] != "") { + foreach ($this->keyname as $val) { + if (isset($arrVal[$val]) && $arrVal[$val] != "") { $this->save_file[$cnt] = $arrVal[$val]; } @@ -407,5 +407,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']; } @@ -415,6 +415,6 @@ function setPostFileList($arrPost,$arrVal) { $cnt = 0; - foreach($this->keyname as $val) { - if(isset($arrPost['temp_down_realfilename:' . ($cnt+1)])) { + foreach ($this->keyname as $val) { + if (isset($arrPost['temp_down_realfilename:' . ($cnt+1)])) { $this->temp_file[$cnt] = $arrPost['temp_down_realfilename:' . ($cnt+1)]; } @@ -426,6 +426,6 @@ function setDBImageList($arrVal) { $cnt = 0; - foreach($this->keyname as $val) { - if($arrVal[$val] != "" && $val == 'tv_products_image') { + foreach ($this->keyname as $val) { + if ($arrVal[$val] != "" && $val == 'tv_products_image') { $this->save_file[$cnt] = $arrVal[$val]; } @@ -438,7 +438,7 @@ $objImage = new SC_Image_Ex($this->temp_dir); $cnt = 0; - foreach($this->keyname as $val) { - if($arrVal[$val] != "") { - if($this->save_file[$cnt] == "" && !ereg("^sub/", $arrVal[$val])) { + foreach ($this->keyname as $val) { + if ($arrVal[$val] != "") { + if ($this->save_file[$cnt] == "" && !ereg("^sub/", $arrVal[$val])) { $objImage->deleteImage($arrVal[$val], $this->save_dir); } @@ -452,6 +452,6 @@ $objImage = new SC_Image_Ex($this->temp_dir); $cnt = 0; - if($arrVal['down_realfilename'] != "") { - if($this->save_file[$cnt] == "" && !ereg("^sub/", $arrVal['down_realfilename'])) { + if ($arrVal['down_realfilename'] != "") { + if ($this->save_file[$cnt] == "" && !ereg("^sub/", $arrVal['down_realfilename'])) { $objImage->deleteImage($arrVal['down_realfilename'], $this->save_dir); } @@ -463,6 +463,6 @@ $cnt = 0; $arrRet = array(); - foreach($this->keyname as $val) { - if($val == $keyname || $keyname == "") { + foreach ($this->keyname as $val) { + if ($val == $keyname || $keyname == "") { // 必須であればエラーチェック if ($this->necessary[$cnt] == true) { @@ -504,5 +504,5 @@ function lfGetTmpImageName($rename, $keyname = "", $uploadfile = ""){ - if( $rename === true ){ + if ($rename === true ) { // 一意なIDを取得し、画像名をリネームし保存 $uniqname = date('mdHi') . "_" . uniqid(""); Index: branches/version-2_12-dev/data/class/SC_FormParam.php =================================================================== --- branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21441) @@ -81,12 +81,12 @@ function setParam($arrVal, $seq = false) { $cnt = 0; - if(!$seq){ - foreach($this->keyname as $val) { - if(isset($arrVal[$val])) { + if (!$seq) { + foreach ($this->keyname as $val) { + if (isset($arrVal[$val])) { $this->setValue($val, $arrVal[$val]); } } } else { - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { $this->param[$cnt] = $arrVal[$cnt]; $cnt++; @@ -98,21 +98,21 @@ function setHtmlDispNameArray() { $cnt = 0; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { $find = false; - foreach($this->arrCheck[$cnt] as $val) { - if($val == "EXIST_CHECK") { + foreach ($this->arrCheck[$cnt] as $val) { + if ($val == "EXIST_CHECK") { $find = true; } } - if($find) { + if ($find) { $this->html_disp_name[$cnt] = $this->disp_name[$cnt] . '(※ 必須)'; } else { $this->html_disp_name[$cnt] = $this->disp_name[$cnt]; } - if($this->default[$cnt] != "") { + if ($this->default[$cnt] != "") { $this->html_disp_name[$cnt] .= ' [省略時初期値: ' . $this->default[$cnt] . ']'; } - if($this->input_db[$cnt] == false) { + if ($this->input_db[$cnt] == false) { $this->html_disp_name[$cnt] .= ' [登録・更新不可] '; } @@ -131,7 +131,7 @@ $count = count($arrVal); $no = 1; - for($cnt = 0; $cnt < $count; $cnt++) { + for ($cnt = 0; $cnt < $count; $cnt++) { $key = $keyname.$no; - if($arrVal[$cnt][$keyname] != "") { + if ($arrVal[$cnt][$keyname] != "") { $this->setValue($key, $arrVal[$cnt][$keyname]); } @@ -153,6 +153,6 @@ function setValue($key, $param) { $cnt = 0; - foreach($this->keyname as $val) { - if($val == $key) { + foreach ($this->keyname as $val) { + if ($val == $key) { $this->param[$cnt] = $param; // 複数一致の場合もあるので break してはいけない。 @@ -164,6 +164,6 @@ function toLower($key) { $cnt = 0; - foreach($this->keyname as $val) { - if($val == $key) { + foreach ($this->keyname as $val) { + if ($val == $key) { $this->param[$cnt] = strtolower($this->param[$cnt]); // 複数一致の場合もあるので break してはいけない。 @@ -178,8 +178,8 @@ $cnt = 0; - foreach($this->keyname as $val) { - foreach($this->arrCheck[$cnt] as $func) { + foreach ($this->keyname as $val) { + foreach ($this->arrCheck[$cnt] as $func) { if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; - switch($func) { + switch ($func) { case 'EXIST_CHECK': case 'NUM_CHECK': @@ -217,5 +217,5 @@ // ファイルの存在チェック case 'FILE_EXISTS': - if($this->param[$cnt] != "" && !file_exists($this->check_dir . $this->param[$cnt])) { + if ($this->param[$cnt] != "" && !file_exists($this->check_dir . $this->param[$cnt])) { $objErr->arrErr[$val] = "※ " . $this->disp_name[$cnt] . "のファイルが存在しません。
"; } @@ -223,5 +223,5 @@ // ダウンロード用ファイルの存在チェック case 'DOWN_FILE_EXISTS': - if($this->param[$cnt] != "" && !file_exists(DOWN_SAVE_REALDIR . $this->param[$cnt])) { + if ($this->param[$cnt] != "" && !file_exists(DOWN_SAVE_REALDIR . $this->param[$cnt])) { $objErr->arrErr[$val] = "※ " . $this->disp_name[$cnt] . "のファイルが存在しません。
"; } @@ -270,7 +270,7 @@ $objErr->doFunc(array($disp_name, 0, $length), array($func)); if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { - foreach($objErr->arrErr as $message) { - - if(!SC_Utils_Ex::isBlank($message)) { + foreach ($objErr->arrErr as $message) { + + if (!SC_Utils_Ex::isBlank($message)) { // 再帰した場合は多次元配列のエラーメッセージを生成 $error_var = '$arrErr[$error_key]'; @@ -327,5 +327,5 @@ function getHashArray($arrKey = array()) { $arrRet = array(); - foreach($this->keyname as $index => $keyname) { + foreach ($this->keyname as $index => $keyname) { if (empty($arrKey) || in_array($keyname, $arrKey)) { $arrRet[$keyname] = isset($this->param[$index]) ? $this->param[$index] : ''; @@ -372,5 +372,5 @@ function getFormParamList() { $cnt = 0; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { // キー名 @@ -385,5 +385,5 @@ if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; - if($this->default[$cnt] != "" && $this->param[$cnt] == "") { + if ($this->default[$cnt] != "" && $this->param[$cnt] == "") { $arrRet[$val]['value'] = $this->default[$cnt]; } @@ -407,6 +407,6 @@ $cnt = 0; $ret = null; - foreach($this->keyname as $val) { - if($val == $keyname) { + foreach ($this->keyname as $val) { + if ($val == $keyname) { $ret = isset($this->param[$cnt]) ? $this->param[$cnt] : ""; break; @@ -434,7 +434,7 @@ function splitParamCheckBoxes($keyname) { $cnt = 0; - foreach($this->keyname as $val) { - if($val == $keyname) { - if(isset($this->param[$cnt]) && !is_array($this->param[$cnt])) { + foreach ($this->keyname as $val) { + if ($val == $keyname) { + if (isset($this->param[$cnt]) && !is_array($this->param[$cnt])) { $this->param[$cnt] = explode("-", $this->param[$cnt]); } @@ -507,5 +507,5 @@ function getFormDispArray() { $cnt = 0; - foreach($this->keyname as $val) { + foreach ($this->keyname as $val) { // キー名 $arrRet[$cnt]['keyname'] = $this->keyname[$cnt]; @@ -521,5 +521,5 @@ if (!isset($this->param[$cnt])) $this->param[$cnt] = ""; - if($this->default[$cnt] != "" && $this->param[$cnt] == "") { + if ($this->default[$cnt] != "" && $this->param[$cnt] == "") { $arrRet[$cnt]['value'] = $this->default[$cnt]; } Index: branches/version-2_12-dev/data/class/SC_CheckError.php =================================================================== --- branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21441) @@ -33,5 +33,5 @@ // チェック対象の値が含まれる配列をセットする。 function SC_CheckError($array = "") { - if($array != "") { + if ($array != "") { $this->arrParam = $array; } else { @@ -42,5 +42,5 @@ function doFunc($value, $arrFunc) { - foreach ( $arrFunc as $key ) { + foreach ($arrFunc as $key ) { $this->$key($value); } @@ -54,5 +54,5 @@ */ function HTML_TAG_CHECK($value) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } @@ -61,10 +61,10 @@ preg_match_all("/<([\/]?[a-z]+)/", $this->arrParam[$value[1]], $arrTag); - foreach($arrTag[1] as $val) { + foreach ($arrTag[1] as $val) { $find = false; - foreach($value[2] as $tag) { + foreach ($value[2] as $tag) { $tag = preg_replace('/^\\//', '\/', $tag); - if(preg_match("/^" . $tag . "$/i", $val)) { + if (preg_match("/^" . $tag . "$/i", $val)) { $find = true; break; @@ -72,5 +72,5 @@ } - if(!$find) { + if (!$find) { $this->arrErr[$value[1]] = "※ " . $value[0] . "に許可されていないタグ[" . strtoupper($val) . "]が含まれています。
"; return; @@ -91,5 +91,5 @@ } $this->createParam($value); - if (!is_array($this->arrParam[$value[1]]) && strlen($this->arrParam[$value[1]]) == 0 ){ + if (!is_array($this->arrParam[$value[1]]) && strlen($this->arrParam[$value[1]]) == 0 ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "が入力されていません。
"; } else if (is_array($this->arrParam[$value[1]]) && count($this->arrParam[$value[1]]) == 0) { @@ -106,9 +106,9 @@ */ function EXIST_CHECK_REVERSE( $value ) { - if(isset($this->arrErr[$value[0]])) { - return; - } - $this->createParam($value); - if( strlen($this->arrParam[$value[0]]) == 0 ){ + if (isset($this->arrErr[$value[0]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[0]]) == 0 ) { $this->arrErr[$value[0]] = "※ " . $value[0] . "が入力されていません。
"; } @@ -123,9 +123,9 @@ */ function SPTAB_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(strlen($this->arrParam[$value[1]]) != 0 && preg_match("/^[ 　\t\r\n]+$/", $this->arrParam[$value[1]])){ + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) != 0 && preg_match("/^[ 　\t\r\n]+$/", $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "にスペース、タブ、改行のみの入力はできません。
"; } @@ -140,9 +140,9 @@ */ function NO_SPTAB( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(strlen($this->arrParam[$value[1]]) != 0 && preg_match("/[　 \t\r\n]+/u", $this->arrParam[$value[1]])){ + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) != 0 && preg_match("/[　 \t\r\n]+/u", $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "にスペース、タブ、改行は含めないで下さい。
"; } @@ -151,9 +151,9 @@ /* ゼロで開始されている数値の判定 */ function ZERO_START($value) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(strlen($this->arrParam[$value[1]]) != 0 && preg_match("/^[0]+[0-9]+$/", $this->arrParam[$value[1]])){ + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) != 0 && preg_match("/^[0]+[0-9]+$/", $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "に0で始まる数値が入力されています。
"; } @@ -168,9 +168,9 @@ */ function SELECT_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if( strlen($this->arrParam[$value[1]]) == 0 ){ + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) == 0 ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "が選択されていません。
"; } @@ -185,10 +185,10 @@ */ function EQUAL_CHECK( $value ) { - if(isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) { + if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) { return; } $this->createParam($value); // 文字数の取得 - if( $this->arrParam[$value[2]] !== $this->arrParam[$value[3]]) { + if ($this->arrParam[$value[2]] !== $this->arrParam[$value[3]]) { $this->arrErr[$value[2]] = "※ " . $value[0] . "と" . $value[1] . "が一致しません。
"; } @@ -203,10 +203,10 @@ */ function DIFFERENT_CHECK( $value ) { - if(isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) { + if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) { return; } $this->createParam($value); // 文字数の取得 - if( $this->arrParam[$value[2]] == $this->arrParam[$value[3]]) { + if ($this->arrParam[$value[2]] == $this->arrParam[$value[3]]) { $this->arrErr[$value[2]] = "※ " . $value[0] . "と" . $value[1] . "は、同じ値を使用できません。
"; } @@ -221,10 +221,10 @@ */ function GREATER_CHECK($value) { - if(isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) { + if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) { return; } $this->createParam($value); // 文字数の取得 - if($this->arrParam[$value[2]] != "" && $this->arrParam[$value[3]] != "" && ($this->arrParam[$value[2]] > $this->arrParam[$value[3]])) { + 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] . "より大きい値を入力できません。
"; } @@ -239,10 +239,10 @@ */ function MAX_LENGTH_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); // 文字数の取得 - if( mb_strlen($this->arrParam[$value[1]]) > $value[2] ) { + if (mb_strlen($this->arrParam[$value[1]]) > $value[2] ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "字以下で入力してください。
"; } @@ -257,10 +257,10 @@ */ function MIN_LENGTH_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); // 文字数の取得 - if( mb_strlen($this->arrParam[$value[1]]) < $value[2] ) { + if (mb_strlen($this->arrParam[$value[1]]) < $value[2] ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "字以上で入力してください。
"; } @@ -275,10 +275,10 @@ */ function MAX_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); // 文字数の取得 - if($this->arrParam[$value[1]] > $value[2] ) { + if ($this->arrParam[$value[1]] > $value[2] ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "以下で入力してください。
"; } @@ -293,9 +293,9 @@ */ function MIN_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if($this->arrParam[$value[1]] < $value[2] ) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if ($this->arrParam[$value[1]] < $value[2] ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は" . $value[2] . "以上で入力してください。
"; } @@ -310,9 +310,9 @@ */ function NUM_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if ( $this->numelicCheck($this->arrParam[$value[1]]) ) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if ($this->numelicCheck($this->arrParam[$value[1]]) ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は数字で入力してください。
"; } @@ -327,9 +327,9 @@ */ function NUM_POINT_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if ( strlen($this->arrParam[$value[1]]) > 0 && !is_numeric($this->arrParam[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !is_numeric($this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は数字で入力してください。
"; } @@ -337,9 +337,9 @@ function ALPHA_CHECK($value) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if( strlen($this->arrParam[$value[1]]) > 0 && !ctype_alpha($this->arrParam[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !ctype_alpha($this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は半角英字で入力してください。
"; } @@ -369,6 +369,6 @@ $cnt = 0; - for($i = 1; $i <= 3; $i++) { - if(strlen($this->arrParam[$value[$i]]) > 0) { + for ($i = 1; $i <= 3; $i++) { + if (strlen($this->arrParam[$value[$i]]) > 0) { $cnt++; } @@ -376,11 +376,11 @@ // すべての項目が満たされていない場合を判定(一部だけ入力されている状態) - if($cnt > 0 && $cnt < 3) { + if ($cnt > 0 && $cnt < 3) { $this->arrErr[$value[1]] .= "※ " . $value[0] . "はすべての項目を入力してください。
"; } $total_count = 0; - for($i = 1; $i <= 3; $i++) { - if(strlen($this->arrParam[$value[$i]]) > 0 && strlen($this->arrParam[$value[$i]]) > $telItemLen) { + 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 . "字以内で入力してください。
"; } else if ($this->numelicCheck($this->arrParam[$value[1]])) { @@ -404,6 +404,6 @@ $this->createParam($value); // 既に該当項目にエラーがある場合は、判定しない。 - for($i = 1; $i < $max; $i++) { - if(isset($this->arrErr[$value[$i]])) { + for ($i = 1; $i < $max; $i++) { + if (isset($this->arrErr[$value[$i]])) { return; } @@ -413,11 +413,11 @@ // すべての項目がブランクでないか、すべての項目が入力されていない場合はエラーとする。 - for($i = 1; $i < $max; $i++) { - if(strlen($this->arrParam[$value[$i]]) <= 0) { + for ($i = 1; $i < $max; $i++) { + if (strlen($this->arrParam[$value[$i]]) <= 0) { $blank = true; } } - if($blank) { + if ($blank) { $this->arrErr[$value[1]] = "※ " . $value[0] . "が入力されていません。
"; } @@ -432,6 +432,6 @@ // 既に該当項目にエラーがある場合は、判定しない。 - for($i = 1; $i < $max; $i++) { - if(isset($this->arrErr[$value[$i]])) { + for ($i = 1; $i < $max; $i++) { + if (isset($this->arrErr[$value[$i]])) { return; } @@ -442,6 +442,6 @@ // すべての項目がブランクでないか、すべての項目が入力されていない場合はエラーとする。 - for($i = 1; $i < $max; $i++) { - if(strlen($this->arrParam[$value[$i]]) <= 0) { + for ($i = 1; $i < $max; $i++) { + if (strlen($this->arrParam[$value[$i]]) <= 0) { $blank = true; } else { @@ -450,5 +450,5 @@ } - if($blank && $input) { + if ($blank && $input) { $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; } @@ -463,6 +463,6 @@ $this->createParam($value); // 既に該当項目にエラーがある場合は、判定しない。 - for($i = 1; $i < $max; $i++) { - if(isset($this->arrErr[$value[$i]])) { + for ($i = 1; $i < $max; $i++) { + if (isset($this->arrErr[$value[$i]])) { return; } @@ -472,11 +472,11 @@ // すべての項目がブランクでないか、すべての項目が入力されていない場合はエラーとする。 - for($i = 1; $i < $max; $i++) { - if(strlen($this->arrParam[$value[$i]]) > 0) { + for ($i = 1; $i < $max; $i++) { + if (strlen($this->arrParam[$value[$i]]) > 0) { $input = true; } } - if(!$input) { + if (!$input) { $this->arrErr[$value[1]] = "※ " . $value[0] . "が入力されていません。
"; } @@ -492,6 +492,6 @@ // 既に該当項目にエラーがある場合は、判定しない。 - for($i = 1; $i < $max; $i++) { - if(isset($this->arrErr[$value[$i]])) { + for ($i = 1; $i < $max; $i++) { + if (isset($this->arrErr[$value[$i]])) { return; } @@ -502,9 +502,9 @@ // すべての項目がブランクでないか、すべての項目が入力されていない場合はエラーとする。 - for($i = 1; $i < $max; $i++) { - if(strlen($this->arrParam[$value[$i]]) <= 0) { + for ($i = 1; $i < $max; $i++) { + if (strlen($this->arrParam[$value[$i]]) <= 0) { $blank = true; } else { - if($blank) { + if ($blank) { $error = true; } @@ -512,5 +512,5 @@ } - if($error) { + if ($error) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は先頭の項目から順番に入力して下さい。
"; } @@ -521,9 +521,9 @@ // value[0] = 項目名 value[1] = 判定対象文字列 function KANA_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[ァ-ヶｦ-ﾟー]+$/u", $this->arrParam[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[ァ-ヶｦ-ﾟー]+$/u", $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "はカタカナで入力してください。
"; } @@ -534,9 +534,9 @@ // value[0] = 項目名 value[1] = 判定対象文字列 function KANABLANK_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^([　 \t\r\n]|[ァ-ヶ]|[ー])+$/u", $this->arrParam[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^([　 \t\r\n]|[ァ-ヶ]|[ー])+$/u", $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "はカタカナで入力してください。
"; } @@ -547,9 +547,9 @@ // value[0] = 項目名 value[1] = 判定対象文字列 function ALNUM_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if( strlen($this->arrParam[$value[1]]) > 0 && !ctype_alnum($this->arrParam[$value[1]]) ) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !ctype_alnum($this->arrParam[$value[1]]) ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は英数字で入力してください。
"; } @@ -560,9 +560,9 @@ // value[0] = 項目名 value[1] = 判定対象文字列 function GRAPH_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if( strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:graph:]|[:space:]]+$/i", $this->arrParam[$value[1]] ) ) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:graph:]|[:space:]]+$/i", $this->arrParam[$value[1]] ) ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は英数記号で入力してください。
"; } @@ -574,5 +574,5 @@ function ZERO_CHECK( $value ) { $this->createParam($value); - if($this->arrParam[$value[1]] == "0" ){ + if ($this->arrParam[$value[1]] == "0" ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は1以上を入力してください。
"; } @@ -583,5 +583,5 @@ // value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 最小桁数 value[3] = 最大桁数 function NUM_RANGE_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } @@ -589,5 +589,5 @@ // $this->arrParam[$value[0]] = mb_convert_kana($this->arrParam[$value[0]], 'n'); $count = strlen($this->arrParam[$value[1]]); - if( ( $count > 0 ) && $value[2] > $count || $value[3] < $count ) { + if (( $count > 0 ) && $value[2] > $count || $value[3] < $count ) { $this->arrErr[$value[1]] = "※ $value[0]は$value[2]桁～$value[3]桁で入力して下さい。
"; } @@ -598,10 +598,10 @@ // value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 桁数 function NUM_COUNT_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); $count = strlen($this->arrParam[$value[1]]); - if(($count > 0) && $count != $value[2] ) { + if (($count > 0) && $count != $value[2] ) { $this->arrErr[$value[1]] = "※ $value[0]は$value[2]桁で入力して下さい。
"; } @@ -617,5 +617,5 @@ */ function EMAIL_CHECK( $value ){ - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } @@ -667,9 +667,9 @@ // value[0] = 項目名 value[1] = 判定対象メールアドレス function EMAIL_CHAR_CHECK( $value ){ - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[a-zA-Z0-9_\.@\+\?-]+$/i",$this->arrParam[$value[1]]) ) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[a-zA-Z0-9_\.@\+\?-]+$/i",$this->arrParam[$value[1]]) ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "に使用する文字を正しく入力してください。
"; } @@ -680,8 +680,8 @@ // value[0] = 項目名 value[1] = 判定対象URL function URL_CHECK( $value ){ - if(isset($this->arrErr[$value[1]])) { - return; - } - if( strlen($this->arrParam[$value[1]]) > 0 && !preg_match("@^https?://+($|[a-zA-Z0-9_~=:&\?\.\/-])+$@i", $this->arrParam[$value[1]] ) ) { + if (isset($this->arrErr[$value[1]])) { + return; + } + if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("@^https?://+($|[a-zA-Z0-9_~=:&\?\.\/-])+$@i", $this->arrParam[$value[1]] ) ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "を正しく入力してください。
"; } @@ -691,17 +691,17 @@ // value[0] = 項目名 value[1] = 判定対象IPアドレス文字列 function IP_CHECK( $value ){ - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } //改行コードが含まれている場合には配列に変換 $params = str_replace("\r","",$this->arrParam[$value[1]]); - if(!empty($params)){ - if(strpos($params,"\n") === false){ + if (!empty($params)) { + if (strpos($params,"\n") === false) { $params .= "\n"; } $params = explode("\n",$params); - foreach($params as $param){ + foreach ($params as $param) { $param = trim($param); - if(long2ip(ip2long($param)) != trim($param) && !empty($param)) { + if (long2ip(ip2long($param)) != trim($param) && !empty($param)) { $this->arrErr[$value[1]] = "※ " . $value[0] . "に正しい形式のIPアドレスを入力してください。
"; } @@ -714,10 +714,10 @@ // value[0] = 項目名 value[1] = 判定対象 value[2]=array(拡張子) function FILE_EXT_CHECK( $value ) { - if(isset($this->arrErr[$value[1]]) || count($value[2]) == 0) { - return; - } - $this->createParam($value); - - if($_FILES[$value[1]]['name'] != "" ) { + if (isset($this->arrErr[$value[1]]) || count($value[2]) == 0) { + return; + } + $this->createParam($value); + + if ($_FILES[$value[1]]['name'] != "" ) { $errFlag = 1; $array_ext = explode(".", $_FILES[$value[1]]['name']); @@ -725,5 +725,5 @@ $strExt = ""; - foreach ( $value[2] as $checkExt ){ + foreach ($value[2] as $checkExt ) { $ext = ""; @@ -731,6 +731,6 @@ $count_period = substr_count($checkExt, "."); - if($count_period > 0) { - for($i = max(array_keys($array_ext)) - $count_period; $i < count($array_ext); $i++) { + if ($count_period > 0) { + for ($i = max(array_keys($array_ext)) - $count_period; $i < count($array_ext); $i++) { $ext .= $array_ext[$i] . "."; } @@ -742,9 +742,9 @@ $ext = strtolower($ext); - if ( $ext == $checkExt) { + if ($ext == $checkExt) { $errFlag = 0; } - if($strExt == "") { + if ($strExt == "") { $strExt.= $checkExt; } else { @@ -762,10 +762,10 @@ // value[0] = 項目名 value[1] = 判定対象 value[2] = 指定ディレクトリ function FIND_FILE( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - - $this->createParam($value); - if($value[2] != "") { + if (isset($this->arrErr[$value[1]])) { + return; + } + + $this->createParam($value); + if ($value[2] != "") { $dir = $value[2]; } else { @@ -776,5 +776,5 @@ $path = str_replace("//", "/", $path); - if($this->arrParam[$value[1]] != "" && !file_exists($path)){ + if ($this->arrParam[$value[1]] != "" && !file_exists($path)) { $this->arrErr[$value[1]] = "※ " . $path . "が見つかりません。
"; } @@ -785,9 +785,9 @@ // value[0] = 項目名 value[1] = 判定対象 value[2] = 指定サイズ(KB) function FILE_EXIST_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(!($_FILES[$value[1]]['size'] != "" && $_FILES[$value[1]]['size'] > 0)){ + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (!($_FILES[$value[1]]['size'] != "" && $_FILES[$value[1]]['size'] > 0)) { $this->arrErr[$value[1]] = "※ " . $value[0] . "をアップロードして下さい。
"; } @@ -798,11 +798,11 @@ // value[0] = 項目名 value[1] = 判定対象 value[2] = 指定サイズ(KB) function FILE_SIZE_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if( $_FILES[$value[1]]['size'] > $value[2] * 1024 ){ + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if ($_FILES[$value[1]]['size'] > $value[2] * 1024 ) { $byte = 'KB'; - if( $value[2] >= 1000 ) { + if ($value[2] >= 1000 ) { $value[2] = $value[2] / 1000; $byte = 'MB'; @@ -816,9 +816,9 @@ // value[0] = 項目名 value[1] = 判定対象文字列 function FILE_NAME_CHECK( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if( strlen($_FILES[$value[1]]['name']) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $_FILES[$value[1]]['name']) ) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($_FILES[$value[1]]['name']) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $_FILES[$value[1]]['name']) ) { $this->arrErr[$value[1]] = "※ " . $value[0] . "のファイル名に日本語やスペースは使用しないで下さい。
"; } @@ -829,9 +829,9 @@ // value[0] = 項目名 value[1] = 判定対象文字列 function FILE_NAME_CHECK_BY_NOUPLOAD( $value ) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if( strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $this->arrParam[$value[1]]) || preg_match("/[\\]/" ,$this->arrParam[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:alnum:]_\.-]+$/i", $this->arrParam[$value[1]]) || preg_match("/[\\]/" ,$this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "のファイル名に日本語やスペースは使用しないで下さい。
"; } @@ -844,14 +844,14 @@ // value[3] = DD function CHECK_DATE($value) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); // 少なくともどれか一つが入力されている。 - if($this->arrParam[$value[1]] > 0 || $this->arrParam[$value[2]] > 0 || $this->arrParam[$value[3]] > 0) { + if ($this->arrParam[$value[1]] > 0 || $this->arrParam[$value[2]] > 0 || $this->arrParam[$value[3]] > 0) { // 年月日のどれかが入力されていない。 - if(!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0)) { + if (!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0)) { $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; - } else if ( ! checkdate($this->arrParam[$value[2]], $this->arrParam[$value[3]], $this->arrParam[$value[1]])) { + } else if (! checkdate($this->arrParam[$value[2]], $this->arrParam[$value[3]], $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "が正しくありません。
"; } @@ -867,14 +867,14 @@ // value[5] = mm function CHECK_DATE2($value) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); // 少なくともどれか一つが入力されている。 - if($this->arrParam[$value[1]] > 0 || $this->arrParam[$value[2]] > 0 || $this->arrParam[$value[3]] > 0 || $this->arrParam[$value[4]] >= 0 || $this->arrParam[$value[5]] >= 0) { + if ($this->arrParam[$value[1]] > 0 || $this->arrParam[$value[2]] > 0 || $this->arrParam[$value[3]] > 0 || $this->arrParam[$value[4]] >= 0 || $this->arrParam[$value[5]] >= 0) { // 年月日時のどれかが入力されていない。 - if(!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && strlen($this->arrParam[$value[4]]) > 0 && strlen($this->arrParam[$value[5]]) > 0 )) { + if (!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && strlen($this->arrParam[$value[4]]) > 0 && strlen($this->arrParam[$value[5]]) > 0 )) { $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; - } else if ( ! checkdate($this->arrParam[$value[2]], $this->arrParam[$value[3]], $this->arrParam[$value[1]])) { + } else if (! checkdate($this->arrParam[$value[2]], $this->arrParam[$value[3]], $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "が正しくありません。
"; } @@ -887,14 +887,14 @@ // value[2] = MM function CHECK_DATE3($value) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); // 少なくともどれか一つが入力されている。 - if($this->arrParam[$value[1]] > 0 || $this->arrParam[$value[2]] > 0) { + if ($this->arrParam[$value[1]] > 0 || $this->arrParam[$value[2]] > 0) { // 年月日時のどれかが入力されていない。 - if(!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0)) { + if (!(strlen($this->arrParam[$value[1]]) > 0 && strlen($this->arrParam[$value[2]]) > 0)) { $this->arrErr[$value[1]] = "※ " . $value[0] . "はすべての項目を入力して下さい。
"; - } else if ( ! checkdate($this->arrParam[$value[2]], 1, $this->arrParam[$value[1]])) { + } else if (! checkdate($this->arrParam[$value[2]], 1, $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "が正しくありません。
"; } @@ -955,16 +955,16 @@ // 期間指定 - if(isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[5]])) { + if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[5]])) { return; } $this->createParam($value); $error = 0; - if ( (strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]] ) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]]) ) { + if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]] ) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]]) ) { $this->arrErr[$value[2]] = "※ " . $value[0] . "を正しく指定してください。
"; } - if ( (strlen($this->arrParam[$value[5]]) > 0 || strlen($this->arrParam[$value[6]]) > 0 || strlen($this->arrParam[$value[7]] ) > 0) && ! checkdate($this->arrParam[$value[6]], $this->arrParam[$value[7]], $this->arrParam[$value[5]]) ) { + if ((strlen($this->arrParam[$value[5]]) > 0 || strlen($this->arrParam[$value[6]]) > 0 || strlen($this->arrParam[$value[7]] ) > 0) && ! checkdate($this->arrParam[$value[6]], $this->arrParam[$value[7]], $this->arrParam[$value[5]]) ) { $this->arrErr[$value[5]] = "※ " . $value[1] . "を正しく指定してください。
"; } - if ( (strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && strlen($this->arrParam[$value[4]] ) > 0) && (strlen($this->arrParam[$value[5]]) > 0 || strlen($this->arrParam[$value[6]]) > 0 || strlen($this->arrParam[$value[7]] ) > 0) ){ + if ((strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && strlen($this->arrParam[$value[4]] ) > 0) && (strlen($this->arrParam[$value[5]]) > 0 || strlen($this->arrParam[$value[6]]) > 0 || strlen($this->arrParam[$value[7]] ) > 0) ) { $date1 = $this->arrParam[$value[2]] .sprintf("%02d", $this->arrParam[$value[3]]) .sprintf("%02d",$this->arrParam[$value[4]]) ."000000"; @@ -1006,16 +1006,16 @@ // 期間指定 - if(isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[8]])) { + if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[8]])) { return; } $this->createParam($value); $error = 0; - if ( (strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]] ) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]]) ) { + if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]] ) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]]) ) { $this->arrErr[$value[2]] = "※ " . $value[0] . "を正しく指定してください。
"; } - if ( (strlen($this->arrParam[$value[8]]) > 0 || strlen($this->arrParam[$value[9]]) > 0 || strlen($this->arrParam[$value[10]] ) > 0 || strlen($this->arrParam[$value[11]] ) > 0) && ! checkdate($this->arrParam[$value[9]], $this->arrParam[$value[10]], $this->arrParam[$value[8]]) ) { + if ((strlen($this->arrParam[$value[8]]) > 0 || strlen($this->arrParam[$value[9]]) > 0 || strlen($this->arrParam[$value[10]] ) > 0 || strlen($this->arrParam[$value[11]] ) > 0) && ! checkdate($this->arrParam[$value[9]], $this->arrParam[$value[10]], $this->arrParam[$value[8]]) ) { $this->arrErr[$value[8]] = "※ " . $value[1] . "を正しく指定してください。
"; } - 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) ){ + 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]]); @@ -1025,5 +1025,5 @@ $this->arrErr[$value[2]] = "※ " .$value[0]. "と" .$value[1]. "の期間指定が不正です。
"; } - if($date1 == $date2) { + if ($date1 == $date2) { $this->arrErr[$value[2]] = "※ " .$value[0]. "と" .$value[1]. "の期間指定が不正です。
"; } @@ -1050,16 +1050,16 @@ // 期間指定 - if(isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[4]])) { + if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[4]])) { return; } $this->createParam($value); $error = 0; - if ( (strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0) && ! checkdate($this->arrParam[$value[3]], 1, $this->arrParam[$value[2]]) ) { + if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0) && ! checkdate($this->arrParam[$value[3]], 1, $this->arrParam[$value[2]]) ) { $this->arrErr[$value[2]] = "※ " . $value[0] . "を正しく指定してください。
"; } - if ( (strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[5]], 1, $this->arrParam[$value[4]]) ) { + if ((strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[5]], 1, $this->arrParam[$value[4]]) ) { $this->arrErr[$value[4]] = "※ " . $value[1] . "を正しく指定してください。
"; } - 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 ))) { + if ((strlen($this->arrParam[$value[2]]) > 0 && strlen($this->arrParam[$value[3]]) > 0 && (strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0 ))) { $date1 = $this->arrParam[$value[2]] .sprintf("%02d", $this->arrParam[$value[3]]); @@ -1074,9 +1074,9 @@ //ディレクトリ存在チェック function DIR_CHECK ($value) { - if(isset($this->arrErr[$value[1]])) { - return; - } - $this->createParam($value); - if(!is_dir($this->arrParam[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { + return; + } + $this->createParam($value); + if (!is_dir($this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ 指定した" . $value[0] . "は存在しません。
"; } @@ -1085,8 +1085,8 @@ // ドメインチェック function DOMAIN_CHECK ($value) { - if(isset($this->arrErr[$value[1]])) { - return; - } - if(strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^\.[^.]+\..+/i", $this->arrParam[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { + return; + } + if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^\.[^.]+\..+/i", $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "の形式が不正です。
"; } @@ -1097,10 +1097,10 @@ // value[0] = 項目名 value[1] = 判定対象メールアドレス function MOBILE_EMAIL_CHECK( $value ){ - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } $this->createParam($value); $objMobile = new SC_Helper_Mobile_Ex(); - if(strlen($this->arrParam[$value[1]]) > 0 && !$objMobile->gfIsMobileMailAddress($this->arrParam[$value[1]])) { + if (strlen($this->arrParam[$value[1]]) > 0 && !$objMobile->gfIsMobileMailAddress($this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は携帯電話のものではありません。
"; } @@ -1116,5 +1116,5 @@ */ function CHECK_REGIST_CUSTOMER_EMAIL ($value) { - if(isset($this->arrErr[$value[1]])) { + if (isset($this->arrErr[$value[1]])) { return; } @@ -1122,5 +1122,5 @@ $register_user_flg = SC_Helper_Customer_Ex::sfCheckRegisterUserFromEmail($this->arrParam[$value[1]]); - switch($register_user_flg) { + switch ($register_user_flg) { case 1: $this->arrErr[$value[1]] .= "※ すでに会員登録で使用されている" . $value[0] . "です。
"; @@ -1142,5 +1142,5 @@ */ function PROHIBITED_STR_CHECK( $value ) { - if( isset($this->arrErr[$value[1]]) || empty($this->arrParam[$value[1]]) ) { + if (isset($this->arrErr[$value[1]]) || empty($this->arrParam[$value[1]]) ) { return; } @@ -1150,5 +1150,5 @@ $pattern = '/' . join('|', $prohibitedStr) . '/i'; - if(preg_match_all($pattern, $this->arrParam[$value[1]], $matches)) { + if (preg_match_all($pattern, $this->arrParam[$value[1]], $matches)) { $this->arrErr[$value[1]] = "※ " . $value[0] . "は入力できません。
"; } @@ -1182,5 +1182,5 @@ function evalCheck($value) { // falseは、正当な式と評価する。 - if($value === 'false') { + if ($value === 'false') { return true; } Index: branches/version-2_12-dev/data/class/SC_SendMail.php =================================================================== --- branches/version-2_12-dev/data/class/SC_SendMail.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_SendMail.php (revision 21441) @@ -63,5 +63,5 @@ // 宛先の設定 function setTo($to, $to_name = "") { - if($to != "") { + if ($to != "") { $this->to = $this->getNameAddress($to_name, $to); $this->setRecip('To', $to); @@ -76,5 +76,5 @@ // CCの設定 function setCc($cc, $cc_name = "") { - if($cc != "") { + if ($cc != "") { $this->cc = $this->getNameAddress($cc_name, $cc); $this->setRecip('Cc', $cc); @@ -84,5 +84,5 @@ // BCCの設定 function setBCc($bcc) { - if($bcc != "") { + if ($bcc != "") { $this->bcc = $bcc; $this->setRecip('Bcc', $bcc); @@ -92,5 +92,5 @@ // Reply-Toの設定 function setReplyTo($reply_to) { - if($reply_to != "") { + if ($reply_to != "") { $this->reply_to = $reply_to; } @@ -140,5 +140,5 @@ // 名前<メールアドレス>の形式を生成 function getNameAddress($name, $mail_address) { - if($name != "") { + if ($name != "") { // 制御文字を変換する。 $_name = $name; @@ -190,7 +190,7 @@ // Errors-Toは、ほとんどのSMTPで無視され、Return-Pathが優先されるためReturn_Pathに設定する。 - if($errors_to != "") { + if ($errors_to != "") { $this->return_path = $errors_to; - } else if($return_path != "") { + } else if ($return_path != "") { $this->return_path = $return_path; } else { @@ -207,11 +207,11 @@ $arrHeader['From'] = $this->from; $arrHeader['Return-Path'] = $this->return_path; - if($this->reply_to != "") { + if ($this->reply_to != "") { $arrHeader['Reply-To'] = $this->reply_to; } - if($this->cc != "") { + if ($this->cc != "") { $arrHeader['Cc'] = $this->cc; } - if($this->bcc != "") { + if ($this->bcc != "") { $arrHeader['Bcc'] = $this->bcc; } Index: branches/version-2_12-dev/data/class/SC_Response.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Response.php (revision 21302) +++ branches/version-2_12-dev/data/class/SC_Response.php (revision 21441) @@ -59,5 +59,5 @@ function sendHeader() { // HTTPのヘッダ - foreach ($this->header as $name => $head){ + foreach ($this->header as $name => $head) { header($name.': '.$head); } @@ -113,6 +113,5 @@ $replacement = HTTPS_URL . '\1'; $url = preg_replace($pattern, $replacement, $url); - } - else { + } else { $pattern = '/^' . preg_quote(HTTPS_URL, '/') . '(.*)/'; $replacement = HTTP_URL . '\1'; Index: branches/version-2_12-dev/data/class/util/SC_Utils.php =================================================================== --- branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 21420) +++ branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 21441) @@ -40,5 +40,5 @@ if (!defined('ECCUBE_INSTALL')) { $phpself = $_SERVER['PHP_SELF']; - if( strpos('/install/', $phpself) === false ) { + if (strpos('/install/', $phpself) === false ) { $path = substr($phpself, 0, strpos($phpself, basename($phpself))); $install_url = SC_Utils_Ex::searchInstallerPath($path); @@ -48,5 +48,5 @@ } $path = HTML_REALDIR . 'install/' . DIR_INDEX_FILE; - if(file_exists($path)) { + if (file_exists($path)) { SC_Utils_Ex::sfErrorHeader('>> /install/' . DIR_INDEX_FILE . ' は、インストール完了後にファイルを削除してください。'); } @@ -187,6 +187,6 @@ function sfIsSuccess($objSess, $disp_error = true) { $ret = $objSess->IsSuccess(); - if($ret != SUCCESS) { - if($disp_error) { + if ($ret != SUCCESS) { + if ($disp_error) { // エラーページの表示 SC_Utils_Ex::sfDispError($ret); @@ -197,5 +197,5 @@ // 「リファラ無」 の場合はスルー // 「リファラ有」 かつ 「管理画面からの遷移でない」 場合にエラー画面を表示する - if ( empty($_SERVER['HTTP_REFERER']) ) { + if (empty($_SERVER['HTTP_REFERER']) ) { // TODO 警告表示させる？ // sfErrorHeader('>> referrerが無効になっています。'); @@ -222,5 +222,5 @@ function sfPassLen($passlen){ $ret = ""; - for ($i=0;$i<$passlen;true){ + for ($i=0;$i<$passlen;true) { $ret.="*"; $i++; @@ -253,5 +253,5 @@ // 前画面からPOSTされるuniqidが正しいものかどうかをチェック $uniqid = $objSess->getUniqId(); - if ( !empty($_POST['uniqid']) && ($_POST['uniqid'] === $uniqid) ) { + if (!empty($_POST['uniqid']) && ($_POST['uniqid'] === $uniqid) ) { return true; } else { @@ -262,6 +262,6 @@ /* DB用日付文字列取得 */ function sfGetTimestamp($year, $month, $day, $last = false) { - if($year != "" && $month != "" && $day != "") { - if($last) { + if ($year != "" && $month != "" && $day != "") { + if ($last) { $time = "23:59:59"; } else { @@ -304,5 +304,5 @@ function sfGetCSVData($data, $prefix = ""){ - if($prefix == "") { + if ($prefix == "") { $dir_name = SC_Utils_Ex::sfUpDirName(); $file_name = $dir_name . date('ymdHis') .".csv"; @@ -311,5 +311,5 @@ } - if (mb_internal_encoding() == CHAR_CODE){ + if (mb_internal_encoding() == CHAR_CODE) { $data = mb_convert_encoding($data,'SJIS-Win',CHAR_CODE); } @@ -334,5 +334,5 @@ $conv = ""; $cnt = 1; - for($cnt = 1; $cnt <= $max; $cnt++) { + for ($cnt = 1; $cnt <= $max; $cnt++) { if ($_POST[$keyname . $cnt] == "1") { $conv.= "1"; @@ -350,11 +350,11 @@ function sfMergeCheckBoxes($array, $max) { $ret = ""; - if(is_array($array)) { - foreach($array as $val) { + if (is_array($array)) { + foreach ($array as $val) { $arrTmp[$val] = "1"; } } - for($i = 1; $i <= $max; $i++) { - if(isset($arrTmp[$i]) && $arrTmp[$i] == "1") { + for ($i = 1; $i <= $max; $i++) { + if (isset($arrTmp[$i]) && $arrTmp[$i] == "1") { $ret.= "1"; } else { @@ -371,7 +371,7 @@ function sfMergeParamCheckBoxes($array) { $ret = ''; - if(is_array($array)) { - foreach($array as $val) { - if($ret != "") { + if (is_array($array)) { + foreach ($array as $val) { + if ($ret != "") { $ret.= "-$val"; } else { @@ -408,6 +408,6 @@ $arrRet = array(); $len = strlen($val); - for($i = 0; $i < $len; $i++) { - if(substr($val, $i, 1) == "1") { + for ($i = 0; $i < $len; $i++) { + if (substr($val, $i, 1) == "1") { $arrRet[] = ($i + 1); } @@ -423,5 +423,5 @@ $conv = ""; $cnt = 1; - for($cnt = 1; $cnt <= $max; $cnt++) { + for ($cnt = 1; $cnt <= $max; $cnt++) { if ($_POST[$keyname . $cnt] == "1") { $conv.= "1"; @@ -442,5 +442,5 @@ $no = 1; for ($cnt = 0; $cnt < $len; $cnt++) { - if($keyname != "") { + if ($keyname != "") { $arr[$keyname . $no] = substr($val, $cnt, 1); } else { @@ -457,10 +457,10 @@ $max = count($arrList); - if($len_max != "" && $max > $len_max) { + if ($len_max != "" && $max > $len_max) { $max = $len_max; } - for($cnt = 0; $cnt < $max; $cnt++) { - if($keysize != "") { + for ($cnt = 0; $cnt < $max; $cnt++) { + if ($keysize != "") { $key = SC_Utils_Ex::sfCutString($arrList[$cnt][$keyname], $keysize); } else { @@ -469,5 +469,5 @@ $val = $arrList[$cnt][$valname]; - if(!isset($arrRet[$key])) { + if (!isset($arrRet[$key])) { $arrRet[$key] = $val; } @@ -482,10 +482,10 @@ $max = count($arrList); - if($len_max != "" && $max > $len_max) { + if ($len_max != "" && $max > $len_max) { $max = $len_max; } - for($cnt = 0; $cnt < $max; $cnt++) { - if($keysize != "") { + for ($cnt = 0; $cnt < $max; $cnt++) { + if ($keysize != "") { $key = SC_Utils_Ex::sfCutString($arrList[$cnt][$keyname], $keysize); } else { @@ -494,5 +494,5 @@ $val = $arrList[$cnt][$valname]; - if($connect != "") { + if ($connect != "") { $arrRet[$key].= "$val".$connect; } else { @@ -507,5 +507,5 @@ if (count($array) > 0) { $line = ""; - foreach($array as $val) { + foreach ($array as $val) { if (!in_array($val, $arrPop)) { if ($space) { @@ -532,10 +532,10 @@ $line = ""; if (count($array) > 0) { - foreach($array as $key => $val) { + foreach ($array as $key => $val) { $val = mb_convert_encoding($val, CHAR_CODE, CHAR_CODE); $line .= "\"".$val."\","; } $line = ereg_replace(",$", "\r\n", $line); - }else{ + } else { return false; } @@ -556,13 +556,13 @@ // 期間指定 $error = 0; - if ( $start_month || $start_day || $start_year){ + if ($start_month || $start_day || $start_year) { if ( ! checkdate($start_month, $start_day , $start_year) ) $error = 1; } else { $error = 1; } - if ( $end_month || $end_day || $end_year){ + if ($end_month || $end_day || $end_year) { if ( ! checkdate($end_month ,$end_day ,$end_year) ) $error = 2; } - if ( ! $error ){ + 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"; @@ -581,6 +581,6 @@ // 一致した値のキー名を取得 function sfSearchKey($array, $word, $default) { - foreach($array as $key => $val) { - if($val == $word) { + foreach ($array as $key => $val) { + if ($val == $word) { return $key; } @@ -590,5 +590,5 @@ function sfGetErrorColor($val) { - if($val != "") { + if ($val != "") { return "background-color:" . ERR_COLOR; } @@ -597,5 +597,5 @@ function sfGetEnabled($val) { - if( ! $val ) { + if (! $val ) { return " disabled=\"disabled\""; } @@ -630,5 +630,5 @@ $real_tax = $tax / 100; $ret = $price * $real_tax; - switch($tax_rule) { + switch ($tax_rule) { // 四捨五入 case 1: @@ -671,5 +671,5 @@ // 整数且つ0出なければ桁数指定を行う - if(SC_Utils_Ex::sfIsInt($adjust) and $pow > 1){ + if (SC_Utils_Ex::sfIsInt($adjust) and $pow > 1) { $ret = (round($value * $adjust)/$adjust); } @@ -684,5 +684,5 @@ $real_point = $point_rate / 100; $ret = $price * $real_point; - switch($rule) { + switch ($rule) { // 四捨五入 case 1: @@ -736,5 +736,5 @@ list($y, $m, $d, $H, $M) = preg_split("/[- :]/", $dbdate); - if(strlen($y) > 0 && strlen($m) > 0 && strlen($d) > 0) { + if (strlen($y) > 0 && strlen($m) > 0 && strlen($d) > 0) { if ($time) { $str = sprintf("%04d/%02d/%02d %02d:%02d", $y, $m, $d, $H, $M); @@ -751,7 +751,7 @@ function sfSwapArray($array, $isColumnName = true) { $arrRet = array(); - foreach($array as $key1 => $arr1) { + foreach ($array as $key1 => $arr1) { $index = 0; - foreach($arr1 as $key2 => $val) { + foreach ($arr1 as $key2 => $val) { if ($isColumnName) { $arrRet[$key2][$key1] = $val; @@ -809,5 +809,5 @@ $add_point = $totalpoint - intval($use_point * ($point_rate / 100)); - if($add_point < 0) { + if ($add_point < 0) { $add_point = '0'; } @@ -831,8 +831,8 @@ $ret = ""; - while($str[$i] != "") { + while ($str[$i] != "") { $line[$cnt].=$str[$i]; $i++; - if(strlen($line[$cnt]) > $size) { + if (strlen($line[$cnt]) > $size) { $line[$cnt].="
"; $cnt++; @@ -840,5 +840,5 @@ } - foreach($line as $val) { + foreach ($line as $val) { $ret.=$val; } @@ -848,8 +848,8 @@ // 二回以上繰り返されているスラッシュ[/]を一つに変換する。 function sfRmDupSlash($istr){ - if(ereg("^http://", $istr)) { + if (ereg("^http://", $istr)) { $str = substr($istr, 7); $head = "http://"; - } else if(ereg("^https://", $istr)) { + } else if (ereg("^https://", $istr)) { $str = substr($istr, 8); $head = "https://"; @@ -890,5 +890,5 @@ $ofp = fopen($outpath, "w+"); - while(!feof($ifp)) { + while (!feof($ifp)) { $line = fgets($ifp); $line = mb_convert_encoding($line, $enc_type, 'auto'); @@ -908,6 +908,6 @@ function sfCutString($str, $len, $byte = true, $commadisp = true) { - if($byte) { - if(strlen($str) > ($len + 2)) { + if ($byte) { + if (strlen($str) > ($len + 2)) { $ret =substr($str, 0, $len); $cut = substr($str, $len); @@ -917,5 +917,5 @@ } } else { - if(mb_strlen($str) > ($len + 1)) { + if (mb_strlen($str) > ($len + 1)) { $ret = mb_substr($str, 0, $len); $cut = mb_substr($str, $len); @@ -948,5 +948,5 @@ } - if($commadisp){ + if ($commadisp) { $ret = $ret . "..."; } @@ -966,5 +966,5 @@ // 月の末日が締め日より少ない場合 - if($end_last_day < $close_day) { + if ($end_last_day < $close_day) { // 締め日を月末日に合わせる $end_day = $end_last_day; @@ -1001,12 +1001,12 @@ // 再帰的に多段配列を検索して一次元配列(Hidden引渡し用配列)に変換する。 function sfMakeHiddenArray($arrSrc, $arrDst = array(), $parent_key = "") { - if(is_array($arrSrc)) { - foreach($arrSrc as $key => $val) { - if($parent_key != "") { + if (is_array($arrSrc)) { + foreach ($arrSrc as $key => $val) { + if ($parent_key != "") { $keyname = $parent_key . "[". $key . "]"; } else { $keyname = $key; } - if(is_array($val)) { + if (is_array($val)) { $arrDst = SC_Utils_Ex::sfMakeHiddenArray($val, $arrDst, $keyname); } else { @@ -1040,5 +1040,5 @@ $max = max( count( $keys ), count( $vals ) ); $combine_ary = array(); - for($i=0; $i<$max; $i++) { + for ($i=0; $i<$max; $i++) { $combine_ary[$keys[$i]] = $vals[$i]; } @@ -1053,8 +1053,8 @@ $arrBrothers = array(); - foreach($arrPID as $id) { + foreach ($arrPID as $id) { // 親IDを検索する - for($i = 0; $i < $max; $i++) { - if($arrData[$i][$id_name] == $id) { + for ($i = 0; $i < $max; $i++) { + if ($arrData[$i][$id_name] == $id) { $parent = $arrData[$i][$pid_name]; break; @@ -1062,6 +1062,6 @@ } // 兄弟IDを検索する - for($i = 0; $i < $max; $i++) { - if($arrData[$i][$pid_name] == $parent) { + for ($i = 0; $i < $max; $i++) { + if ($arrData[$i][$pid_name] == $parent) { $arrBrothers[] = $arrData[$i][$id_name]; } @@ -1077,6 +1077,6 @@ $arrChildren = array(); // 子IDを検索する - for($i = 0; $i < $max; $i++) { - if($arrData[$i][$pid_name] == $parent) { + for ($i = 0; $i < $max; $i++) { + if ($arrData[$i][$pid_name] == $parent) { $arrChildren[] = $arrData[$i][$id_name]; } @@ -1107,10 +1107,10 @@ $count++; // 無限ループ回避 $dir = dirname($path); - if(ereg("^[/]$", $dir) || ereg("^[A-Z]:[\\]$", $dir) || $count > 256) { + if (ereg("^[/]$", $dir) || ereg("^[A-Z]:[\\]$", $dir) || $count > 256) { // ルートディレクトリで終了 return; } else { - if(is_writable(dirname($dir))) { - if(!file_exists($dir)) { + if (is_writable(dirname($dir))) { + if (!file_exists($dir)) { mkdir($dir); GC_Utils_Ex::gfPrintLog("mkdir $dir"); @@ -1118,6 +1118,6 @@ } else { SC_Utils_Ex::sfMakeDir($dir); - if(is_writable(dirname($dir))) { - if(!file_exists($dir)) { + if (is_writable(dirname($dir))) { + if (!file_exists($dir)) { mkdir($dir); GC_Utils_Ex::gfPrintLog("mkdir $dir"); @@ -1131,5 +1131,5 @@ // ディレクトリ以下のファイルを再帰的にコピー function sfCopyDir($src, $des, $mess = "", $override = false){ - if(!is_dir($src)){ + if (!is_dir($src)) { return false; } @@ -1139,6 +1139,6 @@ // ディレクトリがなければ作成する - if(!file_exists($des)) { - if(!mkdir($des, $mod[2])) { + if (!file_exists($des)) { + if (!mkdir($des, $mod[2])) { echo 'path:' . $des; } @@ -1147,13 +1147,13 @@ $fileArray=glob( $src."*" ); if (is_array($fileArray)) { - foreach( $fileArray as $key => $data_ ){ + foreach ($fileArray as $key => $data_ ) { // CVS管理ファイルはコピーしない - if(ereg("/CVS/Entries", $data_)) { + if (ereg("/CVS/Entries", $data_)) { break; } - if(ereg("/CVS/Repository", $data_)) { + if (ereg("/CVS/Repository", $data_)) { break; } - if(ereg("/CVS/Root", $data_)) { + if (ereg("/CVS/Root", $data_)) { break; } @@ -1161,11 +1161,11 @@ mb_ereg("^(.*[\/])(.*)",$data_, $matches); $data=$matches[2]; - if( is_dir( $data_ ) ){ + if (is_dir( $data_ ) ) { $mess = SC_Utils_Ex::sfCopyDir( $data_.'/', $des.$data.'/', $mess); - }else{ - if(!$override && file_exists($des.$data)) { + } else { + if (!$override && file_exists($des.$data)) { $mess.= $des.$data . "：ファイルが存在します\n"; } else { - if(@copy( $data_, $des.$data)) { + if (@copy( $data_, $des.$data)) { $mess.= $des.$data . "：コピー成功\n"; } else { @@ -1183,17 +1183,17 @@ // 指定したフォルダ内のファイルを全て削除する function sfDelFile($dir){ - if(file_exists($dir)) { + if (file_exists($dir)) { $dh = opendir($dir); // フォルダ内のファイルを削除 - while($file = readdir($dh)){ + while ($file = readdir($dh)) { if ($file == "." or $file == "..") continue; $del_file = $dir . "/" . $file; - if(is_file($del_file)){ + if (is_file($del_file)) { $ret = unlink($dir . "/" . $file); - }else if (is_dir($del_file)){ + }else if (is_dir($del_file)) { $ret = SC_Utils_Ex::sfDelFile($del_file); } - if(!$ret){ + if (!$ret) { return $ret; } @@ -1232,5 +1232,5 @@ fclose ($file); // 権限を指定 - if($permission != "") { + if ($permission != "") { chmod($path, $permission); } @@ -1268,10 +1268,10 @@ // @versionの記載があるファイルからバージョンを取得する。 function sfGetFileVersion($path) { - if(file_exists($path)) { + if (file_exists($path)) { $src_fp = fopen($path, 'rb'); - if($src_fp) { + if ($src_fp) { while (!feof($src_fp)) { $line = fgets($src_fp); - if(ereg("@version", $line)) { + if (ereg("@version", $line)) { $arrLine = explode(" ", $line); $version = $arrLine[5]; @@ -1294,5 +1294,5 @@ function mbConvertKanaWithArray($array, $arrConvList) { foreach ($arrConvList as $key => $val) { - if(isset($array[$key])) { + if (isset($array[$key])) { $array[$key] = mb_convert_kana($array[$key] ,$val); } @@ -1363,7 +1363,7 @@ // アルファベットと数字でソート natcasesort($arrDir); - foreach($arrDir as $file) { + foreach ($arrDir as $file) { // ./ と ../を除くファイルのみを取得 - if($file != "." && $file != "..") { + if ($file != "." && $file != "..") { $path = $dir."/".$file; @@ -1374,5 +1374,5 @@ // ディレクトリとファイルで格納配列を変える - if(is_dir($path)) { + if (is_dir($path)) { $arrDirList[$cnt]['file_name'] = $file; $arrDirList[$cnt]['file_path'] = $path; @@ -1404,5 +1404,5 @@ */ function sfGetDirSize($dir) { - if(file_exists($dir)) { + if (file_exists($dir)) { // ディレクトリの場合下層ファイルの総量を取得 if (is_dir($dir)) { @@ -1445,5 +1445,5 @@ $dir = ereg_replace("/$", "", $dir); // 最上位層を格納(user_data/) - if(sfDirChildExists($dir)) { + if (sfDirChildExists($dir)) { $arrTree[$cnt]['type'] = "_parent"; } else { @@ -1454,5 +1454,5 @@ $arrTree[$cnt]['count'] = $cnt; // 初期表示はオープン - if($_POST['mode'] != '') { + if ($_POST['mode'] != '') { $arrTree[$cnt]['open'] = lfIsFileOpen($dir, $tree_status); } else { @@ -1476,10 +1476,10 @@ function sfGetFileTreeSub($dir, $default_rank, &$cnt, &$arrTree, $tree_status) { - if(file_exists($dir)) { + if (file_exists($dir)) { if ($handle = opendir("$dir")) { while (false !== ($item = readdir($handle))) $arrDir[] = $item; // アルファベットと数字でソート natcasesort($arrDir); - foreach($arrDir as $item) { + foreach ($arrDir as $item) { if ($item != "." && $item != "..") { // 文末の/を取り除く @@ -1489,5 +1489,5 @@ if (is_dir($path)) { $arrTree[$cnt]['path'] = $path; - if(sfDirChildExists($path)) { + if (sfDirChildExists($path)) { $arrTree[$cnt]['type'] = "_parent"; } else { @@ -1519,5 +1519,5 @@ */ function sfDirChildExists($dir) { - if(file_exists($dir)) { + if (file_exists($dir)) { if (is_dir($dir)) { $handle = opendir($dir); @@ -1544,5 +1544,5 @@ function lfIsFileOpen($dir, $tree_status) { $arrTreeStatus = explode('\|', $tree_status); - if(in_array($dir, $arrTreeStatus)) { + if (in_array($dir, $arrTreeStatus)) { return true; } @@ -1573,5 +1573,5 @@ function sfCreateFile($file, $mode = "") { // 行末の/を取り除く - if($mode != "") { + if ($mode != "") { $ret = @mkdir($file, $mode); } else { @@ -1592,5 +1592,5 @@ $fp = @fopen($filename, 'rb' ); //ファイル内容を全て変数に読み込む - if($fp) { + if ($fp) { $str = @fread($fp, filesize($filename)+1); } @@ -1606,8 +1606,8 @@ */ function getCSVData($array, $arrayIndex) { - for ($i = 0; $i < count($array); $i++){ + for ($i = 0; $i < count($array); $i++) { // インデックスが設定されている場合 - if (is_array($arrayIndex) && 0 < count($arrayIndex)){ - for ($j = 0; $j < count($arrayIndex); $j++ ){ + if (is_array($arrayIndex) && 0 < count($arrayIndex)) { + for ($j = 0; $j < count($arrayIndex); $j++ ) { if ( $j > 0 ) $return .= ","; $return .= "\""; @@ -1615,5 +1615,5 @@ } } else { - for ($j = 0; $j < count($array[$i]); $j++ ){ + for ($j = 0; $j < count($array[$i]); $j++ ) { if ( $j > 0 ) $return .= ","; $return .= "\""; @@ -1634,5 +1634,5 @@ $html = ""; $html.= ""; - foreach($array[0] as $key => $val) { + foreach ($array[0] as $key => $val) { $html.=""; } @@ -1641,7 +1641,7 @@ $cnt = count($array); - for($i = 0; $i < $cnt; $i++) { + for ($i = 0; $i < $cnt; $i++) { $html.= ""; - foreach($array[$i] as $val) { + foreach ($array[$i] as $val) { $html.=""; } @@ -1989,5 +1989,5 @@ $salt = AUTH_MAGIC; } - if ( AUTH_TYPE == 'PLAIN') { + if (AUTH_TYPE == 'PLAIN') { $res = $str; } else { @@ -2009,5 +2009,5 @@ if ($hashpass != '') { if (AUTH_TYPE == 'PLAIN') { - if($pass === $hashpass) { + if ($pass === $hashpass) { $res = true; } @@ -2019,5 +2019,5 @@ $hash = SC_Utils_Ex::sfGetHashString($pass, $salt); } - if($hash === $hashpass) { + if ($hash === $hashpass) { $res = true; } Index: branches/version-2_12-dev/data/class/util/GC_Utils.php =================================================================== --- branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21420) +++ branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21441) @@ -48,5 +48,5 @@ $return = $header.$contents; - if (mb_detect_encoding($return) == CHAR_CODE){ + if (mb_detect_encoding($return) == CHAR_CODE) { // 文字コード変換 $return = mb_convert_encoding($return,'SJIS',CHAR_CODE); @@ -69,10 +69,10 @@ $return = ""; - for ($i=0; $i 0 ) $return .= ","; $return .= "\""; - if ( $arrayIndex ){ + if ($arrayIndex ) { $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\""; } else { @@ -131,5 +131,5 @@ $traces = debug_backtrace(false); $bklv = 1; - if ( $forLogInfo === true ){ + if ($forLogInfo === true ) { $bklv = 3; if( ($traces[3]['class'] === 'LC_Page' @@ -231,5 +231,5 @@ $fp = fopen($path, "a+"); - if($fp) { + if ($fp) { fwrite( $fp, $today." [".$_SERVER['PHP_SELF']."] ".$mess." from ". $_SERVER['REMOTE_ADDR']. "\n" ); fclose( $fp ); @@ -297,5 +297,5 @@ $password = ""; - for($i = 0; $i<$pwLength; $i++ ) { + for ($i = 0; $i<$pwLength; $i++ ) { $password .= $pw[array_rand($pw, 1)]; } Index: branches/version-2_12-dev/data/class/SC_Display.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Display.php (revision 20970) +++ branches/version-2_12-dev/data/class/SC_Display.php (revision 21441) @@ -67,5 +67,5 @@ */ function prepare($page, $is_admin = false){ - if(!$this->deviceSeted || !is_null($this->view)){ + if (!$this->deviceSeted || !is_null($this->view)) { $device = ($is_admin) ? DEVICE_TYPE_ADMIN : $this->detectDevice(); $this->setDevice($device); @@ -101,5 +101,5 @@ function setDevice($device = DEVICE_TYPE_PC){ - switch ($device){ + switch ($device) { case DEVICE_TYPE_MOBILE: $this->response->setContentType("text/html"); Index: branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php =================================================================== --- branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php (revision 21420) +++ branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php (revision 21441) @@ -231,7 +231,7 @@ $arrDirs = explode("/", str_replace("\\", "/", $path)); - foreach($arrDirs as $n){ + foreach ($arrDirs as $n) { $dir .= $n . '/'; - if(!file_exists($dir)) { + if (!file_exists($dir)) { if (!@mkdir($dir)) break; } Index: branches/version-2_12-dev/data/class/SC_SiteSession.php =================================================================== --- branches/version-2_12-dev/data/class/SC_SiteSession.php (revision 21420) +++ branches/version-2_12-dev/data/class/SC_SiteSession.php (revision 21441) @@ -41,6 +41,6 @@ /* 前ページが正当であるかの判定 */ function isPrePage() { - if($_SESSION['site']['pre_page'] != "" && $_SESSION['site']['now_page'] != "") { - if($_SESSION['site']['pre_regist_success'] || $_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(); } @@ -75,6 +75,6 @@ /* ユニークIDのチェック */ function checkUniqId() { - if(!empty($_POST['uniqid'])) { - if($_POST['uniqid'] != $_SESSION['site']['uniqid']) { + if (!empty($_POST['uniqid'])) { + if ($_POST['uniqid'] != $_SESSION['site']['uniqid']) { return false; } Index: branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php =================================================================== --- branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php (revision 21420) +++ branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php (revision 21441) @@ -13,5 +13,5 @@ $convert = "#script tag escaped#"; - if ( preg_match_all($pattern, $value, $matches) ) { + if (preg_match_all($pattern, $value, $matches) ) { return preg_replace($pattern, $convert, $value); } else { Index: branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php =================================================================== --- branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php (revision 21420) +++ branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php (revision 21441) @@ -54,6 +54,6 @@ $extra = ''; - foreach($params as $_key => $_val) { - switch($_key) { + foreach ($params as $_key => $_val) { + switch ($_key) { case 'tags': $$_key = split("\|", $_val); @@ -92,5 +92,5 @@ default: - if(!is_array($_val)) { + if (!is_array($_val)) { $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"'; } else { @@ -121,5 +121,5 @@ } - if(!empty($params['assign'])) { + if (!empty($params['assign'])) { $smarty->assign($params['assign'], $_html_result); } else { @@ -148,5 +148,5 @@ if ($labels) { - if($label_ids) { + if ($label_ids) { $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value)); $_output .= '
$key
$val