Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php =================================================================== --- /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php (revision 21783) +++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php (revision 21829) @@ -24,5 +24,5 @@ // {{{ requires require_once CLASS_REALDIR . 'pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php'; - + /** * オーナーズストア：モジュール管理のページクラス(拡張). Index: /branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php =================================================================== --- /branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php (revision 21807) +++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php (revision 21829) @@ -65,5 +65,5 @@ SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, '', true, 'テンプレートの文字コードがUTF-8ではありません'); } - + // Smartyのコメントを削除 $source = preg_replace( @@ -113,5 +113,5 @@ $source = ''.$source.''; } - + @$this->objDOM->loadHTML($source); $this->lfScanChild($this->objDOM); Index: /branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php =================================================================== --- /branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php (revision 21826) +++ /branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php (revision 21829) @@ -50,7 +50,7 @@ else { $b2 = ''; - if(is_int(strpos($border, 'L'))) + if (is_int(strpos($border, 'L'))) $b2 .= 'L'; - if(is_int(strpos($border, 'R'))) + if (is_int(strpos($border, 'R'))) $b2 .= 'R'; $b = is_int(strpos($border, 'T')) ? $b2.'T' : $b2; 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 21820) +++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php (revision 21829) @@ -67,5 +67,5 @@ return $this->objPage; } - + /* DBに登録されたテンプレートメールの送信 */ function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '') { Index: /branches/version-2_12-dev/data/class/SC_FormParam.php =================================================================== --- /branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21823) +++ /branches/version-2_12-dev/data/class/SC_FormParam.php (revision 21829) @@ -504,6 +504,5 @@ * カスタマイズおよびプラグインで使用されるのを想定 */ - function removeParam($keyname) - { + function removeParam($keyname) { $index = array_search($keyname, $this->keyname); @@ -548,6 +547,5 @@ * @param mixed $value 指定した内容に上書きする */ - function overwriteParam($keyname, $target, $value) - { + function overwriteParam($keyname, $target, $value) { $index = array_search($keyname, $this->keyname); Index: /branches/version-2_12-dev/data/class/SC_MobileUserAgent.php =================================================================== --- /branches/version-2_12-dev/data/class/SC_MobileUserAgent.php (revision 21824) +++ /branches/version-2_12-dev/data/class/SC_MobileUserAgent.php (revision 21829) @@ -123,5 +123,5 @@ } } - + /** * EC-CUBE がサポートする携帯キャリアかどうかを判別する。 Index: /branches/version-2_12-dev/data/class/SC_View.php =================================================================== --- /branches/version-2_12-dev/data/class/SC_View.php (revision 21820) +++ /branches/version-2_12-dev/data/class/SC_View.php (revision 21829) @@ -67,9 +67,5 @@ } - if(SMARTY_FORCE_COMPILE_MODE === true) { - $this->_smarty->force_compile = true; - } else { - $this->_smarty->force_compile = false; - } + $this->_smarty->force_compile = SMARTY_FORCE_COMPILE_MODE === true; // 各filterをセットします. $this->registFilter(); Index: /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php =================================================================== --- /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php (revision 21794) +++ /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php (revision 21829) @@ -53,5 +53,5 @@ */ abstract function install($arrPlugin); - + /** * アンインストール @@ -63,5 +63,5 @@ */ abstract function uninstall($arrPlugin); - + /** * 稼働 @@ -73,5 +73,5 @@ */ abstract function enable($arrPlugin); - + /** * 停止 Index: /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php =================================================================== --- /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php (revision 21794) +++ /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php (revision 21829) @@ -39,5 +39,5 @@ } $arrRet = $objQuery->select($col,$table,$where); - + // プラグインフックポイントを取得. $max = count($arrRet); @@ -129,5 +129,5 @@ return $arrPluginDirectory; } - + /** * プラグインIDをキーに, プラグインフックポイントを取得する. 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 21820) +++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (revision 21829) @@ -79,5 +79,5 @@ $objHelperMail = new SC_Helper_Mail(); $objHelperMail->setPage($this); - + $this->is_multiple = $objPurchase->isMultiple(); 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 21806) +++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (revision 21829) @@ -269,5 +269,5 @@ return SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id, true) . 'css/'; } - + /** * 文字列に[./]表記がないかをチェックします Index: /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php =================================================================== --- /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php (revision 21809) +++ /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php (revision 21829) @@ -461,5 +461,5 @@ return $arrPluginInfo; } - + /** * プラグインクラス内の定数をチェックします. 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 21809) +++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 21829) @@ -78,14 +78,14 @@ switch ($this->getMode()) { case 'down': //商品の並び替えをする。おすすめはデータベースの登録が昇順なので、Modeを逆にする。 - $arrRet = $objQuery->select("best_id", "dtb_best_products", "rank = ?", array($_POST["rank"])); //おすすめidの取得 - $best_id = $arrRet[0]["best_id"]; + $arrRet = $objQuery->select('best_id', 'dtb_best_products', 'rank = ?', array($_POST['rank'])); //おすすめidの取得 + $best_id = $arrRet[0]['best_id']; $objDb->sfRankUp('dtb_best_products','best_id',$best_id); $arrPost = $objFormParam->getHashArray(); $arrItems = $this->getRecommendProducts(); break; - + case 'up': //商品の並び替えをする。おすすめのみデータベースの登録が昇順なので、Modeを逆にする。 - $arrRet = $objQuery->select("best_id", "dtb_best_products", "rank = ?", array($_POST["rank"])); //おすすめidの取得 - $best_id = $arrRet[0]["best_id"]; + $arrRet = $objQuery->select('best_id', 'dtb_best_products', 'rank = ?', array($_POST['rank'])); //おすすめidの取得 + $best_id = $arrRet[0]['best_id']; $objDb->sfRankDown('dtb_best_products','best_id',$best_id); $arrPost = $objFormParam->getHashArray(); 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 21793) +++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php (revision 21829) @@ -57,5 +57,4 @@ function process() { $this->action(); - //SC_Utils::sfPrintR( $this ); $this->sendResponse(); } @@ -125,5 +124,5 @@ $objFormParam->addParam('商品ID', 'search_name', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); $objFormParam->addParam('商品ID', 'search_category_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK')); - $objFormParam->addParam("商品コード", "search_product_code", LTEXT_LEN, 'KVa', array( "MAX_LENGTH_CHECK")); + $objFormParam->addParam('商品コード', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); $objFormParam->addParam('ページ番号', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK')); } @@ -168,5 +167,5 @@ break; case 'search_product_code': - $where .= " AND alldtl.product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? GROUP BY product_id)"; + $where .= ' AND alldtl.product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? GROUP BY product_id)'; $bind[] = '%'.$val.'%'; break; 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 21820) +++ /branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 21829) @@ -292,5 +292,5 @@ $objHelperMail = new SC_Helper_Mail_Ex(); $objHelperMail->setPage($this); - + // メール送信オブジェクトによる送信処理 $objMail = new SC_SendMail(); Index: /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php =================================================================== --- /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (revision 21771) +++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (revision 21829) @@ -91,5 +91,5 @@ function lfGetCalendar($disp_month = 1) { - $today = date("Y/m/d"); + $today = date('Y/m/d'); for ($j = 0; $j <= $disp_month-1; ++$j) { $year = date('Y'); @@ -121,5 +121,5 @@ } - if ($today === sprintf("%04d/%02d/%02d", $year, $month, $objDay->day)) { + if ($today === sprintf('%04d/%02d/%02d', $year, $month, $objDay->day)) { $arrCalendar[$j][$i]['today'] = true; } 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 21805) +++ /branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (revision 21829) @@ -78,5 +78,5 @@ // リクエスト値をフォームにセット $objFormParam->setParam($_POST); - + $url = htmlspecialchars($_POST['url'], ENT_QUOTES); @@ -111,5 +111,5 @@ $objCookie->setCookie('login_email', ''); } - + // 遷移先の制御 if (count($arrErr) == 0) { 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 21803) +++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php (revision 21829) @@ -96,5 +96,5 @@ SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,'',true); } - + } @@ -106,8 +106,8 @@ */ function sendResponse() { - // TODO sendResponseをオーバーライドしている為、afterフックポイントが実行されない.直接実行する.(#1790 ) + // TODO sendResponseをオーバーライドしている為、afterフックポイントが実行されない.直接実行する.(#1790) $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg); $objPlugin->doAction('LC_Page_Mypage_DownLoad_action_after', array($this)); - + $this->objDisplay->noAction();