Index: /branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php
===================================================================
--- /branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php	(revision 22567)
+++ /branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php	(revision 22796)
@@ -88,6 +88,5 @@
  * EC-CUBE のテスト用会員データを生成する
  */
-class CreateEcCubeCustomerData 
-{
+class CreateEcCubeCustomerData {
 
     /** SC_Query インスタンス */
@@ -97,6 +96,5 @@
      * コンストラクタ.
      */
-    function CreateEcCubeCustomerData()
-    {
+    function CreateEcCubeCustomerData() {
         $this->objQuery = new SC_Query();
     }
@@ -107,6 +105,5 @@
      * @return void
      */
-    function createCustomers()
-    {
+    function createCustomers() {
         lfPrintLog("createCustomers START.(" . CUSTOMERS_VOLUME . " data)");
         for ($i = 0; $i < CUSTOMERS_VOLUME; $i++) {
@@ -162,6 +159,5 @@
 
 /** テスト用スクリプトのログ出力関数 */
-function lfPrintLog($mess)
-{
+function lfPrintLog($mess) {
     $path = DATA_REALDIR . "logs/" .  basename(__FILE__, '.php') . ".log";
     GC_Utils::gfPrintLog($mess, $path);
Index: /branches/version-2_12-dev/test/api_test.php
===================================================================
--- /branches/version-2_12-dev/test/api_test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/api_test.php	(revision 22796)
@@ -82,9 +82,7 @@
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 <script type="text/javascript">
-function var_dump(obj)
-{
+function var_dump(obj) {
    var str = '';
-   $.each(obj, function (key, value)
-   {
+   $.each(obj, function (key, value) {
             if(typeof value == "object" && value != null) {
                 str += " Key: \"" + key + "\" {\n" + var_dump(value) + "}\n";
@@ -96,6 +94,5 @@
 }
 
-function makeSignature()
-{
+function makeSignature() {
     $('#mode').val("signature");
     $('#form').submit();
@@ -183,6 +180,5 @@
             $('#dump').text(str);
         }
-        var recverror = function (result, textstatus, errorThrown)
-        {
+        var recverror = function (result, textstatus, errorThrown) {
             $('#res').text(textstatus);
         }
Index: /branches/version-2_12-dev/test/TestSuite.php
===================================================================
--- /branches/version-2_12-dev/test/TestSuite.php	(revision 22567)
+++ /branches/version-2_12-dev/test/TestSuite.php	(revision 22796)
@@ -36,8 +36,6 @@
  */
 
-class TestSuite 
-{
-    public static function suite()
-    {
+class TestSuite {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('ECCUBE');
         $suite->addTest(Page_AllTests::suite());
Index: /branches/version-2_12-dev/test/createEcCubeData-v25.php
===================================================================
--- /branches/version-2_12-dev/test/createEcCubeData-v25.php	(revision 22567)
+++ /branches/version-2_12-dev/test/createEcCubeData-v25.php	(revision 22796)
@@ -87,6 +87,5 @@
  * EC-CUBE のデータを生成する
  */
-class CreateEcCubeData 
-{
+class CreateEcCubeData {
 
     /** SC_Query インスタンス */
@@ -114,6 +113,5 @@
      * コンストラクタ.
      */
-    function CreateEcCubeData()
-    {
+    function CreateEcCubeData() {
         $this->objQuery = new SC_Query();
 
@@ -139,6 +137,5 @@
      * @return void
      */
-    function createCategories()
-    {
+    function createCategories() {
 
         print("カテゴリを生成しています...\n");
@@ -214,6 +211,5 @@
      * @return void
      */
-    function createClassData()
-    {
+    function createClassData() {
         // 規格データ生成
         print("規格データを生成しています...\n");
@@ -254,6 +250,5 @@
      * @return void
      */
-    function relateClass()
-    {
+    function relateClass() {
 
         print("商品と規格の関連づけを行います...\n");
@@ -274,6 +269,5 @@
      * @return void
      */
-    function createProducts()
-    {
+    function createProducts() {
 
         print("商品を生成しています...\n");
@@ -314,6 +308,5 @@
      * @return void
      */
-    function createClass($class_name)
-    {
+    function createClass($class_name) {
         $sqlval = array();
         $arrRaw = array();
@@ -343,6 +336,5 @@
      * @return void
      */
-    function createClassCategory($classcategory_name, $class_id, $class_name)
-    {
+    function createClassCategory($classcategory_name, $class_id, $class_name) {
         $sqlval = array();
         $arrRaw = array();
@@ -383,6 +375,5 @@
      * @return void
      */
-    function createProductsClass($product_id)
-    {
+    function createProductsClass($product_id) {
 
         printf("商品ID %d の商品規格を生成しています...\n", $product_id);
@@ -428,6 +419,5 @@
      * @return void
      */
-    function relateProductsCategories()
-    {
+    function relateProductsCategories() {
 
         print("商品とカテゴリの関連づけを行います...\n");
@@ -448,6 +438,5 @@
      * @return void
      */
-    function createProductsCategories($arrCategory_id, $category_name)
-    {
+    function createProductsCategories($arrCategory_id, $category_name) {
 
         $count = 0;
@@ -679,6 +668,5 @@
     * 総カテゴリ数を計算し、dtb_categoryに代入するrankに使う
     */
-    function lfGetTotalCategoryrank($existingMaxRank = 0)
-    {
+    function lfGetTotalCategoryrank($existingMaxRank = 0){
         $TotalCategoryrank = (TOP_CATEGORIES_VOLUME * MIDDLE_CATEGORIES_VOLUME * SMALL_CATEGORIES_VOLUME) + (MIDDLE_CATEGORIES_VOLUME * TOP_CATEGORIES_VOLUME) + TOP_CATEGORIES_VOLUME + $existingMaxRank;
         return $TotalCategoryrank;
Index: /branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id:SC_DB_DBFactory_Test.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_DBFactory_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_DB_DBFactory_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
@@ -40,6 +39,5 @@
 
     /* TODO
-    function testSfGetDBVersion()
-    {
+    function testSfGetDBVersion() {
         $dbFactory = SC_DB_DBFactory::getInstance();
         $objQuery = new SC_Query(DEFAULT_DSN, true, true);
@@ -57,6 +55,5 @@
     */
 
-    function testFindTableNames()
-    {
+    function testFindTableNames() {
         $dbFactory = SC_DB_DBFactory::getInstance();
         $objQuery = new SC_Query(DEFAULT_DSN);
@@ -65,6 +62,5 @@
     }
 
-    function testConcatColumn()
-    {
+    function testConcatColumn() {
 
         $params = array('column1', 'column2');
@@ -91,6 +87,5 @@
      * 昨日の売上高・売上件数を算出する SQL のテスト.
      */
-    function testGetOrderYesterdaySql()
-    {
+    function testGetOrderYesterdaySql() {
 
         switch (DB_TYPE) {
@@ -121,6 +116,5 @@
      * 当月の売上高・売上件数を算出する SQL のテスト.
      */
-    function testGetOrderMonthSql()
-    {
+    function testGetOrderMonthSql() {
         switch (DB_TYPE) {
         case 'pgsql':
@@ -152,6 +146,5 @@
      * 昨日のレビュー書き込み件数を算出する SQL のテスト.
      */
-    function testGetReviewYesterdaySql()
-    {
+    function testGetReviewYesterdaySql() {
         switch (DB_TYPE) {
         case 'pgsql':
Index: /branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id:SC_DB_MasterData_Test.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_MasterData_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_DB_MasterData_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
@@ -42,6 +41,5 @@
      * SC_DB_MasterData::getMasterData() のテストケース
      */
-    function testGetMasterData()
-    {
+    function testGetMasterData() {
         $columns = array('id', 'name', 'rank');
         $masterData = new SC_DB_MasterData_Ex();
@@ -63,6 +61,5 @@
      * SC_DB_MasterData::updateMasterData() のテストケース
      */
-    function testUpdateMasterData()
-    {
+    function testUpdateMasterData() {
 
         $columns = array('id', 'name', 'rank');
@@ -89,6 +86,5 @@
      * SC_DB_MasterData::createCache() のテストケース.
      */
-    function testCreateCache()
-    {
+    function testCreateCache() {
         $masterData = new SC_DB_MasterData_Ex();
         $masterData->clearCache('mtb_constants');
Index: /branches/version-2_12-dev/test/class/db/DB_AllTests.php
===================================================================
--- /branches/version-2_12-dev/test/class/db/DB_AllTests.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/db/DB_AllTests.php	(revision 22796)
@@ -35,9 +35,7 @@
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class DB_AllTests extends PHPUnit_Framework_TestCase 
-{
+class DB_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('SC_DB');
         $suite->addTestSuite('SC_DB_DBFactory_Test');
Index: /branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php	(revision 22796)
@@ -33,9 +33,7 @@
  * @version $Id$
  */
-class LC_Page_Shopping_LoadPaymentModule_Test extends PHPUnit_Framework_TestCase 
-{
+class LC_Page_Shopping_LoadPaymentModule_Test extends PHPUnit_Framework_TestCase {
 
-    function setUp()
-    {
+    function setUp() {
         $this->objQuery =& SC_Query::getSingletonInstance();
         $this->objQuery->begin();
@@ -43,12 +41,10 @@
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         $this->objQuery->rollback();
         $this->objPage = null;
     }
 
-    function testGetOrderIdBySession()
-    {
+    function testGetOrderIdBySession() {
         $_SESSION['order_id'] = 1;
         $_GET['order_id'] = 2;
@@ -61,6 +57,5 @@
     }
 
-    function testGetOrderIdByPOST()
-    {
+    function testGetOrderIdByPOST() {
         $_GET['order_id'] = 1;
         $_POST['order_id'] = 1;
@@ -72,6 +67,5 @@
     }
 
-    function testGetOrderIdByGET()
-    {
+    function testGetOrderIdByGET() {
         $_GET['order_id'] = 2;
 
@@ -82,11 +76,9 @@
     }
 
-    function testGetOrderIdIsNull()
-    {
+    function testGetOrderIdIsNull() {
         $this->assertFalse($this->objPage->getOrderId());
     }
 
-    function testGetModulePath()
-    {
+    function testGetModulePath() {
         $order_id = 10000;
         $payment_id = 10000;
@@ -100,6 +92,5 @@
     }
 
-    function testGetModulePathIsFailure()
-    {
+    function testGetModulePathIsFailure() {
         $order_id = 10000;
         $payment_id = 10000;
@@ -113,11 +104,9 @@
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
 
-    function setPayment($order_id, $payment_id, $module_path)
-    {
+    function setPayment($order_id, $payment_id, $module_path) {
         $this->objQuery->insert('dtb_order', array('order_id' => $order_id,
                                                    'customer_id' => (int) 0,
Index: /branches/version-2_12-dev/test/class/page/Page_AllTests.php
===================================================================
--- /branches/version-2_12-dev/test/class/page/Page_AllTests.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/page/Page_AllTests.php	(revision 22796)
@@ -33,9 +33,7 @@
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class Page_AllTests extends PHPUnit_Framework_TestCase 
-{
+class Page_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('Page');
         $suite->addTestSuite('LC_Page_Test');
Index: /branches/version-2_12-dev/test/class/page/LC_Page_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/page/LC_Page_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/page/LC_Page_Test.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class LC_Page_Test extends PHPUnit_Framework_TestCase 
-{
+class LC_Page_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
@@ -48,6 +47,5 @@
      */
     /*
-    function testSendRedirect()
-    {
+    function testSendRedirect() {
         $objPage = new LC_Page();
         $result = $objPage->sendRedirect(HTTP_URL);
@@ -60,6 +58,5 @@
      */
     /*
-    function testSendRedirectIsFailed()
-    {
+    function testSendRedirectIsFailed() {
         $objPage = new LC_Page();
         $result = $objPage->sendRedirect("http://www.example.org");
@@ -72,6 +69,5 @@
      * LC_Page::getToken() のテストケース.
      */
-    function testGetToken()
-    {
+    function testGetToken() {
         $objPage = new LC_Page();
 
@@ -89,6 +85,5 @@
      * LC_Page::getLocation() のテストケース.
      */
-    function testGetLocation()
-    {
+    function testGetLocation() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
@@ -104,6 +99,5 @@
      * 絶対パス
      */
-    function testGetLocationWithFullPath()
-    {
+    function testGetLocationWithFullPath() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
@@ -119,6 +113,5 @@
      * QueryString 付与
      */
-    function testGetLocationWithQueryString()
-    {
+    function testGetLocationWithQueryString() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
@@ -136,6 +129,5 @@
      * HTTPS_URL 使用
      */
-    function testGetLocationUseSSL()
-    {
+    function testGetLocationUseSSL() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
@@ -153,6 +145,5 @@
      * DocumentRoot 指定
      */
-    function testGetLocationWithDocumentRoot()
-    {
+    function testGetLocationWithDocumentRoot() {
         $objPage = new LC_Page();
         $documentRoot = realpath(dirname(__FILE__) . "/../../../html");
Index: /branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php	(revision 22796)
@@ -33,9 +33,7 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductClass_Test extends PHPUnit_Framework_TestCase 
-{
-
-    function setUp()
-    {
+class LC_Page_Admin_Products_ProductClass_Test extends PHPUnit_Framework_TestCase {
+
+    function setUp() {
         $this->objQuery =& SC_Query::getSingletonInstance();
         $this->objQuery->begin();
@@ -46,6 +44,5 @@
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         $this->objQuery->rollback();
         $this->objQuery = null;
@@ -53,6 +50,5 @@
     }
 
-    function testInit()
-    {
+    function testInit() {
 
         $this->assertEquals('products/product_class.tpl',
@@ -66,11 +62,9 @@
     }
 
-    function testProcess()
-    {
+    function testProcess() {
         $this->objPage->process();
     }
 
-    function testCreateSearchParams()
-    {
+    function testCreateSearchParams() {
         $keys = array('search_product_id',
                       'search_product_code',
@@ -110,6 +104,5 @@
     }
 
-    function testGetProductName()
-    {
+    function testGetProductName() {
         $product_id = 10000000;
         $this->expected = "テスト商品";
@@ -121,6 +114,5 @@
     }
 
-    function testGetProductsClass()
-    {
+    function testGetProductsClass() {
         $product_id = 10000000;
         $product_class_id = 10000;
@@ -149,6 +141,5 @@
     }
 
-    function testGetAllClass()
-    {
+    function testGetAllClass() {
         $this->clearClass();
         $this->setClass(1000, "大きさ", 1, array('S', 'M', 'L', 'LL'));
@@ -163,6 +154,5 @@
     }
 
-    function testGetAllClassCategory規格1のみ()
-    {
+    function testGetAllClassCategory規格1のみ() {
         $this->clearClass();
         $this->setClass(1000, "大きさ", 1, array('S', 'M', 'L', 'LL'));
@@ -192,6 +182,5 @@
     }
 
-    function testGetAllClassCategory規格1と3()
-    {
+    function testGetAllClassCategory規格1と3() {
         $this->clearClass();
         $this->setClass(1000, "大きさ", 1, array('S', 'M', 'L', 'LL'));
@@ -305,6 +294,5 @@
     }
 
-    function testGetProductsClassAndClasscategory()
-    {
+    function testGetProductsClassAndClasscategory() {
         $product_id = 10000;
         $product_class_id = 1000;
@@ -343,11 +331,9 @@
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
 
-    function setProduct($product_id, $name)
-    {
+    function setProduct($product_id, $name) {
         $val['product_id'] = $product_id;
         $val['name'] = $name;
@@ -357,6 +343,5 @@
     }
 
-    function setProductsClass($product_id, $product_class_id, $class_combination_id = null)
-    {
+    function setProductsClass($product_id, $product_class_id, $class_combination_id = null) {
         $val['product_class_id'] = $product_class_id;
         $val['product_id'] = $product_id;
@@ -380,6 +365,5 @@
     }
 
-    function clearClass()
-    {
+    function clearClass() {
         $this->objQuery->delete('dtb_class');
         $this->objQuery->delete('dtb_classcategory');
@@ -394,6 +378,5 @@
      * @param array $classcategory 規格分類名の配列
      */
-    function setClass($class_id, $class_name, $rank, $classcategory)
-    {
+    function setClass($class_id, $class_name, $rank, $classcategory) {
         $val['class_id'] = $class_id;
         $val['name'] = $class_name;
@@ -414,14 +397,11 @@
 }
 
-class LC_Page_Admin_Products_ProductClass_Mock extends LC_Page_Admin_Products_ProductClass 
-{
-
-    function authorization()
-    {
+class LC_Page_Admin_Products_ProductClass_Mock extends LC_Page_Admin_Products_ProductClass {
+
+    function authorization() {
         // quiet.
     }
 
-    function assignView()
-    {
+    function assignView() {
         // quiet.
     }
Index: /branches/version-2_12-dev/test/class/SC_DbConn_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/SC_DbConn_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/SC_DbConn_Test.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class SC_DbConn_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_DbConn_Test extends PHPUnit_Framework_TestCase {
 
     /** SC_DbConn インスタンス */
@@ -41,18 +40,15 @@
     var $actual;
 
-    function setUp()
-    {
+    function setUp() {
         $this->objDbConn = new SC_DbConn();
         $this->objDbConn->query('BEGIN');
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         $this->objDbConn->query('ROLLBACK');
         $this->objDbConn = null;
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
@@ -61,6 +57,5 @@
      * インスタンスを取得するテストケース.
      */
-    function testGetInstance()
-    {
+    function testGetInstance() {
         $this->expected = true;
         $this->actual = is_object($this->objDbConn);
@@ -72,6 +67,5 @@
      * SC_DbConn:query() を使用して, CREATE TABLE を実行するテストケース.
      */
-    function testCreateTable()
-    {
+    function testCreateTable() {
         $result = $this->createTestTable();
 
@@ -85,6 +79,5 @@
      * SC_DbConn::getAll() のテストケース.
      */
-    function testGetAll()
-    {
+    function testGetAll() {
         $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
@@ -103,6 +96,5 @@
      */
     /*
-    function testGetAllIsError()
-    {
+    function testGetAllIsError() {
 
         // SC_DbConn::getAll() は接続エラーが発生すると 0 を返す
@@ -119,6 +111,5 @@
      * SC_DbConn::getOne() のテストケース.
      */
-    function testGetOne()
-    {
+    function testGetOne() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
@@ -136,6 +127,5 @@
      */
     /*
-    function testGetOneIsError()
-    {
+    function testGetOneIsError() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
@@ -153,6 +143,5 @@
      * SC_DbConn::getRow() のテストケース.
      */
-    function testGetRow()
-    {
+    function testGetRow() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
@@ -168,6 +157,5 @@
      * SC_DbConn::getCol() のテストケース.
      */
-    function testGetCol()
-    {
+    function testGetCol() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
@@ -186,6 +174,5 @@
      */
     /*
-    function testAutoExecuteOfInsert()
-    {
+    function testAutoExecuteOfInsert() {
         $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
@@ -205,6 +192,5 @@
      */
     /*
-    function testAutoExecuteOfUpdate()
-    {
+    function testAutoExecuteOfUpdate() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
@@ -228,6 +214,5 @@
      * SC_DbConn::query() で INSERT を実行するテストケース.
      */
-    function testQuery1()
-    {
+    function testQuery1() {
         $this->createTestTable();
         $sql = "INSERT INTO test_table VALUES (?, ?, ?, ?)";
@@ -249,6 +234,5 @@
      * SC_DbConn::query() で UPDATE を実行するテストケース.
      */
-    function testQuery2()
-    {
+    function testQuery2() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
@@ -273,6 +257,5 @@
      * SC_DbConn::prepare() は未使用
      */
-    function testPrepare()
-    {
+    function testPrepare() {
     }
 
@@ -280,6 +263,5 @@
      * SC_DbConn::execute() は未使用
      */
-    function testExecute()
-    {
+    function testExecute() {
     }
 
@@ -287,10 +269,8 @@
      * SC_DbConn::reset() は未使用
      */
-    function testReset()
-    {
-    }
-
-    function createTestTable()
-    {
+    function testReset() {
+    }
+
+    function createTestTable() {
         $sql = "CREATE TABLE test_table ("
             . "id SERIAL PRIMARY KEY,"
@@ -302,6 +282,5 @@
     }
 
-    function setTestData($column1, $column2, $column3)
-    {
+    function setTestData($column1, $column2, $column3) {
         $fields_values = array($column1, $column2, $column3);
         $sql = "INSERT INTO test_table (column1, column2, column3) VALUES (?, ?, ?)";
Index: /branches/version-2_12-dev/test/class/util/Util_AllTests.php
===================================================================
--- /branches/version-2_12-dev/test/class/util/Util_AllTests.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/util/Util_AllTests.php	(revision 22796)
@@ -33,9 +33,7 @@
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class Util_AllTests extends PHPUnit_Framework_TestCase 
-{
+class Util_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('Util');
         $suite->addTestSuite('SC_Utils_Test');
Index: /branches/version-2_12-dev/test/class/util/SC_Utils_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/util/SC_Utils_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/util/SC_Utils_Test.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class SC_Utils_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Utils_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
@@ -44,6 +43,5 @@
      * 変換無し
      */
-    function testGetRealURL_変換無し()
-    {
+    function testGetRealURL_変換無し() {
         $url = "http://www.example.jp/admin/index.php";
 
@@ -54,6 +52,5 @@
     }
 
-    function testGetRealURL_変換有()
-    {
+    function testGetRealURL_変換有() {
         $url = "http://www.example.jp/admin/../index.php";
 
@@ -64,6 +61,5 @@
     }
 
-    function testGetRealURL_空のディレクトリ()
-    {
+    function testGetRealURL_空のディレクトリ() {
         $url = "http://www.example.jp/admin/..///index.php";
 
@@ -74,6 +70,5 @@
     }
 
-    function testGetRealURL_Dotのディレクトリ()
-    {
+    function testGetRealURL_Dotのディレクトリ() {
         $url = "http://www.example.jp/admin/././../index.php";
 
@@ -84,6 +79,5 @@
     }
 
-    function testIsBlank()
-    {
+    function testIsBlank() {
         $val = "";
         $this->assertTrue(SC_Utils::isBlank($val));
@@ -128,6 +122,5 @@
     }
 
-    function testIsAbsoluteRealPath()
-    {
+    function testIsAbsoluteRealPath() {
         // for *NIX
         if (strpos(PHP_OS, 'WIN') === false) {
@@ -155,6 +148,5 @@
     }
 
-    function testRecursiveMkdir()
-    {
+    function testRecursiveMkdir() {
         $tmp_dir = sys_get_temp_dir();
         $dir = '/foo/bar';
Index: /branches/version-2_12-dev/test/class/SC_Query_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/SC_Query_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/SC_Query_Test.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class SC_Query_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Query_Test extends PHPUnit_Framework_TestCase {
 
     /** SC_Query インスタンス */
@@ -42,12 +41,10 @@
     var $actual;
 
-    function setUp()
-    {
+    function setUp() {
         $this->objQuery = new SC_Query();
         $this->objQuery->begin();
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         // MySQL では CREATE TABLE がロールバックされないので DROP TABLE を行う
         $this->dropTestTable();
@@ -56,6 +53,5 @@
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
@@ -64,6 +60,5 @@
      * インスタンスを取得するテストケース.
      */
-    function testGetInstance()
-    {
+    function testGetInstance() {
         $this->expected = true;
         $this->actual = is_object($this->objQuery);
@@ -75,6 +70,5 @@
      * SC_Query::query() を使用して, CREATE TABLE を実行するテストケース.
      */
-    function testCreateTable()
-    {
+    function testCreateTable() {
         $result = $this->createTestTable();
 
@@ -88,6 +82,5 @@
      * SC_Query::getAll() のテストケース.
      */
-    function testGetAll()
-    {
+    function testGetAll() {
         $result = $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
@@ -105,6 +98,5 @@
      * SC_Query::select() のテストケース.
      */
-    function testSelect()
-    {
+    function testSelect() {
         $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
@@ -126,6 +118,5 @@
      * SC_Query::getOne() のテストケース.
      */
-    function testGetOne()
-    {
+    function testGetOne() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
@@ -142,6 +133,5 @@
      * SC_Query::getRow() のテストケース.
      */
-    function testGetRow()
-    {
+    function testGetRow() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
@@ -157,6 +147,5 @@
      * SC_Query::getCol() のテストケース.
      */
-    function testGetCol()
-    {
+    function testGetCol() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
@@ -174,6 +163,5 @@
      * SC_Query::query() で INSERT を実行するテストケース.
      */
-    function testQuery1()
-    {
+    function testQuery1() {
         $this->createTestTable();
         $sql = "INSERT INTO test_table VALUES (?, ?, ?, ?)";
@@ -192,6 +180,5 @@
     }
 
-    function testInsert()
-    {
+    function testInsert() {
         $this->createTestTable();
 
@@ -215,6 +202,5 @@
      * SC_Query::query() で UPDATE を実行するテストケース.
      */
-    function testQuery2()
-    {
+    function testQuery2() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
@@ -235,6 +221,5 @@
     }
 
-    function testUpdate()
-    {
+    function testUpdate() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
@@ -256,18 +241,15 @@
     }
 
-    function testListTables()
-    {
+    function testListTables() {
         $tables = $this->objQuery->listTables();
         $this->assertTrue(in_array('mtb_zip', $tables));
     }
 
-    function testListSequences()
-    {
+    function testListSequences() {
         $sequences = $this->objQuery->listSequences();
         $this->assertTrue(in_array('dtb_products_product_id', $sequences));
     }
 
-    function testListTableFields()
-    {
+    function testListTableFields() {
         $this->expected = array('id', 'name', 'rank', 'remarks');
         $this->actual = $this->objQuery->listTableFields('mtb_constants');
@@ -275,12 +257,10 @@
     }
 
-    function testListTableIndexes()
-    {
+    function testListTableIndexes() {
         $indexes = $this->objQuery->listTableIndexes('dtb_mobile_kara_mail');
         $this->assertTrue(in_array('dtb_mobile_kara_mail_create_date_key', $indexes));
     }
 
-    function createTestTable()
-    {
+    function createTestTable() {
         $sql = "CREATE TABLE test_table ("
             . "id SERIAL PRIMARY KEY,"
@@ -292,6 +272,5 @@
     }
 
-    function dropTestTable()
-    {
+    function dropTestTable() {
         $tables = $this->objQuery->listTables();
         if (in_array('test_table', $tables)) {
@@ -301,6 +280,5 @@
     }
 
-    function setTestData($column1, $column2, $column3)
-    {
+    function setTestData($column1, $column2, $column3) {
         $fields_values = array($column1, $column2, $column3);
         $sql = "INSERT INTO test_table (column1, column2, column3) VALUES (?, ?, ?)";
Index: /branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php	(revision 22796)
@@ -33,12 +33,10 @@
  * @version $Id$
  */
-class SC_Helper_Session_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Helper_Session_Test extends PHPUnit_Framework_TestCase {
 
     /**
      * getToken() のテストケース.
      */
-    function testGetToken()
-    {
+    function testGetToken() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
@@ -53,6 +51,5 @@
      * isValidToken() のテストケース.
      */
-    function testIsValidToken()
-    {
+    function testIsValidToken() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
@@ -68,6 +65,5 @@
      * isValidToken() のテストケース(POST).
      */
-    function testIsValidTokenWithPost()
-    {
+    function testIsValidTokenWithPost() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
@@ -84,6 +80,5 @@
      * isValidToken() のテストケース(GET).
      */
-    function testIsValidTokenWithGET()
-    {
+    function testIsValidTokenWithGET() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
@@ -102,6 +97,5 @@
      * 値が渡されてない場合
      */
-    function testIsValidTokenNotParam()
-    {
+    function testIsValidTokenNotParam() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
Index: /branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php	(revision 22796)
@@ -57,6 +57,5 @@
     }
 
-    function testRegistAddress()
-    {
+    function testSave() {
         // ダミーの住所を登録
         $sqlval = $this->dummy;
@@ -64,5 +63,5 @@
         // 検証用の住所02
         $sqlval['addr02'] = $create_test = 'create test ' . time();
-        $this->objAddress->registAddress($sqlval);
+        $this->objAddress->save($sqlval);
 
         // 住所02が検証用のものと同じか確認
@@ -74,5 +73,5 @@
         // 更新の検証のために住所02を変更
         $sqlval['addr02'] = $update_test = 'update test ' . time();
-        $this->objAddress->registAddress($sqlval);
+        $this->objAddress->save($sqlval);
 
         // 住所02が検証用のものと同じか検証
@@ -85,15 +84,14 @@
      * @depends testSave
      */
-    function testGetAddress()
-    {
+    function testGet() {
         // testSave のテストが通っていること前提
         $sqlval = $this->dummy;
         $sqlval['customer_id'] = $this->customer_id;
         $sqlval['addr02'] = 'get test';
-        $this->objAddress->registAddress($sqlval);
+        $this->objAddress->save($sqlval);
         $this->objQuery->setOrder('other_deliv_id DESC');
         $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
         // DBに正しく記録され、取得できているか確認
-        $address = $this->objAddress->getAddress($other_deliv_id);
+        $address = $this->objAddress->get($other_deliv_id);
         $result = TRUE;
         foreach ($sqlval as $key => $value) {
@@ -108,11 +106,10 @@
      * @depends testSave
      */
-    function testGetList()
-    {
+    function testGetList() {
         // testSave のテストが通っていること前提
         $sqlval = $this->dummy;
         $sqlval['customer_id'] = $this->customer_id;
         $sqlval['addr02'] = 'getList test';
-        $this->objAddress->registAddress($sqlval);
+        $this->objAddress->save($sqlval);
         $list = $this->objAddress->getList($this->customer_id);
         $found = FALSE;
@@ -135,14 +132,13 @@
      * @depends testSave
      */
-    function testDeleteAddress()
-    {
+    function testDelete() {
         // testSave のテストが通っていること前提
         $sqlval = $this->dummy;
         $sqlval['customer_id'] = $this->customer_id;
         $sqlval['addr02'] = 'delete test';
-        $this->objAddress->registAddress($sqlval);
+        $this->objAddress->save($sqlval);
         $this->objQuery->setOrder('other_deliv_id DESC');
         $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
-        $this->objAddress->deleteAddress($other_deliv_id);
+        $this->objAddress->delete($other_deliv_id);
         $result = $this->objQuery->getRow('*', 'dtb_other_deliv', 'customer_id = ? and other_deliv_id = ?', array($this->customer_id, $other_deliv_id));
         $this->assertNull($result);
Index: /branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php	(revision 22796)
@@ -33,12 +33,10 @@
  * @version $Id$
  */
-class SC_Helper_DB_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Helper_DB_Test extends PHPUnit_Framework_TestCase {
 
     /**
      * sfColumnExists() のテストケース.
      */
-    function testSfColumnExists()
-    {
+    function testSfColumnExists() {
         $objDb = new SC_Helper_DB_Ex();
         $this->assertEquals(true, $objDb->sfColumnExists('mtb_zip', 'zipcode'));
Index: /branches/version-2_12-dev/test/class/helper/Helper_AllTests.php
===================================================================
--- /branches/version-2_12-dev/test/class/helper/Helper_AllTests.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/helper/Helper_AllTests.php	(revision 22796)
@@ -36,9 +36,7 @@
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class Helper_AllTests extends PHPUnit_Framework_TestCase 
-{
+class Helper_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('SC_Helper');
         $suite->addTestSuite('SC_Helper_DB_Test');
Index: /branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php
===================================================================
--- /branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php	(revision 22567)
+++ /branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase {
     /**
      * @var SC_Helper_Purchase
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_reduceStockTest extends SC_Product_TestBase
-{
+class SC_Product_reduceStockTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testReduceStock_減少数０はFalse()
-    {
+    public function testReduceStock_減少数０はFalse() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -36,6 +32,5 @@
     }
     
-    public function testReduceStock_減少数1はTrue()
-    {
+    public function testReduceStock_減少数1はTrue() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -50,6 +45,5 @@
     }
     
-    public function testReduceStock_在庫数をマイナスにする数はFalse()
-    {
+    public function testReduceStock_在庫数をマイナスにする数はFalse() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -65,6 +59,5 @@
     
         
-    public function testReduceStock_在庫数無限の場合はTrue()
-    {
+    public function testReduceStock_在庫数無限の場合はTrue() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php	(revision 22796)
@@ -6,21 +6,17 @@
  *
  */
-class SC_Product_setProductsOrderTest extends SC_Product_TestBase
-{
+class SC_Product_setProductsOrderTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
-    public function testSetProductsOrder_デフォルト引数()
-    {
+    public function testSetProductsOrder_デフォルト引数() {
         $this->objProducts->setProductsOrder('name');
 
@@ -31,6 +27,5 @@
     }
 
-    public function testSetProductsOrder_引数指定()
-    {
+    public function testSetProductsOrder_引数指定() {
         $this->objProducts->setProductsOrder('name', 'dtb_products_class', 'DESC');
 
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_findProductsOrderTest extends SC_Product_TestBase
-{
+class SC_Product_findProductsOrderTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testFindProductIdsOrder_商品ID降順()
-    {
+    public function testFindProductIdsOrder_商品ID降順() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -37,6 +33,5 @@
     }
 
-    public function testFindProductIdsOrder_商品名昇順()
-    {
+    public function testFindProductIdsOrder_商品名昇順() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -52,6 +47,5 @@
     }
     
-    public function testFindProductIdsOrder_arrOrderDataの設定による並び順()
-    {
+    public function testFindProductIdsOrder_arrOrderDataの設定による並び順() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getBuyLimitTest extends SC_Product_TestBase
-{
+class SC_Product_getBuyLimitTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetBuyLimit_商品数無限の場合販売制限なし()
-    {
+    public function testGetBuyLimit_商品数無限の場合販売制限なし() {
         
         $product = array('stock_unlimited' => '1'
@@ -34,6 +30,5 @@
     }
     
-    public function testGetBuyLimit_商品販売数制限数を返す()
-    {
+    public function testGetBuyLimit_商品販売数制限数を返す() {
         
         $product = array('stock_unlimited' => '1'
@@ -46,6 +41,5 @@
     }
     
-    public function testGetBuyLimit_商品在庫数を制限として返す()
-    {
+    public function testGetBuyLimit_商品在庫数を制限として返す() {
         
         $product = array('stock_unlimited' => null
@@ -58,6 +52,5 @@
     }
 
-    public function testGetBuyLimit_販売制限数大なり在庫数なら在庫数を返す()
-    {
+    public function testGetBuyLimit_販売制限数大なり在庫数なら在庫数を返す() {
         
         $product = array('stock_unlimited' => null
@@ -70,6 +63,5 @@
     }
     
-    public function testGetBuyLimit_販売制限数少なり在庫数なら販売制限数()
-    {
+    public function testGetBuyLimit_販売制限数少なり在庫数なら販売制限数() {
         
         $product = array('stock_unlimited' => null
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_listsTest extends SC_Product_TestBase
-{
+class SC_Product_listsTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testlists_商品一覧取得()
-    {
+    public function testlists_商品一覧取得() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getDetailAndProductsClassTest extends SC_Product_TestBase
-{
+class SC_Product_getDetailAndProductsClassTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetDetailAndProductsClass_商品規格IDの商品情報と規格情報を返す()
-    {
+    public function testGetDetailAndProductsClass_商品規格IDの商品情報と規格情報を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -54,8 +50,8 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
                 ,'maker_id' => null
                 ,'comment4' => null
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_setProductStatusTest extends SC_Product_TestBase
-{
+class SC_Product_setProductStatusTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,12 +19,10 @@
     /////////////////////////////////////////
 
-    public function testSetProductStatus_登録した商品ステータスを返す()
-    {
+    public function testSetProductStatus_登録した商品ステータスを返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
         $this->setUpProductStatus();
-        $_SESSION['member_id'] = 1;
-         
+        
         $this->objProducts->setProductStatus('1001', array('2','3','4'));
 
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getDetailTest extends SC_Product_TestBase
-{
+class SC_Product_getDetailTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetDetail_商品IDの詳細情報を返す()
-    {
+    public function testGetDetail_商品IDの詳細情報を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -54,8 +50,8 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
                 ,'maker_id' => null
                 ,'comment4' => null
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getProductStatusTest extends SC_Product_TestBase
-{
+class SC_Product_getProductStatusTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetProductStatus_商品IDなしは空の配列を返す()
-    {
+    public function testGetProductStatus_商品IDなしは空の配列を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -37,6 +33,5 @@
     }
     
-    public function testGetProductStatus_指定した商品IDの商品ステータスを返す()
-    {
+    public function testGetProductStatus_指定した商品IDの商品ステータスを返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getProductsClassByProductIdsTest extends SC_Product_TestBase
-{
+class SC_Product_getProductsClassByProductIdsTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetProductsClassByProductIds_商品IDなしは空配列を返す()
-    {
+    public function testGetProductsClassByProductIds_商品IDなしは空配列を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -37,6 +33,5 @@
     }
     
-    public function testGetProductsClassByProductIds_指定の商品IDの情報を返す()
-    {
+    public function testGetProductsClassByProductIds_指定の商品IDの情報を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -78,6 +73,5 @@
     }
     
-    public function testGetProductsClassByProductIds_削除商品含む商品情報を返す()
-    {
+    public function testGetProductsClassByProductIds_削除商品含む商品情報を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getListsByProductIdsTest extends SC_Product_TestBase
-{
+class SC_Product_getListsByProductIdsTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetListByProductIds_商品ID指定がない場合は空配列()
-    {
+    public function testGetListByProductIds_商品ID指定がない場合は空配列() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -35,6 +31,5 @@
     }
     
-    public function testGetListByProductIds_指定の商品IDで情報を取得する()
-    {
+    public function testGetListByProductIds_指定の商品IDで情報を取得する() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -69,8 +64,8 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
             )
         );
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getProductsClassTest extends SC_Product_TestBase
-{
+class SC_Product_getProductsClassTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetProductsClass_商品規格IDから規格情報を返す()
-    {
+    public function testGetProductsClass_商品規格IDから規格情報を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php	(revision 22796)
@@ -6,13 +6,10 @@
  *
  */
-class SC_Product_TestBase extends Common_TestCase
-{
-    protected function setUp()
-    {
+class SC_Product_TestBase extends Common_TestCase {
+    protected function setUp() {
         parent::setUp();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -21,6 +18,5 @@
      * DBに商品クラス情報を設定します.
      */
-    protected function setUpProductClass()
-    {
+    protected function setUpProductClass() {
         $product_class = array(
             array(
@@ -63,6 +59,5 @@
 
         $this->objQuery->delete('dtb_products_class');
-        foreach ($product_class as $key => $item)
-{
+        foreach ($product_class as $key => $item) {
             $this->objQuery->insert('dtb_products_class', $item);
         }
@@ -74,6 +69,5 @@
      * DBに製品カテゴリ情報を登録します.
      */
-    protected function setUpClassCategory()
-    {
+    protected function setUpClassCategory() {
         $class_category = array(
             array(
@@ -102,6 +96,5 @@
      * DBに製品情報を登録します.
      */
-    protected function setUpProducts()
-    {
+    protected function setUpProducts() {
         $products = array(
             array(
@@ -163,6 +156,5 @@
      * DBに商品ステータス情報を登録します.
      */
-    protected function setUpProductStatus()
-    {
+    protected function setUpProductStatus() {
         $class_category = array(
             array(
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_findProductCountTest extends SC_Product_TestBase
-{
+class SC_Product_findProductCountTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testFindProductCount_すべての商品数を返す()
-    {
+    public function testFindProductCount_すべての商品数を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
@@ -35,6 +31,5 @@
     }
     
-    public function testFindProductCount_検索条件に一致する商品数を返す()
-    {
+    public function testFindProductCount_検索条件に一致する商品数を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php	(revision 22796)
@@ -6,15 +6,12 @@
  *
  */
-class SC_Product_getProductsClassByQueryTest extends SC_Product_TestBase
-{
+class SC_Product_getProductsClassByQueryTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -22,6 +19,5 @@
     /////////////////////////////////////////
 
-    public function testGetProductsClassByQuery_クエリに該当する商品情報を返す()
-    {
+    public function testGetProductsClassByQuery_クエリに該当する商品情報を返す() {
         $this->setUpProductClass();
         $this->setUpProducts();
Index: /branches/version-2_12-dev/tests/class/Common_TestCase.php
===================================================================
--- /branches/version-2_12-dev/tests/class/Common_TestCase.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/Common_TestCase.php	(revision 22796)
@@ -14,6 +14,5 @@
  *
  */
-class Common_TestCase extends PHPUnit_Framework_TestCase
-{
+class Common_TestCase extends PHPUnit_Framework_TestCase {
 
   /** SC_Query インスタンス */
@@ -25,12 +24,10 @@
   protected $actual;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     $this->objQuery = SC_Query_Ex::getSingletonInstance();
     $this->objQuery->begin();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     $this->objQuery->rollback();
     $this->objQuery = null;
@@ -41,6 +38,5 @@
    * 呼び出す前に、$expectedに期待値を、$actualに実際の値を導入してください。
    */
-  protected function verify($message = null)
-  {
+  protected function verify($message = null) {
     $this->assertEquals($this->expected, $this->actual, $message);
   }
@@ -54,6 +50,5 @@
    */
   /**
-  public function testExit()
-  {
+  public function testExit() {
     $resp = new SC_Response_Ex();
     $resp->actionExit();
@@ -69,6 +64,5 @@
    */
   /**
-  public function testDeviceType()
-  {
+  public function testDeviceType() {
     $this->expected = array(DEVICE_TYPE_MOBILE, DEVICE_TYPE_SMARTPHONE);
     $this->actual = array();
@@ -88,6 +82,5 @@
    */
   /**
-  public function testLoginState()
-  {
+  public function testLoginState() {
     $this->expected = array(FALSE, TRUE);
     $this->actual = array();
Index: /branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php
===================================================================
--- /branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php	(revision 22796)
@@ -4,6 +4,5 @@
  * テスト用にexitしないSC_Responseクラスです。
  */
-class SC_Response_Ex extends SC_Response
-{
+class SC_Response_Ex extends SC_Response {
 
   /** exitしたかどうかを保持するフラグ */
@@ -15,6 +14,5 @@
    * SC_Response::actionExit()をラップし、PHPをexitさせないようにします。
    */
-  function actionExit()
-  {
+  function actionExit() {
     $this->exited = TRUE;
   }
@@ -24,6 +22,5 @@
    * また、リダイレクト先のパスを取得できるようにします。
    */
-  function sendRedirect($location, $arrQueryString = array(), $inheritQuerySring = false, $useSsl = null)
-  {
+  function sendRedirect($location, $arrQueryString = array(), $inheritQuerySring = false, $useSsl = null) {
     $this->exited = TRUE;
     $this->redirectPath = $location;
@@ -33,6 +30,5 @@
    * actionExit()が呼ばれたかどうかを取得します。
    */
-  public function isExited()
-  {
+  public function isExited() {
     return $this->exited;
   }
@@ -41,6 +37,5 @@
    * sendRedirect()で指定されたパスを取得します。 
    */
-  public function getRedirectPath()
-  {
+  public function getRedirectPath() {
     return $this->redirectPath;
   }
Index: /branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php
===================================================================
--- /branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php	(revision 22796)
@@ -4,6 +4,5 @@
  * テスト用にSC_Displayクラスを変更してユーザエージェントを自在に設定できるようにしたクラスです。
  */
-class SC_Display_Ex extends SC_Display
-{
+class SC_Display_Ex extends SC_Display {
 
   /** テスト用に設定した端末種別 */
@@ -16,6 +15,5 @@
    * @return    integer 端末種別ID
    */
-  public static function detectDevice($reset = FALSE)
-  {
+  public static function detectDevice($reset = FALSE) {
     return self::$dummyDevice;
   }
@@ -27,6 +25,5 @@
    * @param     $deviceType 端末種別ID
    */
-  public static function setDummyDevice($deviceType)
-  {
+  public static function setDummyDevice($deviceType) {
     self::$dummyDevice = $deviceType;
   }
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_getValueTest extends Common_TestCase
-{
+class SC_Session_getValueTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testSetNowPage_セッションの値を取得する()
-    {
+    public function testSetNowPage_セッションの値を取得する() {
         $this->expected = $_SERVER['SCRIPT_NAME'];
         $this->actual = $this->objSiteSession->getValue('now_page');
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_setNowPageTest extends Common_TestCase
-{
+class SC_Session_setNowPageTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testSetNowPage_now_pageにパスを設定する()
-    {
+    public function testSetNowPage_now_pageにパスを設定する() {
         $this->expected = 'test.php';
         $this->objSiteSession->setNowPage('test.php');
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_isPrepageTest extends Common_TestCase
-{
+class SC_Session_isPrepageTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testIsPrepage_sessionが空の場合_false()
-    {
+    public function testIsPrepage_sessionが空の場合_false() {
         $this->expected = false;
         $this->actual = $this->objSiteSession->isPrepage();
@@ -48,6 +44,5 @@
     }
     
-    public function testIsPrepage_prepageとnowpageが違う場合_false()
-    {
+    public function testIsPrepage_prepageとnowpageが違う場合_false() {
         $this->expected = false;
         $_SESSION['site']['pre_page'] = 'test.php';
@@ -56,6 +51,5 @@
     }
     
-    public function testIsPrepage_prepageとnowpageが同じの場合_true()
-    {
+    public function testIsPrepage_prepageとnowpageが同じの場合_true() {
         $this->expected = true;
         $_SESSION['site']['pre_page'] = $_SERVER['SCRIPT_NAME'];
@@ -64,6 +58,5 @@
     }
     
-    public function testIsPrepage_pre_regist_successがtrueの場合_true()
-    {
+    public function testIsPrepage_pre_regist_successがtrueの場合_true() {
         $this->expected = true;
         $_SESSION['site']['pre_page'] = 'test.php';
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_setRegistFlagTest extends Common_TestCase
-{
+class SC_Session_setRegistFlagTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testSetRegistFlag_TRUEがセットされる()
-    {
+    public function testSetRegistFlag_TRUEがセットされる() {
         $this->objSiteSession->setRegistFlag();
         $this->assertTrue($_SESSION['site']['regist_success'],'登録成功フラグ');
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_setUniqIdTest extends Common_TestCase
-{
+class SC_Session_setUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testSetUniqId_ユニークなID設定する()
-    {
+    public function testSetUniqId_ユニークなID設定する() {
         $this->objSiteSession->setUniqId();
         $this->assertNotEmpty($_SESSION['site']['uniqid'], 'ユニークID');
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_checkUniqIdTest extends Common_TestCase
-{
+class SC_Session_checkUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testCheckUniqId_POST値がない場合_True()
-    {
+    public function testCheckUniqId_POST値がない場合_True() {
         $_POST = null;
         $this->expected = true;
@@ -49,6 +45,5 @@
     }
     
-    public function testCheckUniqId_POSTとセッションのUniqIDが一致する場合_True()
-    {
+    public function testCheckUniqId_POSTとセッションのUniqIDが一致する場合_True() {
         $_POST['uniqid'] = '1234567890';
         $_SESSION['site']['uniqid'] = '1234567890';
@@ -59,6 +54,5 @@
     }
     
-    public function testCheckUniqId_POSTとセッションのUniqIDが一致しない場合_False()
-    {
+    public function testCheckUniqId_POSTとセッションのUniqIDが一致しない場合_False() {
         $_POST['uniqid'] = '0987654321';
         $_SESSION['site']['uniqid'] = '1234567890';
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_unsetUniqIdTest extends Common_TestCase
-{
+class SC_Session_unsetUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testUnsetUniqId_uniqIDを解除する()
-    {
+    public function testUnsetUniqId_uniqIDを解除する() {
         $_SESSION['site']['uniqid'] = '1234567890';
         $this->objSiteSession->unsetUniqId();
Index: /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_getUniqIdTest extends Common_TestCase
-{
+class SC_Session_getUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Mock();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetUniqId_設定済みのユニークなID取得する()
-    {
+    public function testGetUniqId_設定済みのユニークなID取得する() {
         $_SESSION['site']['uniqid'] = '0987654321';
         $this->expected = '0987654321';
@@ -49,6 +45,5 @@
     }
     
-    public function testGetUniqId_新たにユニークなID取得する()
-    {
+    public function testGetUniqId_新たにユニークなID取得する() {
         $_SESSION['site']['uniqid'] = '';
         $this->expected = '1234567890';
@@ -58,8 +53,6 @@
 }
 
-class SC_SiteSession_Mock extends SC_SiteSession_Ex
-{
-    function setUniqId()
-    {
+class SC_SiteSession_Mock extends SC_SiteSession_Ex {
+    function setUniqId() {
         $_SESSION['site']['uniqid'] = '1234567890';
     }
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Utils_sfTaxTest extends Common_TestCase
-{
+class SC_Utils_sfTaxTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTax_四捨五入の場合_四捨五入の結果になる()
-  {
+  public function testSfTax_四捨五入の場合_四捨五入の結果になる() {
     $this->expected = array(1, 2);
     $this->actual[0] = SC_Utils::sfTax(140, 1, 1); // 1:四捨五入
@@ -55,6 +51,5 @@
   }
 
-  public function testSfTax_切り捨ての場合_切り捨ての結果になる()
-  {
+  public function testSfTax_切り捨ての場合_切り捨ての結果になる() {
     $this->expected = array(2, 3);
     $this->actual[0] = SC_Utils::sfTax(140, 2, 2); // 2:切り捨て
@@ -64,6 +59,5 @@
   }
 
-  public function testSfTax_切り上げの場合_切り上げの結果になる()
-  {
+  public function testSfTax_切り上げの場合_切り上げの結果になる() {
     $this->expected = array(2, 2);
     $this->actual[0] = SC_Utils::sfTax(140, 1, 3); // 3:切り上げ
@@ -73,6 +67,5 @@
   }
 
-  public function testSfTax_それ以外の場合_切り上げの結果になる()
-  {
+  public function testSfTax_それ以外の場合_切り上げの結果になる() {
     $this->expected = array(2, 2);
     $this->actual[0] = SC_Utils::sfTax(140, 1, 4);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_jsonEncodeTest extends Common_TestCase
-{
+class SC_Utils_jsonEncodeTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testJsonEncode__JSON形式にエンコードされた文字列が返る()
-  {
+  public function testJsonEncode__JSON形式にエンコードされた文字列が返る() {
     $input = array('a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5);
     $this->expected = '{"a":1,"b":2,"c":3,"d":4,"e":5}';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php	(revision 22796)
@@ -35,15 +35,12 @@
  * @version $Id$
  */
-class SC_Utils_isAppInnerUrlTest extends Common_TestCase
-{
+class SC_Utils_isAppInnerUrlTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
@@ -51,6 +48,5 @@
   /////////////////////////////////////////
   /**
-  public function testIsAppInnerUrl_非SSLかつアプリ内URLの場合_trueが返る()
-  {
+  public function testIsAppInnerUrl_非SSLかつアプリ内URLの場合_trueが返る() {
     $input = 'http://sample.eccube.jp/admin/';
     $this->expected = true;
@@ -60,6 +56,5 @@
   }
 
-  public function testIsAppInnerUrl_非SSLかつアプリ外URLの場合_falseが返る()
-  {
+  public function testIsAppInnerUrl_非SSLかつアプリ外URLの場合_falseが返る() {
     $input = 'http://outside.eccube.jp/admin/';
     $this->expected = false;
@@ -69,6 +64,5 @@
   }
 
-  public function testIsAppInnerUrl_SSLかつアプリ内URLの場合_trueが返る()
-  {
+  public function testIsAppInnerUrl_SSLかつアプリ内URLの場合_trueが返る() {
     $input = 'https://sample.eccube.jp/admin/';
     $this->expected = true;
@@ -78,6 +72,5 @@
   }
 
-  public function testIsAppInnerUrl_SSLかつアプリ外URLの場合_falseが返る()
-  {
+  public function testIsAppInnerUrl_SSLかつアプリ外URLの場合_falseが返る() {
     $input = 'https://outside.eccube.jp/admin/';
     $this->expected = false;
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfDispDBDateTest extends Common_TestCase
-{
+class SC_Utils_sfDispDBDateTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfDispDBDate_年が指定されていない場合_0バイト文字列が返る()
-  {
+  public function testSfDispDBDate_年が指定されていない場合_0バイト文字列が返る() {
     $dbdate = '-01-23 01:12:24';
     
@@ -56,6 +52,5 @@
     $this->verify();
   }
-  public function testSfDispDBDate_月が指定されていない場合_0バイト文字列が返る()
-  {
+  public function testSfDispDBDate_月が指定されていない場合_0バイト文字列が返る() {
     $dbdate = '2012--23 01:12:24';
     
@@ -65,6 +60,5 @@
     $this->verify();
   }
-  public function testSfDispDBDate_日が指定されていない場合_0バイト文字列が返る()
-  {
+  public function testSfDispDBDate_日が指定されていない場合_0バイト文字列が返る() {
     $dbdate = '2012-01- 01:12:24';
     
@@ -74,6 +68,5 @@
     $this->verify();
   }
-  public function testSfDispDBDate_年月日すべて存在する場合_フォーマット済み文字列が返る()
-  {
+  public function testSfDispDBDate_年月日すべて存在する場合_フォーマット済み文字列が返る() {
     $dbdate = '2012-1-23 1:12:24';
     
@@ -83,6 +76,5 @@
     $this->verify();
   }
-  public function testSfDispDBDate_時刻表示フラグがOFFの場合_時刻なしのフォーマット済み文字列が返る()
-  {
+  public function testSfDispDBDate_時刻表示フラグがOFFの場合_時刻なしのフォーマット済み文字列が返る() {
     $dbdate = '2012-1-23 1:12:24';
     
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfMbConvertEncodingTest extends Common_TestCase
-{
+class SC_Utils_sfMbConvertEncodingTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfMbConvertEncoding_MS932の場合_エラーが起きない()
-  {
+  public function testSfMbConvertEncoding_MS932の場合_エラーが起きない() {
     $input = 'あいうえお、今日は良い天気です。';
     $encode = 'MS932';
@@ -55,6 +51,5 @@
   }
 
-  public function testSfMbConvertEncoding_UTF8の場合_エラーが起きない()
-  {
+  public function testSfMbConvertEncoding_UTF8の場合_エラーが起きない() {
     $input = 'あいうえお、今日は良い天気です。';
     $encode = 'UTF8';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php	(revision 22796)
@@ -32,22 +32,18 @@
  * @version $Id$
  */
-class SC_Utils_sfGetClassCatCountTest extends Common_TestCase
-{
+class SC_Utils_sfGetClassCatCountTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpClassCat();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetClassCatCount__規格分類の件数がIDごとに取得できる()
-  {
+  public function testSfGetClassCatCount__規格分類の件数がIDごとに取得できる() {
     
     $this->expected = array(
@@ -62,6 +58,5 @@
   //////////////////////////////////////////
 
-  protected function setUpClassCat()
-  {
+  protected function setUpClassCat() {
     $classes = array(
       array(
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetSearchPageMaxTest extends Common_TestCase
-{
+class SC_Utils_sfGetSearchPageMaxTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetSearchPageMax_正の整数が指定されている場合_指定の値が返る()
-  {
+  public function testSfGetSearchPageMax_正の整数が指定されている場合_指定の値が返る() {
     
     $this->expected = 100;
@@ -56,6 +52,5 @@
   }
 
-  public function testSfGetSearchPageMax_正の小数が指定されている場合_整数に変換される()
-  {
+  public function testSfGetSearchPageMax_正の小数が指定されている場合_整数に変換される() {
     
     $this->expected = 99;
@@ -65,6 +60,5 @@
   }
 
-  public function testSfGetSearchPageMax_負の数が指定されている場合_デフォルト値が返る()
-  {
+  public function testSfGetSearchPageMax_負の数が指定されている場合_デフォルト値が返る() {
     
     $this->expected = SEARCH_PMAX;
@@ -74,6 +68,5 @@
   }
 
-  public function testSfGetSearchPageMax_指定がない場合_デフォルト値が返る()
-  {
+  public function testSfGetSearchPageMax_指定がない場合_デフォルト値が返る() {
     
     $this->expected = SEARCH_PMAX;
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Utils_sfTrimTest extends Common_TestCase
-{
+class SC_Utils_sfTrimTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTrim_文頭と途中にホワイトスペースがある場合_文頭だけが除去できる()
-  {
+  public function testSfTrim_文頭と途中にホワイトスペースがある場合_文頭だけが除去できる() {
     $this->expected = 'あ　い うえ' . chr(0x0D) . 'お';
     // 0x0A=CR, 0x0d=LF
@@ -55,6 +51,5 @@
   }
   
-  public function testSfTrim_途中と文末にホワイトスペースがある場合_文末だけが除去できる()
-  {
+  public function testSfTrim_途中と文末にホワイトスペースがある場合_文末だけが除去できる() {
     $this->expected = 'あ　い うえ' . chr(0x0D) . 'お';
     // 0x0A=CR, 0x0d=LF
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Utils_sfIsZeroFillingTest extends Common_TestCase
-{
+class SC_Utils_sfIsZeroFillingTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsZeroFilling_桁数が1の場合_FALSEを返す()
-  {
+  public function testSfIsZeroFilling_桁数が1の場合_FALSEを返す() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsZeroFilling('0');
@@ -54,6 +50,5 @@
   }
 
-  public function testSfIsZeroFilling_桁数が2以上で0埋めされていない場合_FALSEを返す()
-  {
+  public function testSfIsZeroFilling_桁数が2以上で0埋めされていない場合_FALSEを返す() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsZeroFilling('12');
@@ -62,6 +57,5 @@
   }
 
-  public function testSfIsZeroFilling_桁数が2以上で0埋めされている場合_TRUEを返す()
-  {
+  public function testSfIsZeroFilling_桁数が2以上で0埋めされている場合_TRUEを返す() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsZeroFilling('01');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php	(revision 22796)
@@ -33,21 +33,17 @@
  * @version $Id$
  */
-class SC_Utils_sfFlushTest extends Common_TestCase
-{
+class SC_Utils_sfFlushTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfFlush_IEの場合_フラッシュされる()
-  {
+  public function testSfFlush_IEの場合_フラッシュされる() {
     $this->expectOutputString('');
     echo 'Hello, World!!';
@@ -55,6 +51,5 @@
   }
 
-  public function testSfFlush_文字列を指定した場合_フラッシュされる()
-  {
+  public function testSfFlush_文字列を指定した場合_フラッシュされる() {
     $this->expectOutputString('');
     echo 'Hello, World!!';
@@ -62,6 +57,5 @@
   }
 
-  public function testSfFlush_参考_この関数を呼ばないとバッファに出力が残る()
-  {
+  public function testSfFlush_参考_この関数を呼ばないとバッファに出力が残る() {
     $this->expectOutputString('Hello, World!!');
     echo 'Hello, World!!';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfCutStringTest extends Common_TestCase
-{
+class SC_Utils_sfCutStringTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfCutString_マルチバイト指定で指定長より2文字以上長い場合_指定長でカットされる()
-  {
+  public function testSfCutString_マルチバイト指定で指定長より2文字以上長い場合_指定長でカットされる() {
     $input = 'あいうえおABC、こんにちは。';
     $this->expected = 'あいうえおABC、こんにち...';
@@ -56,6 +52,5 @@
   }
 
-  public function testSfCutString_マルチバイト指定で指定長より1文字長い場合_カットされない()
-  {
+  public function testSfCutString_マルチバイト指定で指定長より1文字長い場合_カットされない() {
     $input = 'あいうえおABC、こんにちは';
     $this->expected = 'あいうえおABC、こんにちは';
@@ -65,6 +60,5 @@
   }
 
-  public function testSfCutString_マルチバイト指定で指定長以内の場合_カットされない()
-  {
+  public function testSfCutString_マルチバイト指定で指定長以内の場合_カットされない() {
     $input = 'あいうえおABC、こんにち';
     $this->expected = 'あいうえおABC、こんにち';
@@ -74,6 +68,5 @@
   }
 
-  public function testSfCutString_1バイト指定で指定長より3文字以上長い場合_指定長でカットされる()
-  {
+  public function testSfCutString_1バイト指定で指定長より3文字以上長い場合_指定長でカットされる() {
     $input = 'hello, world!!';
     $this->expected = 'hello, worl...';
@@ -83,6 +76,5 @@
   }
 
-  public function testSfCutString_1バイト指定で指定長より2文字長い場合_カットされない()
-  {
+  public function testSfCutString_1バイト指定で指定長より2文字長い場合_カットされない() {
     $input = 'hello, world!';
     $this->expected = 'hello, world!';
@@ -92,6 +84,5 @@
   }
 
-  public function testSfCutString_1バイト指定で指定長より1文字長い場合_カットされない()
-  {
+  public function testSfCutString_1バイト指定で指定長より1文字長い場合_カットされない() {
     $input = 'hello, world';
     $this->expected = 'hello, world';
@@ -101,6 +92,5 @@
   }
 
-  public function testSfCutString_1バイト指定で指定長以内の場合_カットされない()
-  {
+  public function testSfCutString_1バイト指定で指定長以内の場合_カットされない() {
     $input = 'hello, worl';
     $this->expected = 'hello, worl';
@@ -111,6 +101,5 @@
 
   // [までの場合
-  public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる1()
-  {
+  public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる1() {
     $input = "hello[emoji:135], world.";
     $this->expected = 'hello...';
@@ -121,6 +110,5 @@
 
   // ]の直前までの場合
-  public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる2()
-  {
+  public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる2() {
     $input = "hello[emoji:135], world.";
     $this->expected = 'hello...';
@@ -131,6 +119,5 @@
 
   // 最初の絵文字の途中
-  public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる1()
-  {
+  public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる1() {
     $input = "hello[emoji:100][emoji:20], world![emoji:10]";
     $this->expected = 'hello...';
@@ -141,6 +128,5 @@
 
   // 2つめの絵文字の途中
-  public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる2()
-  {
+  public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる2() {
     $input = "hello[emoji:100][emoji:20], world![emoji:10]";
     $this->expected = 'hello[emoji:100]...';
@@ -151,6 +137,5 @@
 
   // 3つめの絵文字の途中
-  public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる3()
-  {
+  public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる3() {
     $input = "hello[emoji:100][emoji:20], world![emoji:10]";
     $this->expected = 'hello[emoji:100][emoji:20], wo...';
@@ -161,6 +146,5 @@
 
   // TODO 要確認 三点リーダ付けない場合は、lenと比較した方が良いのでは？
-  public function testSfCutString_三点リーダ付加指定がない場合_付加されない()
-  {
+  public function testSfCutString_三点リーダ付加指定がない場合_付加されない() {
     $input = 'hello, world';
     $this->expected = 'hello';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfRmDupSlashTest extends Common_TestCase
-{
+class SC_Utils_sfRmDupSlashTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfRmDupSlash_非SSLの場合_スキーマ部分以外の重複スラッシュが1つになる()
-  {
+  public function testSfRmDupSlash_非SSLの場合_スキーマ部分以外の重複スラッシュが1つになる() {
     $input = 'http://www.example.co.jp///aaa//bb/co.php';
     $this->expected = 'http://www.example.co.jp/aaa/bb/co.php';
@@ -56,6 +52,5 @@
   }
 
-  public function testSfRmDupSlash_SSLの場合_スキーマ部分以外の重複スラッシュが1つになる()
-  {
+  public function testSfRmDupSlash_SSLの場合_スキーマ部分以外の重複スラッシュが1つになる() {
     $input = 'https://www.example.co.jp///aaa//bb/co.php';
     $this->expected = 'https://www.example.co.jp/aaa/bb/co.php';
@@ -65,6 +60,5 @@
   }
 
-  public function testSfRmDupSlash_上記以外の場合_すべての重複スラッシュが1つになる()
-  {
+  public function testSfRmDupSlash_上記以外の場合_すべての重複スラッシュが1つになる() {
     $input = 'hoge//www.example.co.jp///aaa//bb/co.php';
     $this->expected = 'hoge/www.example.co.jp/aaa/bb/co.php';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfUpDirNameTest extends Common_TestCase
-{
+class SC_Utils_sfUpDirNameTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfUpDirName__1階層上のディレクトリ名が取得できる()
-  {
+  public function testSfUpDirName__1階層上のディレクトリ名が取得できる() {
     $_SERVER['SCRIPT_NAME'] = 'dir1/dir2/updir/current';
 
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetUnderChildrenArrayTest extends Common_TestCase
-{
+class SC_Utils_sfGetUnderChildrenArrayTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetUnderChildrenArray__与えられた親IDを持つ要素だけが抽出される()
-  {
+  public function testSfGetUnderChildrenArray__与えられた親IDを持つ要素だけが抽出される() {
     $input_array = array(
       array('parent_id' => '1001', 'child_id' => '1001001'),
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php	(revision 22796)
@@ -34,21 +34,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetHashString_authTypeHmacTest extends Common_TestCase
-{
+class SC_Utils_sfGetHashString_authTypeHmacTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetHashString_暗号化ありの設定になっている場合_文字列が変換される()
-  {
+  public function testSfGetHashString_暗号化ありの設定になっている場合_文字列が変換される() {
     $input = 'hello, world';
     $salt = 'sample';
@@ -59,6 +55,5 @@
   }
 
-  public function testSfGetHashString_暗号化ありの設定になっていてsaltがない場合_文字列が変換される()
-  {
+  public function testSfGetHashString_暗号化ありの設定になっていてsaltがない場合_文字列が変換される() {
     $input = 'hello, world';
     $output = SC_Utils::sfGetHashString($input);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_encodeRFC3986Test extends Common_TestCase
-{
+class SC_Utils_encodeRFC3986Test extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testEncodeRFC3986_チルダが含まれる場合_エンコードされない()
-  {
+  public function testEncodeRFC3986_チルダが含まれる場合_エンコードされない() {
     $input = 'http://www.example.co.jp/~';
     $this->expected = 'http%3A%2F%2Fwww.example.co.jp%2F~';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php	(revision 22796)
@@ -33,21 +33,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetUniqRandomIdTest extends Common_TestCase
-{
+class SC_Utils_sfGetUniqRandomIdTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function test_prefix指定が無い場合_21文字のランダムな文字列が生成される()
-  {
+  public function test_prefix指定が無い場合_21文字のランダムな文字列が生成される() {
     $output1 = SC_Utils::sfGetUniqRandomId();
     $output2 = SC_Utils::sfGetUniqRandomId();
@@ -58,6 +54,5 @@
   }
 
-  public function test_prefix指定がある場合_prefixのあとに21文字のランダムな文字列が生成される()
-  {
+  public function test_prefix指定がある場合_prefixのあとに21文字のランダムな文字列が生成される() {
     $output1 = SC_Utils::sfGetUniqRandomId('hello');
     $output2 = SC_Utils::sfGetUniqRandomId('hello');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php	(revision 22796)
@@ -34,15 +34,12 @@
  * @version $Id$
  */
-class SC_Utils_sfGetEnabledTest extends Common_TestCase
-{
+class SC_Utils_sfGetEnabledTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
@@ -50,6 +47,5 @@
   /////////////////////////////////////////
   // TODO 要確認 実際には使われていない?
-  public function testSfGetEnabled_falseを指定した場合_無効化するための文字列が返る()
-  {
+  public function testSfGetEnabled_falseを指定した場合_無効化するための文字列が返る() {
     
     $this->expected = ' disabled="disabled"';
@@ -59,6 +55,5 @@
   }
 
-  public function testSfGetEnabled_trueを指定した場合_0バイト文字列が返る()
-  {
+  public function testSfGetEnabled_trueを指定した場合_0バイト文字列が返る() {
     
     $this->expected = '';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfIsHTTPSTest extends Common_TestCase
-{
+class SC_Utils_sfIsHTTPSTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsHTTPS_環境変数にSSLを示す値が入っている場合_trueが返る()
-  {
+  public function testSfIsHTTPS_環境変数にSSLを示す値が入っている場合_trueが返る() {
     $_SERVER['HTTPS'] = 'on';
     $this->expected = true;
@@ -56,6 +52,5 @@
   }
 
-  public function testSfIsHTTPS_環境変数に非SSLを示す値が入っている場合_falseが返る()
-  {
+  public function testSfIsHTTPS_環境変数に非SSLを示す値が入っている場合_falseが返る() {
     $_SERVER['HTTPS'] = 'off';
     $this->expected = false;
@@ -65,6 +60,5 @@
   }
 
-  public function testSfIsHTTPS_環境変数に値が入っていない場合_falseが返る()
-  {
+  public function testSfIsHTTPS_環境変数に値が入っていない場合_falseが返る() {
     unset($_SERVER['HTTPS']);
     $this->expected = false;
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfErrorHeaderTest extends Common_TestCase
-{
+class SC_Utils_sfErrorHeaderTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfErrorHeader_printフラグがONの場合_指定したメッセージが出力される()
-  {
+  public function testSfErrorHeader_printフラグがONの場合_指定したメッセージが出力される() {
     global $GLOBAL_ERR; 
     $this->expectOutputString($GLOBAL_ERR . '<div id="errorHeader">ERROR MESSAGE</div>');
@@ -54,6 +50,5 @@
   }
 
-  public function testSfErrorHeader_printフラグがOFFの場合_指定したメッセージがグローバル変数に格納される()
-  {
+  public function testSfErrorHeader_printフラグがOFFの場合_指定したメッセージがグローバル変数に格納される() {
     global $GLOBAL_ERR;
     $this->expectOutputString('');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetTimestampTest extends Common_TestCase
-{
+class SC_Utils_sfGetTimestampTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetTimestamp_年が設定されていない場合_0バイト文字列が返る()
-  {
+  public function testSfGetTimestamp_年が設定されていない場合_0バイト文字列が返る() {
     $year = '';
     $month = '10';
@@ -58,6 +54,5 @@
   }
 
-  public function testSfGetTimestamp_月が設定されていない場合_0バイト文字列が返る()
-  {
+  public function testSfGetTimestamp_月が設定されていない場合_0バイト文字列が返る() {
     $year = '2012';
     $month = '';
@@ -69,6 +64,5 @@
   }
 
-  public function testSfGetTimestamp_日が設定されていない場合_0バイト文字列が返る()
-  {
+  public function testSfGetTimestamp_日が設定されていない場合_0バイト文字列が返る() {
     $year = '1999';
     $month = '09';
@@ -80,6 +74,5 @@
   }
 
-  public function testSfGetTimestamp_年月日すべて設定されている場合_連結された文字列が返る()
-  {
+  public function testSfGetTimestamp_年月日すべて設定されている場合_連結された文字列が返る() {
     $year = '1999';
     $month = '09';
@@ -92,6 +85,5 @@
   }
 
-  public function testSfGetTimestamp_最終時刻フラグがONの場合_時刻が深夜のものになる()
-  {
+  public function testSfGetTimestamp_最終時刻フラグがONの場合_時刻が深夜のものになる() {
     $year = '1999';
     $month = '09';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php	(revision 22796)
@@ -32,11 +32,9 @@
  * @version $Id$
  */
-class SC_Utils_sfCopyDirTest extends Common_TestCase
-{
+class SC_Utils_sfCopyDirTest extends Common_TestCase {
 
   static $TMP_DIR;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
     self::$TMP_DIR = realpath(dirname(__FILE__)) . "/../../../tmp";
@@ -45,12 +43,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfCopyDir_ディレクトリでない場合_falseを返し何もしない()
-  {
+  public function testSfCopyDir_ディレクトリでない場合_falseを返し何もしない() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     $fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
@@ -71,6 +67,5 @@
   }
 
-  public function testSfCopyDir_コピー先のディレクトリが存在しない場合_新たに作成する()
-  {
+  public function testSfCopyDir_コピー先のディレクトリが存在しない場合_新たに作成する() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     $fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
@@ -94,6 +89,5 @@
   // TODO CVS以下のEntriesなどはコピーされないが、CVSという親ディレクトリはコピーされてしまう。
   // そもそも、CVSだけ特別扱いする意味がないような…
-  public function testSfCopyDir_コピー先のディレクトリが存在する場合_そのままコピーする()
-  {
+  public function testSfCopyDir_コピー先のディレクトリが存在する場合_そのままコピーする() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     mkdir(self::$TMP_DIR . "/dst", 0777, true); // コピー先も作成しておく
@@ -136,6 +130,5 @@
   }
 
-  public function testSfCopyDir_上書きフラグがONの場合_同名ファイルが上書きされる()
-  {
+  public function testSfCopyDir_上書きフラグがONの場合_同名ファイルが上書きされる() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     mkdir(self::$TMP_DIR . "/dst", 0777, true); // コピー先も作成しておく
@@ -166,6 +159,5 @@
   }
 
-  public function testSfCopyDir_上書きフラグがONかつ書き込み権限がない場合_同名ファイルが上書きされない()
-  {
+  public function testSfCopyDir_上書きフラグがONかつ書き込み権限がない場合_同名ファイルが上書きされない() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     mkdir(self::$TMP_DIR . "/dst", 0777, true); // コピー先も作成しておく
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_getHash2ArrayTest extends Common_TestCase
-{
+class SC_Utils_getHash2ArrayTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetHash2Array_必須キー指定がない場合_値のみの配列が返る()
-  {
+  public function testGetHash2Array_必須キー指定がない場合_値のみの配列が返る() {
     $input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
     $this->expected = array('りんご', 'バナナ', 'オレンジ');
@@ -56,6 +52,5 @@
   }
 
-  public function testGetHash2Array_必須キー指定がある場合_指定キーの値のみの配列が返る()
-  {
+  public function testGetHash2Array_必須キー指定がある場合_指定キーの値のみの配列が返る() {
     $input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
     $requires = array('banana', 'apple');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfTermMonthTest extends Common_TestCase
-{
+class SC_Utils_sfTermMonthTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTermMonth_締め日が月末より早い場合_設定した締め日の通りになる()
-  {
+  public function testSfTermMonth_締め日が月末より早い場合_設定した締め日の通りになる() {
     $this->expected = array('2012/9/16', '2012/10/15 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2012, 10, 15);
@@ -55,6 +51,5 @@
   }
 
-  public function testSfTermMonth_該当月の末日が締め日より早い場合_末日に合わせられる()
-  {
+  public function testSfTermMonth_該当月の末日が締め日より早い場合_末日に合わせられる() {
     $this->expected = array('2012/9/1', '2012/9/30 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2012, 9, 31);
@@ -63,6 +58,5 @@
   }
 
-  public function testSfTermMonth_前月の末日が締め日より早い場合_末日に合わせられる()
-  {
+  public function testSfTermMonth_前月の末日が締め日より早い場合_末日に合わせられる() {
     $this->expected = array('2012/10/1', '2012/10/31 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2012, 10, 31);
@@ -71,6 +65,5 @@
   }
 
-  public function testSfTermMonth_年をまたぐ場合_前月が前年十二月になる()
-  {
+  public function testSfTermMonth_年をまたぐ場合_前月が前年十二月になる() {
     $this->expected = array('2012/12/16', '2013/1/15 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2013, 1, 15);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfMultiplyTest extends Common_TestCase
-{
+class SC_Utils_sfMultiplyTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfMultiply__掛け算の結果が返る()
-  {
+  public function testSfMultiply__掛け算の結果が返る() {
     $this->expected = 520;
     $this->actual = SC_Utils::sfMultiply(13, 40);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfNoImageMainListTest extends Common_TestCase
-{
+class SC_Utils_sfNoImageMainListTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfNoImageMainList_ファイル名が空の場合_デフォルトのファイル名が返る()
-  {
+  public function testSfNoImageMainList_ファイル名が空の場合_デフォルトのファイル名が返る() {
     $this->expected = 'noimage_main_list.jpg';
     $this->actual = SC_Utils::sfNoImageMainList('');
@@ -55,6 +51,5 @@
   }
 
-  public function testSfNoImageMainList_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る()
-  {
+  public function testSfNoImageMainList_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る() {
     $this->expected = 'aaa/bbb/noimage_main_list.jpg';
     $this->actual = SC_Utils::sfNoImageMainList('aaa/bbb/');
@@ -63,6 +58,5 @@
   }
 
-  public function testSfNoImageMainList_ファイル名が指定されている場合_指定されたファイル名が返る()
-  {
+  public function testSfNoImageMainList_ファイル名が指定されている場合_指定されたファイル名が返る() {
     $this->expected = 'aaa/bbb/ccc.png';
     $this->actual = SC_Utils::sfNoImageMainList('aaa/bbb/ccc.png');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfArrCombineTest extends Common_TestCase
-{
+class SC_Utils_sfArrCombineTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfArrCombine_入力の配列が空の場合_結果も空になる()
-  {
+  public function testSfArrCombine_入力の配列が空の場合_結果も空になる() {
     $keys = array();
     $values = array();
@@ -59,6 +55,5 @@
 
   // TODO 要確認　キーの方が短い場合はエラーで良いのでは？
-  public function testSfArrCombine_入力のキー配列の方が短い場合_余った値の配列の要素は無視される()
-  {
+  public function testSfArrCombine_入力のキー配列の方が短い場合_余った値の配列の要素は無視される() {
     $keys = array('apple', 'banana');
     $values = array('りんご', 'バナナ', 'オレンジ', '梨');
@@ -74,6 +69,5 @@
   }
 
-  public function testSfArrCombine_入力のキー配列の方が長い場合_余ったキーの配列の要素は空になる()
-  {
+  public function testSfArrCombine_入力のキー配列の方が長い場合_余ったキーの配列の要素は空になる() {
     $keys = array('apple', 'banana', 'orange', 'pear');
     $values = array('りんご', 'バナナ');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfSetErrorStyleTest extends Common_TestCase
-{
+class SC_Utils_sfSetErrorStyleTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfSetErrorStyle__背景色変更用の文字列が返る()
-  {
+  public function testSfSetErrorStyle__背景色変更用の文字列が返る() {
     
     $this->expected = 'style="background-color:#ffe8e8"';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php	(revision 22796)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php	(revision 22796)
@@ -0,0 +1,67 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/Common_TestCase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Utils::sfGetBrothersArray()のテストクラス.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Utils_sfGetBrothersArrayTest extends Common_TestCase {
+
+
+  protected function setUp() {
+    // parent::setUp();
+  }
+
+  protected function tearDown() {
+    // parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testSfGetBrothersArray__与えられたIDの兄弟要素だけが抽出される() {
+    $input_array = array(
+      array('parent_id' => '1001', 'child_id' => '1001001'),
+      array('parent_id' => '1002', 'child_id' => '1002001'),
+      array('parent_id' => '1002', 'child_id' => '1002002'),
+      array('parent_id' => '1003', 'child_id' => '1003001'),
+      array('parent_id' => '1004', 'child_id' => '1004001')
+    );
+    $this->expected = array('1002001', '1002002', '1004001');
+    $this->actual = SC_Utils::sfGetBrothersArray(
+      $input_array, 
+      'parent_id',
+      'child_id', 
+      array('1002001', '1004001')
+    );
+    $this->verify();
+  }
+
+  //////////////////////////////////////////
+
+}
+
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfMakeHiddenArrayest extends Common_TestCase
-{
+class SC_Utils_sfMakeHiddenArrayest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfMakeHiddenArray__多段配列が1次元配列に変換される()
-  {
+  public function testSfMakeHiddenArray__多段配列が1次元配列に変換される() {
     $input_array = array(
       'vegetable' => '野菜',
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfArrayIntersectKeysTest extends Common_TestCase
-{
+class SC_Utils_sfArrayIntersectKeysTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfArrayIntersectKeys_指定キーに含まれるものがない場合_空の配列が返る()
-  {
+  public function testSfArrayIntersectKeys_指定キーに含まれるものがない場合_空の配列が返る() {
     $input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
     $key_array = array('kiwi', 'tomato');
@@ -58,6 +54,5 @@
   }
 
-  public function testSfArrayIntersctKeys_指定キーに含まれるものがある場合_含まれるものだけが返る()
-  {
+  public function testSfArrayIntersctKeys_指定キーに含まれるものがある場合_含まれるものだけが返る() {
     $input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
     $key_array = array('orange', 'apple');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Utils_repeatStrWithSeparatorTest extends Common_TestCase
-{
+class SC_Utils_repeatStrWithSeparatorTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRepeatStrWithSeparator_反復回数が0回の場合_結果が0バイト文字列になる()
-  {
+  public function testRepeatStrWithSeparator_反復回数が0回の場合_結果が0バイト文字列になる() {
     $this->expected = '';
     $this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 0, '#');
@@ -54,6 +50,5 @@
   }
 
-  public function testRepeatStrWithSeparator_反復回数が1回の場合_区切り文字が入らない()
-  {
+  public function testRepeatStrWithSeparator_反復回数が1回の場合_区切り文字が入らない() {
     $this->expected = 'ECサイト';
     $this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 1, '#');
@@ -62,6 +57,5 @@
   }
 
-  public function testRepeatStrWithSeparator_反復回数が2回以上の場合_区切り文字が入って出力される()
-  {
+  public function testRepeatStrWithSeparator_反復回数が2回以上の場合_区切り文字が入って出力される() {
     $this->expected = 'ECサイト#ECサイト#ECサイト#ECサイト#ECサイト';
     $this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 5, '#');
@@ -70,6 +64,5 @@
   }
 
-  public function testRepeatStrWithSeparator_区切り文字が未指定の場合_カンマ区切りとなる()
-  {
+  public function testRepeatStrWithSeparator_区切り文字が未指定の場合_カンマ区切りとなる() {
     $this->expected = 'ECサイト,ECサイト,ECサイト';
     $this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 3);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php	(revision 22796)
@@ -34,21 +34,17 @@
  * @version $Id$
  */
-class SC_Utils_sfPrePointTest extends Common_TestCase
-{
+class SC_Utils_sfPrePointTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfPrePoint_四捨五入の設定の場合_四捨五入された値が返る()
-  {
+  public function testSfPrePoint_四捨五入の設定の場合_四捨五入された値が返る() {
     $rule = 1; // 四捨五入
 
@@ -59,6 +55,5 @@
   }
 
-  public function testSfPrePoint_切り捨ての設定の場合_切り捨てされた値が返る()
-  {
+  public function testSfPrePoint_切り捨ての設定の場合_切り捨てされた値が返る() {
     $rule = 2; // 切り捨て 
 
@@ -69,6 +64,5 @@
   }
 
-  public function testSfPrePoint_切り上げの設定の場合_切り上げされた値が返る()
-  {
+  public function testSfPrePoint_切り上げの設定の場合_切り上げされた値が返る() {
     $rule = 3; // 切り上げ
 
@@ -79,6 +73,5 @@
   }
 
-  public function testSfPrePoint_存在しない選択肢の場合_切り上げされた値が返る()
-  {
+  public function testSfPrePoint_存在しない選択肢の場合_切り上げされた値が返る() {
     $rule = 4; // 存在しない選択肢
 
@@ -89,6 +82,5 @@
   }
 
-  public function testSfPrePoint_丸め方法の指定がない場合_定数で指定された値が使われる()
-  {
+  public function testSfPrePoint_丸め方法の指定がない場合_定数で指定された値が使われる() {
     $this->expected = array(9, 9);
     $this->actual = array(
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_Test extends Common_TestCase
-{
+class SC_Utils_Test extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsAbsoluteRealPath_絶対パスの場合_trueが返る()
-  {
+  public function testIsAbsoluteRealPath_絶対パスの場合_trueが返る() {
 
     if (strpos(PHP_OS, 'WIN')) {
@@ -61,6 +57,5 @@
   }
 
-  public function testIsAbsoluteRealPath_相対パスの場合_trueが返る()
-  {
+  public function testIsAbsoluteRealPath_相対パスの場合_trueが返る() {
 
     if (strpos(PHP_OS, 'WIN')) {
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetAddPointTest extends Common_TestCase
-{
+class SC_Utils_sfGetAddPointTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetAddPoint_計算結果が正になる場合_値がそのまま返る()
-  {
+  public function testSfGetAddPoint_計算結果が正になる場合_値がそのまま返る() {
     $totalpoint = 100;
     $use_point = 2000;
@@ -59,6 +55,5 @@
   }
 
-  public function testSfGetAddPoint_計算結果が負になる場合_0が返る()
-  {
+  public function testSfGetAddPoint_計算結果が負になる場合_0が返る() {
     $totalpoint = 70;
     $use_point = 2000;
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfDBDatetoTimeTest extends Common_TestCase
-{
+class SC_Utils_sfDBDatetoTimeTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfDbDatetoTime_時刻にマイクロ秒が含まれている場合_マイクロ秒を無視して変換できる()
-  {
+  public function testSfDbDatetoTime_時刻にマイクロ秒が含まれている場合_マイクロ秒を無視して変換できる() {
     
     $this->expected = mktime(10, 20, 30, 10, 31, 2012);
@@ -56,6 +52,5 @@
   }
 
-  public function testSfDbDatetoTime_時刻にマイクロ秒が含まれていない場合_そのまま変換できる()
-  {
+  public function testSfDbDatetoTime_時刻にマイクロ秒が含まれていない場合_そのまま変換できる() {
     
     $this->expected = mktime(10, 20, 30, 10, 31, 2012);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_getSfPassLenTest extends Common_TestCase
-{
+class SC_Utils_getSfPassLenTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfPassLen_入力が0の場合_0バイト文字列が返る()
-  {
+  public function testSfPassLen_入力が0の場合_0バイト文字列が返る() {
     $input = '';
     $this->expected = '';
@@ -56,6 +52,5 @@
   }
 
-  public function testSfPassLen_入力が正の数の場合_入力と同じ文字数のアスタリスクが返る()
-  {
+  public function testSfPassLen_入力が正の数の場合_入力と同じ文字数のアスタリスクが返る() {
     $input = 17;
     $this->expected = '*****************';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php	(revision 22796)
@@ -32,11 +32,9 @@
  * @version $Id$
  */
-class SC_Utils_copyDirectoryTest extends Common_TestCase
-{
+class SC_Utils_copyDirectoryTest extends Common_TestCase {
 
   static $TMP_DIR;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
     self::$TMP_DIR = realpath(dirname(__FILE__)) . "/../../../tmp";
@@ -45,12 +43,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCopyDirectory_存在するパスの場合_指定したパス以下が再帰的にコピーされる()
-  {
+  public function testCopyDirectory_存在するパスの場合_指定したパス以下が再帰的にコピーされる() {
     /**
      * tests/tmp/src
@@ -78,6 +74,5 @@
   }
 
-  public function testCopyDirectory_存在しないパスの場合_何も起こらない()
-  {
+  public function testCopyDirectory_存在しないパスの場合_何も起こらない() {
     /**
      * tests/tmp/src
@@ -97,6 +92,5 @@
   }
 
-  public function testCopyDirectory_コピー先のディレクトリが元々存在する場合_上書きされる()
-  {
+  public function testCopyDirectory_コピー先のディレクトリが元々存在する場合_上書きされる() {
     /**
      * tests/tmp/src
@@ -126,6 +120,5 @@
   }
 
-  public function testCopyDirectory_コピー先のファイルが元々存在する場合_上書きされる()
-  {
+  public function testCopyDirectory_コピー先のファイルが元々存在する場合_上書きされる() {
     /**
      * tests/tmp/src
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php	(revision 22796)
@@ -32,14 +32,11 @@
  * @version $Id$
  */
-class SC_Utils_sfGetRandomStringTest extends Common_TestCase
-{
+class SC_Utils_sfGetRandomStringTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
@@ -47,6 +44,5 @@
   /////////////////////////////////////////
   // ランダムな文字列取得なので、文字列長のみ確認します。
-  public function testSfGetRandomString_文字列長未指定の場合_長さ1の文字列が取得できる()
-  {
+  public function testSfGetRandomString_文字列長未指定の場合_長さ1の文字列が取得できる() {
     $this->expected = 1;
     $this->actual = strlen(SC_Utils::sfGetRandomString());
@@ -55,6 +51,5 @@
   }
 
-  public function testSfGetRandomString_文字列長指定ありの場合_指定した長さの文字列が取得できる()
-  {
+  public function testSfGetRandomString_文字列長指定ありの場合_指定した長さの文字列が取得できる() {
     $this->expected = 10;
     $this->actual = strlen(SC_Utils::sfGetRandomString(10));
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Utils_sfCalcIncTaxTest extends Common_TestCase
-{
+class SC_Utils_sfCalcIncTaxTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfCalcIncTax_四捨五入の場合_四捨五入の結果になる()
-  {
+  public function testSfCalcIncTax_四捨五入の場合_四捨五入の結果になる() {
     $this->expected = array(141, 152);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 1); // 1:四捨五入
@@ -55,6 +51,5 @@
   }
 
-  public function testSfCalcIncTax_切り捨ての場合_切り捨ての結果になる()
-  {
+  public function testSfCalcIncTax_切り捨ての場合_切り捨ての結果になる() {
     $this->expected = array(142, 153);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 2, 2); // 2:切り捨て
@@ -64,6 +59,5 @@
   }
 
-  public function testSfCalcIncTax_切り上げの場合_切り上げの結果になる()
-  {
+  public function testSfCalcIncTax_切り上げの場合_切り上げの結果になる() {
     $this->expected = array(142, 152);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 3); // 3:切り上げ
@@ -73,6 +67,5 @@
   }
 
-  public function testSfCalcIncTax_それ以外の場合_切り上げの結果になる()
-  {
+  public function testSfCalcIncTax_それ以外の場合_切り上げの結果になる() {
     $this->expected = array(142, 152);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 4);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfSwapArrayTest extends Common_TestCase
-{
+class SC_Utils_sfSwapArrayTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfSwapArray_カラム名ありの指定の場合_キーに名称が入る()
-  {
+  public function testSfSwapArray_カラム名ありの指定の場合_キーに名称が入る() {
     $input_array = array(
       array('id' => '1001', 'name' => 'name1001'),
@@ -63,6 +59,5 @@
   }
 
-  public function testSfSwapArray_カラム名なしの指定の場合_キーに名称が入らない()
-  {
+  public function testSfSwapArray_カラム名なしの指定の場合_キーに名称が入らない() {
     $input_array = array(
       array('id' => '1001', 'name' => 'name1001'),
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php	(revision 22796)
@@ -32,15 +32,12 @@
  * @version $Id$
  */
-class SC_Utils_getRealURLTest extends Common_TestCase
-{
+class SC_Utils_getRealURLTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
@@ -48,6 +45,5 @@
   /////////////////////////////////////////
   // TODO ポート番号のためのコロンが必ず入ってしまうのはOK?
-  public function testGetRealURL_親ディレクトリへの参照を含む場合_正しくパースできる()
-  {
+  public function testGetRealURL_親ディレクトリへの参照を含む場合_正しくパースできる() {
     $input = 'http://www.example.jp/aaa/../index.php';
     $this->expected = 'http://www.example.jp:/index.php';
@@ -57,6 +53,5 @@
   }
 
-  public function testGetRealURL_親ディレクトリへの参照を複数回含む場合_正しくパースできる()
-  {
+  public function testGetRealURL_親ディレクトリへの参照を複数回含む場合_正しくパースできる() {
     $input = 'http://www.example.jp/aaa/bbb/../../ccc/ddd/../index.php';
     $this->expected = 'http://www.example.jp:/ccc/index.php';
@@ -66,6 +61,5 @@
   }
 
-  public function testGetRealURL_カレントディレクトリへの参照を含む場合_正しくパースできる()
-  {
+  public function testGetRealURL_カレントディレクトリへの参照を含む場合_正しくパースできる() {
     $input = 'http://www.example.jp/aaa/./index.php';
     $this->expected = 'http://www.example.jp:/aaa/index.php';
@@ -75,6 +69,5 @@
   }
 
-  public function testGetRealURL_httpsの場合_正しくパースできる()
-  {
+  public function testGetRealURL_httpsの場合_正しくパースできる() {
     $input = 'https://www.example.jp/aaa/./index.php';
     $this->expected = 'https://www.example.jp:/aaa/index.php';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php	(revision 22796)
@@ -32,15 +32,12 @@
  * @version $Id$
  */
-class SC_Utils_sfPrintRTest extends Common_TestCase
-{
+class SC_Utils_sfPrintRTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
@@ -49,6 +46,5 @@
   // TODO 環境により出力形式が異なるため、テスト不可(デバッグ用なので、テストしなくてもよさそう)
   /**
-  public function testSfPrintR__指定したオブジェクトの情報が出力される()
-  {
+  public function testSfPrintR__指定したオブジェクトの情報が出力される() {
     $output = '<div style="font-size: 12px;color: #00FF00;">' . "\n"
       . '<strong>**デバッグ中**</strong><br />' . "\n"
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_jsonDecodeTest extends Common_TestCase
-{
+class SC_Utils_jsonDecodeTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testJsonDecode__JSON形式にエンコードされた文字列からarrayに変換される()
-  {
+  public function testJsonDecode__JSON形式にエンコードされた文字列からarrayに変換される() {
     $input = '{"a":1,"b":2,"c":3,"d":4,"e":5}';
 
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetCSVListTest extends Common_TestCase
-{
+class SC_Utils_sfGetCSVListTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetCSVList_配列が空の場合_falseが返る()
-  {
+  public function testSfGetCSVList_配列が空の場合_falseが返る() {
     
     $this->expected = FALSE;
@@ -56,6 +52,5 @@
   }
 
-  public function testSfGetCSVList_配列に要素が存在する場合_CSV形式に変換した文字列が返る()
-  {
+  public function testSfGetCSVList_配列に要素が存在する場合_CSV形式に変換した文字列が返る() {
     
     $this->expected = '"1つ目の要素","カンマを,含む要素","3つ目の要素"' . "\r\n";
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php	(revision 22796)
@@ -32,15 +32,12 @@
  * @version $Id$
  */
-class SC_Utils_sfGetErrorColorTest extends Common_TestCase
-{
+class SC_Utils_sfGetErrorColorTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
@@ -48,6 +45,5 @@
   /////////////////////////////////////////
   // TODO 要確認 実際には使われていない?
-  public function testSfGetErrorColor_引数が空でない場合_背景色変更用の文字列が返る()
-  {
+  public function testSfGetErrorColor_引数が空でない場合_背景色変更用の文字列が返る() {
     
     $this->expected = 'background-color:#ffe8e8';
@@ -57,6 +53,5 @@
   }
 
-  public function testSfGetErrorColor_引数が空の場合_0バイト文字列が返る()
-  {
+  public function testSfGetErrorColor_引数が空の場合_0バイト文字列が返る() {
     
     $this->expected = '';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfEncodeFileTest extends Common_TestCase
-{
+class SC_Utils_sfEncodeFileTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfEncodeFile_ファイルが正常に開けた場合_ファイルがエンコードされ出力先のパスが取得できる()
-  {
+  public function testSfEncodeFile_ファイルが正常に開けた場合_ファイルがエンコードされ出力先のパスが取得できる() {
     $outdir = realpath(dirname(__FILE__)) . "/../../../tmp/enc_output/";
     SC_Helper_FileManager::deleteFile($outdir);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfTrimURLTest extends Common_TestCase
-{
+class SC_Utils_sfTrimURLTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTrimURL_URLがスラッシュで終わる場合_スラッシュが取り除かれる()
-  {
+  public function testSfTrimURL_URLがスラッシュで終わる場合_スラッシュが取り除かれる() {
     $input = 'http://www.example.co.jp/';
     $this->expected = 'http://www.example.co.jp';
@@ -55,6 +51,5 @@
   }
 
-  public function testSfTrimURL_URL末尾にスラッシュがない場合_文字列に変化がない()
-  {
+  public function testSfTrimURL_URL末尾にスラッシュがない場合_文字列に変化がない() {
     $input = 'http://www.example.co.jp';
     $this->expected = $input;
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php	(revision 22796)
@@ -32,11 +32,9 @@
  * @version $Id$
  */
-class SC_Utils_recursiveMkdirTest extends Common_TestCase
-{
+class SC_Utils_recursiveMkdirTest extends Common_TestCase {
 
   static $TMP_DIR;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     self::$TMP_DIR = realpath(dirname(__FILE__)) . "/../../../tmp";
     SC_Helper_FileManager::deleteFile(self::$TMP_DIR);
@@ -45,12 +43,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRecursiveMkdir_パーミッションを指定した場合_指定のパーミッションでディレクトリが作られる()
-  {
+  public function testRecursiveMkdir_パーミッションを指定した場合_指定のパーミッションでディレクトリが作られる() {
     $path = realpath(dirname(__FILE__)) . "/../../../tmp/dir1/dir2/dir3/";
     $mode = 0755;
@@ -63,6 +59,5 @@
   }
 
-  public function testRecursiveMkdir_パーミッションを指定しない場合_0777でディレクトリが作られる()
-  {
+  public function testRecursiveMkdir_パーミッションを指定しない場合_0777でディレクトリが作られる() {
     $path = realpath(dirname(__FILE__)) . "/../../../tmp/dir1/dir2/dir3/";
 
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_clearCompliedTemplateTest extends Common_TestCase
-{
+class SC_Utils_clearCompliedTemplateTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function test__コンパイル済みのファイルを配置するディレクトリが空になる()
-  {
+  public function test__コンパイル済みのファイルを配置するディレクトリが空になる() {
     SC_Utils::clearCompliedTemplate();
 
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfIsInternalDomainTest extends Common_TestCase
-{
+class SC_Utils_sfIsInternalDomainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testsfIsInternalDomain_ドメインが一致する場合_trueが返る()
-  {
+  public function testsfIsInternalDomain_ドメインが一致する場合_trueが返る() {
     $url = 'http://test.local/html/index.php';
     $this->expected = TRUE;
@@ -56,6 +52,5 @@
   }
 
-  public function testsfIsInternalDomain_アンカーを含むURLの場合_trueが返る()
-  {
+  public function testsfIsInternalDomain_アンカーを含むURLの場合_trueが返る() {
     $url = 'http://test.local/html/index.php#hoge';
     $this->expected = TRUE;
@@ -65,6 +60,5 @@
   }
 
-  public function testsfIsInternalDomain_ドメインが一致しない場合_falseが返る()
-  {
+  public function testsfIsInternalDomain_ドメインが一致しない場合_falseが返る() {
     $url = 'http://test.local.jp/html/index.php';
     $this->expected = TRUE;
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfIsSuccessTest extends Common_TestCase
-{
+class SC_Utils_sfIsSuccessTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsSuccess_認証に失敗している場合_falseが返る()
-  {
+  public function testSfIsSuccess_認証に失敗している場合_falseが返る() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS + 1;
@@ -58,6 +54,5 @@
   }
 
-  public function testSfIsSuccess_認証成功でリファラがない場合_trueが返る()
-  {
+  public function testSfIsSuccess_認証成功でリファラがない場合_trueが返る() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS;
@@ -70,6 +65,5 @@
 
   // TODO 正規のドメインであることは確認しているが、管理画面からというのはチェックしていないのでは？
-  public function testSfIsSuccess_認証成功でリファラが正しい場合_trueが返る()
-  {
+  public function testSfIsSuccess_認証成功でリファラが正しい場合_trueが返る() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS;
@@ -82,6 +76,5 @@
   }
 
-  public function testSfIsSuccess_認証成功でリファラが不正な場合_falseが返る()
-  {
+  public function testSfIsSuccess_認証成功でリファラが不正な場合_falseが返る() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS;
@@ -98,11 +91,9 @@
 }
 
-class SC_Session_Mock extends SC_Session
-{
+class SC_Session_Mock extends SC_Session {
 
   public $is_success;
 
-  function IsSuccess()
-  {
+  function IsSuccess() {
     return $this->is_success;
   }
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_arrayDefineIndexesTest extends Common_TestCase
-{
+class SC_Utils_arrayDefineIndexesTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testArrayDefineIndexes_チェック対象のキーがすべて存在する場合_配列に変化がない()
-  {
+  public function testArrayDefineIndexes_チェック対象のキーがすべて存在する場合_配列に変化がない() {
     $input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
     $defineIndexes = array('banana', 'orange');
@@ -58,6 +54,5 @@
   }
 
-  public function testArrayDefineIndexes_チェック対象のキーが一部存在しない場合_配列に追加される()
-  {
+  public function testArrayDefineIndexes_チェック対象のキーが一部存在しない場合_配列に追加される() {
     $input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
     $defineIndexes = array('tomato', 'banana', 'kiwi');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php	(revision 22796)
@@ -34,15 +34,12 @@
  * @version $Id$
  */
-class SC_Utils_sfGetHashString_authTypePlainTest extends Common_TestCase
-{
+class SC_Utils_sfGetHashString_authTypePlainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
@@ -50,6 +47,5 @@
   /////////////////////////////////////////
   /**
-  public function testSfGetHashString_暗号化なしの設定になっている場合_文字列が変換されない()
-  {
+  public function testSfGetHashString_暗号化なしの設定になっている場合_文字列が変換されない() {
     $input = 'hello, world';
 
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php	(revision 22796)
@@ -32,58 +32,26 @@
  * @version $Id$
  */
-class SC_Utils_sfGetProductClassIdTest extends Common_TestCase
-{
+class SC_Utils_sfGetProductClassIdTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpProductsClass();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetProductClassId_存在する製品IDのみを指定した場合_カテゴリ0の対応する製品クラスが取得できる()
-  {
+  public function testSfGetProductClassId_存在するIDを指定した場合_対応する製品クラスが取得できる() {
     
-    $this->expected = '2001';
-    $this->actual = SC_Utils::sfGetProductClassId('2001');
+    $this->expected = '1001';
+    $this->actual = SC_Utils::sfGetProductClassId('1001');
 
     $this->verify('取得した製品クラス');
   }
 
-  public function testSfGetProductClassId_存在する製品IDのみを指定してカテゴリ0の製品クラスが存在しなければ_nullが返る()
-  {
-    
-    $this->expected = null;
-    $this->actual = SC_Utils::sfGetProductClassId('1001');
-
-    $this->verify('取得結果が空');
-  }
-
-  public function testSfGetProductClassId_存在する製品IDとカテゴリIDを指定した場合_対応する製品クラスが取得できる()
-  {
-    
-    $this->expected = '1002';
-    $this->actual = SC_Utils::sfGetProductClassId('1001', '2');
-
-    $this->verify('取得した製品クラス');
-  }
-
-  public function testSfGetProductClassId_存在する製品IDと存在しないカテゴリIDを指定した場合_nullが返る()
-  {
-    
-    $this->expected = null;
-    $this->actual = SC_Utils::sfGetProductClassId('1001', '999');
-
-    $this->verify('取得結果が空');
-  }
-
-  public function testSfGetProductClassId_存在しない製品IDを指定した場合_nullが返る()
-  {
+  public function testSfGetProductClassId_存在しないIDを指定した場合_nullが返る() {
     $this->expected = null;
     $this->actual = SC_Utils::sfGetProductClassId('9999');
@@ -93,6 +61,5 @@
 
   //////////////////////////////////////////
-  protected function setUpProductsClass()
-  {
+  protected function setUpProductsClass() {
     $products_class = array(
       array(
@@ -110,5 +77,6 @@
         'creator_id' => '1',
         'update_date' => 'CURRENT_TIMESTAMP'
-      ),
+      )
+      /** 同じproduct_idが2つあるケースは現状failするのでいったんコメントアウト
       array(
         'product_class_id' => '1002',
@@ -119,9 +87,9 @@
         'update_date' => 'CURRENT_TIMESTAMP'
       )
+      */
     );
 
     $this->objQuery->delete('dtb_products_class');
-    foreach ($products_class as $item)
-{
+    foreach ($products_class as $item) {
       $this->objQuery->insert('dtb_products_class', $item);
     }
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfNoImageMainTest extends Common_TestCase
-{
+class SC_Utils_sfNoImageMainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfNoImageMain_ファイル名が空の場合_デフォルトのファイル名が返る()
-  {
+  public function testSfNoImageMain_ファイル名が空の場合_デフォルトのファイル名が返る() {
     $this->expected = 'noimage_main.png';
     $this->actual = SC_Utils::sfNoImageMain('');
@@ -55,6 +51,5 @@
   }
 
-  public function testSfNoImageMain_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る()
-  {
+  public function testSfNoImageMain_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る() {
     $this->expected = 'aaa/bbb/noimage_main.png';
     $this->actual = SC_Utils::sfNoImageMain('aaa/bbb/');
@@ -63,6 +58,5 @@
   }
 
-  public function testSfNoImageMain_ファイル名が指定されている場合_指定されたファイル名が返る()
-  {
+  public function testSfNoImageMain_ファイル名が指定されている場合_指定されたファイル名が返る() {
     $this->expected = 'aaa/bbb/ccc.png';
     $this->actual = SC_Utils::sfNoImageMain('aaa/bbb/ccc.png');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php	(revision 22796)
@@ -32,22 +32,18 @@
  * @version $Id$
  */
-class SC_Utils_sfGetAddressTest extends Common_TestCase
-{
+class SC_Utils_sfGetAddressTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpAddress();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function test_住所がヒットしない場合_空の配列が返る()
-  {
+  public function test_住所がヒットしない場合_空の配列が返る() {
     $this->expected = array();
     $this->actual = SC_Utils::sfGetAddress('9999999');
@@ -56,6 +52,5 @@
   }
 
-  public function test_住所が一件だけヒットする場合_住所データが取得できる()
-  {
+  public function test_住所が一件だけヒットする場合_住所データが取得できる() {
     $this->expected = array(
       array(
@@ -74,6 +69,5 @@
   // $data_list[0]を返した方が良いのでは?
   /**
-  public function test_住所が二件以上ヒットする場合_町名を消した住所データが取得できる()
-  {
+  public function test_住所が二件以上ヒットする場合_町名を消した住所データが取得できる() {
     $this->expected = array(
       array(
@@ -94,6 +88,5 @@
   */
 
-  public function test_住所に但し書きが含まれる場合_但し書きが消去される()
-  {
+  public function test_住所に但し書きが含まれる場合_但し書きが消去される() {
     $this->expected = array(
       array(
@@ -108,6 +101,5 @@
   }
 
-  public function test_住所に注意文言がある場合_町名が消去される()
-  {
+  public function test_住所に注意文言がある場合_町名が消去される() {
     $this->expected = array(
       array(
@@ -122,6 +114,5 @@
   }
 
-  public function test_住所に番地の説明が含まれる場合_町名が消去される()
-  {
+  public function test_住所に番地の説明が含まれる場合_町名が消去される() {
     $this->expected = array(
       array(
@@ -138,6 +129,5 @@
   //////////////////////////////////////////
 
-  protected function setUpAddress()
-  {
+  protected function setUpAddress() {
 
     $address = array(
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Utils_sfGetCheckedTest extends Common_TestCase
-{
+class SC_Utils_sfGetCheckedTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetChecked_引数が一致する場合_チェック済みの文字列が返る()
-  {
+  public function testSfGetChecked_引数が一致する場合_チェック済みの文字列が返る() {
     $this->expected = 'checked="checked"';
     $this->actual = SC_Utils::sfGetChecked('1', '1');
@@ -55,6 +51,5 @@
   }
 
-  public function testSfGetChecked_引数が一致しない場合_0バイト文字列が返る()
-  {
+  public function testSfGetChecked_引数が一致しない場合_0バイト文字列が返る() {
     $this->expected = '';
     $this->actual = SC_Utils::sfGetChecked('2', '1');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php	(revision 22796)
@@ -34,15 +34,12 @@
  * @version $Id$
  */
-class SC_Utils_sfIsMatchHashPassword_authTypePlainTest extends Common_TestCase
-{
+class SC_Utils_sfIsMatchHashPassword_authTypePlainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
@@ -50,6 +47,5 @@
   /////////////////////////////////////////
   /**
-  public function testSfIsMatchHashPassword_文字列が一致する場合_trueが返る()
-  {
+  public function testSfIsMatchHashPassword_文字列が一致する場合_trueが返る() {
     $pass = 'ec-cube';
     $hashpass = 'ec-cube';
@@ -61,6 +57,5 @@
   }
 
-  public function testSfIsMatchHashPassword_文字列が一致しない場合_falseが返る()
-  {
+  public function testSfIsMatchHashPassword_文字列が一致しない場合_falseが返る() {
     $pass = 'ec-cube';
     $hashpass = 'EC-cube';
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Utils_sfIsIntTest extends Common_TestCase
-{
+class SC_Utils_sfIsIntTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsInt_0バイト文字列の場合_FALSEが返る()
-  {
+  public function testSfIsInt_0バイト文字列の場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('');
@@ -54,6 +50,5 @@
   }
 
-  public function testSfIsInt_intの最大長より長い場合_FALSEが返る()
-  {
+  public function testSfIsInt_intの最大長より長い場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('10000000000');
@@ -62,6 +57,5 @@
   }
 
-  public function testSfIsInt_intの最大値ギリギリの場合_TRUEが返る()
-  {
+  public function testSfIsInt_intの最大値ギリギリの場合_TRUEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('2147483647');
@@ -70,6 +64,5 @@
   }
 
-  public function testSfIsInt_intの最大値を超える場合_FALSEが返る()
-  {
+  public function testSfIsInt_intの最大値を超える場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('2147483648');
@@ -78,6 +71,5 @@
   }
 
-  public function testSfIsInt_数値でない場合_FALSEが返る()
-  {
+  public function testSfIsInt_数値でない場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('HELLO123');
@@ -86,6 +78,5 @@
   }
 
-  public function testSfIsInt_正の整数の場合_TRUEが返る()
-  {
+  public function testSfIsInt_正の整数の場合_TRUEが返る() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInt('123456789');
@@ -96,6 +87,5 @@
   // TODO 「整数かどうか」という関数名なのでここはFALSEになるべきでは？
   /**
-  public function testSfIsInt_正の小数の場合_FALSEが返る()
-  {
+  public function testSfIsInt_正の小数の場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('123.456');
@@ -105,6 +95,5 @@
   */
 
-  public function testSfIsInt_負の整数の場合_TRUEが返る()
-  {
+  public function testSfIsInt_負の整数の場合_TRUEが返る() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInt('-12345678');
@@ -115,6 +104,5 @@
   // TODO 文字列長でチェックしているので負の場合は範囲が小さくなっている
   /**
-  public function testSfIsInt_負の整数で桁数が最大の場合_TRUEが返る()
-  {
+  public function testSfIsInt_負の整数で桁数が最大の場合_TRUEが返る() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInt('-123456789');
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Utils_sfGetCommaListTest extends Common_TestCase
-{
+class SC_Utils_sfGetCommaListTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetCommaList_配列が空の場合_FALSEが返る()
-  {
+  public function testSfGetCommaList_配列が空の場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfGetCommaList(array());
@@ -54,6 +50,5 @@
   }
 
-  public function testSfGetCommaList_スペースフラグが立っている場合_スペース付きで連結される()
-  {
+  public function testSfGetCommaList_スペースフラグが立っている場合_スペース付きで連結される() {
     $this->expected = 'りんご, ミカン, バナナ';
     $this->actual = SC_Utils::sfGetCommaList(
@@ -65,6 +60,5 @@
   }
 
-  public function testSfGetCommaList_スペースフラグが倒れている場合_スペース付きで連結される()
-  {
+  public function testSfGetCommaList_スペースフラグが倒れている場合_スペース付きで連結される() {
     $this->expected = 'りんご,ミカン,バナナ';
     $this->actual = SC_Utils::sfGetCommaList(
@@ -77,6 +71,5 @@
 
   // TODO 要確認：arrpopの役割
-  public function testSfGetCommaList_除外リストが指定されている場合_スペース付きで連結される()
-  {
+  public function testSfGetCommaList_除外リストが指定されている場合_スペース付きで連結される() {
     $this->expected = 'りんご, バナナ';
     $this->actual = SC_Utils::sfGetCommaList(
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php	(revision 22796)
@@ -32,111 +32,92 @@
  * @version $Id$
  */
-class SC_Utils_isBlankTest extends Common_TestCase
-{
+class SC_Utils_isBlankTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsBlank_0バイト文字列の場合_trueが返る()
-  {
+  public function testIsBlank_0バイト文字列の場合_trueが返る() {
     $input = '';
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_全角スペースの場合_trueが返る()
-  {
+  public function testIsBlank_全角スペースの場合_trueが返る() {
     $input = '　';
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy指定なしで全角スペースの場合_falseが返る()
-  {
+  public function testIsBlank_greedy指定なしで全角スペースの場合_falseが返る() {
     $input = '　';
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_空の配列の場合_trueが返る()
-  {
+  public function testIsBlank_空の配列の場合_trueが返る() {
     $input = array();
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_ネストした配列の場合_trueが返る()
-  {
+  public function testIsBlank_ネストした配列の場合_trueが返る() {
     $input = array(array(array()));
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy指定なしでネストした配列の場合_falseが返る()
-  {
+  public function testIsBlank_greedy指定なしでネストした配列の場合_falseが返る() {
     $input = array(array(array()));
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_空でない配列の場合_falseが返る()
-  {
+  public function testIsBlank_空でない配列の場合_falseが返る() {
     $input = array(array(array('1')));
     $this->assertFalse(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy指定なしで空でない配列の場合_falseが返る()
-  {
+  public function testIsBlank_greedy指定なしで空でない配列の場合_falseが返る() {
     $input = array(array(array('1')));
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_全角スペースと空白の組み合わせの場合_trueが返る()
-  {
+  public function testIsBlank_全角スペースと空白の組み合わせの場合_trueが返る() {
     $input = "　\n　";
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy指定なしで全角スペースと空白の組み合わせの場合_falseが返る()
-  {
+  public function testIsBlank_greedy指定なしで全角スペースと空白の組み合わせの場合_falseが返る() {
     $input = "　\n　";
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_全角スペースと非空白の組み合わせの場合_falseが返る()
-  {
+  public function testIsBlank_全角スペースと非空白の組み合わせの場合_falseが返る() {
     $input = '　A　';
     $this->assertFalse(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy指定なしで全角スペースと非空白の組み合わせの場合_falseが返る()
-  {
+  public function testIsBlank_greedy指定なしで全角スペースと非空白の組み合わせの場合_falseが返る() {
     $input = '　A　';
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_数値のゼロを入力した場合_falseが返る()
-  {
+  public function testIsBlank_数値のゼロを入力した場合_falseが返る() {
     $input = 0;
     $this->assertFalse(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_値が空の配列を入力した場合_trueが返る()
-  {
+  public function testIsBlank_値が空の配列を入力した場合_trueが返る() {
     $input = array("");
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_すべてのホワイトスペースを並べた場合_trueが返る()
-  {
+  public function testIsBlank_すべてのホワイトスペースを並べた場合_trueが返る() {
     $input = " \t　\n\r\x0B\0";
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_通常の文字が含まれている場合_falseが返る()
-  {
+  public function testIsBlank_通常の文字が含まれている場合_falseが返る() {
     $input = " AB \n\t";
     $this->assertFalse(SC_Utils::isBlank($input), $input);
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class SC_Utils_sfArrKeyValueTest extends Common_TestCase
-{
+class SC_Utils_sfArrKeyValueTest extends Common_TestCase {
 
   var $arrList;
@@ -39,6 +38,5 @@
   var $valuename;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
 
@@ -53,12 +51,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfArrKeyValue_最大長が配列より短い場合_最大長でカットされる()
-  {
+  public function testSfArrKeyValue_最大長が配列より短い場合_最大長でカットされる() {
     $len_max = 3;
 
@@ -73,6 +69,5 @@
   }
 
-  public function testSfArrKeyValue_最大長が指定されていない場合_全要素が出力される()
-  {
+  public function testSfArrKeyValue_最大長が指定されていない場合_全要素が出力される() {
     $this->expected = array(
       '1011' => '2001',
@@ -86,6 +81,5 @@
   }
 
-  public function testSfArrKeyValue_キーサイズが短い場合_キーサイズでカットされる()
-  {
+  public function testSfArrKeyValue_キーサイズが短い場合_キーサイズでカットされる() {
     $len_max = 5;
     $keysize = 1;
Index: /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php	(revision 22796)
@@ -34,21 +34,17 @@
  * @version $Id$
  */
-class SC_Utils_sfIsMatchHashPassword_authTypeHmacTest extends Common_TestCase
-{
+class SC_Utils_sfIsMatchHashPassword_authTypeHmacTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsMatchHashPassword_ハッシュ化後の文字列が一致する場合_trueが返る()
-  {
+  public function testSfIsMatchHashPassword_ハッシュ化後の文字列が一致する場合_trueが返る() {
     $pass = 'ec-cube';
     $salt = 'salt';
@@ -61,6 +57,5 @@
   }
 
-  public function testSfIsMatchHashPassword_ハッシュ化後の文字列が一致しない場合_falseが返る()
-  {
+  public function testSfIsMatchHashPassword_ハッシュ化後の文字列が一致しない場合_falseが返る() {
     $pass = 'ec-cube';
     $salt = 'salt';
@@ -73,6 +68,5 @@
   }
 
-  public function testSfIsMatchHashPassword_saltが未指定の場合_旧バージョンの暗号化で比較される()
-  {
+  public function testSfIsMatchHashPassword_saltが未指定の場合_旧バージョンの暗号化で比較される() {
     $pass = 'ec-cube';
     $hashpass = sha1($pass . ':' . AUTH_MAGIC);
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_cleanupSessionTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_cleanupSessionTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpProductClass();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCleanupSession__カートとセッションの配送情報が削除される()
-  {
+  public function testCleanupSession__カートとセッションの配送情報が削除される() {
     // 引数の準備
     $helper = new SC_Helper_Purchase();
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php	(revision 22796)
@@ -32,10 +32,8 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_getOrderDetailTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getOrderDetailTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
@@ -44,12 +42,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetOrderDetail_存在しない受注IDを指定した場合_結果が空になる()
-  {
+  public function testGetOrderDetail_存在しない受注IDを指定した場合_結果が空になる() {
     $order_id = '9999';
 
@@ -60,6 +56,5 @@
   }
 
-  public function testGetOrderDetail_存在する受注IDを指定した場合_対応する受注詳細情報が取得できる()
-  {
+  public function testGetOrderDetail_存在する受注IDを指定した場合_対応する受注詳細情報が取得できる() {
     $order_id = '1001';
 
@@ -107,6 +102,5 @@
   }
 
-  public function testGetOrderDetail_ステータス取得フラグがOFFのの場合_ステータス以外の情報が取得できる()
-  {
+  public function testGetOrderDetail_ステータス取得フラグがOFFのの場合_ステータス以外の情報が取得できる() {
     $order_id = '1001';
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php	(revision 22796)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php	(revision 22796)
@@ -0,0 +1,71 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getPayments()のテストクラス.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getPaymentsTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpPaymentOptions();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetPayments_存在しない配送業者IDを指定した場合_結果が空になる() {
+    $deliv_id = '100'; // 存在しないID
+
+    $this->expected = array();
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPayments($deliv_id);
+
+    $this->verify('支払方法');
+  }
+
+  public function testGetPayments_存在する配送業者IDを指定した場合_結果が正しい順序で取得できる() {
+    $deliv_id = '1001';
+  
+    $this->expected = array('1002', '1001');
+
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPayments($deliv_id);
+    
+    $this->verify('支払方法');
+  }
+
+  //////////////////////////////////////////
+
+}
+
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php	(revision 22796)
@@ -32,22 +32,18 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_getOrderTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getOrderTempTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderTemp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetOrderTemp_存在しない受注IDを指定した場合_結果が空になる()
-  {
+  public function testGetOrderTemp_存在しない受注IDを指定した場合_結果が空になる() {
     $order_id = '9999';
 
@@ -58,6 +54,5 @@
   }
 
-  public function testGetOrderTemp_存在する受注IDを指定した場合_対応する結果が取得できる()
-  {
+  public function testGetOrderTemp_存在する受注IDを指定した場合_対応する結果が取得できる() {
     $order_temp_id = '1002';
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php	(revision 22796)
@@ -32,15 +32,12 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_setShipmentItemTempForSoleTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_setShipmentItemTempForSoleTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
     $_SESSION['testResult'] = null;
@@ -48,6 +45,5 @@
 
   /////////////////////////////////////////
-  public function testSetShipmentItemTempForSole__いったん配送情報がクリアされたあと改めて指定のものが設定される()
-  {
+  public function testSetShipmentItemTempForSole__いったん配送情報がクリアされたあと改めて指定のものが設定される() {
     $helper = new SC_Helper_Purchase_setShipmentItemTempForSoleMock();
     $cartSession = new SC_CartSession_setShipmentItemTempForSoleMock();
@@ -72,13 +68,10 @@
 }
 
-class SC_Helper_Purchase_setShipmentItemTempForSoleMock extends SC_Helper_Purchase
-{
-  function clearShipmentItemTemp()
-  {
+class SC_Helper_Purchase_setShipmentItemTempForSoleMock extends SC_Helper_Purchase {
+  function clearShipmentItemTemp() {
     $_SESSION['testResult']['clearShipmentItemTemp'] = TRUE;
   }
 
-  function setShipmentItemTemp($shipping_id, $id, $quantity)
-  {
+  function setShipmentItemTemp($shipping_id, $id, $quantity) {
     $_SESSION['testResult']['shipmentItemTemp'][] = 
       array('shipping_id' => $shipping_id, 'id' => $id, 'quantity' => $quantity);
@@ -86,8 +79,6 @@
 }
 
-class SC_CartSession_setShipmentItemTempForSoleMock extends SC_CartSession
-{
-  function getCartList($key)
-  {
+class SC_CartSession_setShipmentItemTempForSoleMock extends SC_CartSession {
+  function getCartList($key) {
     return array(
       array('id'=>'1', 'quantity'=>'10'),
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php	(revision 22796)
@@ -27,25 +27,22 @@
 /**
  * SC_Helper_Purchase::registerOrderDetail()のテストクラス.
+ * TODO 他のfunctionと、SC_Query_Exのインスタンスの受け取り方が異なっている。
  *
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_registerOrderDetailTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerOrderDetailTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderDetail();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterOrderDetail_該当の受注が存在する場合_削除後に新しい情報が登録される()
-  {
+  public function testRegisterOrderDetail_該当の受注が存在する場合_削除後に新しい情報が登録される() {
     $params = array(
       array(
@@ -80,6 +77,5 @@
   }
 
-  public function testRegisterOrderDetail_該当の受注が存在しない場合_新しい情報が追加登録される()
-  {
+  public function testRegisterOrderDetail_該当の受注が存在しない場合_新しい情報が追加登録される() {
     $params = array(
       array(
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_setDownloadableFlgToTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_setDownloadableFlgToTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSetDownloadableFlgTo_販売価格が0円の場合_フラグがONになる()
-  {
+  public function testSetDownloadableFlgTo_販売価格が0円の場合_フラグがONになる() {
     $input = array(
       '1001' => array('price' => 0)
@@ -60,6 +56,5 @@
   }
 
-  public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日ありの場合_フラグがONになる()
-  {
+  public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日ありの場合_フラグがONになる() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '1', 'payment_date' => '2012-12-12')
@@ -73,6 +68,5 @@
   }
 
-  public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日なしの場合_フラグがOFFになる()
-  {
+  public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日なしの場合_フラグがOFFになる() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '1', 'payment_date' => null)
@@ -86,6 +80,5 @@
   }
 
-  public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日ありの場合_フラグがOFFになる()
-  {
+  public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日ありの場合_フラグがOFFになる() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '0', 'payment_date' => '2012-12-12')
@@ -99,6 +92,5 @@
   }
 
-  public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日なしの場合_フラグがOFFになる()
-  {
+  public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日なしの場合_フラグがOFFになる() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '0', 'payment_date' => null)
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php	(revision 22796)
@@ -33,10 +33,8 @@
  */
 
-class SC_Helper_Purchase_registerOrderCompleteTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerOrderCompleteTest extends SC_Helper_Purchase_TestBase {
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderTemp();
@@ -44,12 +42,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterOrderComplete_不要な変数が含まれている場合_登録前に除外される()
-  {
+  public function testRegisterOrderComplete_不要な変数が含まれている場合_登録前に除外される() {
     // 引数の準備
     $orderParams = array(
@@ -98,6 +94,5 @@
   }
 
-  public function testRegisterOrderComplete_ステータスの指定がない場合_新規受付扱いとなる()
-  {
+  public function testRegisterOrderComplete_ステータスの指定がない場合_新規受付扱いとなる() {
     // 引数の準備
     $orderParams = array(
@@ -129,9 +124,7 @@
 }
 
-class SC_Helper_Purchase_registerOrderCompleteMock extends SC_Helper_Purchase
-{
+class SC_Helper_Purchase_registerOrderCompleteMock extends SC_Helper_Purchase {
 
-  function registerOrder($order_id, $params)
-  {
+  function registerOrder($order_id, $params) {
     $_SESSION['testResult']['registerOrder'] = array(
       'order_id' => $order_id,
@@ -141,6 +134,5 @@
   }
 
-  function registerOrderDetail($order_id, $params)
-  {
+  function registerOrderDetail($order_id, $params) {
     $_SESSION['testResult']['registerOrderDetail'] = array(
       'order_id' => $order_id,
@@ -149,14 +141,11 @@
   }
 
-  function setUniqId()
-  {}
+  function setUniqId() {}
 }
 
-class SC_CartSession_registerOrderCompleteMock extends SC_CartSession
-{
+class SC_CartSession_registerOrderCompleteMock extends SC_CartSession {
 
   // カートの内容を取得
-  function getCartList($cartKey)
-  {
+  function getCartList($cartKey) {
     return array(
       array(
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php	(revision 22796)
@@ -32,11 +32,9 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_sfUpdateOrderStatusTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_sfUpdateOrderStatusTest extends SC_Helper_Purchase_TestBase {
 
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
@@ -45,6 +43,5 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
@@ -52,6 +49,5 @@
   /////////////////////////////////////////
   // オプションの引数：対応状況、使用ポイント、加算ポイント
-  public function testSfUpdateOrderStatus_オプションの引数が未指定の場合_DBの値が引き継がれる()
-  {
+  public function testSfUpdateOrderStatus_オプションの引数が未指定の場合_DBの値が引き継がれる() {
     $order_id = '1001';
     $old_update_date = $this->objQuery->get('update_date', 'dtb_order', 'order_id = ?', array($order_id));
@@ -85,6 +81,5 @@
   // TODO 定数を変更できないためテスト不可
   /**
-  public function testSfUpdateOrderStatus_ポイント使用しない設定の場合_ポイントに関する処理が行われない()
-  {
+  public function testSfUpdateOrderStatus_ポイント使用しない設定の場合_ポイントに関する処理が行われない() {
 
 
@@ -93,6 +88,5 @@
   */
 
-  public function testSfUpdateOrderStatus_対応状況が発送済みに変更された場合_発送日が更新される()
-  {
+  public function testSfUpdateOrderStatus_対応状況が発送済みに変更された場合_発送日が更新される() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
@@ -130,6 +124,5 @@
   }
 
-  public function testSfUpdateOrderStatus_対応状況が入金済みに変更された場合_入金日が更新される()
-  {
+  public function testSfUpdateOrderStatus_対応状況が入金済みに変更された場合_入金日が更新される() {
     $order_id = '1002';
     $old_dates = $this->objQuery->select(
@@ -162,6 +155,5 @@
   }
 
-  public function testSfUpdateOrderStatus_変更前の対応状況が利用対象の場合_変更前の使用ポイントを戻す()
-  {
+  public function testSfUpdateOrderStatus_変更前の対応状況が利用対象の場合_変更前の使用ポイントを戻す() {
     $order_id = '1002';
     $old_dates = $this->objQuery->select(
@@ -191,6 +183,5 @@
   }
 
-  public function testSfUpdateOrderStatus_変更後の対応状況が利用対象の場合_変更後の使用ポイントを引く()
-  {
+  public function testSfUpdateOrderStatus_変更後の対応状況が利用対象の場合_変更後の使用ポイントを引く() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
@@ -219,6 +210,5 @@
   }
 
-  public function testSfUpdateOrderStatus_変更前の対応状況が加算対象の場合_変更前の加算ポイントを戻す()
-  {
+  public function testSfUpdateOrderStatus_変更前の対応状況が加算対象の場合_変更前の加算ポイントを戻す() {
     $order_id = '1002';
     $old_dates = $this->objQuery->select(
@@ -248,6 +238,5 @@
   }
 
-  public function testSfUpdateOrderStatus_変更後の対応状況が加算対象の場合_変更後の加算ポイントを足す()
-  {
+  public function testSfUpdateOrderStatus_変更後の対応状況が加算対象の場合_変更後の加算ポイントを足す() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
@@ -276,6 +265,5 @@
   }
 
-  public function testSfUpdateOrderStatus_加算ポイントがプラスの場合_会員テーブルが更新される()
-  {
+  public function testSfUpdateOrderStatus_加算ポイントがプラスの場合_会員テーブルが更新される() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
@@ -306,6 +294,5 @@
   }
 
-  public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りている場合_会員テーブルが更新される()
-  {
+  public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りている場合_会員テーブルが更新される() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
@@ -338,6 +325,5 @@
   // TODO ロールバックされる場合はexitするためテスト不可.
   /**
-  public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りていない場合_会員テーブルがロールバックされエラーとなる()
-  {
+  public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りていない場合_会員テーブルがロールバックされエラーとなる() {
   }
   */
@@ -345,6 +331,5 @@
   //////////////////////////////////////////
 
-  function assertUpdate($new_dates, $old_dates, $key, $message, $is_update = true)
-  {
+  function assertUpdate($new_dates, $old_dates, $key, $message, $is_update = true) {
     $new_date = $new_dates[0][$key];
     $old_date = $old_dates[0][$key];
@@ -360,12 +345,10 @@
 }
 
-class SC_Helper_Purchase_sfUpdateOrderStatusMock extends SC_Helper_Purchase
-{
+class SC_Helper_Purchase_sfUpdateOrderStatusMock extends SC_Helper_Purchase {
 
   var $usePoint;
   var $addPoint;
 
-  function isUsePoint($status)
-  {
+  function isUsePoint($status) {
     if (is_null($this->usePoint)) {
       return parent::isUsePoint($status);
@@ -374,6 +357,5 @@
   }
 
-  function isAddPoint($status)
-  {
+  function isAddPoint($status) {
     if (is_null($this->addPoint)) {
       return parent::isAddPoint($status);
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php	(revision 22796)
@@ -32,22 +32,18 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_getOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getOrderTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetOrder_存在しない受注IDを指定した場合_結果が空になる()
-  {
+  public function testGetOrder_存在しない受注IDを指定した場合_結果が空になる() {
     $order_id = '9999';
 
@@ -58,6 +54,5 @@
   }
 
-  public function testGetOrder_存在しない顧客IDを指定した場合_結果が空になる()
-  {
+  public function testGetOrder_存在しない顧客IDを指定した場合_結果が空になる() {
     $order_id = '1002';
     $customer_id = '9999';
@@ -69,6 +64,5 @@
   }
 
-  public function testGetOrder_顧客IDを指定しなかった場合_受注IDに対応する結果が取得できる()
-  {
+  public function testGetOrder_顧客IDを指定しなかった場合_受注IDに対応する結果が取得できる() {
     $order_id = '1002';
 
@@ -84,6 +78,5 @@
   }
 
-  public function testGetOrder_存在する顧客IDを指定した場合_対応する結果が取得できる()
-  {
+  public function testGetOrder_存在する顧客IDを指定した場合_対応する結果が取得できる() {
     $order_id = '1002';
     $customer_id = '1002';
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_registerShipmentItemTest extends SC_Helper_Purchase_TestBase
-{
-
-  protected function setUp()
-  {
+class SC_Helper_Purchase_registerShipmentItemTest extends SC_Helper_Purchase_TestBase {
+
+  protected function setUp() {
     parent::setUp();
     $this->setUpShipmentItem();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterShipmentItem_製品クラスIDが入っていない場合_登録を行わない()
-  {
+  public function testRegisterShipmentItem_製品クラスIDが入っていない場合_登録を行わない() {
     // 引数の設定
     $order_id = '1';
@@ -79,6 +75,5 @@
   }
 
-  public function testRegisterShipmentItem_製品名等が指定されている場合_指定された値で登録を行う()
-  {
+  public function testRegisterShipmentItem_製品名等が指定されている場合_指定された値で登録を行う() {
     // 引数の設定
     $order_id = '1';
@@ -120,6 +115,5 @@
   }
 
-  public function testRegisterShipmentItem_製品名等が指定されていない場合_DBからマスタ情報を取得して登録を行う()
-  {
+  public function testRegisterShipmentItem_製品名等が指定されていない場合_DBからマスタ情報を取得して登録を行う() {
     // 引数の設定
     $order_id = '1';
@@ -164,6 +158,5 @@
   }
 
-  public function testRegisterShipmentItem_DBに存在しないカラムを指定した場合_エラーなく登録できる()
-  {
+  public function testRegisterShipmentItem_DBに存在しないカラムを指定した場合_エラーなく登録できる() {
     // 引数の設定
     $order_id = '1';
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php	(revision 22796)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php	(revision 22796)
@@ -0,0 +1,116 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getPaymentsByPrice()のテストクラス.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getPaymentsByPriceTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpPayment();
+    $this->setUpPaymentOptions();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetPaymentsByPrice_購入金額がすべての上限を上回る場合_上限の設定がないものだけ取得できる() {
+    $deliv_id = '1003';
+    $total = 21001;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected['count'] = 2;
+    $this->expected['first'] = array(
+      'payment_id' => '3002',
+      'payment_method' => '支払方法3002',
+      'rule_max' => null,
+      'upper_rule' => null,
+      'note' => null,
+      'payment_image' => null,
+      'charge' => null
+    );
+    $this->expected['second_id'] = '3003';
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual['count'] = count($result);
+    $this->actual['first'] = $result[0];
+    $this->actual['second_id'] = $result[1]['payment_id'];
+
+    $this->verify();
+  }
+
+  public function testGetPaymentsByPrice_購入金額が一部の上限を上回る場合_上限に引っかからないものだけ取得できる() {
+    $deliv_id = '1003';
+    $total = 20500;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected = array('3002', '3003', '3005');
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual = Test_Utils::mapCols($result, 'payment_id');
+
+    $this->verify();
+  }
+
+  public function testGetPaymentsByPrice_購入金額が一部の下限を下回る場合_下限に引っかからないものだけ取得できる() {
+    $deliv_id = '1003';
+    $total = 11000;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected = array('3002', '3003', '3004');
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual = Test_Utils::mapCols($result, 'payment_id');
+
+    $this->verify();
+  }
+
+  public function testGetPaymentsByPrice_購入金額がすべての下限を下回る場合_下限の設定がないものだけ取得できる() {
+    $deliv_id = '1003';
+    $total = 9999;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected = array('3002', '3004');
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual = Test_Utils::mapCols($result, 'payment_id');
+
+    $this->verify();
+  }
+
+
+  //////////////////////////////////////////
+
+}
+
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php	(revision 22796)
@@ -32,9 +32,7 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_unsetAllShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_unsetAllShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
 
@@ -44,12 +42,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testUnsetAllShippingTemp_複数配送も破棄するフラグがOFFの場合_情報の一部が破棄される()
-  {
+  public function testUnsetAllShippingTemp_複数配送も破棄するフラグがOFFの場合_情報の一部が破棄される() {
     SC_Helper_Purchase::unsetAllShippingTemp();
 
@@ -61,6 +57,5 @@
   }
 
-  public function testUnsetAllShippingTemp_複数配送も破棄するフラグがONの場合_全ての情報が破棄される()
-  {
+  public function testUnsetAllShippingTemp_複数配送も破棄するフラグがONの場合_全ての情報が破棄される() {
     SC_Helper_Purchase::unsetAllShippingTemp(TRUE);
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php	(revision 22796)
@@ -32,10 +32,8 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_saveOrderTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_saveOrderTempTest extends SC_Helper_Purchase_TestBase {
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderTemp();
@@ -43,12 +41,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSaveOrderTemp_受注一時情報IDが空の場合_何もしない()
-  {
+  public function testSaveOrderTemp_受注一時情報IDが空の場合_何もしない(){
     $this->helper->saveOrderTemp(null,
       array(
@@ -65,6 +61,5 @@
   }
 
-  public function testSaveOrderTemp_既存の情報がない場合_情報が新規登録される()
-  {
+  public function testSaveOrderTemp_既存の情報がない場合_情報が新規登録される(){
     $this->helper->saveOrderTemp('1003',
       array(
@@ -91,6 +86,5 @@
   }
 
-  public function testSaveOrderTemp_既存の情報がある場合_情報が更新される()
-  {
+  public function testSaveOrderTemp_既存の情報がある場合_情報が更新される(){
     $this->helper->saveOrderTemp('1002',
       array(
@@ -117,6 +111,5 @@
   }
 
-  public function testSaveOrderTemp_注文者情報がある場合_情報がコピーされる()
-  {
+  public function testSaveOrderTemp_注文者情報がある場合_情報がコピーされる(){
     $this->helper->saveOrderTemp('1003',
       array(
@@ -142,8 +135,6 @@
 }
 
-class SC_Helper_Purchase_saveOrderTempMock extends SC_Helper_Purchase
-{
-  function copyFromCustomer($sqlval, $objCustomer)
-  {
+class SC_Helper_Purchase_saveOrderTempMock extends SC_Helper_Purchase {
+  function copyFromCustomer($sqlval, $objCustomer) {
     echo('COPY_FROM_CUSTOMER');
   }
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php	(revision 22796)
@@ -32,11 +32,9 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_registerOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerOrderTest extends SC_Helper_Purchase_TestBase {
 
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
@@ -44,12 +42,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterOrder_既に受注IDが存在する場合_情報が更新される()
-  {
+  public function testRegisterOrder_既に受注IDが存在する場合_情報が更新される() {
     $order_id = '1001';
     $arrParams = array(
@@ -93,6 +89,5 @@
   }
 
-  public function testRegisterOrder_存在しない受注IDを指定した場合_新規に登録される()
-  {
+  public function testRegisterOrder_存在しない受注IDを指定した場合_新規に登録される() {
     $order_id = '1003';
     $arrParams = array(
@@ -137,6 +132,5 @@
   }
 
-  public function testRegisterOrder_受注IDが未指定の場合_新たにIDが発行される()
-  {
+  public function testRegisterOrder_受注IDが未指定の場合_新たにIDが発行される() {
     $order_id = '';
     $arrParams = array( // 顧客IDも未指定
@@ -188,8 +182,6 @@
 }
 
-class SC_Helper_Purchase_registerOrderMock extends SC_Helper_Purchase
-{
-  function sfUpdateOrderStatus($order_id, $status, $add_point, $use_point, $values)
-  {
+class SC_Helper_Purchase_registerOrderMock extends SC_Helper_Purchase {
+  function sfUpdateOrderStatus($order_id, $status, $add_point, $use_point, $values) {
     $_SESSION['testResult']['sfUpdateOrderStatus'] = array(
       'order_id' => $order_id,
@@ -200,6 +192,5 @@
   }
 
-  function sfUpdateOrderNameCol($order_id)
-  {
+  function sfUpdateOrderNameCol($order_id) {
    $_SESSION['testResult']['sfUpdateOrderNameCol'] = $order_id;
   }
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php	(revision 22796)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php	(revision 22796)
@@ -0,0 +1,74 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getDelivTime()のテストクラス.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getDelivTimeTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpDelivTime();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetDelivTime_存在しない配送業者IDを指定した場合_結果が空になる() {
+    $deliv_id = '100'; // 存在しないID
+
+    $this->expected = array();
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getDelivTime($deliv_id);
+
+    $this->verify('お届け時間');
+  }
+
+  public function testGetDelivTime_存在する配送業者IDを指定した場合_結果が正しい順序で取得できる() {
+    $deliv_id = '1001';
+  
+    $this->expected = array(
+      '1' => '午前',
+      '2' => '午後'
+    );
+
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getDelivTime($deliv_id);
+    
+    $this->verify('お届け時間');
+  }
+
+  //////////////////////////////////////////
+
+}
+
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_saveShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_saveShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSaveShippingTemp_元々存在しない配送先IDの場合_新規に配列が作られる()
-  {
+  public function testSaveShippingTemp_元々存在しない配送先IDの場合_新規に配列が作られる() {
     $this->setUpShipping($this->getMultipleShipping());
 
@@ -68,6 +64,5 @@
   }
 
-  public function testSaveShippingTemp_元々存在する配送先IDの場合_情報がマージされる()
-  {
+  public function testSaveShippingTemp_元々存在する配送先IDの場合_情報がマージされる() {
     $this->setUpShipping($this->getMultipleShipping());
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_registerShippingTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerShippingTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpShippingOnDb();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterShipping_元々存在しない受注IDの場合_新規にデータが作られる()
-  {
+  public function testRegisterShipping_元々存在しない受注IDの場合_新規にデータが作られる() {
     $order_id = '10';
     $arrParams = array(
@@ -85,6 +81,5 @@
   }
 
-  public function testRegisterShipping_元々存在する受注IDの場合_既存のデータが置き換えられる()
-  {
+  public function testRegisterShipping_元々存在する受注IDの場合_既存のデータが置き換えられる() {
     $order_id = '2';
     $arrParams = array(
@@ -123,6 +118,5 @@
   }
 
-  public function testRegisterShipping_配送日付が空の場合_エラーが起きず変換処理がスキップされる()
-  {
+  public function testRegisterShipping_配送日付が空の場合_エラーが起きず変換処理がスキップされる() {
     $order_id = '2';
     $arrParams = array(
@@ -161,6 +155,5 @@
   }
 
-  public function testRegisterShipping_非会員購入の場合_配送IDが設定される()
-  {
+  public function testRegisterShipping_非会員購入の場合_配送IDが設定される() {
     $order_id = '2';
     $arrParams = array(
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php	(revision 22796)
@@ -32,9 +32,7 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_unsetShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_unsetShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
 
@@ -44,12 +42,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testUnsetShippingTemp__配送情報がすべて破棄される()
-  {
+  public function testUnsetShippingTemp__配送情報がすべて破棄される() {
     SC_Helper_Purchase::unsetShippingTemp(TRUE);
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php	(revision 22796)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php	(revision 22796)
@@ -0,0 +1,85 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getPaymentsByPaymentsId()のテストクラス.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getPaymentsByPaymentsIdTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpPayment();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetPaymentsByPaymentsId_存在しない支払IDを指定した場合_結果が空になる() {
+    $payment_id = '9999'; // 存在しないID
+  
+    $this->expected = null;
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPaymentsByPaymentsId($payment_id);
+
+    $this->verify('支払方法');
+  }
+
+  public function testGetPaymentsByPaymentsId_存在する支払IDを指定した場合_対応する支払方法の情報が取得できる() {
+    $payment_id = '1001';
+  
+    $this->expected = array(
+      'payment_id' => '1001',
+      'payment_method' => '支払方法1001'
+    );
+
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPaymentsByPaymentsId($payment_id);
+    $this->actual = Test_Utils::mapArray($this->actual, array('payment_id', 'payment_method'));
+
+    $this->verify('支払方法');
+  }
+
+  public function testGetPaymentsByPaymentsId_削除されている支払IDを指定した場合_結果が空になる() {
+    $payment_id = '1002'; // 削除済みのID
+  
+    $this->expected = null;
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPaymentsByPaymentsId($payment_id);
+
+    $this->verify('支払方法');
+  }
+
+  //////////////////////////////////////////
+
+}
+
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_copyFromOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_copyFromOrderTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCopyFromOrder_すべてデフォルト設定にした場合_デフォルトの接頭辞・キーでコピーされる()
-  {
+  public function testCopyFromOrder_すべてデフォルト設定にした場合_デフォルトの接頭辞・キーでコピーされる() {
      $dest = array();
      $src = array(
@@ -94,6 +90,5 @@
   }
 
-  public function testCopyFromOrder_接頭辞・キーを設定した場合_指定の値でコピーされる()
-  {
+  public function testCopyFromOrder_接頭辞・キーを設定した場合_指定の値でコピーされる() {
      $dest = array();
      $src = array(
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_isAddPointTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_isAddPointTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsAddPoint_新規注文の場合_FALSEが返る()
-  {
+  public function testIsAddPoint_新規注文の場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_NEW);
@@ -54,6 +50,5 @@
   }
 
-  public function testIsAddPoint_入金待ちの場合_FALSEが返る()
-  {
+  public function testIsAddPoint_入金待ちの場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PAY_WAIT);
@@ -62,6 +57,5 @@
   }
 
-  public function testIsAddPoint_入金済みの場合_FALSEが返る()
-  {
+  public function testIsAddPoint_入金済みの場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PRE_END);
@@ -70,6 +64,5 @@
   }
 
-  public function testIsAddPoint_キャンセルの場合_FALSEが返る()
-  {
+  public function testIsAddPoint_キャンセルの場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_CANCEL);
@@ -78,6 +71,5 @@
   }
 
-  public function testIsAddPoint_取り寄せ中の場合_FALSEが返る()
-  {
+  public function testIsAddPoint_取り寄せ中の場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_BACK_ORDER);
@@ -86,6 +78,5 @@
   }
 
-  public function testIsAddPoint_発送済みの場合_TRUEが返る()
-  {
+  public function testIsAddPoint_発送済みの場合_TRUEが返る() {
     $this->expected = TRUE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_DELIV);
@@ -94,6 +85,5 @@
   }
 
-  public function testIsAddPoint_その他の場合_FALSEが返る()
-  {
+  public function testIsAddPoint_その他の場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PENDING);
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php	(revision 22796)
@@ -32,14 +32,11 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_getShippingPrefTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShippingPrefTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
@@ -47,6 +44,5 @@
   /////////////////////////////////////////
   // TODO 要確認：引数の名前がおかしい（is_multipleではないはず）
-  public function testGetShippingPref_保有フラグがOFFの場合_全配送情報を取得する()
-  {
+  public function testGetShippingPref_保有フラグがOFFの場合_全配送情報を取得する() {
     $this->setUpShipping($this->getMultipleShipping());
 
@@ -57,6 +53,5 @@
   }
 
-  public function testGetShippingPref_保有フラグがONの場合_商品のある配送情報のみ取得する()
-  {
+  public function testGetShippingPref_保有フラグがONの場合_商品のある配送情報のみ取得する() {
     $this->setUpShipping($this->getMultipleShipping());
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_isUsePointTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_isUsePointTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsUsePoint_ステータスがnullの場合_FALSEが返る()
-  {
+  public function testIsUsePoint_ステータスがnullの場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isUsePoint(null);
@@ -54,6 +50,5 @@
   }
 
-  public function testIsUsePoint_ステータスがキャンセルの場合_FALSEが返る()
-  {
+  public function testIsUsePoint_ステータスがキャンセルの場合_FALSEが返る() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isUsePoint(ORDER_CANCEL);
@@ -63,6 +58,5 @@
 
   // TODO 要確認：本当にキャンセルのとき以外はすべてTRUEで良いのか、現在の使われ方の都合か
-  public function testIsUsePoint_ステータスがキャンセル以外の場合_TRUEが返る()
-  {
+  public function testIsUsePoint_ステータスがキャンセル以外の場合_TRUEが返る() {
     $this->expected = TRUE;
     $this->actual = SC_Helper_Purchase::isUsePoint(ORDER_NEW);
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_unsetOneShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_unsetOneShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testUnsetOneShippingTemp__指定したIDの配送情報のみが破棄される()
-  {
+  public function testUnsetOneShippingTemp__指定したIDの配送情報のみが破棄される() {
     $this->setUpShipping($this->getMultipleShipping());
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_clearShipmentItemTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_clearShipmentItemTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testClearShipmentItem_配送先ID未指定の場合_全ての配送商品がクリアされる()
-  {
+  public function testClearShipmentItem_配送先ID未指定の場合_全ての配送商品がクリアされる() {
     $this->setUpShipping($this->getMultipleShipping());
 
@@ -61,6 +57,5 @@
   }
 
-  public function testClearShipmentItem_配送先ID指定の場合_指定したIDの配送商品がクリアされる()
-  {
+  public function testClearShipmentItem_配送先ID指定の場合_指定したIDの配送商品がクリアされる() {
     $this->setUpShipping($this->getMultipleShipping());
 
@@ -76,6 +71,5 @@
   }
 
-  public function testClearShipmentItem_存在しないIDを指定した場合_何も変更されない()
-  {
+  public function testClearShipmentItem_存在しないIDを指定した場合_何も変更されない() {
     $this->setUpShipping($this->getMultipleShipping());
 
@@ -91,6 +85,5 @@
   }
 
-  public function testClearShipmentItem_商品情報が配列でない場合_何も変更されない()
-  {
+  public function testClearShipmentItem_商品情報が配列でない場合_何も変更されない() {
     $this->setUpShipping($this->getMultipleShipping());
     // 内容を配列でないように変更
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php	(revision 22796)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php	(revision 22796)
@@ -0,0 +1,87 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getDeliv()のテストクラス.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getDelivTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpDeliv();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetDeliv_存在しない商品種別IDを指定した場合_結果が空になる() {
+    $product_type_id = '9999'; // 存在しないID
+
+    $this->expected = array();
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getDeliv($product_type_id);
+
+    $this->verify('配送業者');
+  }
+
+  public function testGetDeliv_存在する商品種別IDを指定した場合_結果が正しい順序で取得できる() {
+    $product_type_id = '1001';
+  
+    $this->expected['count'] = 2;
+    $this->expected['first'] = array(
+      'deliv_id' => '1002',
+      'product_type_id' => '1001',
+      'name' => '配送業者02',
+      'rank' => '3'
+    );
+    $this->expected['second'] = array(
+      'deliv_id' => '1001',
+      'product_type_id' => '1001',
+      'name' => '配送業者01',
+      'rank' => '2'
+    );
+
+    $helper = new SC_Helper_Purchase();
+    $result = $helper->getDeliv($product_type_id);
+    $this->actual['count'] = count($result);
+    $cols = array('deliv_id', 'product_type_id', 'name', 'rank');
+    $this->actual['first'] = Test_Utils::mapArray($result[0], $cols);
+    $this->actual['second'] = Test_Utils::mapArray($result[1], $cols);
+
+    $this->verify('配送業者');
+  }
+
+  //////////////////////////////////////////
+
+}
+
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php	(revision 22796)
@@ -32,10 +32,8 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_getShippingsTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShippingsTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpShipmentItem();
@@ -43,12 +41,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetShippings_存在しない受注IDを指定した場合_結果が空になる()
-  {
+  public function testGetShippings_存在しない受注IDを指定した場合_結果が空になる() {
     $order_id = '100'; // 存在しないID
 
@@ -60,6 +56,5 @@
   }
 
-  public function testGetShippings_存在する受注IDを指定した場合_結果が取得できる()
-  {
+  public function testGetShippings_存在する受注IDを指定した場合_結果が取得できる() {
     $order_id = '1';
   
@@ -83,6 +78,5 @@
   }
 
-  public function testGetShippings_商品取得フラグをOFFにした場合_結果に商品情報が含まれない()
-  {
+  public function testGetShippings_商品取得フラグをOFFにした場合_結果に商品情報が含まれない() {
     $order_id = '1';
     
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php	(revision 22796)
@@ -32,13 +32,10 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_completeOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_completeOrderTest extends SC_Helper_Purchase_TestBase {
 
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
-    $this->setUpOrder();
     $this->setUpOrderTemp(); // order_temp_id = '1001'
     $this->setUpShipping();
@@ -56,6 +53,5 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
@@ -63,6 +59,5 @@
   /////////////////////////////////////////
   // 適切なfunctionが呼ばれていることのみ確認
-  public function testCompleteOrder_顧客IDが指定されている場合_購入日が更新される()
-  {
+  public function testCompleteOrder_顧客IDが指定されている場合_購入日が更新される() {
     $_SESSION['customer']['customer_id'] = '1002'; // 顧客ID
     $this->helper->completeOrder(ORDER_DELIV);
@@ -101,6 +96,5 @@
   }
 
-  public function testCompleteOrder_顧客IDが指定されていない場合_特にエラーなく修了できる()
-  {
+  public function testCompleteOrder_顧客IDが指定されていない場合_特にエラーなく修了できる() {
     $this->helper->completeOrder(); // デフォルトのステータス(NEW)
 
@@ -140,20 +134,16 @@
 }
 
-class SC_Helper_Purchase_completeOrderMock extends SC_Helper_Purchase
-{
+class SC_Helper_Purchase_completeOrderMock extends SC_Helper_Purchase{
 
-  function verifyChangeCart($uniqId, $objCartSession)
-  {
+  function verifyChangeCart($uniqId, $objCartSession){
     $_SESSION['testResult']['verifyChangeCart'] = array('uniqId'=>$uniqId);
   }
 
-  function getOrderTemp($uniqId)
-  {
+  function getOrderTemp($uniqId) {
     $_SESSION['testResult']['getOrderTemp'] = array('uniqId'=>$uniqId);
     return parent::getOrderTemp($uniqId);
   }
 
-  function registerOrderComplete($orderTemp, $objCartSession, $cartKey)
-  {
+  function registerOrderComplete($orderTemp, $objCartSession, $cartKey) {
     $_SESSION['testResult']['registerOrderComplete'] = array(
       'order_temp_id' => $orderTemp['order_temp_id'],
@@ -164,6 +154,5 @@
   }
 
-  function registerShipmentItem($order_id, $shipping_id, $shipment_item)
-  {
+  function registerShipmentItem($order_id, $shipping_id, $shipment_item) {
     $_SESSION['testResult']['registerShipmentItem'][] = array(
       'order_id' => $order_id,
@@ -173,6 +162,5 @@
   }
 
-  function registerShipping($order_id, $shipping_temp)
-  {
+  function registerShipping($order_id, $shipping_temp) {
     $_SESSION['testResult']['registerShipping'] = array(
       'order_id' => $order_id
@@ -180,6 +168,5 @@
   }
 
-  function cleanupSession($order_id, $objCartSesion, $objCustomer, $cartKey)
-  {
+  function cleanupSession($order_id, $objCartSesion, $objCustomer, $cartKey) {
     $_SESSION['testResult']['cleanupSession'] = array(
       'order_id' => $order_id,
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php	(revision 22796)
@@ -32,10 +32,8 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_sfUpdateOrderNameColTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_sfUpdateOrderNameColTest extends SC_Helper_Purchase_TestBase {
   var $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
@@ -49,12 +47,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfUpdateOrderNameCol_TEMPフラグがOFFの場合_受注テーブルと発送テーブルが更新される()
-  {
+  public function testSfUpdateOrderNameCol_TEMPフラグがOFFの場合_受注テーブルと発送テーブルが更新される() {
     $order_id = '1002';
 
@@ -77,6 +73,5 @@
   }
 
-  public function testSfUpdateOrderNameCol_TEMPフラグがONの場合_一時テーブルが更新される()
-  {
+  public function testSfUpdateOrderNameCol_TEMPフラグがONの場合_一時テーブルが更新される() {
     $order_id = '1002';
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_getShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetShippingTemp_保有フラグがOFFの場合_セッション情報を取得する()
-  {
+  public function testGetShippingTemp_保有フラグがOFFの場合_セッション情報を取得する() {
     $this->setUpShipping($this->getMultipleShipping());
 
@@ -56,6 +52,5 @@
   }
 
-  public function testGetShippingTemp_保有フラグがONの場合_商品のある情報のみ取得する()
-  {
+  public function testGetShippingTemp_保有フラグがONの場合_商品のある情報のみ取得する() {
     $this->setUpShipping($this->getMultipleShipping());
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php	(revision 22796)
@@ -32,10 +32,8 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_setShipmentItemTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_setShipmentItemTempTest extends SC_Helper_Purchase_TestBase {
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpProductClass();
@@ -48,12 +46,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSetShipmentItemTemp_製品情報が既に存在する場合_存在する情報が価格に反映される()
-  {
+  public function testSetShipmentItemTemp_製品情報が既に存在する場合_存在する情報が価格に反映される() {
     $this->helper->setShipmentItemTemp('1001', '1001', 10);
 
@@ -71,6 +67,5 @@
   }
 
-  public function testSetShipmentItemTemp_製品情報が存在しない場合_DBから取得した値が反映される()
-  {
+  public function testSetShipmentItemTemp_製品情報が存在しない場合_DBから取得した値が反映される() {
     $this->helper->setShipmentItemTemp('1001', '1002', 10);
 
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php	(revision 22796)
@@ -31,14 +31,11 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_TestBase extends Common_TestCase
-{
-
-  protected function setUp()
-  {
+class SC_Helper_Purchase_TestBase extends Common_TestCase {
+
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
@@ -48,6 +45,5 @@
    * セッションに配送情報を設定します。
    */
-  protected function setUpShipping($shipping)
-  {
+  protected function setUpShipping($shipping) {
     if (!$shipping) {
       $shipping = $this->getSingleShipping(); 
@@ -57,6 +53,5 @@
   }
 
-  protected function getSingleShipping()
-  {
+  protected function getSingleShipping() {
     return array(
       '00001' => array(
@@ -67,6 +62,5 @@
   }
 
-  protected function getMultipleShipping()
-  {
+  protected function getMultipleShipping() {
     return array(
       '00001' => array(
@@ -88,6 +82,5 @@
    * DBに配送情報を設定します。
    */
-  protected function setUpShippingOnDb()
-  {
+  protected function setUpShippingOnDb() {
     $shippings = array(
       array(
@@ -123,6 +116,5 @@
    * DBに配送商品情報を設定します。
    */
-  protected function setUpShipmentItem()
-  {
+  protected function setUpShipmentItem() {
       $shipping_items = array(
         array(
@@ -152,6 +144,5 @@
    * DBに商品クラス情報を設定します.
    */
-  protected function setUpProductClass()
-  {
+  protected function setUpProductClass() {
       $product_class = array(
         array(
@@ -166,5 +157,4 @@
           'price02' => '1500',
           'creator_id' => '1',
-          'stock' => '100',
           'del_flg' => '0'
         ),
@@ -176,5 +166,4 @@
           'price02' => '2500',
           'creator_id' => '1',
-          'stock' => '50',
           'del_flg' => '0'
         )
@@ -182,6 +171,5 @@
 
     $this->objQuery->delete('dtb_products_class');
-    foreach ($product_class as $key => $item)
-{
+    foreach ($product_class as $key => $item) {
       $this->objQuery->insert('dtb_products_class', $item);
     }
@@ -193,6 +181,5 @@
    * DBに製品カテゴリ情報を登録します.
    */
-  protected function setUpClassCategory()
-  {
+  protected function setUpClassCategory() {
     $class_category = array(
       array(
@@ -221,6 +208,5 @@
    * DBに製品情報を登録します.
    */
- protected function setUpProducts()
- {
+ protected function setUpProducts() {
    $products = array(
      array(
@@ -251,6 +237,5 @@
   * DBに支払方法の情報を登録します.
   */
- protected function setUpPaymentOptions()
- {
+ protected function setUpPaymentOptions() {
    $payment_options = array(
      array(
@@ -305,6 +290,5 @@
   * DBに配送業者の情報を登録します.
   */
- protected function setUpDeliv()
- {
+ protected function setUpDeliv() {
    $deliv = array(
      array(  // 削除フラグON
@@ -352,6 +336,5 @@
   * DBにお届け時間の情報を登録します.
   */
- protected function setUpDelivTime()
- {
+ protected function setUpDelivTime() {
    $deliv_time = array(
      array(
@@ -381,6 +364,5 @@
   * DBに支払方法の情報を登録します.
   */
- protected function setUpPayment()
- {
+ protected function setUpPayment() {
    $payment = array(
      array(
@@ -449,6 +431,5 @@
   * DBに受注情報を設定します.
   */
-  protected function setUpOrder()
-  {
+  protected function setUpOrder() {
     $order = array(
       array(
@@ -485,6 +466,5 @@
   * DBに受注一時情報を設定します.
   */
-  protected function setUpOrderTemp()
-  {
+  protected function setUpOrderTemp() {
     $order = array(
       array(
@@ -514,6 +494,5 @@
   * DBに受注詳細を設定します.
   */
- protected function setUpOrderDetail()
- {
+ protected function setUpOrderDetail() {
    $order_detail = array(
      array(
@@ -565,6 +544,5 @@
   * DBに顧客情報を設定します。
   */
- protected function setUpCustomer()
- {
+ protected function setUpCustomer() {
    $customer = array(
      array(
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php	(revision 22796)
@@ -32,20 +32,16 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_extractShippingTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_extractShippingTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testExtractShipping__予め指定されたキーだけが抽出される()
-  {
+  public function testExtractShipping__予め指定されたキーだけが抽出される() {
     $helper = new SC_Helper_Purchase();
     $helper->arrShippingKey = array('id', 'name', 'code');
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php	(revision 22796)
@@ -32,12 +32,10 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_copyFromCustomerTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_copyFromCustomerTest extends SC_Helper_Purchase_TestBase {
 
   var $customer;
   var $customer_array;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->customer = new SC_Customer();
@@ -66,12 +64,10 @@
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCopyFromCustomer_ログインしていない場合_何もしない()
-  {
+  public function testCopyFromCustomer_ログインしていない場合_何もしない() {
     $dest = array();
     User_Utils::setLoginState(FALSE, $this->customer_array, $this->objQuery);
@@ -85,6 +81,5 @@
   }
 
-  public function testCopyFromCustomer_モバイルの場合_モバイルのメールアドレスを設定する()
-  {
+  public function testCopyFromCustomer_モバイルの場合_モバイルのメールアドレスを設定する() {
     $dest = array();
     User_Utils::setLoginState(TRUE, $this->customer_array, $this->objQuery);
@@ -122,6 +117,5 @@
   }
 
-  public function testCopyFromCustomer_モバイルかつモバイルのメールアドレスがない場合_通常のメールアドレスを設定する()
-  {
+  public function testCopyFromCustomer_モバイルかつモバイルのメールアドレスがない場合_通常のメールアドレスを設定する() {
     $dest = array();
     $prefix = 'order';
@@ -144,6 +138,5 @@
   }
 
-  public function testCopyFromCustomer_モバイルでない場合_通常のメールアドレスをそのまま設定する()
-  {
+  public function testCopyFromCustomer_モバイルでない場合_通常のメールアドレスをそのまま設定する() {
     $dest = array();
     $prefix = 'prefix';
Index: /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php	(revision 22796)
@@ -32,21 +32,17 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_getShipmentItemsTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShipmentItemsTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpShipmentItem();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetShipmentItems_存在しない受注IDを指定した場合_結果が空になる()
-  {
+  public function testGetShipmentItems_存在しない受注IDを指定した場合_結果が空になる() {
     $order_id = '100'; // 存在しないID
     $shipping_id = '1';
@@ -58,6 +54,5 @@
   }
 
-  public function testGetShipmentItems_存在しない配送先IDを指定した場合_結果が空になる()
-  {
+  public function testGetShipmentItems_存在しない配送先IDを指定した場合_結果が空になる() {
     $order_id = '1';
     $shipping_id = '100'; // 存在しないID
@@ -69,6 +64,5 @@
   }
 
-  public function testGetShipmentItems_存在する受注IDと配送先IDを指定した場合_結果が取得できる()
-  {
+  public function testGetShipmentItems_存在する受注IDと配送先IDを指定した場合_結果が取得できる() {
     $order_id = '1';
     $shipping_id = '1';
@@ -103,6 +97,5 @@
   }
 
-  public function testGetShipmentItems_詳細フラグをOFFにした場合_結果に詳細情報が含まれない()
-  {
+  public function testGetShipmentItems_詳細フラグをOFFにした場合_結果に詳細情報が含まれない() {
     $order_id = '1';
     $shipping_id = '1';
Index: anches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php	(revision 22567)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?php
-
-$HOME = realpath(dirname(__FILE__)) . "/../../../..";
-require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * SC_Helper_Purchase::cancelOrder()のテストクラス.
- *
- * @author Hiroko Tamagawa
- * @version $Id$
- */
-class SC_Helper_Purchase_cancelOrderTest extends SC_Helper_Purchase_TestBase
-{
-
-  private $helper;
-
-  protected function setUp()
-  {
-    parent::setUp();
-    $this->setUpProductClass();
-    $this->helper = new SC_Helper_Purchase_cancelOrderMock();
-  }
-
-  protected function tearDown()
-  {
-    parent::tearDown();
-  }
-
-  /////////////////////////////////////////
-  public function testCancelOrder_デフォルトの引数で呼び出した場合_製品クラスのデータが更新される()
-  {
-    $order_id = '1001';
-    $this->objQuery->begin();
-
-    $this->helper->cancelOrder($order_id);
-
-    $this->actual['testResult'] = $_SESSION['testResult'];
-    $this->actual['productClass'] = $this->objQuery->select(
-      'stock', 'dtb_products_class',
-      'product_class_id in (?, ?)', array('1001', '1002')
-    );
-    $this->expected = array(
-      'testResult' => array(
-        'registerOrder' => array(
-          'order_id' => '1001',
-          'params' => array(
-            'status' => ORDER_CANCEL
-          )
-        ),
-        'getOrderDetail' => array(
-          'order_id' => '1001'
-        )
-      ),
-      'productClass' => array(
-        array('stock' => '105'),
-        array('stock' => '51')
-      )
-    );
-    $this->verify();
-  }
-
-  // 実際にトランザクションを開始したかどうかはテストできないが、
-  // 問題なく処理が完了することのみ確認
-  public function testCancelOrder_トランザクションが開始していない場合_内部で開始する()
-  {
-    $order_id = '1001';
-
-    $this->helper->cancelOrder($order_id, ORDER_NEW);
-
-    $this->actual['testResult'] = $_SESSION['testResult'];
-    $this->actual['productClass'] = $this->objQuery->select(
-      'stock', 'dtb_products_class',
-      'product_class_id in (?, ?)', array('1001', '1002')
-    );
-    $this->expected = array(
-      'testResult' => array(
-        'registerOrder' => array(
-          'order_id' => '1001',
-          'params' => array(
-            'status' => ORDER_NEW
-          )
-        ),
-        'getOrderDetail' => array(
-          'order_id' => '1001'
-        )
-      ),
-      'productClass' => array(
-        array('stock' => '105'),
-        array('stock' => '51')
-      )
-    );
-
-    $this->verify();
-  }
-
-  public function testCancelOrder_削除フラグが立っている場合_DB更新時に削除フラグが立てられる()
-  {
-    $order_id = '1001';
-    $this->objQuery->begin();
-
-    $this->helper->cancelOrder($order_id, ORDER_DELIV, true);
-
-    $this->actual['testResult'] = $_SESSION['testResult'];
-    $this->actual['productClass'] = $this->objQuery->select(
-      'stock', 'dtb_products_class',
-      'product_class_id in (?, ?)', array('1001', '1002')
-    );
-    $this->expected = array(
-      'testResult' => array(
-        'registerOrder' => array(
-          'order_id' => '1001',
-          'params' => array(
-            'status' => ORDER_DELIV,
-            'del_flg' => '1'
-          )
-        ),
-        'getOrderDetail' => array(
-          'order_id' => '1001'
-        )
-      ),
-      'productClass' => array(
-        array('stock' => '105'),
-        array('stock' => '51')
-      )
-    );
-
-    $this->verify();
-  }
-
-  //////////////////////////////////////////
-
-}
-
-class SC_Helper_Purchase_cancelOrderMock extends SC_Helper_Purchase
-{
-
-  function registerOrder($order_id, $params)
-  {
-    $_SESSION['testResult']['registerOrder'] = array(
-      'order_id' => $order_id,
-      'params' => $params
-    );
-  }
-
-  function getOrderDetail($order_id)
-  {
-    $_SESSION['testResult']['getOrderDetail'] = array(
-      'order_id' => $order_id
-    );
-
-    return array(
-      array(
-        'product_class_id' => '1001',
-        'quantity' => '5'
-      ),
-      array(
-        'product_class_id' => '1002',
-        'quantity' => '1'
-      )
-    );
-  }
-}
-
-
Index: anches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php	(revision 22567)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?php
-
-$HOME = realpath(dirname(__FILE__)) . "/../../../..";
-require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * SC_Helper_Purchase::rollbackOrder()のテストクラス.
- *
- * @author Hiroko Tamagawa
- * @version $Id$
- */
-class SC_Helper_Purchase_rollbackOrderTest extends SC_Helper_Purchase_TestBase
-{
-
-  private $helper;
-
-  protected function setUp()
-  {
-    parent::setUp();
-
-    $this->helper = new SC_Helper_Purchase_rollbackOrderMock();
-  }
-
-  protected function tearDown()
-  {
-    parent::tearDown();
-  }
-
-  /////////////////////////////////////////
-  public function testRollbackOrder_デフォルトの引数で呼び出した場合_カートの状態をロールバックして元に戻る()
-  {
-    $this->objQuery->begin();
-    $order_id = '1001';
-
-    $uniqid = $this->helper->rollbackOrder($order_id);
-
-    $this->actual['testResult'] = $this->helper->testResult;
-    $this->actual['siteRegist'] = $_SESSION['site']['regist_success'];
-    $this->expected = array(
-      'testResult' => array(
-        'cancelOrder' => array(
-          'order_id' => '1001',
-          'orderStatus' => ORDER_CANCEL,
-          'is_delete' => false
-        ),
-        'getOrderTempByOrderId' => array(
-          'order_id' => '1001'
-        ),
-        'saveOrderTemp' => array(
-          'uniqid' => $uniqid,
-          'arrOrderTemp' => array(
-            'customer_id' => '2001',
-            'del_flg' => '0'
-          )
-        ),
-        'verifyChangeCart' => array(
-          'uniqid' => $uniqid
-        )
-      ),
-      'siteRegist' => true
-    );
-    $this->verify();
-  }
-
-  /**
-   * 実際にトランザクションを開始したかどうかはテストできないが、
-   * 問題なく処理が完了することのみ確認
-   */
-  public function testRollbackOrder_トランザクションが開始していない場合_内部で開始する()
-  {
-    $order_id = '1001';
-
-    $uniqid = $this->helper->rollbackOrder($order_id, ORDER_DELIV, true);
-
-    $this->actual['testResult'] = $this->helper->testResult;
-    $this->actual['siteRegist'] = $_SESSION['site']['regist_success'];
-    $this->expected = array(
-      'testResult' => array(
-        'cancelOrder' => array(
-          'order_id' => '1001',
-          'orderStatus' => ORDER_DELIV,
-          'is_delete' => true
-        ),
-        'getOrderTempByOrderId' => array(
-          'order_id' => '1001'
-        ),
-        'saveOrderTemp' => array(
-          'uniqid' => $uniqid,
-          'arrOrderTemp' => array(
-            'customer_id' => '2001',
-            'del_flg' => '0'
-          )
-        ),
-        'verifyChangeCart' => array(
-          'uniqid' => $uniqid
-        )
-      ),
-      'siteRegist' => true
-    );
-    $this->verify();
-  }
-  //////////////////////////////////////////
-
-}
-
-class SC_Helper_Purchase_rollbackOrderMock extends SC_Helper_Purchase
-{
-  public $testResult = array();
-
-  function cancelOrder($order_id, $orderStatus, $is_delete)
-  {
-    $this->testResult['cancelOrder'] = array(
-      'order_id' => $order_id,
-      'orderStatus' => $orderStatus,
-      'is_delete' => $is_delete
-    );
-  }
-
-  function getOrderTempByOrderId($order_id)
-  {
-    $this->testResult['getOrderTempByOrderId'] = array(
-      'order_id' => $order_id
-    );
-    return array(
-      'customer_id' => '2001'
-    );
-  }
-
-  function saveOrderTemp($uniqid, $arrOrderTemp, $objCustomer)
-  {
-    $this->testResult['saveOrderTemp'] = array(
-      'uniqid' => $uniqid,
-      'arrOrderTemp' => $arrOrderTemp
-    );
-  }
-
-  function verifyChangeCart($uniqid, $objCartSession)
-  {
-    $this->testResult['verifyChangeCart'] = array(
-      'uniqid' => $uniqid
-    );
-  }
-}
-
Index: /branches/version-2_12-dev/tests/class/test/util/User_Utils.php
===================================================================
--- /branches/version-2_12-dev/tests/class/test/util/User_Utils.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/test/util/User_Utils.php	(revision 22796)
@@ -5,6 +5,5 @@
  *
  */
-class User_Utils
-{
+class User_Utils {
 
   /**
@@ -14,6 +13,5 @@
    * @param deviceType  端末種別ID
    */
-  public static function setDeviceType($deviceType)
-  {
+  public static function setDeviceType($deviceType) {
     SC_Display_Ex::setDummyDevice($deviceType);
   }
@@ -25,6 +23,5 @@
    * @param isLogin true:ログインしている、false:ログインしていない
    */
-  public static function setLoginState($isLogin, $customer = null, $objQuery = null)
-  {
+  public static function setLoginState($isLogin, $customer = null, $objQuery = null) {
     if (!$isLogin) {
       $_SESSION['customer']['customer_id'] = null;
@@ -42,6 +39,5 @@
    * ユーザ情報を外部から設定しなかった場合のデフォルト値を取得します。
    */
-  private static function getDefaultCustomer()
-  {
+  private static function getDefaultCustomer() {
     $arrValue['customer_id'] = '999999998';
     $arrValue['name01'] = '苗字';
Index: /branches/version-2_12-dev/tests/class/test/util/Test_Utils.php
===================================================================
--- /branches/version-2_12-dev/tests/class/test/util/Test_Utils.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/test/util/Test_Utils.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id$
  */
-class Test_Utils
-{
+class Test_Utils {
 
   /**
@@ -41,6 +40,5 @@
    * @return 指定したキーのみを持つ連想配列
    */
-  public static function mapArray($input_array, $map_keys)
-  {
+  public static function mapArray($input_array, $map_keys) {
     $output_array = array();
     foreach ($map_keys as $index => $map_key) {
@@ -60,6 +58,5 @@
    * @return 指定のキーだけを抜き出した配列
    */
-  public static function mapCols($input_array, $key)
-  {
+  public static function mapCols($input_array, $key) {
     $output_array = array();
     foreach ($input_array as $data) {
@@ -78,6 +75,5 @@
    * @param new_array 追加要素を持つ配列
    */
-  public static function array_append(&$orig_array, $new_array)
-  {
+  public static function array_append(&$orig_array, $new_array) {
     foreach ($new_array as $element) {
       $orig_array[] = $element;
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getYearTest extends Common_TestCase
-{
+class SC_Date_getYearTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
   
-    public function testGetYear_要素の数が4の配列を返す()
-    {
+    public function testGetYear_要素の数が4の配列を返す() {
         $this->expected = 4;
         $this->actual = count($this->objDate->getYear());
@@ -49,6 +45,5 @@
     }
     
-    public function testGetYear_最小値が今年の配列を返す()
-    {
+    public function testGetYear_最小値が今年の配列を返す() {
         $this->expected = DATE('Y');
         $this->actual = min($this->objDate->getYear());
@@ -57,6 +52,5 @@
     }
     
-    public function testGetYear_最低値が引数の年の配列を返す()
-    {
+    public function testGetYear_最低値が引数の年の配列を返す() {
         $this->expected = '2007';
         $this->actual = min($this->objDate->getYear('2007'));
@@ -65,6 +59,5 @@
     }
     
-    public function testGetYear_最低値がメンバー変数の年の配列を返す()
-    {
+    public function testGetYear_最低値がメンバー変数の年の配列を返す() {
         $this->expected = '2004';
         $this->objDate->setStartYear('2004');
@@ -74,6 +67,5 @@
     }
     
-    public function testGetYear_最大値が3年後の配列を返す()
-    {
+    public function testGetYear_最大値が3年後の配列を返す() {
         $this->expected = DATE('Y')+3;
         $this->actual = max($this->objDate->getYear());
@@ -82,6 +74,5 @@
     }
     
-    public function testGetYear_最大値がメンバ変数の配列を返す()
-    {
+    public function testGetYear_最大値がメンバ変数の配列を返す() {
         $this->expected = '2020';
         $this->objDate->setEndYear('2020');
@@ -91,12 +82,10 @@
     }
     
-    public function testGetYear_デフォルト値が含まれる配列を返す()
-    {
+    public function testGetYear_デフォルト値が含まれる配列を返す() {
         $result = in_array('----', $this->objDate->getYear(DATE('Y'), TRUE));
         $this->assertTrue($result, "デフォルト値");
     }
     
-    public function testGetYear_デフォルト値の引数に年を指定した配列を返す()
-    {
+    public function testGetYear_デフォルト値の引数に年を指定した配列を返す() {
         $year = date('Y');
         $this->expected = array( $year => $year, $year+1 => $year+1
@@ -107,6 +96,5 @@
     }
 
-    public function testGetYear_引数に指定したキーがデフォルト値となる配列を返す()
-    {
+    public function testGetYear_引数に指定したキーがデフォルト値となる配列を返す() {
         $this->expected = 'default';
         $return = $this->objDate->getYear(DATE('Y'), TRUE, 'default');
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getZeroYearTest extends Common_TestCase
-{
+class SC_Date_getZeroYearTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
   
-    public function testGetZeroYear_要素の数が4の配列を返す()
-    {
+    public function testGetZeroYear_要素の数が4の配列を返す() {
         $this->expected = 4;
         $this->actual = count($this->objDate->getZeroYear());
@@ -48,6 +44,5 @@
     }
     
-    public function testGetZeroYear_最小値が2桁表記の今年の配列を返す()
-    {
+    public function testGetZeroYear_最小値が2桁表記の今年の配列を返す() {
         $this->expected = DATE('y');
         $this->actual = min($this->objDate->getZeroYear());
@@ -55,6 +50,5 @@
     }
     
-    public function testGetZeroYear_最低値が引数の年の2桁表記の配列を返す()
-    {
+    public function testGetZeroYear_最低値が引数の年の2桁表記の配列を返す() {
         $this->expected = '07';
         $this->actual = min($this->objDate->getZeroYear('2007'));
@@ -63,6 +57,5 @@
     }
     
-    public function testGetZeroYear_最低値がメンバー変数の年の2桁表記の配列を返す()
-    {
+    public function testGetZeroYear_最低値がメンバー変数の年の2桁表記の配列を返す() {
         $this->expected = '04';
         $this->objDate->setStartYear('2004');
@@ -72,6 +65,5 @@
     }
     
-    public function testGetZeroYear_最大値が3年後の2桁表記の配列を返す()
-    {
+    public function testGetZeroYear_最大値が3年後の2桁表記の配列を返す() {
         $this->expected = DATE('y')+3;
         $this->actual = max($this->objDate->getZeroYear());
@@ -80,6 +72,5 @@
     }
     
-    public function testGetZeroYear_最大値がメンバ変数の2桁表記の配列を返す()
-    {
+    public function testGetZeroYear_最大値がメンバ変数の2桁表記の配列を返す() {
         $this->expected = '20';
         $this->objDate->setEndYear('2020');
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_AccessorTest extends Common_TestCase
-{
+class SC_Date_AccessorTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex('2010','2014');
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetStartYear_startYearの値を取得する()
-    {
+    public function testGetStartYear_startYearの値を取得する() {
         $this->expected = '2010';
         $this->actual = $this->objDate->getStartYear();
@@ -49,6 +45,5 @@
     }
 
-    public function testGetEndYear_endYearの値を取得する()
-    {
+    public function testGetEndYear_endYearの値を取得する() {
         $this->expected = '2014';
         $this->actual = $this->objDate->getEndYear();
@@ -57,6 +52,5 @@
     }
 
-    public function testsetMonth_monthの値を設定する()
-    {
+    public function testsetMonth_monthの値を設定する() {
         $this->expected = '9';
         $this->objDate->setMonth('9');
@@ -66,6 +60,5 @@
     }
     
-    public function testsetDay_dayの値を設定する()
-    {
+    public function testsetDay_dayの値を設定する() {
         $this->expected = '28';
         $this->objDate->setDay('28');
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getMinutesTest extends Common_TestCase
-{
+class SC_Date_getMinutesTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetMinutes_要素の数が60の配列を返す()
-    {
+    public function testGetMinutes_要素の数が60の配列を返す() {
         $this->expected = 60;
         $this->actual = count($this->objDate->getMinutes());
@@ -49,6 +45,5 @@
     }
 
-    public function testGetMinutes_要素の最低値が0の配列を返す()
-    {
+    public function testGetMinutes_要素の最低値が0の配列を返す() {
         $this->expected = 0;
         $this->actual = min($this->objDate->getMinutes());
@@ -57,6 +52,5 @@
     }
 
-    public function testGetMinutes_要素の最大値が59の配列を返す()
-    {
+    public function testGetMinutes_要素の最大値が59の配列を返す() {
         $this->expected = 59;
         $this->actual = max($this->objDate->getMinutes());
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getMonthTest extends Common_TestCase
-{
+class SC_Date_getMonthTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetMonth_要素の数が12の配列を返す()
-    {
+    public function testGetMonth_要素の数が12の配列を返す() {
         $this->expected = 12;
         $this->actual = count($this->objDate->getMonth());
@@ -49,6 +45,5 @@
     }
 
-    public function testGetMonth_要素の最低値が1の配列を返す()
-    {
+    public function testGetMonth_要素の最低値が1の配列を返す() {
         $this->expected = 1;
         $this->actual = min($this->objDate->getMonth());
@@ -57,6 +52,5 @@
     }
 
-    public function testGetMonth_要素の最大値が12の配列を返す()
-    {
+    public function testGetMonth_要素の最大値が12の配列を返す() {
         $this->expected = 12;
         $this->actual = max($this->objDate->getMonth());
@@ -65,6 +59,5 @@
     }
 
-    public function testGetMonth_TRUEを与えた場合要素の数が13の配列を返す()
-    {
+    public function testGetMonth_TRUEを与えた場合要素の数が13の配列を返す() {
         $this->expected = 13;
         $this->actual = count($this->objDate->getMonth(true));
@@ -73,6 +66,5 @@
     }
 
-    public function testGetMonth_TRUEを与えた場合ーー含まれるの配列を返す()
-    {
+    public function testGetMonth_TRUEを与えた場合ーー含まれるの配列を返す() {
         $result = in_array('--', $this->objDate->getMonth(true));
 
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getZeroMonthTest extends Common_TestCase
-{
+class SC_Date_getZeroMonthTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetZeroMonth_要素の数が12の配列を返す()
-    {
+    public function testGetZeroMonth_要素の数が12の配列を返す() {
         $this->expected = 12;
         $this->actual = count($this->objDate->getZeroMonth());
@@ -49,6 +45,5 @@
     }
 
-    public function testGetZeroMonth_0をつけた月の配列を返す()
-    {
+    public function testGetZeroMonth_0をつけた月の配列を返す() {
         $this->expected = array('01'=>'01','02'=>'02','03'=>'03'
                                 ,'04'=>'04','05'=>'05','06'=>'06'
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getMinutesIntervalTest extends Common_TestCase
-{
+class SC_Date_getMinutesIntervalTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetMinutesInterval_要素が00と30の配列を返す()
-    {
+    public function testGetMinutesInterval_要素が00と30の配列を返す() {
         $this->expected = array('00'=>'00', '30'=>'30');
         $this->actual = $this->objDate->getMinutesInterval();
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getDayTest extends Common_TestCase
-{
+class SC_Date_getDayTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetDay_要素の数が31の配列を返す()
-    {
+    public function testGetDay_要素の数が31の配列を返す() {
         $this->expected = 31;
         $this->actual = count($this->objDate->getDay());
@@ -49,6 +45,5 @@
     }
 
-    public function testGetDay_要素の最低値が1の配列を返す()
-    {
+    public function testGetDay_要素の最低値が1の配列を返す() {
         $this->expected = 1;
         $this->actual = min($this->objDate->getDay());
@@ -57,6 +52,5 @@
     }
 
-    public function testGetDay_要素の最大値が31の配列を返す()
-    {
+    public function testGetDay_要素の最大値が31の配列を返す() {
         $this->expected = 31;
         $this->actual = max($this->objDate->getDay());
@@ -65,6 +59,5 @@
     }
 
-    public function testGetDay_TRUEを与えた場合要素の数が32の配列を返す()
-    {
+    public function testGetDay_TRUEを与えた場合要素の数が32の配列を返す() {
         $this->expected = 32;
         $this->actual = count($this->objDate->getDay(true));
@@ -73,6 +66,5 @@
     }
 
-    public function testGetDay_TRUEを与えた場合ーー含まれるの配列を返す()
-    {
+    public function testGetDay_TRUEを与えた場合ーー含まれるの配列を返す() {
         $result = in_array('--', $this->objDate->getDay(true));
 
Index: /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php
===================================================================
--- /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php	(revision 22567)
+++ /branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php	(revision 22796)
@@ -25,15 +25,12 @@
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getHourTest extends Common_TestCase
-{
+class SC_Date_getHourTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
@@ -41,6 +38,5 @@
     /////////////////////////////////////////
 
-    public function testGetHour_24の配列を返す()
-    {
+    public function testGetHour_24の配列を返す() {
         $this->expected = 24;
         $this->actual = count($this->objDate->getHour());
@@ -49,6 +45,5 @@
     }
 
-    public function testGetHour_要素の最低値が0の配列を返す()
-    {
+    public function testGetHour_要素の最低値が0の配列を返す() {
         $this->expected = 0;
         $this->actual = min($this->objDate->getHour());
@@ -57,6 +52,5 @@
     }
 
-    public function testGetHour_要素の最大値が23の配列を返す()
-    {
+    public function testGetHour_要素の最大値が23の配列を返す() {
         $this->expected = 23;
         $this->actual = max($this->objDate->getHour());
Index: /branches/version-2_12-dev/html/install/index.php
===================================================================
--- /branches/version-2_12-dev/html/install/index.php	(revision 22567)
+++ /branches/version-2_12-dev/html/install/index.php	(revision 22796)
@@ -198,12 +198,10 @@
 
         //マスターデータのキャッシュを削除
-        $cache_dir = DATA_REALDIR . 'cache/';
+        $cache_dir = '../../data/cache/';
         $res_dir = opendir($cache_dir);
         while ($file_name = readdir($res_dir)){
             //dummy以外は削除
             if ($file_name != 'dummy'){
-                if (is_file($cache_dir . $file_name)) {
-                    unlink($cache_dir . $file_name);
-                }
+                unlink($cache_dir . $file_name);
             }
         }
@@ -275,6 +273,5 @@
 //-----------------------------------------------------------------------------------------------------------------------------------
 // ようこそ画面の表示
-function lfDispWelcome($objPage)
-{
+function lfDispWelcome($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -291,6 +288,5 @@
 
 // 使用許諾契約書の表示
-function lfDispAgreement($objPage)
-{
+function lfDispAgreement($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -307,6 +303,5 @@
 
 // STEP0画面の表示(チェック)
-function lfDispStep0($objPage)
-{
+function lfDispStep0($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -452,6 +447,5 @@
 
 // STEP0_1画面の表示(ファイルのコピー)
-function lfDispStep0_1($objPage)
-{
+function lfDispStep0_1($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -470,6 +464,5 @@
 }
 
-function lfGetFileMode($path)
-{
+function lfGetFileMode($path) {
     $mode = substr(sprintf('%o', fileperms($path)), -3);
     return $mode;
@@ -477,6 +470,5 @@
 
 // STEP1画面の表示
-function lfDispStep1($objPage)
-{
+function lfDispStep1($objPage) {
     global $objDBParam;
     // hiddenに入力値を保持
@@ -490,6 +482,5 @@
 
 // STEP2画面の表示
-function lfDispStep2($objPage)
-{
+function lfDispStep2($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -504,6 +495,5 @@
 
 // STEP3画面の表示
-function lfDispStep3($objPage)
-{
+function lfDispStep3($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -520,6 +510,5 @@
 
 // STEP4画面の表示
-function lfDispStep4($objPage)
-{
+function lfDispStep4($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -554,6 +543,5 @@
 
 // 完了画面の表示
-function lfDispComplete($objPage)
-{
+function lfDispComplete($objPage) {
     global $objWebParam;
     global $objDBParam;
@@ -627,6 +615,5 @@
 
 // WEBパラメーター情報の初期化
-function lfInitWebParam($objWebParam)
-{
+function lfInitWebParam($objWebParam) {
     global $objDb;
 
@@ -715,6 +702,5 @@
 
 // DBパラメーター情報の初期化
-function lfInitDBParam($objDBParam)
-{
+function lfInitDBParam($objDBParam) {
 
     if (defined('DB_SERVER')) {
@@ -759,6 +745,5 @@
 
 // 入力内容のチェック
-function lfCheckWebError($objWebParam)
-{
+function lfCheckWebError($objWebParam) {
     // 入力データを渡す。
     $arrRet = $objWebParam->getHashArray();
@@ -794,6 +779,5 @@
 
 // 入力内容のチェック
-function lfCheckDBError($objDBParam)
-{
+function lfCheckDBError($objDBParam) {
     global $objPage;
 
@@ -826,6 +810,5 @@
 
 // SQL文の実行
-function lfExecuteSQL($filepath, $arrDsn, $disp_err = true)
-{
+function lfExecuteSQL($filepath, $arrDsn, $disp_err = true) {
     $arrErr = array();
 
@@ -884,6 +867,5 @@
  * @return array エラーが発生した場合はエラーメッセージの配列
  */
-function lfDropSequence($arrSequences, $arrDsn)
-{
+function lfDropSequence($arrSequences, $arrDsn) {
     $arrErr = array();
 
@@ -924,6 +906,5 @@
  * @return array エラーが発生した場合はエラーメッセージの配列
  */
-function lfCreateSequence($arrSequences, $arrDsn)
-{
+function lfCreateSequence($arrSequences, $arrDsn) {
     $arrErr = array();
 
@@ -964,6 +945,5 @@
 
 // 設定ファイルの作成
-function lfMakeConfigFile()
-{
+function lfMakeConfigFile() {
     global $objWebParam;
     global $objDBParam;
@@ -1059,6 +1039,5 @@
  */
 $alldirs = array();
-function listdirs($dir)
-{
+function listdirs($dir) {
     global $alldirs;
     $alldirs[] = $dir;
@@ -1075,6 +1054,5 @@
  * 保持したスタティック変数をクリアする。
  */
-function initdirs()
-{
+function initdirs() {
     global $alldirs;
     $alldirs = array();
@@ -1086,6 +1064,5 @@
  * @return array シーケンスを使用するテーブル名とカラム名の配列
  */
-function getSequences()
-{
+function getSequences() {
     return array(
         array('dtb_best_products', 'best_id'),
@@ -1128,6 +1105,5 @@
  * @param string 設定する管理機能のディレクトリ名
  */
-function renameAdminDir($adminDir)
-{
+function renameAdminDir($adminDir) {
     $oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR);
     if ($adminDir === $oldAdminDir) {
@@ -1143,6 +1119,5 @@
 }
 
-function getArrayDsn(SC_FormParam $objDBParam)
-{
+function getArrayDsn(SC_FormParam $objDBParam) {
     $arrRet = $objDBParam->getHashArray();
 
Index: /branches/version-2_12-dev/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_12-dev/html/install/sql/insert_data.sql	(revision 22551)
+++ /branches/version-2_12-dev/html/install/sql/insert_data.sql	(revision 22796)
@@ -828,5 +828,4 @@
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (6, 'disney.ne.jp', 5);
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (7, 'willcom.com', 6);
-INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (8, 'emnet.ne.jp', 7);
 
 INSERT INTO mtb_order_status (id, name, rank) VALUES (7, '決済処理中', 0);
@@ -1223,5 +1222,5 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PLUGIN_HTML_URLPATH', 'ROOT_URLPATH . "plugin/"', 614, 'プラグインURL'); 
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_DAYS_LEN', '3', 700, '日数桁数');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_EXTENSION', '"zip,lzh,jpg,jpeg,gif,png,mp3,pdf,csv"', 701, 'ダウンロードファイル登録可能拡張子(カンマ区切り)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_EXTENSION', '"zip,lzh,jpg,jpeg,gif,png,mp3,pdf,csv"', 701, 'ダウンロードファイル登録可能拡張子(カンマ区切り)"');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_SIZE', '50000', 702, 'ダウンロード販売ファイル用サイズ制限(KB)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEFAULT_PRODUCT_DOWN', '1', 703, '1:実商品 2:ダウンロード');
Index: /branches/version-2_12-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_12-dev/html/install/sql/create_table_mysql.sql	(revision 22218)
+++ /branches/version-2_12-dev/html/install/sql/create_table_mysql.sql	(revision 22796)
@@ -553,6 +553,4 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -612,6 +610,4 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -718,6 +714,4 @@
     quantity numeric,
     point_rate numeric NOT NULL DEFAULT 0,
-    tax_rate numeric,
-    tax_rule smallint,
     PRIMARY KEY (order_detail_id)
 );
Index: /branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql	(revision 22218)
+++ /branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql	(revision 22796)
@@ -553,6 +553,4 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -612,6 +610,4 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -718,6 +714,4 @@
     quantity numeric,
     point_rate numeric NOT NULL DEFAULT 0,
-    tax_rate numeric,
-    tax_rule smallint,
     PRIMARY KEY (order_detail_id)
 );
Index: /branches/version-2_12-dev/html/js/site.js
===================================================================
--- /branches/version-2_12-dev/html/js/site.js	(revision 22306)
+++ /branches/version-2_12-dev/html/js/site.js	(revision 22796)
@@ -130,4 +130,10 @@
         }
         break;
+    case 'delete_order':
+        if(!window.confirm('一度削除したデータは、元に戻せません。\n削除しても宜しいですか？\n\n※ 在庫数は手動で戻してください。')){
+            return;
+        }
+        mode = 'delete';
+        break;
     case 'confirm':
         if(!window.confirm('登録しても宜しいですか')){
Index: /branches/version-2_12-dev/html/test/upgrade/index.php
===================================================================
--- /branches/version-2_12-dev/html/test/upgrade/index.php	(revision 22567)
+++ /branches/version-2_12-dev/html/test/upgrade/index.php	(revision 22796)
@@ -73,6 +73,5 @@
  * @return string
  */
-function getMode()
-{
+function getMode() {
     if (isset($_GET['mode'])) {
         return $_GET['mode'];
@@ -87,6 +86,5 @@
  *
  */
-function displayProductsList()
-{
+function displayProductsList() {
     $arrRet = array(
         'status' => 'SUCCESS',
@@ -105,6 +103,5 @@
  * @param array $arrProductsList
  */
-function updateModuleTable($arrProductsList)
-{
+function updateModuleTable($arrProductsList) {
     $table = 'dtb_module';
     $where = 'module_id = ?';
Index: /branches/version-2_12-dev/html/user_data/packages/default/css/table.css
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/default/css/table.css	(revision 22560)
+++ /branches/version-2_12-dev/html/user_data/packages/default/css/table.css	(revision 22796)
@@ -1,3 +1,3 @@
-@charset "utf-8";
+﻿@charset "utf-8";
 
 /************************************************
Index: /branches/version-2_12-dev/html/user_data/packages/default/css/reset.css
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/default/css/reset.css	(revision 22560)
+++ /branches/version-2_12-dev/html/user_data/packages/default/css/reset.css	(revision 22796)
@@ -1,3 +1,3 @@
-@charset "utf-8";
+﻿@charset "utf-8";
 
 /************************************************
Index: /branches/version-2_12-dev/html/user_data/packages/admin/css/reset.css
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/admin/css/reset.css	(revision 22560)
+++ /branches/version-2_12-dev/html/user_data/packages/admin/css/reset.css	(revision 22796)
@@ -1,3 +1,3 @@
-@charset "utf-8";
+﻿@charset "utf-8";
 
 /************************************************
Index: /branches/version-2_12-dev/html/user_data/packages/admin/css/admin_contents.css
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/admin/css/admin_contents.css	(revision 22596)
+++ /branches/version-2_12-dev/html/user_data/packages/admin/css/admin_contents.css	(revision 22796)
@@ -177,5 +177,5 @@
 /*おすすめ商品管理*/
 
-table.recommend-table {
+table#recommend-table {
     border-collapse: collapse;
     font-size: 100%;
@@ -184,18 +184,14 @@
 }
 
-.recommend-product.hidden td{
-    background: #C9C9C9;
-}
-
-div.table-wrap {
+div#table-wrap {
     margin-top: 6px;
 }
 
-div.table-wrap div.table-img {
+div#table-wrap div.table-img {
     float: left;
     padding-left: 6px;
 }
 
-div.table-wrap div.table-detail {
+div#table-wrap div.table-detail {
     float: left;
     text-align: left;
@@ -203,6 +199,16 @@
 }
 
-div.table-wrap div.table-detail div.detail-name {
+div#table-wrap div.table-detail div.detail-name {
     margin-bottom: 5px;
+}
+
+td.no-border {
+    border: 0;
+    background: #f5f5f5;
+    padding: 20px;
+}
+
+td.no-border-w {
+    border: 0;
 }
 
@@ -210,11 +216,4 @@
     text-align: left;
     padding-left: 11px;
-}
-
-/*おすすめ商品検索画面*/
-
-#recommend-search-results .hidden td,
-#recommend-search-results .hidden th{
-    background: #C9C9C9;
 }
 
@@ -632,5 +631,6 @@
 #navi li.on li a span,
 #navi li li.on a,
-#navi li li.on a span {
+#navi li li.on a span,
+ {
     background: transparent;
 }
@@ -767,5 +767,5 @@
 #agreement {
     margin: 0;
-    border-width: 1px;
+    border-width: 1px
     border-color: #c0c0c0;
     border-style: solid;
@@ -1130,9 +1130,4 @@
     width: 230px;
     background-color: #f3f3f3;
-}
-
-#products-category-left li ul,
-#products-rank-left li ul {
-    margin-left: 20px;
 }
 
Index: /branches/version-2_12-dev/html/user_data/packages/admin/js/admin.js
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/admin/js/admin.js	(revision 22312)
+++ /branches/version-2_12-dev/html/user_data/packages/admin/js/admin.js	(revision 22796)
@@ -20,4 +20,37 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+// 管理者メンバーを追加する。
+function fnRegistMember() {
+    // 必須項目の名前、ログインID、パスワード、権限
+    var lstitem = new Array();
+    lstitem[0] = 'name';
+    lstitem[1] = 'login_id';
+    lstitem[2] = 'password';
+    lstitem[3] = 'authority';
+
+    var max = lstitem.length;
+    var errflg = false;
+    var cnt = 0;
+
+    //　必須項目のチェック
+    for(cnt = 0; cnt < max; cnt++) {
+        if(document.form1[lstitem[cnt]].value == "") {
+            errflg = true;
+            break;
+        }
+    }
+
+    // 必須項目が入力されていない場合
+    if(errflg == true) {
+        alert('必須項目を入力して下さい。');
+        return false;
+    } else {
+        if(window.confirm('内容を登録しても宜しいでしょうか')){
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
 
 //親ウィンドウのページを変更する。
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.facebox/facebox.css
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.facebox/facebox.css	(revision 22564)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.facebox/facebox.css	(revision 22796)
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js	(revision 22605)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js	(revision 22796)
@@ -1,26 +1,118 @@
+/*------------------------------------------
+指定されたノードを、オープンまたはクローズする
+------------------------------------------*/
+function openOrClose(tgt){
+    //指定ノードが「hidden」のとき、リストを可視化
+    if(tgt.style.visibility == "hidden"){
+        tgt.style.display = "block";
+        tgt.style.visibility = "visible";
+        tgt.style.height = "auto";
+        tgt.style.paddingTop = "0.25em";
+        tgt.style.lineHeight = "1em";
+        tgt.style.opacity = 1.0;
+    }
+    //指定ノードが「hidden」でないとき、リストを隠す
+    else{
+        tgt.style.display = "none";
+        tgt.style.visibility = "hidden";
+        tgt.style.height = "0px";
+        tgt.style.paddingTop = "0";
+        tgt.style.lineHeight = 0;
+        tgt.style.opacity = 0;
+    }
+}
+
+/*------------------------------------------
+リストープン処理
+------------------------------------------*/
+function listopen(lv, num){
+    var tgt = document.getElementsByClassName("level" + lv)[num];
+    //次のレベルをサーチ → 次のレベルのリストをオープンする
+    for(var i=0; i < document.getElementsByClassName("level" + (lv+1)).length; i++){
+        var next_tgt = document.getElementsByClassName("level" + (lv+1))[i];
+        //li
+        if (next_tgt.parentNode == tgt || next_tgt.parentNode.parentNode == tgt){
+            openOrClose(next_tgt);
+        }
+    }
+    //次のレベルをサーチ → 表示ボタンの状態を変更
+    for(var i=0; i < tgt.childNodes.length; i++){
+        var next_tgt = tgt.childNodes[i];
+        //ul
+        if(next_tgt.tagName == "UL"){
+            if(next_tgt.style.height == "0px"){
+                if(event.srcElement.parentNode.className == "category_header plus"){
+                    event.srcElement.innerText = '−';
+                    event.srcElement.parentNode.className = "category_header minus";
+                }
+                next_tgt.style.height = "auto";
+            }
+            else{
+                for(var i=0; i<next_tgt.parentNode.childNodes.length; i++){
+                    if(event.srcElement.parentNode.className == "category_header minus"){
+                        event.srcElement.innerText = '＋';
+                        event.srcElement.parentNode.className = "category_header plus";
+                    }
+                }
+                next_tgt.style.height = "0px";
+            }
+        }
+    }
+}
+
+/*------------------------------------------
+クリックイベントを設定する
+------------------------------------------*/
+function setclickevent(tgt, lv, num){
+    //レベル１以外の時は非表示に
+    if(lv!=1){
+        tgt.style.visibility = "hidden";
+        tgt.style.display = "none";
+        tgt.style.height = "0px";
+        tgt.style.lineHeight = 0;
+        tgt.style.paddingTop = 0;
+        tgt.style.paddingBottom = 0;
+        if(tgt.parentNode.tagName == "UL"){
+            tgt.parentNode.style.height = "0px";
+            tgt.parentNode.style.margin = "0";
+            tgt.parentNode.style.padding = "0";
+            tgt.parentNode.style.border = "none";
+        }
+    }
+    var hasLink_flg;
+    if(tgt.childNodes.length){
+        for (var j = 0; j < tgt.childNodes.length; j++) {
+            //クリック範囲の拡大
+            if(tgt.childNodes[j].tagName == 'A'){
+                tgt.setAttribute('onclick', 'location.href="' + tgt.childNodes[j].getAttribute('href') + '"');
+            }
+            //アコーディオンリストの操作イベント関数を追加
+            else if(tgt.childNodes[j].tagName == 'UL'){
+                //▶を表示し、リストオープン関数を追加
+                var linkObj = document.createElement("a");
+                linkObj.innerText = '＋';
+                tgt.childNodes[0].className="category_header plus";
+                tgt.childNodes[0].appendChild(linkObj);
+                j++;
+                linkObj.parentNode.setAttribute('onclick', 'listopen(' + lv + ',' + num + ')');
+
+                //tgt.setAttribute('onclick', 'listopen(' + lv + ',' + num + ')');
+                break;
+            }
+        }
+    }
+}
+
 /*------------------------------------------
 初期化
 ------------------------------------------*/
 //level?クラスを持つノード全てを走査し初期化
-$(function(){
-    $("#categorytree li").each(function(){
-        if ($(this).children("ul").length) {
-            //▶を表示し、リストオープンイベントを追加
-            var tgt = $(this).children('span.category_header');
-            var linkObj = $("<a>");
-            linkObj.text('＋');
-            tgt
-                .click(function(){
-                    $(this).siblings("ul").toggle('fast', function(){
-                        if ($(this).css('display') === 'none') {
-                            tgt.children('a').text('＋');
-                        } else {
-                            tgt.children('a').text('－');
-                        }
-                    });
-                })
-                .addClass('plus')
-                .append(linkObj);
+function initCategoryList(){
+    var lv = 0;
+    //level?クラスを持つノード全てに、クリックイベントを追加
+    while(document.getElementsByClassName("level" + (++lv)).length){
+        for (var i = 0; i < document.getElementsByClassName("level" + lv).length; i++) {
+            setclickevent(document.getElementsByClassName("level" + lv)[i], lv, i);
         }
-    });
-});
+    }
+}
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/js/favorite.js
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/js/favorite.js	(revision 22564)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/js/favorite.js	(revision 22796)
@@ -6,6 +6,6 @@
     //送信データを準備
     var postData = {};
-    $("#form1").find(':input').each(function(){
-        postData[$(this).attr('name')] = $(this).val();
+    $("#form1").find(':input').each(function(){  
+        postData[$(this).attr('name')] = $(this).val();  
     });
     postData["mode"] = "add_favorite_sphone";
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/js/btn.js
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/js/btn.js	(revision 22564)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/js/btn.js	(revision 22796)
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js	(revision 22564)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js	(revision 22796)
@@ -1,1 +1,118 @@
-/* * jQuery autoResizeTextAreaQ plugin * @requires jQuery v1.4.2 or later * * Copyright (c) 2010 M. Brown (mbrowniebytes A gmail.com) * Licensed under the Revised BSD license: * http://www.opensource.org/licenses/bsd-license.php * http://en.wikipedia.org/wiki/BSD_licenses  * * Versions: * 0.1 - 2010-07-21 *       initial *  * usage: *  $(document).ready( function() { *      $('textarea').autoResizeTextAreaQ({"max_rows":8}); *  }); * */(function($) {	$.fn.autoResizeTextAreaQ = function(options) {	var opts = $.extend({		// ya prob want to use		max_rows: 10,	// # - max rows to resize too				// ya may want to use, but defaults should be ok		extra_rows: 1,  // # - nbr extra rows after last line ie padding; 0|1 optimal				// ya should really specify in html		rows: null,		// null|# - null infer from html; # override html		cols: null,		// null|# - null infer from html; # override html				debug: false	// true|false - turn on|off console.log()	}, options);		// extra padding based on browser	if ($.browser.msie) {		opts.extra_rows += 1;	} else if ($.browser.webkit) {		opts.extra_rows += 1;	} // else $.browser.mozilla				// iterate over passed in selector, only process actual textareas	return $(this).filter('textarea').each(function(index) {		var ta = $(this);		var orig = {};				// textarea rows cols current state		if (opts.cols != null && opts.cols > 0) {							ta.attr('cols', opts.cols);		}		orig.cols = ta.attr('cols');							if (opts.rows != null && opts.rows > 0) {							ta.attr('rows', opts.rows);		}		orig.rows = ta.attr('rows');				// validate max extra_rows		if (opts.max_rows == null || opts.max_rows < orig.rows) {			opts.max_rows = orig.rows;		}		if (opts.extra_rows == null || opts.extra_rows < 0) {			opts.extra_rows = 0;		}				if (opts.debug) {			console.log('opts: ', opts, ' orig: ', orig);		}		// resize textares on load		resize(ta, orig);				// check resize on key input		ta.bind('keyup', function(e) {			resize(ta, orig);		});				}); // end each()	function resize(ta, orig) {				// nbr explicit rows		var nl_rows = ta.val().split('\n');				// nbr inferred rows		var nbr_ta_rows = 0;					for (index in nl_rows) {			// overly simple check to account for text being auto wrapped and thus a new line			nbr_ta_rows += Math.floor((nl_rows[index].length / orig.cols)) + 1;		}				// get final nbr ta rows		var final_nbr_ta_rows = nbr_ta_rows - 1; // deduct for current line		final_nbr_ta_rows += opts.extra_rows; // add on extra rows		 		// resize textarea		// note: $.animate() doesnt work well here since only inc/dec row by one		if (final_nbr_ta_rows >= opts.max_rows) {			ta.attr('rows', opts.max_rows);									} else if (final_nbr_ta_rows >= orig.rows) {			ta.attr('rows', final_nbr_ta_rows);					} else {			ta.attr('rows', orig.rows);		}				if (opts.debug) {			console.log('rows: ', ta.attr('rows'), ' nbr nl_rows: ', nl_rows.length, ' nbr_ta_rows: ', nbr_ta_rows, ' final_nbr_ta_rows: ', final_nbr_ta_rows);		}	} // end resize()}; // end autoResizeTextAreaQ()})(jQuery);
+/*
+ * jQuery autoResizeTextAreaQ plugin
+ * @requires jQuery v1.4.2 or later
+ *
+ * Copyright (c) 2010 M. Brown (mbrowniebytes A gmail.com)
+ * Licensed under the Revised BSD license:
+ * http://www.opensource.org/licenses/bsd-license.php
+ * http://en.wikipedia.org/wiki/BSD_licenses 
+ *
+ * Versions:
+ * 0.1 - 2010-07-21
+ *       initial
+ * 
+ * usage:
+ *  $(document).ready( function() {
+ *      $('textarea').autoResizeTextAreaQ({"max_rows":8});
+ *  });
+ *
+ */
+
+(function($) {
+	
+$.fn.autoResizeTextAreaQ = function(options) {
+	var opts = $.extend({
+		// ya prob want to use
+		max_rows: 10,	// # - max rows to resize too
+		
+		// ya may want to use, but defaults should be ok
+		extra_rows: 1,  // # - nbr extra rows after last line ie padding; 0|1 optimal
+		
+		// ya should really specify in html
+		rows: null,		// null|# - null infer from html; # override html
+		cols: null,		// null|# - null infer from html; # override html
+		
+		debug: false	// true|false - turn on|off console.log()
+	}, options);
+	
+	// extra padding based on browser
+	if ($.browser.msie) {
+		opts.extra_rows += 1;
+	} else if ($.browser.webkit) {
+		opts.extra_rows += 1;
+	} // else $.browser.mozilla
+			
+	// iterate over passed in selector, only process actual textareas
+	return $(this).filter('textarea').each(function(index) {
+
+		var ta = $(this);
+		var orig = {};
+		
+		// textarea rows cols current state
+		if (opts.cols != null && opts.cols > 0) {				
+			ta.attr('cols', opts.cols);
+		}
+		orig.cols = ta.attr('cols');
+					
+		if (opts.rows != null && opts.rows > 0) {				
+			ta.attr('rows', opts.rows);
+		}
+		orig.rows = ta.attr('rows');
+		
+		// validate max extra_rows
+		if (opts.max_rows == null || opts.max_rows < orig.rows) {
+			opts.max_rows = orig.rows;
+		}
+		if (opts.extra_rows == null || opts.extra_rows < 0) {
+			opts.extra_rows = 0;
+		}
+		
+		if (opts.debug) {
+			console.log('opts: ', opts, ' orig: ', orig);
+		}
+
+		// resize textares on load
+		resize(ta, orig);
+		
+		// check resize on key input
+		ta.bind('keyup', function(e) {
+			resize(ta, orig);
+		});			
+	}); // end each()
+
+	function resize(ta, orig) {
+		
+		// nbr explicit rows
+		var nl_rows = ta.val().split('\n');
+		
+		// nbr inferred rows
+		var nbr_ta_rows = 0;			
+		for (index in nl_rows) {
+			// overly simple check to account for text being auto wrapped and thus a new line
+			nbr_ta_rows += Math.floor((nl_rows[index].length / orig.cols)) + 1;
+		}
+		
+		// get final nbr ta rows
+		var final_nbr_ta_rows = nbr_ta_rows - 1; // deduct for current line
+		final_nbr_ta_rows += opts.extra_rows; // add on extra rows
+		 
+		// resize textarea
+		// note: $.animate() doesnt work well here since only inc/dec row by one
+		if (final_nbr_ta_rows >= opts.max_rows) {
+			ta.attr('rows', opts.max_rows);
+							
+		} else if (final_nbr_ta_rows >= orig.rows) {
+			ta.attr('rows', final_nbr_ta_rows);
+			
+		} else {
+			ta.attr('rows', orig.rows);
+		}
+		
+		if (opts.debug) {
+			console.log('rows: ', ta.attr('rows'), ' nbr nl_rows: ', nl_rows.length, ' nbr_ta_rows: ', nbr_ta_rows, ' final_nbr_ta_rows: ', final_nbr_ta_rows);
+		}
+	} // end resize()
+
+}; // end autoResizeTextAreaQ()
+
+})(jQuery);
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js	(revision 22564)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js	(revision 22796)
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/css/mypage.css
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/css/mypage.css	(revision 22574)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/css/mypage.css	(revision 22796)
@@ -114,5 +114,5 @@
 }
 
-.historyBox {
+#historyBox {
     padding: 10px 10px 5px;
     background: #F7F5F0;
@@ -123,5 +123,5 @@
     margin-bottom: 10px;
 }
-.historyBox p {
+#historyBox p {
     font-size: 12px;
     width: 70%;
@@ -129,5 +129,5 @@
     float: left;
 }
-.historyBox .btn_reorder {
+#historyBox .btn_reorder {
     width: 5em;
     float: right;
Index: /branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css
===================================================================
--- /branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css	(revision 22602)
+++ /branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css	(revision 22796)
@@ -250,9 +250,4 @@
     vertical-align: middle;
 }
-#categorytree li ul {
-    border: none;
-    margin: 0;
-    padding: 0;
-}
 
 #categorytree li:first-child {
Index: /branches/version-2_12-dev/html/user_data/__default.php
===================================================================
--- /branches/version-2_12-dev/html/user_data/__default.php	(revision 22567)
+++ /branches/version-2_12-dev/html/user_data/__default.php	(revision 22796)
@@ -10,6 +10,5 @@
  * @package Page
  */
-class LC_Page_User extends LC_Page_Ex 
-{
+class LC_Page_User extends LC_Page_Ex {
 
     /**
@@ -18,6 +17,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -28,6 +26,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -40,6 +37,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
     }
 
@@ -49,6 +45,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/html/upgrade/index.php
===================================================================
--- /branches/version-2_12-dev/html/upgrade/index.php	(revision 22567)
+++ /branches/version-2_12-dev/html/upgrade/index.php	(revision 22796)
@@ -43,6 +43,5 @@
 
 
-function lfPageFactory($mode)
-{
+function lfPageFactory($mode) {
     $prefix = 'LC_Page_Upgrade_';
     $file   = CLASS_REALDIR . "pages/upgrade/${prefix}";
Index: /branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch
===================================================================
--- /branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch	(revision 22565)
+++ /branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch	(revision 22796)
Index: /branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_InstallView.php';
 
-class SC_InstallView_Ex extends SC_InstallView 
-{
+class SC_InstallView_Ex extends SC_InstallView {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Customer.php';
 
-class SC_Customer_Ex extends SC_Customer 
-{
+class SC_Customer_Ex extends SC_Customer {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_MobileView.php';
 
-class SC_MobileView_Ex extends SC_MobileView 
-{
+class SC_MobileView_Ex extends SC_MobileView {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_Helper_Plugin_Ex extends SC_Helper_Plugin 
-{
+class SC_Helper_Plugin_Ex extends SC_Helper_Plugin {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_Customer_Ex extends SC_Helper_Customer 
-{
+class SC_Helper_Customer_Ex extends SC_Helper_Customer {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php	(revision 22796)
@@ -31,5 +31,4 @@
  * @version $Id:$
  */
-class SC_Helper_FPDI_Ex extends SC_Helper_FPDI 
-{
+class SC_Helper_FPDI_Ex extends SC_Helper_FPDI {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_Mail_Ex extends SC_Helper_Mail 
-{
+class SC_Helper_Mail_Ex extends SC_Helper_Mail {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id:SC_Helper_Session_Ex.php 16741 2007-11-08 00:43:24Z adachi $
  */
-class SC_Helper_Session_Ex extends SC_Helper_Session 
-{
+class SC_Helper_Session_Ex extends SC_Helper_Session {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_Helper_DB_Ex extends SC_Helper_DB 
-{
+class SC_Helper_DB_Ex extends SC_Helper_DB {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php	(revision 22796)
@@ -30,5 +30,4 @@
  * @version $Id$
  */
-class SC_Helper_HandleError_Ex extends SC_Helper_HandleError 
-{
+class SC_Helper_HandleError_Ex extends SC_Helper_HandleError {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_Helper_Mobile_Ex extends SC_Helper_Mobile 
-{
+class SC_Helper_Mobile_Ex extends SC_Helper_Mobile {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_FileManager_Ex extends SC_Helper_FileManager 
-{
+class SC_Helper_FileManager_Ex extends SC_Helper_FileManager {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_Helper_PageLayout_Ex extends SC_Helper_PageLayout 
-{
+class SC_Helper_PageLayout_Ex extends SC_Helper_PageLayout {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_Helper_Purchase_Ex extends SC_Helper_Purchase 
-{
+class SC_Helper_Purchase_Ex extends SC_Helper_Purchase {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_CSV_Ex extends SC_Helper_CSV 
-{
+class SC_Helper_CSV_Ex extends SC_Helper_CSV {
 }
Index: /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_Helper_Transform_Ex extends SC_Helper_Transform 
-{
+class SC_Helper_Transform_Ex extends SC_Helper_Transform {
 }
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Bloc_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Bloc_Ex.php	(revision 22610)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Bloc.php';
-
-/**
- * ブロックを管理するヘルパークラス(拡張).
- *
- * LC_Helper_Bloc をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Bloc_Ex extends SC_Helper_Bloc
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Delivery_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Delivery_Ex.php	(revision 22564)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Delivery.php';
-
-/**
- * 配送方法を管理するヘルパークラス(拡張).
- *
- * LC_Helper_Delivery をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Delivery_Ex extends SC_Helper_Delivery
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Holiday_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Holiday_Ex.php	(revision 22575)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Holiday.php';
-
-/**
- * 休日を管理するヘルパークラス(拡張).
- *
- * LC_Helper_Holiday をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Holiday_Ex extends SC_Helper_Holiday
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Kiyaku_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Kiyaku_Ex.php	(revision 22570)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Kiyaku.php';
-
-/**
- * 会員規約を管理するヘルパークラス(拡張).
- *
- * LC_Helper_Kiyaku をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Kiyaku_Ex extends SC_Helper_Kiyaku
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Maker_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Maker_Ex.php	(revision 22578)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Maker.php';
-
-/**
- * メーカーを管理するヘルパークラス(拡張).
- *
- * LC_Helper_Maker をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Maker_Ex extends SC_Helper_Maker
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Recommend_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Recommend_Ex.php	(revision 22582)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Recommend.php';
-
-/**
- * おすすめ商品を管理するヘルパークラス(拡張).
- *
- * LC_Helper_Recommend をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Recommend_Ex extends SC_Helper_Recommend
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_News_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_News_Ex.php	(revision 22581)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_News.php';
-
-/**
- * 新着情報を管理するヘルパークラス(拡張).
- *
- * LC_Helper_News をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_News_Ex extends SC_Helper_News
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Category_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Category_Ex.php	(revision 22588)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Category.php';
-
-/**
- * カテゴリーを管理するヘルパークラス(拡張).
- *
- * LC_Helper_Category をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Category_Ex extends SC_Helper_Category
-{
-    //put your code here
-}
Index: anches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mailtemplate_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mailtemplate_Ex.php	(revision 22584)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Mailtemplate.php';
-
-/**
- * メールテンプレートを管理するヘルパークラス(拡張).
- *
- * LC_Helper_Mailtemplate をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Mailtemplate_Ex extends SC_Helper_Mailtemplate
-{
-    //put your code here
-}
Index: /branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'util/SC_Batch_Update.php';
 
-class SC_Batch_Update_Ex extends SC_Batch_Update 
-{
+class SC_Batch_Update_Ex extends SC_Batch_Update {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php	(revision 22796)
@@ -3,5 +3,4 @@
 require_once CLASS_REALDIR . 'SC_Display.php';
 
-class SC_Display_Ex extends SC_Display
-{
+class SC_Display_Ex extends SC_Display{
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_View_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_View_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_View_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_View.php';
 
-class SC_View_Ex extends SC_View 
-{
+class SC_View_Ex extends SC_View {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_SmartphoneView.php';
 
-class SC_SmartphoneView_Ex extends SC_SmartphoneView 
-{
+class SC_SmartphoneView_Ex extends SC_SmartphoneView {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Product.php';
 
-class SC_Product_Ex extends SC_Product 
-{
+class SC_Product_Ex extends SC_Product {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Batch.php';
 
-class SC_Batch_Ex extends SC_Batch 
-{
+class SC_Batch_Ex extends SC_Batch {
 }
Index: /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'graph/SC_Graph_Pie.php';
 
-class SC_Graph_Pie_Ex extends SC_Graph_Pie 
-{
+class SC_Graph_Pie_Ex extends SC_Graph_Pie {
 }
Index: /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'graph/SC_Graph_Bar.php';
 
-class SC_Graph_Bar_Ex extends SC_Graph_Bar 
-{
+class SC_Graph_Bar_Ex extends SC_Graph_Bar {
 }
Index: /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'graph/SC_Graph_Line.php';
 
-class SC_Graph_Line_Ex extends SC_Graph_Line 
-{
+class SC_Graph_Line_Ex extends SC_Graph_Line {
 }
Index: /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'graph/SC_Graph_Base.php';
 
-class SC_Graph_Base_Ex extends SC_Graph_Base 
-{
+class SC_Graph_Base_Ex extends SC_Graph_Base {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_FormParam.php';
 
-class SC_FormParam_Ex extends SC_FormParam 
-{
+class SC_FormParam_Ex extends SC_FormParam {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_CheckError.php';
 
-class SC_CheckError_Ex extends SC_CheckError 
-{
+class SC_CheckError_Ex extends SC_CheckError {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php	(revision 22796)
@@ -33,5 +33,4 @@
  * @version $Id$
  */
-class SC_Initial_Ex extends SC_Initial 
-{
+class SC_Initial_Ex extends SC_Initial {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_CartSession.php';
 
-class SC_CartSession_Ex extends SC_CartSession 
-{
+class SC_CartSession_Ex extends SC_CartSession {
 }
Index: /branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'sessionfactory/SC_SessionFactory_UseRequest.php';
 
-class SC_SessionFactory_UseRequest_Ex extends SC_SessionFactory_UseRequest 
-{
+class SC_SessionFactory_UseRequest_Ex extends SC_SessionFactory_UseRequest {
 }
Index: /branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'sessionfactory/SC_SessionFactory_UseCookie.php';
 
-class SC_SessionFactory_UseCookie_Ex extends SC_SessionFactory_UseCookie 
-{
+class SC_SessionFactory_UseCookie_Ex extends SC_SessionFactory_UseCookie {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_SmartphoneUserAgent.php';
 
-class SC_SmartphoneUserAgent_Ex extends SC_SmartphoneUserAgent 
-{
+class SC_SmartphoneUserAgent_Ex extends SC_SmartphoneUserAgent {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_SiteView.php';
 
-class SC_SiteView_Ex extends SC_SiteView 
-{
+class SC_SiteView_Ex extends SC_SiteView {
 }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_Kiyaku_Ex extends LC_Page_Entry_Kiyaku 
-{
+class LC_Page_Entry_Kiyaku_Ex extends LC_Page_Entry_Kiyaku {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_EmailMobile_Ex extends LC_Page_Entry_EmailMobile 
-{
+class LC_Page_Entry_EmailMobile_Ex extends LC_Page_Entry_EmailMobile {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_Ex extends LC_Page_Entry 
-{
+class LC_Page_Entry_Ex extends LC_Page_Entry {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_Complete_Ex extends LC_Page_Entry_Complete 
-{
+class LC_Page_Entry_Complete_Ex extends LC_Page_Entry_Complete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_New_Ex extends LC_Page_Entry_New 
-{
+class LC_Page_Entry_New_Ex extends LC_Page_Entry_New {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Login_Ex extends LC_Page_FrontParts_Bloc_Login 
-{
+class LC_Page_FrontParts_Bloc_Login_Ex extends LC_Page_FrontParts_Bloc_Login {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $ $
  */
-class LC_Page_FrontParts_Bloc_Calendar_Ex extends LC_Page_FrontParts_Bloc_Calendar 
-{
+class LC_Page_FrontParts_Bloc_Calendar_Ex extends LC_Page_FrontParts_Bloc_Calendar {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Cart_Ex extends LC_Page_FrontParts_Bloc_Cart 
-{
+class LC_Page_FrontParts_Bloc_Cart_Ex extends LC_Page_FrontParts_Bloc_Cart {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id: LC_Page_FrontParts_Bloc__Ex.php -1   $
  */
-class LC_Page_FrontParts_Bloc_Recommend_Ex extends LC_Page_FrontParts_Bloc_Recommend 
-{
+class LC_Page_FrontParts_Bloc_Recommend_Ex extends LC_Page_FrontParts_Bloc_Recommend {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_SearchProducts_Ex extends LC_Page_FrontParts_Bloc_SearchProducts 
-{
+class LC_Page_FrontParts_Bloc_SearchProducts_Ex extends LC_Page_FrontParts_Bloc_SearchProducts {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviFooter_Ex extends LC_Page_FrontParts_Bloc_NaviFooter 
-{
+class LC_Page_FrontParts_Bloc_NaviFooter_Ex extends LC_Page_FrontParts_Bloc_NaviFooter {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_News_Ex extends LC_Page_FrontParts_Bloc_News 
-{
+class LC_Page_FrontParts_Bloc_News_Ex extends LC_Page_FrontParts_Bloc_News {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Category_Ex extends LC_Page_FrontParts_Bloc_Category 
-{
+class LC_Page_FrontParts_Bloc_Category_Ex extends LC_Page_FrontParts_Bloc_Category {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id: LC_Page_FrontParts_Bloc_Ex.php $
  */
-class LC_Page_FrontParts_Bloc_Ex extends LC_Page_FrontParts_Bloc 
-{
+class LC_Page_FrontParts_Bloc_Ex extends LC_Page_FrontParts_Bloc {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginHeader_Ex extends LC_Page_FrontParts_Bloc_LoginHeader 
-{
+class LC_Page_FrontParts_Bloc_LoginHeader_Ex extends LC_Page_FrontParts_Bloc_LoginHeader {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviHeader_Ex extends LC_Page_FrontParts_Bloc_NaviHeader 
-{
+class LC_Page_FrontParts_Bloc_NaviHeader_Ex extends LC_Page_FrontParts_Bloc_NaviHeader {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginFooter_Ex extends LC_Page_FrontParts_Bloc_LoginFooter 
-{
+class LC_Page_FrontParts_Bloc_LoginFooter_Ex extends LC_Page_FrontParts_Bloc_LoginFooter {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_LoginCheck_Ex extends LC_Page_FrontParts_LoginCheck 
-{
+class LC_Page_FrontParts_LoginCheck_Ex extends LC_Page_FrontParts_LoginCheck {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Index_Ex extends LC_Page_Index 
-{
+class LC_Page_Index_Ex extends LC_Page_Index {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Products_Review_Ex extends LC_Page_Products_Review 
-{
+class LC_Page_Products_Review_Ex extends LC_Page_Products_Review {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Products_Detail_Ex extends LC_Page_Products_Detail 
-{
+class LC_Page_Products_Detail_Ex extends LC_Page_Products_Detail {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Products_Search_Ex extends LC_Page_Products_Search 
-{
+class LC_Page_Products_Search_Ex extends LC_Page_Products_Search {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Products_CategoryList_Ex extends LC_Page_Products_CategoryList 
-{
+class LC_Page_Products_CategoryList_Ex extends LC_Page_Products_CategoryList {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Products_ReviewComplete_Ex extends LC_Page_Products_ReviewComplete 
-{
+class LC_Page_Products_ReviewComplete_Ex extends LC_Page_Products_ReviewComplete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Products_List_Ex extends LC_Page_Products_List 
-{
+class LC_Page_Products_List_Ex extends LC_Page_Products_List {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Rss_Products_Ex extends LC_Page_Rss_Products 
-{
+class LC_Page_Rss_Products_Ex extends LC_Page_Rss_Products {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Rss_Ex extends LC_Page_Rss 
-{
+class LC_Page_Rss_Ex extends LC_Page_Rss {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Api_Php_Ex extends LC_Page_Api_Php 
-{
+class LC_Page_Api_Php_Ex extends LC_Page_Api_Php {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Api_Json_Ex extends LC_Page_Api_Json 
-{
+class LC_Page_Api_Json_Ex extends LC_Page_Api_Json {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Api_Ex extends LC_Page_Api 
-{
+class LC_Page_Api_Ex extends LC_Page_Api {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Api_Xml_Ex extends LC_Page_Api_Xml 
-{
+class LC_Page_Api_Xml_Ex extends LC_Page_Api_Xml {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Order_Ex extends LC_Page_Order 
-{
+class LC_Page_Order_Ex extends LC_Page_Order {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'pages/LC_Page.php';
 
-class LC_Page_Ex extends LC_Page 
-{
+class LC_Page_Ex extends LC_Page {
 }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_InputZip_Ex extends LC_Page_InputZip 
-{
+class LC_Page_InputZip_Ex extends LC_Page_InputZip {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Preview_Ex extends LC_Page_Preview 
-{
+class LC_Page_Preview_Ex extends LC_Page_Preview {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Delivery_Ex extends LC_Page_Mypage_Delivery 
-{
+class LC_Page_Mypage_Delivery_Ex extends LC_Page_Mypage_Delivery {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_AbstractMypage_Ex extends LC_Page_AbstractMypage 
-{
+class LC_Page_AbstractMypage_Ex extends LC_Page_AbstractMypage {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_HistoryDetail_Ex extends LC_Page_Mypage_HistoryDetail 
-{
+class LC_Page_Mypage_HistoryDetail_Ex extends LC_Page_Mypage_HistoryDetail {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Change_Ex extends LC_Page_Mypage_Change 
-{
+class LC_Page_Mypage_Change_Ex extends LC_Page_Mypage_Change {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id: LC_Page_Mypage_Download_Ex.php $
  */
-class LC_Page_Mypage_Download_Ex extends LC_Page_Mypage_Download 
-{
+class LC_Page_Mypage_Download_Ex extends LC_Page_Mypage_Download {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Login_Ex extends LC_Page_Mypage_Login 
-{
+class LC_Page_Mypage_Login_Ex extends LC_Page_Mypage_Login {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_RefusalComplete_Ex extends LC_Page_Mypage_RefusalComplete 
-{
+class LC_Page_Mypage_RefusalComplete_Ex extends LC_Page_Mypage_RefusalComplete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Order_Ex extends LC_Page_Mypage_Order 
-{
+class LC_Page_Mypage_Order_Ex extends LC_Page_Mypage_Order {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_MailView_Ex extends LC_Page_Mypage_MailView 
-{
+class LC_Page_Mypage_MailView_Ex extends LC_Page_Mypage_MailView {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_ChangeComplete_Ex extends LC_Page_Mypage_ChangeComplete 
-{
+class LC_Page_Mypage_ChangeComplete_Ex extends LC_Page_Mypage_ChangeComplete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_DeliveryAddr_Ex extends LC_Page_Mypage_DeliveryAddr 
-{
+class LC_Page_Mypage_DeliveryAddr_Ex extends LC_Page_Mypage_DeliveryAddr {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Favorite_Ex extends LC_Page_Mypage_Favorite 
-{
+class LC_Page_Mypage_Favorite_Ex extends LC_Page_Mypage_Favorite {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Ex extends LC_Page_Mypage 
-{
+class LC_Page_Mypage_Ex extends LC_Page_Mypage {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_History_Ex extends LC_Page_Mypage_History 
-{
+class LC_Page_Mypage_History_Ex extends LC_Page_Mypage_History {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Refusal_Ex extends LC_Page_Mypage_Refusal 
-{
+class LC_Page_Mypage_Refusal_Ex extends LC_Page_Mypage_Refusal {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_DelivAddr_Ex extends LC_Page_Shopping_DelivAddr 
-{
+class LC_Page_Shopping_DelivAddr_Ex extends LC_Page_Shopping_DelivAddr {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Ex extends LC_Page_Shopping 
-{
+class LC_Page_Shopping_Ex extends LC_Page_Shopping {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Deliv_Ex extends LC_Page_Shopping_Deliv 
-{
+class LC_Page_Shopping_Deliv_Ex extends LC_Page_Shopping_Deliv {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_LoadPaymentModule_Ex extends LC_Page_Shopping_LoadPaymentModule 
-{
+class LC_Page_Shopping_LoadPaymentModule_Ex extends LC_Page_Shopping_LoadPaymentModule {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Complete_Ex extends LC_Page_Shopping_Complete 
-{
+class LC_Page_Shopping_Complete_Ex extends LC_Page_Shopping_Complete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Multiple_Ex extends LC_Page_Shopping_Multiple 
-{
+class LC_Page_Shopping_Multiple_Ex extends LC_Page_Shopping_Multiple {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Confirm_Ex extends LC_Page_Shopping_Confirm 
-{
+class LC_Page_Shopping_Confirm_Ex extends LC_Page_Shopping_Confirm {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Payment_Ex extends LC_Page_Shopping_Payment 
-{
+class LC_Page_Shopping_Payment_Ex extends LC_Page_Shopping_Payment {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Unsupported_Ex extends LC_Page_Unsupported 
-{
+class LC_Page_Unsupported_Ex extends LC_Page_Unsupported {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductRank_Ex extends LC_Page_Admin_Products_ProductRank 
-{
+class LC_Page_Admin_Products_ProductRank_Ex extends LC_Page_Admin_Products_ProductRank {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Category_Ex extends LC_Page_Admin_Products_Category 
-{
+class LC_Page_Admin_Products_Category_Ex extends LC_Page_Admin_Products_Category {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $$Id$$
  */
-class LC_Page_Admin_Products_UploadCSVCategory_Ex extends LC_Page_Admin_Products_UploadCSVCategory 
-{
+class LC_Page_Admin_Products_UploadCSVCategory_Ex extends LC_Page_Admin_Products_UploadCSVCategory {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Maker_Ex extends LC_Page_Admin_Products_Maker 
-{
+class LC_Page_Admin_Products_Maker_Ex extends LC_Page_Admin_Products_Maker {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Ex extends LC_Page_Admin_Products 
-{
+class LC_Page_Admin_Products_Ex extends LC_Page_Admin_Products {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductSelect_Ex extends LC_Page_Admin_Products_ProductSelect 
-{
+class LC_Page_Admin_Products_ProductSelect_Ex extends LC_Page_Admin_Products_ProductSelect {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Product_Ex extends LC_Page_Admin_Products_Product 
-{
+class LC_Page_Admin_Products_Product_Ex extends LC_Page_Admin_Products_Product {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $$Id$$
  */
-class LC_Page_Admin_Products_UploadCSV_Ex extends LC_Page_Admin_Products_UploadCSV 
-{
+class LC_Page_Admin_Products_UploadCSV_Ex extends LC_Page_Admin_Products_UploadCSV {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Review_Ex extends LC_Page_Admin_Products_Review 
-{
+class LC_Page_Admin_Products_Review_Ex extends LC_Page_Admin_Products_Review {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ClassCategory_Ex extends LC_Page_Admin_Products_ClassCategory 
-{
+class LC_Page_Admin_Products_ClassCategory_Ex extends LC_Page_Admin_Products_ClassCategory {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Class_Ex extends LC_Page_Admin_Products_Class 
-{
+class LC_Page_Admin_Products_Class_Ex extends LC_Page_Admin_Products_Class {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id:LC_Page_Admin_Products_Product_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_Products_ProductClass_Ex extends LC_Page_Admin_Products_ProductClass 
-{
+class LC_Page_Admin_Products_ProductClass_Ex extends LC_Page_Admin_Products_ProductClass {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ReviewEdit_Ex extends LC_Page_Admin_Products_ReviewEdit 
-{
+class LC_Page_Admin_Products_ReviewEdit_Ex extends LC_Page_Admin_Products_ReviewEdit {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Total_Ex extends LC_Page_Admin_Total 
-{
+class LC_Page_Admin_Total_Ex extends LC_Page_Admin_Total {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'pages/admin/LC_Page_Admin.php';
 
-class LC_Page_Admin_Ex extends LC_Page_Admin 
-{
+class LC_Page_Admin_Ex extends LC_Page_Admin {
 }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_System_Ex extends LC_Page_Admin_System_System 
-{
+class LC_Page_Admin_System_System_Ex extends LC_Page_Admin_System_System {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id:LC_Page_Admin_Basis_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_System_Masterdata_Ex extends LC_Page_Admin_System_Masterdata 
-{
+class LC_Page_Admin_System_Masterdata_Ex extends LC_Page_Admin_System_Masterdata {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Editdb_Ex extends LC_Page_Admin_System_Editdb 
-{
+class LC_Page_Admin_System_Editdb_Ex extends LC_Page_Admin_System_Editdb {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Rank_Ex extends LC_Page_Admin_System_Rank 
-{
+class LC_Page_Admin_System_Rank_Ex extends LC_Page_Admin_System_Rank {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Input_Ex extends LC_Page_Admin_System_Input 
-{
+class LC_Page_Admin_System_Input_Ex extends LC_Page_Admin_System_Input {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Ex extends LC_Page_Admin_System 
-{
+class LC_Page_Admin_System_Ex extends LC_Page_Admin_System {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id:LC_Page_Admin_Basis_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_System_Parameter_Ex extends LC_Page_Admin_System_Parameter 
-{
+class LC_Page_Admin_System_Parameter_Ex extends LC_Page_Admin_System_Parameter {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_AdminArea_Ex extends LC_Page_Admin_System_AdminArea 
-{
+class LC_Page_Admin_System_AdminArea_Ex extends LC_Page_Admin_System_AdminArea {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Bkup_Ex extends LC_Page_Admin_System_Bkup 
-{
+class LC_Page_Admin_System_Bkup_Ex extends LC_Page_Admin_System_Bkup {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Log_Ex extends LC_Page_Admin_System_Log 
-{
+class LC_Page_Admin_System_Log_Ex extends LC_Page_Admin_System_Log {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Delete_Ex extends LC_Page_Admin_System_Delete 
-{
+class LC_Page_Admin_System_Delete_Ex extends LC_Page_Admin_System_Delete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_CSS_Ex extends LC_Page_Admin_Design_CSS 
-{
+class LC_Page_Admin_Design_CSS_Ex extends LC_Page_Admin_Design_CSS {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_Header_Ex extends LC_Page_Admin_Design_Header 
-{
+class LC_Page_Admin_Design_Header_Ex extends LC_Page_Admin_Design_Header {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_MainEdit_Ex extends LC_Page_Admin_Design_MainEdit 
-{
+class LC_Page_Admin_Design_MainEdit_Ex extends LC_Page_Admin_Design_MainEdit {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_Template_Ex extends LC_Page_Admin_Design_Template 
-{
+class LC_Page_Admin_Design_Template_Ex extends LC_Page_Admin_Design_Template {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_UpDown_Ex extends LC_Page_Admin_Design_UpDown 
-{
+class LC_Page_Admin_Design_UpDown_Ex extends LC_Page_Admin_Design_UpDown {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_Bloc_Ex extends LC_Page_Admin_Design_Bloc 
-{
+class LC_Page_Admin_Design_Bloc_Ex extends LC_Page_Admin_Design_Bloc {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_Ex extends LC_Page_Admin_Design 
-{
+class LC_Page_Admin_Design_Ex extends LC_Page_Admin_Design {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Ex extends LC_Page_Admin_OwnersStore 
-{
+class LC_Page_Admin_OwnersStore_Ex extends LC_Page_Admin_OwnersStore {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Settings_Ex extends LC_Page_Admin_OwnersStore_Settings 
-{
+class LC_Page_Admin_OwnersStore_Settings_Ex extends LC_Page_Admin_OwnersStore_Settings {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Log_Ex extends LC_Page_Admin_OwnersStore_Log 
-{
+class LC_Page_Admin_OwnersStore_Log_Ex extends LC_Page_Admin_OwnersStore_Log {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Module_Ex extends LC_Page_Admin_OwnersStore_Module 
-{
+class LC_Page_Admin_OwnersStore_Module_Ex extends LC_Page_Admin_OwnersStore_Module {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Index_Ex extends LC_Page_Admin_Index 
-{
+class LC_Page_Admin_Index_Ex extends LC_Page_Admin_Index {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Ex extends LC_Page_Admin_Order 
-{
+class LC_Page_Admin_Order_Ex extends LC_Page_Admin_Order {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_ProductSelect_Ex extends LC_Page_Admin_Order_ProductSelect 
-{
+class LC_Page_Admin_Order_ProductSelect_Ex extends LC_Page_Admin_Order_ProductSelect {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Mail_Ex extends LC_Page_Admin_Order_Mail 
-{
+class LC_Page_Admin_Order_Mail_Ex extends LC_Page_Admin_Order_Mail {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Status_Ex extends LC_Page_Admin_Order_Status 
-{
+class LC_Page_Admin_Order_Status_Ex extends LC_Page_Admin_Order_Status {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Edit_Ex extends LC_Page_Admin_Order_Edit 
-{
+class LC_Page_Admin_Order_Edit_Ex extends LC_Page_Admin_Order_Edit {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Pdf_Ex extends LC_Page_Admin_Order_Pdf 
-{
+class LC_Page_Admin_Order_Pdf_Ex extends LC_Page_Admin_Order_Pdf {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Multiple_Ex extends LC_Page_Admin_Order_Multiple 
-{
+class LC_Page_Admin_Order_Multiple_Ex extends LC_Page_Admin_Order_Multiple {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_MailView_Ex extends LC_Page_Admin_Order_MailView 
-{
+class LC_Page_Admin_Order_MailView_Ex extends LC_Page_Admin_Order_MailView {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id: LC_Page_Admin_Order_Disp_Ex.php 20764 2011-03-22 06:26:40Z nanasess $
  */
-class LC_Page_Admin_Order_Disp_Ex extends LC_Page_Admin_Order_Disp 
-{
+class LC_Page_Admin_Order_Disp_Ex extends LC_Page_Admin_Order_Disp {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Home_Ex extends LC_Page_Admin_Home 
-{
+class LC_Page_Admin_Home_Ex extends LC_Page_Admin_Home {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Login_Ex extends LC_Page_Admin_Login 
-{
+class LC_Page_Admin_Login_Ex extends LC_Page_Admin_Login {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Logout_Ex extends LC_Page_Admin_Logout 
-{
+class LC_Page_Admin_Logout_Ex extends LC_Page_Admin_Logout {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_Recommend_Ex extends LC_Page_Admin_Contents_Recommend 
-{
+class LC_Page_Admin_Contents_Recommend_Ex extends LC_Page_Admin_Contents_Recommend {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileManager_Ex extends LC_Page_Admin_Contents_FileManager 
-{
+class LC_Page_Admin_Contents_FileManager_Ex extends LC_Page_Admin_Contents_FileManager {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileView_Ex extends LC_Page_Admin_Contents_FileView 
-{
+class LC_Page_Admin_Contents_FileView_Ex extends LC_Page_Admin_Contents_FileView {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CSV_Ex extends LC_Page_Admin_Contents_CSV 
-{
+class LC_Page_Admin_Contents_CSV_Ex extends LC_Page_Admin_Contents_CSV {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CsvSql_Ex extends LC_Page_Admin_Contents_CsvSql 
-{
+class LC_Page_Admin_Contents_CsvSql_Ex extends LC_Page_Admin_Contents_CsvSql {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_RecommendSearch_Ex extends LC_Page_Admin_Contents_RecommendSearch 
-{
+class LC_Page_Admin_Contents_RecommendSearch_Ex extends LC_Page_Admin_Contents_RecommendSearch {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_Ex extends LC_Page_Admin_Contents 
-{
+class LC_Page_Admin_Contents_Ex extends LC_Page_Admin_Contents {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Seo_Ex extends LC_Page_Admin_Basis_Seo 
-{
+class LC_Page_Admin_Basis_Seo_Ex extends LC_Page_Admin_Basis_Seo {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id:LC_Page_Admin_Basis_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_Basis_Holiday_Ex extends LC_Page_Admin_Basis_Holiday 
-{
+class LC_Page_Admin_Basis_Holiday_Ex extends LC_Page_Admin_Basis_Holiday {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Point_Ex extends LC_Page_Admin_Basis_Point 
-{
+class LC_Page_Admin_Basis_Point_Ex extends LC_Page_Admin_Basis_Point {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_ZipInstall_Ex extends LC_Page_Admin_Basis_ZipInstall 
-{
+class LC_Page_Admin_Basis_ZipInstall_Ex extends LC_Page_Admin_Basis_ZipInstall {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Kiyaku_Ex extends LC_Page_Admin_Basis_Kiyaku 
-{
+class LC_Page_Admin_Basis_Kiyaku_Ex extends LC_Page_Admin_Basis_Kiyaku {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_PaymentInput_Ex extends LC_Page_Admin_Basis_PaymentInput 
-{
+class LC_Page_Admin_Basis_PaymentInput_Ex extends LC_Page_Admin_Basis_PaymentInput {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Payment_Ex extends LC_Page_Admin_Basis_Payment 
-{
+class LC_Page_Admin_Basis_Payment_Ex extends LC_Page_Admin_Basis_Payment {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Ex extends LC_Page_Admin_Basis 
-{
+class LC_Page_Admin_Basis_Ex extends LC_Page_Admin_Basis {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Mail_Ex extends LC_Page_Admin_Basis_Mail 
-{
+class LC_Page_Admin_Basis_Mail_Ex extends LC_Page_Admin_Basis_Mail {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_DeliveryInput_Ex extends LC_Page_Admin_Basis_DeliveryInput 
-{
+class LC_Page_Admin_Basis_DeliveryInput_Ex extends LC_Page_Admin_Basis_DeliveryInput {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Delivery_Ex extends LC_Page_Admin_Basis_Delivery 
-{
+class LC_Page_Admin_Basis_Delivery_Ex extends LC_Page_Admin_Basis_Delivery {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Tradelaw_Ex extends LC_Page_Admin_Basis_Tradelaw 
-{
+class LC_Page_Admin_Basis_Tradelaw_Ex extends LC_Page_Admin_Basis_Tradelaw {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -64,6 +61,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Customer_Ex extends LC_Page_Admin_Customer_Customer 
-{
+class LC_Page_Admin_Customer_Customer_Ex extends LC_Page_Admin_Customer_Customer {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Edit_Ex extends LC_Page_Admin_Customer_Edit 
-{
+class LC_Page_Admin_Customer_Edit_Ex extends LC_Page_Admin_Customer_Edit {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php	(revision 22796)
@@ -45,6 +45,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +63,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Ex extends LC_Page_Admin_Customer 
-{
+class LC_Page_Admin_Customer_Ex extends LC_Page_Admin_Customer {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Ex extends LC_Page_Admin_Mail 
-{
+class LC_Page_Admin_Mail_Ex extends LC_Page_Admin_Mail {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_History_Ex extends LC_Page_Admin_Mail_History 
-{
+class LC_Page_Admin_Mail_History_Ex extends LC_Page_Admin_Mail_History {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Preview_Ex extends LC_Page_Admin_Mail_Preview 
-{
+class LC_Page_Admin_Mail_Preview_Ex extends LC_Page_Admin_Mail_Preview {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_TemplateInput_Ex extends LC_Page_Admin_Mail_TemplateInput 
-{
+class LC_Page_Admin_Mail_TemplateInput_Ex extends LC_Page_Admin_Mail_TemplateInput {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Template_Ex extends LC_Page_Admin_Mail_Template 
-{
+class LC_Page_Admin_Mail_Template_Ex extends LC_Page_Admin_Mail_Template {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Sendmail_Ex extends LC_Page_Admin_Mail_Sendmail 
-{
+class LC_Page_Admin_Mail_Sendmail_Ex extends LC_Page_Admin_Mail_Sendmail {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Cart_Ex extends LC_Page_Cart 
-{
+class LC_Page_Cart_Ex extends LC_Page_Cart {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Error_DispError_Ex extends LC_Page_Error_DispError 
-{
+class LC_Page_Error_DispError_Ex extends LC_Page_Error_DispError {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php	(revision 22796)
@@ -35,6 +35,5 @@
  * @version $Id$
  */
-class LC_Page_Error_SystemError_Ex extends LC_Page_Error_SystemError 
-{
+class LC_Page_Error_SystemError_Ex extends LC_Page_Error_SystemError {
 
     // }}}
@@ -46,6 +45,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -66,6 +63,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Error_Ex extends LC_Page_Error 
-{
+class LC_Page_Error_Ex extends LC_Page_Error {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Contact_Complete_Ex extends LC_Page_Contact_Complete 
-{
+class LC_Page_Contact_Complete_Ex extends LC_Page_Contact_Complete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Contact_Ex extends LC_Page_Contact 
-{
+class LC_Page_Contact_Ex extends LC_Page_Contact {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Regist_Ex extends LC_Page_Regist 
-{
+class LC_Page_Regist_Ex extends LC_Page_Regist {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Regist_Complete_Ex extends LC_Page_Regist_Complete 
-{
+class LC_Page_Regist_Complete_Ex extends LC_Page_Regist_Complete {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Redirect_Ex extends LC_Page_Redirect 
-{
+class LC_Page_Redirect_Ex extends LC_Page_Redirect {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Abouts_Ex extends LC_Page_Abouts 
-{
+class LC_Page_Abouts_Ex extends LC_Page_Abouts {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Kiyaku_Ex extends LC_Page_Guide_Kiyaku 
-{
+class LC_Page_Guide_Kiyaku_Ex extends LC_Page_Guide_Kiyaku {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Privacy_Ex extends LC_Page_Guide_Privacy 
-{
+class LC_Page_Guide_Privacy_Ex extends LC_Page_Guide_Privacy {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Ex extends LC_Page_Guide 
-{
+class LC_Page_Guide_Ex extends LC_Page_Guide {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Usage_Ex extends LC_Page_Guide_Usage 
-{
+class LC_Page_Guide_Usage_Ex extends LC_Page_Guide_Usage {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Charge_Ex extends LC_Page_Guide_Charge 
-{
+class LC_Page_Guide_Charge_Ex extends LC_Page_Guide_Charge {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_About_Ex extends LC_Page_Guide_About 
-{
+class LC_Page_Guide_About_Ex extends LC_Page_Guide_About {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Order_Ex extends LC_Page_Guide_Order 
-{
+class LC_Page_Guide_Order_Ex extends LC_Page_Guide_Order {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Sitemap_Ex extends LC_Page_Sitemap 
-{
+class LC_Page_Sitemap_Ex extends LC_Page_Sitemap {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_ResizeImage_Ex extends LC_Page_ResizeImage 
-{
+class LC_Page_ResizeImage_Ex extends LC_Page_ResizeImage {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Forgot_Ex extends LC_Page_Forgot 
-{
+class LC_Page_Forgot_Ex extends LC_Page_Forgot {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_SelectSql.php';
 
-class SC_SelectSql_Ex extends SC_SelectSql 
-{
+class SC_SelectSql_Ex extends SC_SelectSql {
 }
Index: /branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_Utils_Ex extends SC_Utils 
-{
+class SC_Utils_Ex extends SC_Utils {
 }
Index: /branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class GC_Utils_Ex extends GC_Utils 
-{
+class GC_Utils_Ex extends GC_Utils {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Query.php';
 
-class SC_Query_Ex extends SC_Query 
-{
+class SC_Query_Ex extends SC_Query {
 }
Index: /branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_DB_DBFactory_MYSQL_Ex extends SC_DB_DBFactory_MYSQL 
-{
+class SC_DB_DBFactory_MYSQL_Ex extends SC_DB_DBFactory_MYSQL {
 }
Index: /branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_DB_DBFactory_PGSQL_Ex extends SC_DB_DBFactory_PGSQL 
-{
+class SC_DB_DBFactory_PGSQL_Ex extends SC_DB_DBFactory_PGSQL {
 }
Index: /branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_DB_MasterData_Ex extends SC_DB_MasterData 
-{
+class SC_DB_MasterData_Ex extends SC_DB_MasterData {
 }
Index: /branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class SC_DB_DBFactory_Ex extends SC_DB_DBFactory 
-{
+class SC_DB_DBFactory_Ex extends SC_DB_DBFactory {
 
     // }}}
@@ -46,6 +45,5 @@
      * @return mixed DBFactory インスタンス
      */
-    function getInstance($db_type = DB_TYPE)
-    {
+    function getInstance($db_type = DB_TYPE) {
         switch ($db_type) {
             case 'mysql':
Index: /branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_SiteSession.php';
 
-class SC_SiteSession_Ex extends SC_SiteSession 
-{
+class SC_SiteSession_Ex extends SC_SiteSession {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Cookie.php';
 
-class SC_Cookie_Ex extends SC_Cookie 
-{
+class SC_Cookie_Ex extends SC_Cookie {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_MobileImage.php';
 
-class SC_MobileImage_Ex extends SC_MobileImage 
-{
+class SC_MobileImage_Ex extends SC_MobileImage {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_SessionFactory.php';
 
-class SC_SessionFactory_Ex extends SC_SessionFactory 
-{
+class SC_SessionFactory_Ex extends SC_SessionFactory {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Date.php';
 
-class SC_Date_Ex extends SC_Date 
-{
+class SC_Date_Ex extends SC_Date {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Fpdf.php';
 
-class SC_Fpdf_Ex extends SC_Fpdf 
-{
+class SC_Fpdf_Ex extends SC_Fpdf {
 }
Index: /branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'plugin/SC_Plugin_Util.php';
 
-class SC_Plugin_Util_Ex extends SC_Plugin_Util 
-{
+class SC_Plugin_Util_Ex extends SC_Plugin_Util {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Image.php';
 
-class SC_Image_Ex extends SC_Image 
-{
+class SC_Image_Ex extends SC_Image {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_Session.php';
 
-class SC_Session_Ex extends SC_Session 
-{
+class SC_Session_Ex extends SC_Session {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_AdminView.php';
 
-class SC_AdminView_Ex extends SC_AdminView 
-{
+class SC_AdminView_Ex extends SC_AdminView {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_UploadFile.php';
 
-class SC_UploadFile_Ex extends SC_UploadFile 
-{
+class SC_UploadFile_Ex extends SC_UploadFile {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_MobileUserAgent.php';
 
-class SC_MobileUserAgent_Ex extends SC_MobileUserAgent 
-{
+class SC_MobileUserAgent_Ex extends SC_MobileUserAgent {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_ClassAutoloader.php';
 
-class SC_ClassAutoloader_Ex extends SC_ClassAutoloader 
-{
+class SC_ClassAutoloader_Ex extends SC_ClassAutoloader {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_PageNavi.php';
 
-class SC_PageNavi_Ex extends SC_PageNavi 
-{
+class SC_PageNavi_Ex extends SC_PageNavi {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_MobileEmoji.php';
 
-class SC_MobileEmoji_Ex extends SC_MobileEmoji 
-{
+class SC_MobileEmoji_Ex extends SC_MobileEmoji {
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/SC_Api_Operation.php';
 
-class SC_Api_Operation_Ex extends SC_Api_Operation 
-{
+class SC_Api_Operation_Ex extends SC_Api_Operation {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/SC_Api_Utils.php';
 
-class SC_Api_Utils_Ex extends SC_Api_Utils 
-{
+class SC_Api_Utils_Ex extends SC_Api_Utils {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/SC_Api_Abstract.php';
 
-abstract class SC_Api_Abstract_Ex extends SC_Api_Abstract 
-{
+abstract class SC_Api_Abstract_Ex extends SC_Api_Abstract {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/CartCreate.php';
 
-class API_CartCreate_Ex extends API_CartCreate 
-{
+class API_CartCreate_Ex extends API_CartCreate {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/CartAdd.php';
 
-class API_CartAdd_Ex extends API_CartAdd 
-{
+class API_CartAdd_Ex extends API_CartAdd {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/CartClear.php';
 
-class API_CartClear_Ex extends API_CartClear 
-{
+class API_CartClear_Ex extends API_CartClear {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/Default.php';
 
-class API_Default_Ex extends API_Default 
-{
+class API_Default_Ex extends API_Default {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/AddrFromZip.php';
 
-class API_AddrFromZip_Ex extends API_AddrFromZip 
-{
+class API_AddrFromZip_Ex extends API_AddrFromZip {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/BrowseNodeLookup.php';
 
-class API_BrowseNodeLookup_Ex extends API_BrowseNodeLookup 
-{
+class API_BrowseNodeLookup_Ex extends API_BrowseNodeLookup {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/CartModify.php';
 
-class API_CartModify_Ex extends API_CartModify 
-{
+class API_CartModify_Ex extends API_CartModify {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/GetVersion.php';
 
-class API_GetVersion_Ex extends API_GetVersion 
-{
+class API_GetVersion_Ex extends API_GetVersion {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/ItemSearch.php';
 
-class API_ItemSearch_Ex extends API_ItemSearch 
-{
+class API_ItemSearch_Ex extends API_ItemSearch {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/ItemLookup.php';
 
-class API_ItemLookup_Ex extends API_ItemLookup 
-{
+class API_ItemLookup_Ex extends API_ItemLookup {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_REALDIR . 'api/operations/CartGet.php';
 
-class API_CartGet_Ex extends API_CartGet 
-{
+class API_CartGet_Ex extends API_CartGet {
 
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php	(revision 22796)
@@ -34,5 +34,4 @@
  * @version $Id$
  */
-class SC_SendMail_Ex extends SC_SendMail 
-{
+class SC_SendMail_Ex extends SC_SendMail {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php	(revision 22796)
@@ -24,5 +24,4 @@
 require_once CLASS_REALDIR . 'SC_CustomerList.php';
 
-class SC_CustomerList_Ex extends SC_CustomerList 
-{
+class SC_CustomerList_Ex extends SC_CustomerList {
 }
Index: /branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php	(revision 22796)
@@ -3,5 +3,4 @@
 require_once CLASS_REALDIR . 'SC_Response.php';
 
-class SC_Response_Ex extends SC_Response
-{
+class SC_Response_Ex extends SC_Response{
 }
Index: anches/version-2_12-dev/data/class_extends/SC_Cache_Ex.php
===================================================================
--- /branches/version-2_12-dev/data/class_extends/SC_Cache_Ex.php	(revision 22587)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-require_once CLASS_REALDIR . 'SC_Cache.php';
-
-class SC_Cache_Ex extends SC_Cache
-{
-}
Index: /branches/version-2_12-dev/data/class/SC_PageNavi.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_PageNavi.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_PageNavi.php	(revision 22796)
@@ -29,12 +29,10 @@
     ・$func_nameに指定するJavaScriptの例
         // ページナビで使用する
-        function fnNaviPage(pageno)
-        {
+        function fnNaviPage(pageno) {
             document.form1['pageno'].value = pageno;
             document.form1.submit();
         }
 */
-class SC_PageNavi 
-{
+class SC_PageNavi {
     var $now_page;      // 現在のページ番号
     var $max_page;      // 最終のページ番号
@@ -44,6 +42,5 @@
 
     // コンストラクタ
-    function __construct($now_page, $all_row, $page_row, $func_name, $navi_max = NAVI_PMAX, $urlParam = '', $display_number = true)
-    {
+    function __construct($now_page, $all_row, $page_row, $func_name, $navi_max = NAVI_PMAX, $urlParam = '', $display_number = true) {
         $this->arrPagenavi['mode'] = 'search';
 
Index: /branches/version-2_12-dev/data/class/SC_MobileEmoji.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_MobileEmoji.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_MobileEmoji.php	(revision 22796)
@@ -31,6 +31,5 @@
  * 携帯端末の絵文字を扱うクラス
  */
-class SC_MobileEmoji 
-{
+class SC_MobileEmoji {
     /**
      * 絵文字タグを各キャリア用の文字コードに変換する
@@ -40,6 +39,5 @@
      * @return string 出力
      */
-    static function handler($buffer)
-    {
+    static function handler($buffer) {
         $replace_callback = create_function('$matches', 'return SC_MobileEmoji_Ex::indexToCode($matches[1]);');
         return preg_replace_callback('/\[emoji:(e?\d+)\]/', $replace_callback, $buffer);
@@ -52,6 +50,5 @@
      * @return string 絵文字を表す Shift JIS の文字列を返す。
      */
-    function indexToCode($index)
-    {
+    function indexToCode($index) {
         $carrier = SC_MobileUserAgent_Ex::getCarrier();
         if ($carrier === false) {
Index: /branches/version-2_12-dev/data/class/SC_SendMail.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_SendMail.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_SendMail.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 // テキスト/HTML　メール送信
-class SC_SendMail 
-{
+class SC_SendMail {
 
     var $to;            // 送信先
@@ -40,6 +39,5 @@
      * @return void
      */
-    function __construct()
-    {
+    function __construct() {
         $this->arrRecip = array();
         $this->to = '';
@@ -64,12 +62,10 @@
 
     // 送信先の設定
-    function setRecip($key, $recipient)
-    {
+    function setRecip($key, $recipient) {
         $this->arrRecip[$key] = $recipient;
     }
 
     // 宛先の設定
-    function setTo($to, $to_name = '')
-    {
+    function setTo($to, $to_name = '') {
         if ($to != '') {
             $this->to = $this->getNameAddress($to_name, $to);
@@ -79,12 +75,10 @@
 
     // 送信元の設定
-    function setFrom($from, $from_name = '')
-    {
+    function setFrom($from, $from_name = '') {
         $this->from = $this->getNameAddress($from_name, $from);
     }
 
     // CCの設定
-    function setCc($cc, $cc_name = '')
-    {
+    function setCc($cc, $cc_name = '') {
         if ($cc != '') {
             $this->cc = $this->getNameAddress($cc_name, $cc);
@@ -94,6 +88,5 @@
 
     // BCCの設定
-    function setBCc($bcc)
-    {
+    function setBCc($bcc) {
         if ($bcc != '') {
             $this->bcc = $bcc;
@@ -103,6 +96,5 @@
 
     // Reply-Toの設定
-    function setReplyTo($reply_to)
-    {
+    function setReplyTo($reply_to) {
         if ($reply_to != '') {
             $this->reply_to = $reply_to;
@@ -111,12 +103,10 @@
 
     // Return-Pathの設定
-    function setReturnPath($return_path)
-    {
+    function setReturnPath($return_path) {
         $this->return_path = $return_path;
     }
 
     // 件名の設定
-    function setSubject($subject)
-    {
+    function setSubject($subject) {
         $this->subject = mb_encode_mimeheader($subject, 'JIS', 'B', "\n");
         $this->subject = str_replace(array("\r\n", "\r"), "\n", $this->subject);
@@ -124,6 +114,5 @@
 
     // 本文の設定
-    function setBody($body)
-    {
+    function setBody($body) {
         // iso-2022-jpだと特殊文字が？で送信されるのでJISを使用する
         $this->body = mb_convert_encoding($body, 'JIS', CHAR_CODE);
@@ -135,6 +124,5 @@
      * @deprecated 2.12.2 (#1912)
      */
-    function setHost($host)
-    {
+    function setHost($host) {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         $this->host = $host;
@@ -153,6 +141,5 @@
      * @deprecated 2.12.2 (#1912)
      */
-    function setPort($port)
-    {
+    function setPort($port) {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         $this->port = $port;
@@ -166,6 +153,5 @@
 
     // 名前<メールアドレス>の形式を生成
-    function getNameAddress($name, $mail_address)
-    {
+    function getNameAddress($name, $mail_address) {
             if ($name != '') {
                 // 制御文字を変換する。
@@ -180,11 +166,9 @@
     }
 
-    function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='')
-    {
+    function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='') {
         $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc);
     }
 
-    function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='')
-    {
+    function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='') {
         $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc);
     }
@@ -202,6 +186,5 @@
          $bcc           -> ブラインドカーボンコピー
     */
-    function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='')
-    {
+    function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='') {
         // 宛先設定
         $this->setTo($to);
@@ -230,6 +213,5 @@
 
     // ヘッダーを返す
-    function getBaseHeader()
-    {
+    function getBaseHeader() {
         // 送信するメールの内容と送信先
         $arrHeader = array();
@@ -254,6 +236,5 @@
 
     // ヘッダーを返す
-    function getTEXTHeader()
-    {
+    function getTEXTHeader() {
         $arrHeader = $this->getBaseHeader();
         $arrHeader['Content-Type'] = 'text/plain; charset="ISO-2022-JP"';
@@ -262,6 +243,5 @@
 
     // ヘッダーを返す
-    function getHTMLHeader()
-    {
+    function getHTMLHeader() {
         $arrHeader = $this->getBaseHeader();
         $arrHeader['Content-Type'] = 'text/html; charset="ISO-2022-JP"';
@@ -274,6 +254,5 @@
      * @return array|string メーラーバックエンドに応じた送信先
      */
-    function getRecip()
-    {
+    function getRecip() {
         switch ($this->backend) {
             // PEAR::Mail_mail#send は、(他のメーラーバックエンドと異なり) 第1引数を To: として扱う。Cc: や Bcc: は、ヘッダー情報から処理する。
@@ -295,6 +274,5 @@
      * @return void
      */
-    function sendMail($isHtml = false)
-    {
+    function sendMail($isHtml = false) {
         $header = $isHtml ? $this->getHTMLHeader() : $this->getTEXTHeader();
         $recip = $this->getRecip();
@@ -317,6 +295,5 @@
      * @return void
      */
-    function sendHtmlMail()
-    {
+    function sendHtmlMail() {
         return $this->sendMail(true);
     }
@@ -328,6 +305,5 @@
      * @return array メーラーバックエンドに応じたパラメーターの配列
      */
-    function getBackendParams($backend)
-    {
+    function getBackendParams($backend) {
         switch ($backend) {
             case 'mail':
Index: /branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php	(revision 22796)
@@ -27,6 +27,5 @@
  * @auther Yu Nobira
  */
-class SC_SmartphoneUserAgent 
-{
+class SC_SmartphoneUserAgent {
 
     /**
@@ -36,6 +35,5 @@
      * @return boolean
      */
-    function isSmartphone()
-    {
+    function isSmartphone() {
         $nu = new Net_UserAgent_Mobile();
         // SPでかつPC表示OFFの場合
@@ -48,6 +46,5 @@
      * @return boolean
      */
-    function isNonSmartphone()
-    {
+    function isNonSmartphone() {
         return !SC_SmartphoneUserAgent_Ex::isSmartphone();
     }
@@ -58,6 +55,5 @@
      * @return string
      */
-    function getSmartphonePcFlag()
-    {
+    function getSmartphonePcFlag() {
         $_SESSION['pc_disp'] = empty($_SESSION['pc_disp']) ? false : $_SESSION['pc_disp'];
         return $_SESSION['pc_disp'];
@@ -67,6 +63,5 @@
      * PC表示ON
      */
-    function setPcDisplayOn()
-    {
+    function setPcDisplayOn() {
         $_SESSION['pc_disp'] = true;
     }
@@ -75,6 +70,5 @@
      * PC表示OFF
      */
-    function setPcDisplayOff()
-    {
+    function setPcDisplayOff() {
         $_SESSION['pc_disp'] = false;
     }
Index: /branches/version-2_12-dev/data/class/SC_Response.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Response.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Response.php	(revision 22796)
@@ -28,6 +28,5 @@
  * @version $Id$
  */
-class SC_Response
-{
+class SC_Response{
 
     /**
@@ -50,12 +49,10 @@
      * レスポンス出力を書き込む.
      */
-    function write()
-    {
+    function write() {
         $this->sendHeader();
         echo $this->body;
     }
 
-    function sendHeader()
-    {
+    function sendHeader() {
         // HTTPのヘッダ
         foreach ($this->header as $name => $head) {
@@ -67,21 +64,17 @@
     }
 
-    function setContentType($contentType)
-    {
+    function setContentType($contentType) {
         $this->header['Content-Type'] = $contentType;
     }
 
-    function setResposeBody($body)
-    {
+    function setResposeBody($body) {
         $this->body = $body;
     }
 
-    function addHeader($name, $value)
-    {
+    function addHeader($name, $value) {
         $this->header[$name] = $value;
     }
 
-    function containsHeader($name)
-    {
+    function containsHeader($name) {
         return isset($this->header[$name]);
     }
@@ -91,6 +84,5 @@
      * 各クラス内部で勝手にexitするな！
     */
-    function actionExit()
-    {
+    function actionExit() {
         // ローカルフックポイント処理
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
@@ -123,6 +115,5 @@
      * @static
      */
-    function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null)
-    {
+    function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) {
 
         // ローカルフックポイント処理
@@ -225,6 +216,5 @@
      * @static
      */
-    function sendRedirectFromUrlPath($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null)
-    {
+    function sendRedirectFromUrlPath($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) {
         $location = ROOT_URLPATH . ltrim($location, '/');
         SC_Response_Ex::sendRedirect($location, $arrQueryString, $inheritQueryString, $useSsl);
@@ -234,6 +224,5 @@
      * @static
      */
-    function reload($arrQueryString = array(), $removeQueryString = false)
-    {
+    function reload($arrQueryString = array(), $removeQueryString = false) {
         // 現在の URL を取得
         $netUrl = new Net_URL($_SERVER['REQUEST_URI']);
@@ -247,11 +236,9 @@
     }
 
-    function setHeader($headers)
-    {
+    function setHeader($headers) {
         $this->header = $headers;
     }
 
-    function setStatusCode($statusCode = null)
-    {
+    function setStatusCode($statusCode = null) {
         $this->statusCode = $statusCode;
     }
@@ -272,6 +259,5 @@
      * @static
      */
-    function sendHttpStatus($statusCode)
-    {
+    function sendHttpStatus($statusCode) {
         $protocol = $_SERVER['SERVER_PROTOCOL'];
         $httpVersion = (strpos($protocol, '1.1') !== false) ? '1.1' : '1.0';
Index: /branches/version-2_12-dev/data/class/api/operations/ItemLookup.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/ItemLookup.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/ItemLookup.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_ItemLookup extends SC_Api_Abstract_Ex 
-{
+class API_ItemLookup extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'ItemLookup';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
@@ -77,6 +75,5 @@
     }
 
-    protected function checkErrorExtended($arrParam)
-    {
+    protected function checkErrorExtended($arrParam) {
         switch ($arrParam['IdType']) {
         case 'product_code':
@@ -92,6 +89,5 @@
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('商品コンディション', 'Condition', STEXT_LEN, 'a', array('ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('商品ID種別', 'IdType', STEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -106,6 +102,5 @@
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'Item';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/CartGet.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/CartGet.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/CartGet.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartGet extends SC_Api_Abstract_Ex 
-{
+class API_CartGet extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartGet';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
@@ -48,15 +46,12 @@
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/CartCreate.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/CartCreate.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/CartCreate.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartCreate extends SC_Api_Abstract_Ex 
-{
+class API_CartCreate extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartCreate';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
@@ -48,15 +46,12 @@
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/CartClear.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/CartClear.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/CartClear.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartClear extends SC_Api_Abstract_Ex 
-{
+class API_CartClear extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartClear';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
@@ -48,15 +46,12 @@
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_AddrFromZip extends SC_Api_Abstract_Ex 
-{
+class API_AddrFromZip extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'AddrFromZip';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
@@ -60,12 +58,10 @@
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('郵便番号1', 'zip1', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('郵便番号2', 'zip2', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'AddressResponse';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_BrowseNodeLookup extends SC_Api_Abstract_Ex 
-{
+class API_BrowseNodeLookup extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'BrowseNodeLookup';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
@@ -106,12 +104,10 @@
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('対象カテゴリID', 'BrowseNodeId', INT_LEN, 'a', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('返答種別', 'ResponseGroup', INT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'BrowseNodes';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/CartModify.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/CartModify.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/CartModify.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartModify extends SC_Api_Abstract_Ex 
-{
+class API_CartModify extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartModify';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
@@ -48,15 +46,12 @@
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/CartAdd.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/CartAdd.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/CartAdd.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartAdd extends SC_Api_Abstract_Ex 
-{
+class API_CartAdd extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartAdd';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
@@ -48,15 +46,12 @@
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
Index: /branches/version-2_12-dev/data/class/api/operations/Default.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/Default.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/Default.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_Default extends SC_Api_Abstract_Ex 
-{
+class API_Default extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'Default';
@@ -41,22 +40,18 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array('DefaultEmpty' => array());
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return array('DefaultResponse' => array());
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'DefaultResponse';
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 }
Index: /branches/version-2_12-dev/data/class/api/operations/ItemSearch.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/ItemSearch.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/ItemSearch.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_ItemSearch extends SC_Api_Abstract_Ex 
-{
+class API_ItemSearch extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'ItemSearch';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
@@ -70,5 +68,5 @@
             if (!SC_Utils_Ex::isBlank($arrProducts)) {
                 $arrProducts = $this->setStatusDataTo($arrProducts, $arrSTATUS, $arrSTATUS_IMAGE);
-                SC_Product_Ex::setPriceTaxTo($arrProducts);
+                $arrProducts = $objProduct->setPriceTaxTo($arrProducts);
                 foreach ($arrProducts as $key=>$val) {
                     $arrProducts[$key]['main_list_image'] = SC_Utils_Ex::sfNoImageMainList($val['main_list_image']);
@@ -94,6 +92,5 @@
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('カテゴリID', 'BrowseNode', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('キーワード', 'Keywords', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -103,6 +100,5 @@
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'Items';
     }
@@ -115,6 +111,5 @@
      * TODO: LC_Page_Products_List::lfGetProductsList() と共通化
      */
-    protected function getProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct)
-    {
+    protected function getProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct) {
 
         $arrOrderVal = array();
@@ -190,6 +185,5 @@
      * TODO: LC_Page_Products_List:;lfGetSearchCondition() と共通化
      */
-    protected function getSearchCondition($arrSearchData)
-    {
+    protected function getSearchCondition($arrSearchData) {
         $searchCondition = array(
             'where'             => '',
@@ -260,6 +254,5 @@
      * @return Array $arrProducts 商品一覧情報
      */
-    protected function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage)
-    {
+    protected function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage) {
 
         foreach ($arrProducts['productStatus'] as $product_id => $arrValues) {
Index: /branches/version-2_12-dev/data/class/api/operations/GetVersion.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/operations/GetVersion.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/operations/GetVersion.php	(revision 22796)
@@ -31,6 +31,5 @@
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_GetVersion extends SC_Api_Abstract_Ex 
-{
+class API_GetVersion extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'GetVersion';
@@ -41,6 +40,5 @@
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
@@ -48,15 +46,12 @@
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
Index: /branches/version-2_12-dev/data/class/api/SC_Api_Operation.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/SC_Api_Operation.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/SC_Api_Operation.php	(revision 22796)
@@ -33,6 +33,5 @@
 
 
-class SC_Api_Operation 
-{
+class SC_Api_Operation {
 
     /** API_DEBUG_MODE */
@@ -59,6 +58,5 @@
      * @return boolean ログイン情報が有効な場合 true
      */
-    protected function checkMemberAccount($member_id, $member_password)
-    {
+    protected function checkMemberAccount($member_id, $member_password) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //パスワード、saltの取得
@@ -84,6 +82,5 @@
      * @return boolean ログインに成功した場合 true; 失敗した場合 false
      */
-    protected function checkCustomerAccount($login_email, $login_password)
-    {
+    protected function checkCustomerAccount($login_email, $login_password) {
         $objCustomer = new SC_Customer_Ex();
         if ($objCustomer->getCustomerDataFromEmailPass($login_password, $login_email)) {
@@ -99,6 +96,5 @@
      * @return boolean チェックに成功した場合 true; 失敗した場合 false
      */
-    protected function checkReferer()
-    {
+    protected function checkReferer() {
         $ret = false;
         if (!SC_Utils_Ex::isBlank($_SERVER['HTTP_REFERER'])) {
@@ -121,6 +117,5 @@
      * @return boolean 署名認証に成功した場合 true; 失敗した場合 false
      */
-    protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig)
-    {
+    protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig) {
         if (SC_Utils_Ex::isBlank($arrParam['Signature'])) {
             return false;
@@ -176,6 +171,5 @@
      * @return boolean チェックに成功した場合 true; 失敗した場合 false
      */
-    protected function checkIp($operation_name)
-    {
+    protected function checkIp($operation_name) {
         $ret = false;
         $allow_hosts = SC_Api_Utils_Ex::getOperationSubConfig($operation_name, 'allow_hosts');
@@ -195,6 +189,5 @@
      * @return string 秘密鍵文字列
      */
-    protected function getApiSecretKey($access_key)
-    {
+    protected function getApiSecretKey($access_key) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $secret_key = $objQuery->get('api_secret_key', 'dtb_api_account', 'api_access_key = ? and enable = 1 and del_flg = 0', array($access_key));
@@ -209,6 +202,5 @@
      * @return boolean 権限がある場合 true; 無い場合 false
      */
-    protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig)
-    {
+    protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig) {
         if (SC_Utils_Ex::isBlank($operation_name)) {
             return false;
@@ -273,6 +265,5 @@
      * @return void
      */
-    protected function setApiBaseParam(&$objFormParam)
-    {
+    protected function setApiBaseParam(&$objFormParam) {
         $objFormParam->addParam('Operation', 'Operation', STEXT_LEN, 'an', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('Service', 'Service', STEXT_LEN, 'an', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -288,6 +279,5 @@
      * @return array(string レスポンス名, array レスポンス配列)
      */
-    public function doApiAction($arrPost)
-    {
+    public function doApiAction($arrPost) {
         // 実行時間計測用
         $start_time = microtime(true);
@@ -384,6 +374,5 @@
      * @return array エコー情報配列 (XML用の _attributes 指定入り）
      */
-    protected function getOperationRequestEcho($arrParam, $start_time)
-    {
+    protected function getOperationRequestEcho($arrParam, $start_time) {
         $arrRet = array(
                 'HTTPHeaders' => array('Header' => array('_attributes' => array('Name' => 'UserAgent',
@@ -400,6 +389,5 @@
 
     // TODO: ここらへんは SC_Displayに持って行きたい所だが・・
-    public function sendApiResponse($type, $response_outer_name, &$arrResponse)
-    {
+    public function sendApiResponse($type, $response_outer_name, &$arrResponse) {
         switch ($type) {
             case 'xml':
Index: /branches/version-2_12-dev/data/class/api/SC_Api_Utils.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/SC_Api_Utils.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/SC_Api_Utils.php	(revision 22796)
@@ -33,6 +33,5 @@
 define('API_CLASS_REALDIR', CLASS_REALDIR . 'api/operations/');
 
-class SC_Api_Utils 
-{
+class SC_Api_Utils {
 
     /** API XML Namspase Header */
@@ -54,6 +53,5 @@
      * @return string 秘密鍵文字列
      */
-    public function getOperationSubConfig($operation_name, $key_name = '', $arrApiConfig = '')
-    {
+    public function getOperationSubConfig($operation_name, $key_name = '', $arrApiConfig = '') {
         if (SC_Utils_Ex::isBlank($arrApiConfig)) {
             $arrApiConfig = SC_Api_Utils_Ex::getAuthConfig($operation_name);
@@ -81,6 +79,5 @@
      * @return array 設定配列
      */
-    public function getApiConfig($operation_name)
-    {
+    public function getApiConfig($operation_name) {
         // 設定優先度 DB > plugin default > base
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -115,6 +112,5 @@
      @ @rturn void
      */
-    public function printApiLog($msg, $start_time = '' , $operation_name = '')
-    {
+    public function printApiLog($msg, $start_time = '' , $operation_name = '') {
         if (!SC_Utils_Ex::isBlank($operation_name)) {
             $msg = 'API_' . $operation_name . ':' . $msg;
@@ -133,6 +129,5 @@
      * @return object APIオペレーションクラスオブジェクト
      */
-    public function loadApiOperation($operation_name, $arrParam = array())
-    {
+    public function loadApiOperation($operation_name, $arrParam = array()) {
         // API_UPLOADのほうが優先
         // API_UPLOAD > API_CLASS_EX > API_CLASS
@@ -160,6 +155,5 @@
      * @return array $arrFiles
      */
-    public function getApiDirFiles()
-    {
+    public function getApiDirFiles() {
         $arrFiles = array();
         // Core API ディレクトリ
@@ -189,6 +183,5 @@
     }
 
-    public function sendResponseJson($response_outer_name, &$arrResponse)
-    {
+    public function sendResponseJson($response_outer_name, &$arrResponse) {
         header('Content-Type: application/json; charset=UTF-8');
         $arrResponse['response_name'] = $response_outer_name;
@@ -196,6 +189,5 @@
     }
 
-    public function sendResponsePhp($response_outer_name, &$arrResponse)
-    {
+    public function sendResponsePhp($response_outer_name, &$arrResponse) {
         header('Content-Type: application/php; charset=UTF-8');
         $arrResponse['response_name'] = $response_outer_name;
@@ -203,6 +195,5 @@
     }
 
-    public function sendResponseXml($response_outer_name, &$arrResponse)
-    {
+    public function sendResponseXml($response_outer_name, &$arrResponse) {
         require_once 'XML/Serializer.php';
 
Index: /branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php
===================================================================
--- /branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php	(revision 22796)
@@ -30,6 +30,5 @@
  */
 
-abstract class SC_Api_Abstract 
-{
+abstract class SC_Api_Abstract {
 
     /** 認証タイプ */
@@ -57,9 +56,7 @@
     protected $arrErr = array();
 
-    final public function __construct()
-    {}
+    final public function __construct() {}
 
-    final public function __destruct()
-    {}
+    final public function __destruct() {}
 
     abstract public function doAction($arrParam);
@@ -69,16 +66,13 @@
     abstract protected function lfInitParam(&$objFormParam);
 
-    public function getResponseArray()
-    {
+    public function getResponseArray() {
         return $this->arrResponse;
     }
 
-    public function getErrorArray()
-    {
+    public function getErrorArray() {
         return $this->arrErr;
     }
 
-    public function getDefaultConfig()
-    {
+    public function getDefaultConfig() {
         $arrApiConfig = array();
         $arrApiConfig['operation_name'] = $this->operation_name;
@@ -91,25 +85,20 @@
     }
 
-    protected function setResponse($key, $data)
-    {
+    protected function setResponse($key, $data) {
         $this->arrResponse[$key] = $data;
     }
 
-    protected function addError($arrErr)
-    {
+    protected function addError($arrErr) {
         $this->arrErr = array_merge((array)$this->arrErr, (array)$arrErr);
     }
 
-    protected function isParamError()
-    {
+    protected function isParamError() {
         return !SC_Utils_Ex::isBlank($this->arrErr);
     }
 
-    protected function checkErrorExtended($arrParam)
-    {
+    protected function checkErrorExtended($arrParam) {
     }
 
-    protected function doInitParam($arrParam = array())
-    {
+    protected function doInitParam($arrParam = array()) {
         $this->objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($this->objFormParam);
@@ -121,6 +110,5 @@
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         $arrParam = $this->objFormParam->getHashArray();
         if (!SC_Utils_Ex::isBlank($arrParam)) {
Index: /branches/version-2_12-dev/data/class/SC_SiteView.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_SiteView.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_SiteView.php	(revision 22796)
@@ -22,8 +22,6 @@
  */
 
-class SC_SiteView extends SC_View_Ex 
-{
-    function __construct($setPrevURL = true)
-    {
+class SC_SiteView extends SC_View_Ex {
+    function __construct($setPrevURL = true) {
         parent::__construct();
 
@@ -33,6 +31,5 @@
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -43,6 +40,5 @@
     }
 
-    function setPrevURL()
-    {
+    function setPrevURL() {
             $objCartSess = new SC_CartSession_Ex();
             $objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
Index: /branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php
===================================================================
--- /branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class SC_SessionFactory_UseRequest extends SC_SessionFactory_Ex 
-{
+class SC_SessionFactory_UseRequest extends SC_SessionFactory_Ex {
 
     var $state = null;
@@ -46,6 +45,5 @@
      * @param string $state
      */
-    function setState($state = 'pc')
-    {
+    function setState($state = 'pc') {
         switch ($state) {
             case 'mobile':
@@ -65,6 +63,5 @@
      * @return boolean 常にfalseを返す
      */
-    function useCookie()
-    {
+    function useCookie() {
         return false;
     }
@@ -77,6 +74,5 @@
      *                     取得できなかった場合は null を返す。
      */
-    function getExtSessionId()
-    {
+    function getExtSessionId() {
         if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
             return null;
@@ -108,6 +104,5 @@
      * @return void
      */
-    function setExtSessionId($param_key, $param_value, $url)
-    {
+    function setExtSessionId($param_key, $param_value, $url) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -132,6 +127,5 @@
      * @return boolean セッションデータが有効な場合は true、無効な場合は false を返す。
      */
-    function validateSession()
-    {
+    function validateSession() {
         /**
          * PCサイトでは
@@ -157,6 +151,5 @@
      *                      取得できなかった場合は false を返す。
      */
-    function getSessionId()
-    {
+    function getSessionId() {
         // パラメーターからセッションIDを取得する。
         $sessionId = @$_POST[session_name()];
@@ -192,6 +185,5 @@
      * @return void
      */
-    function initSession()
-    {
+    function initSession() {
         // セッションIDの受け渡しにクッキーを使用しない。
         ini_set('session.use_cookies', '0');
@@ -241,6 +233,5 @@
  *
  */
-class LC_UseRequest_State 
-{
+class LC_UseRequest_State {
     /** 名前空間(pc/mobile) */
     var $namespace = '';
@@ -255,6 +246,5 @@
      * @return string
      */
-    function getNameSpace()
-    { return $this->namespace; }
+    function getNameSpace() { return $this->namespace; }
 
     /**
@@ -263,6 +253,5 @@
      * @return integer
      */
-    function getLifeTime()
-    { return $this->lifetime; }
+    function getLifeTime() { return $this->lifetime; }
 
     /**
@@ -273,6 +262,5 @@
      * @return boolean
      */
-    function validateNameSpace()
-    {
+    function validateNameSpace() {
         $namespace = $this->getNameSpace();
         if (isset($_SESSION[$namespace]) && is_array($_SESSION[$namespace])) {
@@ -290,6 +278,5 @@
      * @return mixed|null
      */
-    function getValue($key)
-    {
+    function getValue($key) {
         $namespace = $this->getNameSpace();
         return isset($_SESSION[$namespace][$key])
@@ -305,6 +292,5 @@
      * @param mixed $value
      */
-    function setValue($key, $value)
-    {
+    function setValue($key, $value) {
         $namespace = $this->getNameSpace();
         $_SESSION[$namespace][$key] = $value;
@@ -316,6 +302,5 @@
      * @return integer
      */
-    function getExpire()
-    {
+    function getExpire() {
         return $this->getValue('expires');
     }
@@ -325,6 +310,5 @@
      *
      */
-    function updateExpire()
-    {
+    function updateExpire() {
         $lifetime = $this->getLifeTime();
         $this->setValue('expires', time() + $lifetime);
@@ -336,6 +320,5 @@
      * @return boolean
      */
-    function validateExpire()
-    {
+    function validateExpire() {
         $expire = $this->getExpire();
         if (intval($expire) > time()) {
@@ -352,6 +335,5 @@
      * @return string
      */
-    function getIp()
-    {
+    function getIp() {
         return $this->getValue('ip');
     }
@@ -361,6 +343,5 @@
      *
      */
-    function updateIp()
-    {
+    function updateIp() {
         $this->setValue('ip', $_SERVER['REMOTE_ADDR']);
     }
@@ -372,6 +353,5 @@
      * @return boolean
      */
-    function validateIp()
-    {
+    function validateIp() {
         $ip = $this->getIp();
         if (!empty($_SERVER['REMOTE_ADDR']) && $ip === $_SERVER['REMOTE_ADDR']) {
@@ -390,6 +370,5 @@
      * @return string
      */
-    function getModel()
-    {
+    function getModel() {
         return $this->getValue('model');
     }
@@ -400,6 +379,5 @@
      * @return boolean
      */
-    function validateSessionData()
-    {
+    function validateSessionData() {
         foreach ($this->validate as $method) {
             $method = 'validate' . $method;
@@ -415,6 +393,5 @@
      *
      */
-    function inisializeSessionData()
-    {}
+    function inisializeSessionData() {}
 }
 
@@ -423,6 +400,5 @@
  *
  */
-class LC_UseRequest_State_PC extends LC_UseRequest_State 
-{
+class LC_UseRequest_State_PC extends LC_UseRequest_State {
 
     /**
@@ -437,6 +413,5 @@
      * @return LC_UseRequest_State_PC
      */
-    function LC_UseRequest_State_PC()
-    {
+    function LC_UseRequest_State_PC() {
         $this->namespace = 'pc';
         $this->lifetime  = SESSION_LIFETIME;
@@ -448,6 +423,5 @@
      *
      */
-    function updateModel()
-    {
+    function updateModel() {
         $this->setValue('model', $_SERVER['HTTP_USER_AGENT']);
     }
@@ -458,6 +432,5 @@
      * @return boolean
      */
-    function validateModel()
-    {
+    function validateModel() {
         $ua = $this->getModel();
         if (!empty($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] === $ua) {
@@ -474,6 +447,5 @@
      *
      */
-    function inisializeSessionData()
-    {
+    function inisializeSessionData() {
         $_SESSION = array();
         $this->updateModel();
@@ -487,6 +459,5 @@
  *
  */
-class LC_UseRequest_State_Mobile extends LC_UseRequest_State 
-{
+class LC_UseRequest_State_Mobile extends LC_UseRequest_State {
 
     /**
@@ -502,6 +473,5 @@
      * @return LC_UseRequest_State_Mobile
      */
-    function LC_UseRequest_State_Mobile()
-    {
+    function LC_UseRequest_State_Mobile() {
         $this->namespace = 'mobile';
         $this->lifetime  = MOBILE_SESSION_LIFETIME;
@@ -513,6 +483,5 @@
      *
      */
-    function updateModel()
-    {
+    function updateModel() {
         $this->setValue('model', SC_MobileUserAgent_Ex::getModel());
     }
@@ -523,6 +492,5 @@
      * @return boolean
      */
-    function validateModel()
-    {
+    function validateModel() {
         $modelInSession = $this->getModel();
         $model = SC_MobileUserAgent_Ex::getModel();
@@ -538,6 +506,5 @@
      * @return string
      */
-    function getPhoneId()
-    {
+    function getPhoneId() {
         return $this->getValue('phone_id');
     }
@@ -547,6 +514,5 @@
      *
      */
-    function updatePhoneId()
-    {
+    function updatePhoneId() {
         $this->setValue('phone_id', SC_MobileUserAgent_Ex::getId());
     }
@@ -556,6 +522,5 @@
      *
      */
-    function inisializeSessionData()
-    {
+    function inisializeSessionData() {
         $_SESSION = array();
         $this->updateModel();
Index: /branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php
===================================================================
--- /branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class SC_SessionFactory_UseCookie extends SC_SessionFactory_Ex 
-{
+class SC_SessionFactory_UseCookie extends SC_SessionFactory_Ex {
 
     // }}}
@@ -46,6 +45,5 @@
      * FIXME セッションキーのキーが PHP デフォルトのため、上位ディレクトリーで定義があると、その値で動作すると考えられる。
      **/
-    function initSession()
-    {
+    function initSession() {
         ini_set('session.cache_limiter', 'none');
         // (session.auto_start などで)セッションが開始されていた場合に備えて閉じる。(FIXME: 保存する必要はない。破棄で良い。)
@@ -63,6 +61,5 @@
      * @return boolean 常に true を返す
      */
-    function useCookie()
-    {
+    function useCookie() {
         return true;
     }
Index: /branches/version-2_12-dev/data/class/SC_InstallView.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_InstallView.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_InstallView.php	(revision 22796)
@@ -22,8 +22,6 @@
  */
 
-class SC_InstallView extends SC_View_Ex 
-{
-    function __construct($template_dir, $compile_dir = COMPILE_REALDIR)
-    {
+class SC_InstallView extends SC_View_Ex {
+    function __construct($template_dir, $compile_dir = COMPILE_REALDIR) {
         parent::__construct();
 
Index: /branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- /branches/version-2_12-dev/data/class/util/SC_Utils.php	(revision 22603)
+++ /branches/version-2_12-dev/data/class/util/SC_Utils.php	(revision 22796)
@@ -33,10 +33,8 @@
  * @version $Id:SC_Utils.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Utils 
-{
+class SC_Utils {
 
     // インストール初期処理
-    function sfInitInstall()
-    {
+    function sfInitInstall() {
         // インストール済みが定義されていない。
         if (!defined('ECCUBE_INSTALL')) {
@@ -66,6 +64,5 @@
      * @return string インストーラの URL
      */
-    function searchInstallerPath($path)
-    {
+    function searchInstallerPath($path) {
         $installer = 'install/' . DIR_INDEX_PATH;
 
@@ -104,6 +101,5 @@
      * @return string $url を絶対パスに変換した URL
      */
-    function getRealURL($url)
-    {
+    function getRealURL($url) {
         $parse = parse_url($url);
         $tmp = explode('/', $parse['path']);
@@ -124,6 +120,5 @@
 
     // 装飾付きエラーメッセージの表示
-    function sfErrorHeader($mess, $print = false)
-    {
+    function sfErrorHeader($mess, $print = false) {
         global $GLOBAL_ERR;
         $GLOBAL_ERR.= '<div id="errorHeader">';
@@ -136,6 +131,5 @@
 
     /* エラーページの表示 */
-    function sfDispError($type)
-    {
+    function sfDispError($type) {
 
         require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_DispError_Ex.php';
@@ -150,6 +144,5 @@
 
     /* サイトエラーページの表示 */
-    function sfDispSiteError($type, $objSiteSess = '', $return_top = false, $err_msg = '')
-    {
+    function sfDispSiteError($type, $objSiteSess = '', $return_top = false, $err_msg = '') {
 
         require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_Ex.php';
@@ -172,6 +165,5 @@
      * @deprecated 2.12.0 trigger_error($debugMsg, E_USER_ERROR) を使用すること
      */
-    function sfDispException($debugMsg = null)
-    {
+    function sfDispException($debugMsg = null) {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         trigger_error($debugMsg, E_USER_ERROR);
@@ -179,6 +171,5 @@
 
     /* 認証の可否判定 */
-    function sfIsSuccess($objSess, $disp_error = true)
-    {
+    function sfIsSuccess($objSess, $disp_error = true) {
         $ret = $objSess->IsSuccess();
         if ($ret != SUCCESS) {
@@ -215,6 +206,5 @@
      * @return string アスタリスクへ変換した文字列
      */
-    function sfPassLen($passlen)
-    {
+    function sfPassLen($passlen) {
         $ret = '';
         for ($i=0;$i<$passlen;true) {
@@ -230,6 +220,5 @@
      * @return bool
      */
-    function sfIsHTTPS()
-    {
+    function sfIsHTTPS() {
         // HTTPS時には$_SERVER['HTTPS']には空でない値が入る
         // $_SERVER['HTTPS'] != 'off' はIIS用
@@ -247,6 +236,5 @@
      *  @return bool
      */
-    function sfIsValidTransition($objSess)
-    {
+    function sfIsValidTransition($objSess) {
         // 前画面からPOSTされるuniqidが正しいものかどうかをチェック
         $uniqid = $objSess->getUniqId();
@@ -259,6 +247,5 @@
 
     /* DB用日付文字列取得 */
-    function sfGetTimestamp($year, $month, $day, $last = false)
-    {
+    function sfGetTimestamp($year, $month, $day, $last = false) {
         if ($year != '' && $month != '' && $day != '') {
             if ($last) {
@@ -283,6 +270,5 @@
      */
     //
-    function sfIsInt($value)
-    {
+    function sfIsInt($value) {
         if (strlen($value) >= 1 && strlen($value) <= INT_LEN && is_numeric($value)) {
             return true;
@@ -297,6 +283,5 @@
      * @return boolean 0で埋められている
      */
-    function sfIsZeroFilling($value)
-    {
+    function sfIsZeroFilling($value) {
         if (strlen($value) > 1 && $value{0} === '0')
             return true;
@@ -304,6 +289,5 @@
     }
 
-    function sfGetCSVData($data, $prefix = '')
-    {
+    function sfGetCSVData($data, $prefix = '') {
         if ($prefix == '') {
             $dir_name = SC_Utils_Ex::sfUpDirName();
@@ -322,6 +306,5 @@
 
     /* 1階層上のディレクトリ名を取得する */
-    function sfUpDirName()
-    {
+    function sfUpDirName() {
         $path = $_SERVER['SCRIPT_NAME'];
         $arrVal = explode('/', $path);
@@ -334,6 +317,5 @@
      * @deprecated
      */
-    function sfMergeCBValue($keyname, $max)
-    {
+    function sfMergeCBValue($keyname, $max) {
         $conv = '';
         $cnt = 1;
@@ -352,6 +334,5 @@
      * @deprecated
      */
-    function sfMergeCheckBoxes($array, $max)
-    {
+    function sfMergeCheckBoxes($array, $max) {
         $ret = '';
         $arrTmp = array();
@@ -375,6 +356,5 @@
      * @deprecated
      */
-    function sfMergeParamCheckBoxes($array)
-    {
+    function sfMergeParamCheckBoxes($array) {
         $ret = '';
         if (is_array($array)) {
@@ -396,6 +376,5 @@
      * @deprecated
      */
-    function sfSearchCheckBoxes($array)
-    {
+    function sfSearchCheckBoxes($array) {
         $max = max($array);
         $ret = '';
@@ -413,6 +392,5 @@
      * @deprecated
      */
-    function sfSplitCheckBoxes($val)
-    {
+    function sfSplitCheckBoxes($val) {
         $arrRet = array();
         $len = strlen($val);
@@ -429,6 +407,5 @@
      * @deprecated
      */
-    function sfMergeCBSearchValue($keyname, $max)
-    {
+    function sfMergeCBSearchValue($keyname, $max) {
         $conv = '';
         $cnt = 1;
@@ -447,6 +424,5 @@
      * @deprecated
      */
-    function sfSplitCBValue($val, $keyname = '')
-    {
+    function sfSplitCBValue($val, $keyname = '') {
         $arr = array();
         $len = strlen($val);
@@ -464,6 +440,5 @@
 
     // キーと値をセットした配列を取得
-    function sfArrKeyValue($arrList, $keyname, $valname, $len_max = '', $keysize = '')
-    {
+    function sfArrKeyValue($arrList, $keyname, $valname, $len_max = '', $keysize = '') {
         $arrRet = array();
         $max = count($arrList);
@@ -490,6 +465,5 @@
 
     // キーと値をセットした配列を取得(値が複数の場合)
-    function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = '')
-    {
+    function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = '') {
 
         $max = count($arrList);
@@ -518,6 +492,5 @@
 
     // 配列の値をカンマ区切りで返す。
-    function sfGetCommaList($array, $space=true, $arrPop = array())
-    {
+    function sfGetCommaList($array, $space=true, $arrPop = array()) {
         if (count($array) > 0) {
             $line = '';
@@ -544,6 +517,5 @@
 
     /* 配列の要素をCSVフォーマットで出力する。*/
-    function sfGetCSVList($array)
-    {
+    function sfGetCSVList($array) {
         $line = '';
         if (count($array) > 0) {
@@ -568,6 +540,5 @@
     /*            ３．エラー (0 = OK, 1 = NG)
     /*-----------------------------------------------------------------*/
-    function sfCheckSetTerm($start_year, $start_month, $start_day, $end_year, $end_month, $end_day)
-    {
+    function sfCheckSetTerm($start_year, $start_month, $start_day, $end_year, $end_month, $end_day) {
 
         // 期間指定
@@ -592,12 +563,10 @@
 
     // エラー箇所の背景色を変更するためのfunction SC_Viewで読み込む
-    function sfSetErrorStyle()
-    {
+    function sfSetErrorStyle() {
         return 'style="background-color:'.ERR_COLOR.'"';
     }
 
     // 一致した値のキー名を取得
-    function sfSearchKey($array, $word, $default)
-    {
+    function sfSearchKey($array, $word, $default) {
         foreach ($array as $key => $val) {
             if ($val == $word) {
@@ -608,6 +577,5 @@
     }
 
-    function sfGetErrorColor($val)
-    {
+    function sfGetErrorColor($val) {
         if ($val != '') {
             return 'background-color:' . ERR_COLOR;
@@ -616,6 +584,5 @@
     }
 
-    function sfGetEnabled($val)
-    {
+    function sfGetEnabled($val) {
         if (! $val) {
             return ' disabled="disabled"';
@@ -624,6 +591,5 @@
     }
 
-    function sfGetChecked($param, $value)
-    {
+    function sfGetChecked($param, $value) {
         if ((string)$param === (string)$value) {
             return 'checked="checked"';
@@ -632,6 +598,5 @@
     }
 
-    function sfTrim($str)
-    {
+    function sfTrim($str) {
         $ret = mb_ereg_replace("^[　 \n\r]*", '', $str);
         $ret = mb_ereg_replace("[　 \n\r]*$", '', $ret);
@@ -650,6 +615,5 @@
      * @return integer 税金額
      */
-    function sfTax($price, $tax, $tax_rule)
-    {
+    function sfTax($price, $tax, $tax_rule) {
         $real_tax = $tax / 100;
         $ret = $price * $real_tax;
@@ -686,12 +650,10 @@
      * @return integer 税金付与した金額
      */
-    function sfCalcIncTax($price, $tax, $tax_rule)
-    {
+    function sfCalcIncTax($price, $tax, $tax_rule) {
         return $price + SC_Utils_Ex::sfTax($price, $tax, $tax_rule);
     }
 
     // 桁数を指定して四捨五入
-    function sfRound($value, $pow = 0)
-    {
+    function sfRound($value, $pow = 0) {
         $adjust = pow(10 ,$pow-1);
 
@@ -715,6 +677,5 @@
      * @return int 
      */
-    function sfPrePoint($price, $point_rate, $rule = POINT_RULE, $product_id = '')
-    {
+    function sfPrePoint($price, $point_rate, $rule = POINT_RULE, $product_id = '') {
         $real_point = $point_rate / 100;
         $ret = $price * $real_point;
@@ -741,6 +702,5 @@
 
     /* 規格分類の件数取得 */
-    function sfGetClassCatCount()
-    {
+    function sfGetClassCatCount() {
         $sql = 'select count(dtb_class.class_id) as count, dtb_class.class_id ';
         $sql.= 'from dtb_class inner join dtb_classcategory on dtb_class.class_id = dtb_classcategory.class_id ';
@@ -756,27 +716,19 @@
 
     /**
-     * 商品IDとカテゴリIDから商品規格IDを取得する
+     * $classcategory_id1 と $classcategory_id2 が使用されていない。
      * @param int $product_id
-     * @param int $classcategory_id1 デフォルト値0
-     * @param int $classcategory_id2 デフォルト値0
+     * @param int $classcategory_id1
+     * @param int $classcategory_id2
      * @return int 
      */
-    function sfGetProductClassId($product_id, $classcategory_id1=0, $classcategory_id2=0)
-    {
-        $where = 'product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?';
-        if (!$classcategory_id1) { //NULLが入ってきた場合への対策
-          $classcategory_id1 = 0;
-        }
-        if (!$classcategory_id2) {
-          $classcategory_id2 = 0;
-        }
+    function sfGetProductClassId($product_id, $classcategory_id1, $classcategory_id2) {
+        $where = 'product_id = ?';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $ret = $objQuery->get('product_class_id', 'dtb_products_class', $where, Array($product_id, $classcategory_id1, $classcategory_id2));
+        $ret = $objQuery->get('product_class_id', 'dtb_products_class', $where, Array($product_id));
         return $ret;
     }
 
     /* 文末の「/」をなくす */
-    function sfTrimURL($url)
-    {
+    function sfTrimURL($url) {
         $ret = rtrim($url, '/');
         return $ret;
@@ -784,6 +736,5 @@
 
     /* DBから取り出した日付の文字列を調整する。*/
-    function sfDispDBDate($dbdate, $time = true)
-    {
+    function sfDispDBDate($dbdate, $time = true) {
         list($y, $m, $d, $H, $M) = preg_split('/[- :]/', $dbdate);
 
@@ -801,6 +752,5 @@
 
     /* 配列をキー名ごとの配列に変更する */
-    function sfSwapArray($array, $isColumnName = true)
-    {
+    function sfSwapArray($array, $isColumnName = true) {
         $arrRet = array();
         foreach ($array as $key1 => $arr1) {
@@ -827,6 +777,5 @@
      * @return array 連想配列の値のみの配列
      */
-    function getHash2Array($hash, $requires = array())
-    {
+    function getHash2Array($hash, $requires = array()) {
         $array = array();
         $i = 0;
@@ -846,6 +795,5 @@
 
     /* かけ算をする（Smarty用) */
-    function sfMultiply($num1, $num2)
-    {
+    function sfMultiply($num1, $num2) {
         return $num1 * $num2;
     }
@@ -861,6 +809,5 @@
      * @return integer 加算ポイント
      */
-    function sfGetAddPoint($totalpoint, $use_point, $point_rate)
-    {
+    function sfGetAddPoint($totalpoint, $use_point, $point_rate) {
         // 購入商品の合計ポイントから利用したポイントのポイント換算価値を引く方式
         $add_point = $totalpoint - intval($use_point * ($point_rate / 100));
@@ -873,6 +820,5 @@
 
     /* 一意かつ予測されにくいID */
-    function sfGetUniqRandomId($head = '')
-    {
+    function sfGetUniqRandomId($head = '') {
         // 予測されないようにランダム文字列を付与する。
         $random = GC_Utils_Ex::gfMakePassword(8);
@@ -883,6 +829,5 @@
 
     // 二回以上繰り返されているスラッシュ[/]を一つに変換する。
-    function sfRmDupSlash($istr)
-    {
+    function sfRmDupSlash($istr) {
         if (preg_match('|^http://|', $istr)) {
             $str = substr($istr, 7);
@@ -916,6 +861,5 @@
      * @return string 変換後のテキストファイルのパス
      */
-    function sfEncodeFile($filepath, $enc_type, $out_dir)
-    {
+    function sfEncodeFile($filepath, $enc_type, $out_dir) {
         $ifp = fopen($filepath, 'r');
 
@@ -945,6 +889,5 @@
     }
 
-    function sfCutString($str, $len, $byte = true, $commadisp = true)
-    {
+    function sfCutString($str, $len, $byte = true, $commadisp = true) {
         if ($byte) {
             if (strlen($str) > ($len + 2)) {
@@ -994,6 +937,5 @@
 
     // 年、月、締め日から、先月の締め日+1、今月の締め日を求める。
-    function sfTermMonth($year, $month, $close_day)
-    {
+    function sfTermMonth($year, $month, $close_day) {
         $end_year = $year;
         $end_month = $month;
@@ -1037,6 +979,5 @@
 
     // 再帰的に多段配列を検索して一次元配列(Hidden引渡し用配列)に変換する。
-    function sfMakeHiddenArray($arrSrc, $arrDst = array(), $parent_key = '')
-    {
+    function sfMakeHiddenArray($arrSrc, $arrDst = array(), $parent_key = '') {
         if (is_array($arrSrc)) {
             foreach ($arrSrc as $key => $val) {
@@ -1057,6 +998,5 @@
 
     // DB取得日時をタイムに変換
-    function sfDBDatetoTime($db_date)
-    {
+    function sfDBDatetoTime($db_date) {
         $date = preg_replace("|\..*$|",'',$db_date);
         $time = strtotime($date);
@@ -1069,12 +1009,10 @@
      * XXX この関数を使っている箇所は、ほぼ設計誤りと思われる。変数にフェッチするか、出力時のエンコーディングで対応すべきと見受ける。
      */
-    function sfMbConvertEncoding($str, $encode = CHAR_CODE)
-    {
+    function sfMbConvertEncoding($str, $encode = CHAR_CODE) {
         return mb_convert_encoding($str, $encode);
     }
 
     // 2つの配列を用いて連想配列を作成する
-    function sfArrCombine($arrKeys, $arrValues)
-    {
+    function sfArrCombine($arrKeys, $arrValues) {
 
         if (count($arrKeys) <= 0 and count($arrValues) <= 0) return array();
@@ -1093,7 +1031,29 @@
     }
 
+    /* 階層構造のテーブルから与えられたIDの兄弟を取得する */
+    function sfGetBrothersArray($arrData, $pid_name, $id_name, $arrPID) {
+        $max = count($arrData);
+
+        $arrBrothers = array();
+        foreach ($arrPID as $id) {
+            // 親IDを検索する
+            for ($i = 0; $i < $max; $i++) {
+                if ($arrData[$i][$id_name] == $id) {
+                    $parent = $arrData[$i][$pid_name];
+                    break;
+                }
+            }
+            // 兄弟IDを検索する
+            for ($i = 0; $i < $max; $i++) {
+                if ($arrData[$i][$pid_name] == $parent) {
+                    $arrBrothers[] = $arrData[$i][$id_name];
+                }
+            }
+        }
+        return $arrBrothers;
+    }
+
     /* 階層構造のテーブルから与えられたIDの直属の子を取得する */
-    function sfGetUnderChildrenArray($arrData, $pid_name, $id_name, $parent)
-    {
+    function sfGetUnderChildrenArray($arrData, $pid_name, $id_name, $parent) {
         $max = count($arrData);
 
@@ -1112,6 +1072,5 @@
      * @deprecated SC_Query::quote() を使用すること
      */
-    function sfQuoteSmart($in)
-    {
+    function sfQuoteSmart($in) {
 
         if (is_int($in) || is_double($in)) {
@@ -1127,6 +1086,5 @@
 
     // ディレクトリを再帰的に生成する
-    function sfMakeDir($path)
-    {
+    function sfMakeDir($path) {
         static $count = 0;
         $count++;  // 無限ループ回避
@@ -1155,6 +1113,5 @@
 
     // ディレクトリ以下のファイルを再帰的にコピー
-    function sfCopyDir($src, $des, $mess = '', $override = false)
-    {
+    function sfCopyDir($src, $des, $mess = '', $override = false) {
         if (!is_dir($src)) {
             return false;
@@ -1213,6 +1170,5 @@
      * @return void
      */
-    function sfFlush($output = false, $sleep = 0)
-    {
+    function sfFlush($output = false, $sleep = 0) {
         // 出力をバッファリングしない(==日本語自動変換もしない)
         while (@ob_end_flush());
@@ -1236,6 +1192,5 @@
 
     // @versionの記載があるファイルからバージョンを取得する。
-    function sfGetFileVersion($path)
-    {
+    function sfGetFileVersion($path) {
         if (file_exists($path)) {
             $src_fp = fopen($path, 'rb');
@@ -1262,6 +1217,5 @@
      * @see mb_convert_kana
      */
-    function mbConvertKanaWithArray($array, $arrConvList)
-    {
+    function mbConvertKanaWithArray($array, $arrConvList) {
         foreach ($arrConvList as $key => $val) {
             if (isset($array[$key])) {
@@ -1279,6 +1233,5 @@
      * @return array 添字を定義した配列
      */
-    function arrayDefineIndexes($array, $defineIndexes)
-    {
+    function arrayDefineIndexes($array, $defineIndexes) {
         foreach ($defineIndexes as $key) {
             if (!isset($array[$key])) $array[$key] = '';
@@ -1296,6 +1249,5 @@
      * @return array
      */
-    function sfArrayIntersectKeys($arrSrc, $arrKey)
-    {
+    function sfArrayIntersectKeys($arrSrc, $arrKey) {
         $arrRet = array();
         foreach ($arrKey as $key) {
@@ -1310,6 +1262,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::printXMLDeclaration を使用すること
      */
-    function printXMLDeclaration()
-    {
+    function printXMLDeclaration() {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         GC_Utils_Ex::printXMLDeclaration();
@@ -1321,6 +1272,5 @@
      * @return string
      */
-    function getTableTag($array)
-    {
+    function getTableTag($array) {
         $html = '<table>';
         $html.= '<tr>';
@@ -1348,6 +1298,5 @@
      * @return string
      */
-    function sfNoImageMainList($filename = '')
-    {
+    function sfNoImageMainList($filename = '') {
         if (strlen($filename) == 0 || substr($filename, -1, 1) == '/') {
             $filename .= 'noimage_main_list.jpg';
@@ -1362,6 +1311,5 @@
      * @return string
      */
-    function sfNoImageMain($filename = '')
-    {
+    function sfNoImageMain($filename = '') {
         if (strlen($filename) == 0 || substr($filename, -1, 1) == '/') {
             $filename .= 'noimage_main.png';
@@ -1371,6 +1319,5 @@
 
     /* デバッグ用 ------------------------------------------------------------------------------------------------*/
-    function sfPrintR($obj)
-    {
+    function sfPrintR($obj) {
         echo '<div style="font-size: 12px;color: #00FF00;">' . "\n";
         echo '<strong>**デバッグ中**</strong><br />' . "\n";
@@ -1387,6 +1334,5 @@
      * @return string ランダムな文字列
      */
-    function sfGetRandomString($length = 1)
-    {
+    function sfGetRandomString($length = 1) {
         return Text_Password::create($length);
     }
@@ -1397,6 +1343,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::getUrl を使用すること
      */
-    function sfGetUrl()
-    {
+    function sfGetUrl() {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         return GC_Utils_Ex::getUrl();
@@ -1408,6 +1353,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::toStringBacktrace を使用すること
      */
-    function sfBacktraceToString($arrBacktrace)
-    {
+    function sfBacktraceToString($arrBacktrace) {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         return GC_Utils_Ex::toStringBacktrace($arrBacktrace);
@@ -1419,6 +1363,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::isAdminFunction を使用すること
      */
-    function sfIsAdminFunction()
-    {
+    function sfIsAdminFunction() {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         return GC_Utils_Ex::isAdminFunction();
@@ -1430,6 +1373,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::isFrontFunction を使用すること
      */
-    function sfIsFrontFunction()
-    {
+    function sfIsFrontFunction() {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         return GC_Utils_Ex::isFrontFunction();
@@ -1441,6 +1383,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::isInstallFunction を使用すること
      */
-    function sfIsInstallFunction()
-    {
+    function sfIsInstallFunction() {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         return GC_Utils_Ex::isInstallFunction();
@@ -1448,6 +1389,5 @@
 
     // 郵便番号から住所の取得
-    function sfGetAddress($zipcode)
-    {
+    function sfGetAddress($zipcode) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -1495,6 +1435,5 @@
      * @deprecated 2.12.0 microtime(true) を使用する。
      */
-    function sfMicrotimeFloat()
-    {
+    function sfMicrotimeFloat() {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         return microtime(true);
@@ -1522,6 +1461,5 @@
      * @return boolean $val が空白と判断された場合 true
      */
-    function isBlank($val, $greedy = true)
-    {
+    function isBlank($val, $greedy = true) {
         if (is_array($val)) {
             if ($greedy) {
@@ -1565,6 +1503,5 @@
      * @return boolean
      */
-    function sfIsInternalDomain($url)
-    {
+    function sfIsInternalDomain($url) {
         $netURL = new Net_URL(HTTP_URL);
         $host = $netURL->host;
@@ -1582,6 +1519,5 @@
      * @return string ハッシュ暗号化された文字列
      */
-    function sfGetHashString($str, $salt)
-    {
+    function sfGetHashString($str, $salt) {
         $res = '';
         if ($salt == '') {
@@ -1604,6 +1540,5 @@
      * @return boolean 一致判定
      */
-    function sfIsMatchHashPassword($pass, $hashpass, $salt)
-    {
+    function sfIsMatchHashPassword($pass, $hashpass, $salt) {
         $res = false;
         if ($hashpass != '') {
@@ -1636,6 +1571,5 @@
      * @return integer 1ページあたりの最大表示件数
      */
-    function sfGetSearchPageMax($search_page_max)
-    {
+    function sfGetSearchPageMax($search_page_max) {
         if (SC_Utils_Ex::sfIsInt($search_page_max) && $search_page_max > 0) {
             $page_max = intval($search_page_max);
@@ -1658,6 +1592,5 @@
      * @see Services_JSON::encode()
      */
-    function jsonEncode($value)
-    {
+    function jsonEncode($value) {
         if (function_exists('json_encode')) {
             return json_encode($value);
@@ -1681,6 +1614,5 @@
      * @see Services_JSON::decode()
      */
-    function jsonDecode($json)
-    {
+    function jsonDecode($json) {
         if (function_exists('json_decode')) {
             return json_decode($json);
@@ -1701,6 +1633,5 @@
      * @return boolean 絶対パスの場合 true
      */
-    function isAbsoluteRealPath($realpath)
-    {
+    function isAbsoluteRealPath($realpath) {
         if (strpos(PHP_OS, 'WIN') === false) {
             return substr($realpath, 0, 1) == '/';
@@ -1720,6 +1651,5 @@
      * @see http://jp.php.net/mkdir
      */
-    function recursiveMkdir($pathname, $mode = 0777)
-    {
+    function recursiveMkdir($pathname, $mode = 0777) {
         /*
          * SC_Utils_Ex への再帰は無限ループやメモリリークの懸念
@@ -1730,6 +1660,5 @@
     }
 
-    function isAppInnerUrl($url)
-    {
+    function isAppInnerUrl($url) {
         $pattern = '/^(' . preg_quote(HTTP_URL, '/') . '|' . preg_quote(HTTPS_URL, '/') . ')/';
         return preg_match($pattern, $url) >= 1;
@@ -1744,6 +1673,5 @@
      * @return boolean 成功=true, 失敗=false
      */
-    function extendTimeOut($seconds = null)
-    {
+    function extendTimeOut($seconds = null) {
         $safe_mode = (boolean)ini_get('safe_mode');
         if ($safe_mode) return false;
@@ -1767,6 +1695,5 @@
      * @return void
      */
-    function clearCompliedTemplate()
-    {
+    function clearCompliedTemplate() {
         // コンパイルファイルの削除処理
         SC_Helper_FileManager_Ex::deleteFile(COMPILE_REALDIR, false);
@@ -1782,6 +1709,5 @@
      * @return void
      */
-    function copyDirectory($source_path, $dest_path)
-    {
+    function copyDirectory($source_path, $dest_path) {
 
         $handle=opendir($source_path);  
@@ -1809,6 +1735,5 @@
      * @return string
      */
-    function repeatStrWithSeparator($input, $multiplier, $separator = ',')
-    {
+    function repeatStrWithSeparator($input, $multiplier, $separator = ',') {
         return implode($separator, array_fill(0, $multiplier, $input));
     }
@@ -1821,6 +1746,5 @@
      * @return string RFC3986エンコード文字列
      */
-    function encodeRFC3986($str)
-    {
+    function encodeRFC3986($str) {
         return str_replace('%7E', '~', rawurlencode($str));
     }
@@ -1833,6 +1757,5 @@
      * @return string 変更後の文字列
      */
-    static function trim($str, $charlist = null)
-    {
+    static function trim($str, $charlist = null) {
         $re = SC_Utils_Ex::getTrimPregPattern($charlist);
         return preg_replace('/(^' . $re . ')|(' . $re . '$)/us', '', $str);
@@ -1846,6 +1769,5 @@
      * @return string 変更後の文字列
      */
-    static function ltrim($str, $charlist = null)
-    {
+    static function ltrim($str, $charlist = null) {
         $re = SC_Utils_Ex::getTrimPregPattern($charlist);
         return preg_replace('/^' . $re . '/us', '', $str);
@@ -1859,6 +1781,5 @@
      * @return string 変更後の文字列
      */
-    static function rtrim($str, $charlist = null)
-    {
+    static function rtrim($str, $charlist = null) {
         $re = SC_Utils_Ex::getTrimPregPattern($charlist);
         return preg_replace('/' . $re . '$/us', '', $str);
@@ -1871,6 +1792,5 @@
      * @return string パターン
      */
-    static function getTrimPregPattern($charlist = null)
-    {
+    static function getTrimPregPattern($charlist = null) {
         if (is_null($charlist)) {
             return '\s+';
@@ -1879,121 +1799,3 @@
         }
     }
-
-    /**
-     * データ量の単位を付与する
-     * 
-     * @param int $data
-     * @return string
-     */
-    function getUnitDataSize($data)
-    {
-
-        if($data < 1000){
-            $return = $data . "KB";
-        }elseif($data < 1000000){ 
-            $return = $data/1000 . "MB";
-        }else{
-            $return = $data/1000000 . "GB";
-        }
-        return $return;
-    }
-
-    /**
-     * カテゴリーツリー状の配列を作成.
-     * 
-     * @param string $primary_key
-     * @param string $glue_key
-     * @param integer $max_depth
-     * @param array $correction
-     * @param integer $root_id
-     * @return array ツリーの配列
-     */
-    public static function buildTree($primary_key, $glue_key, $max_depth, $correction = array(), $root_id = 0)
-    {
-        $children = array();
-        foreach ($correction as $child) {
-            $children[$child[$glue_key]][] = $child;
-        }
-        $arrTree = $children[$root_id];
-        foreach ($arrTree as &$child) {
-            SC_Utils_Ex::addChild($child, $primary_key, 1, $max_depth, $children);
-        }
-        return $arrTree;
-    }
-
-    /**
-     * ツリーの親子をつなげるルーチン.
-     * 
-     * @param array $target 親
-     * @param string $primary_key 主キーの識別子
-     * @param integer $level 親の階層
-     * @param integer $max_depth 階層の深さの最大値
-     * @param array $children 子の配列（キーが親ID）
-     * @return void
-     */
-    public static function addChild(&$target, $primary_key, $level, $max_depth, &$children = array())
-    {
-        if (isset($children[$target[$primary_key]])) {
-            $target['children'] = $children[$target[$primary_key]];
-            if ($level + 1 < $max_depth) {
-                foreach ($target['children'] as &$child) {
-                    SC_Utils_Ex::addChild($child, $primary_key, $level++, $max_depth, $children);
-                }
-            }
-        }
-    }
-
-    /**
-     * 配列のキーをIDにした配列を作成.
-     * 
-     * @param string $ID_name IDが格納されているキー名
-     * @param array $correction 元の配列
-     * @return array
-     */
-    public static function makeArrayIDToKey($ID_name, $correction = array())
-    {
-        $arrTmp = array();
-        foreach ($correction as $item) {
-            $arrTmp[$item[$ID_name]] = $item;
-        }
-        $return =& $arrTmp;
-        unset($arrTmp);
-        return $return;
-    }
-
-    /**
-     * 階層情報が含まれている配列から親ID配列を取得する.
-     * 
-     * @param integer $start_id 取得起点
-     * @param string $primary_key 主キー名
-     * @param string $glue_key 親IDキー名
-     * @param array $correction 階層構造が含まれている配列
-     * @param boolean $cid_is_key キーがIDの配列の場合はtrue
-     * @param integer $root_id ルートID
-     * @param boolean $id_only IDだけの配列を返す場合はtrue
-     * @return array 親ID配列
-     */
-    public static function getTreeTrail($start_id, $primary_key, $glue_key, $correction = array(), $cid_is_key = FALSE, $root_id = 0, $id_only = TRUE)
-    {
-        if ($cid_is_key) {
-            $arrIDToKay = $correction;
-        } else {
-            $arrIDToKay = SC_Utils_Ex::makeArrayIDToKey($primary_key, $correction);
-        }
-        $id = $start_id;
-        $arrTrail = array();
-        while ($id != $root_id && !SC_Utils_Ex::isBlank($id)) {
-            if ($id_only) {
-                $arrTrail[] = $id;
-            } else {
-                $arrTrail[] = $arrIDToKay[$id];
-            }
-            if (isset($arrIDToKay[$id][$glue_key])) {
-                $id = $arrIDToKay[$id][$glue_key];
-            } else {
-                $id = $root_id;
-            }
-        }
-        return array_reverse($arrTrail);
-    }
 }
Index: /branches/version-2_12-dev/data/class/util/GC_Utils.php
===================================================================
--- /branches/version-2_12-dev/data/class/util/GC_Utils.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/util/GC_Utils.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @version $Id$
  */
-class GC_Utils 
-{
+class GC_Utils {
 
     /**
@@ -40,6 +39,5 @@
      * @return void
      */
-    function gfDebugLog($obj)
-    {
+    function gfDebugLog($obj) {
         if (USE_VERBOSE_LOG === true) {
             $msg = "DEBUG\n"
@@ -55,6 +53,5 @@
      * @return string 呼び出し元クラス、関数名、行数の文字列表現
      */
-    function gfGetCallerInfo($forLogInfo = true)
-    {
+    function gfGetCallerInfo($forLogInfo = true) {
         // バックトレースを取得する
         $traces = debug_backtrace(false);
@@ -77,6 +74,5 @@
      * エラーハンドリングに関わる情報を切り捨てる。
      */
-    function getDebugBacktrace($arrBacktrace = null)
-    {
+    function getDebugBacktrace($arrBacktrace = null) {
         if (is_null($arrBacktrace)) {
             $arrBacktrace = debug_backtrace(false);
@@ -123,6 +119,5 @@
      * @deprecated 2.12.0
      */
-    function gfGetLogStr($mess, $log_level = 'Info')
-    {
+    function gfGetLogStr($mess, $log_level = 'Info') {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         // メッセージの前に、ログ出力元関数名とログ出力関数呼び出し部分の行数を付与
@@ -142,6 +137,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
      */
-    function gfAdminLog($mess, $log_level = 'Info')
-    {
+    function gfAdminLog($mess, $log_level = 'Info') {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         // ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
@@ -159,6 +153,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
      */
-    function gfFrontLog($mess, $log_level = 'Info')
-    {
+    function gfFrontLog($mess, $log_level = 'Info') {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         // ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
@@ -179,6 +172,5 @@
      * @param bool $verbose 冗長な出力を行うか
      */
-    function gfPrintLog($msg, $path = '', $verbose = USE_VERBOSE_LOG)
-    {
+    function gfPrintLog($msg, $path = '', $verbose = USE_VERBOSE_LOG) {
         // 日付の取得
         $today = date('Y/m/d H:i:s');
@@ -216,6 +208,5 @@
      * @return void
      */
-    function gfLogRotation($max_log, $max_size, $path)
-    {
+    function gfLogRotation($max_log, $max_size, $path) {
 
         // ファイルが存在しない場合、終了
@@ -254,6 +245,5 @@
      * [注釈] -
      *----------------------------------------------------------------------*/
-    function gfMakePassword($pwLength)
-    {
+    function gfMakePassword($pwLength) {
 
         // 乱数表のシードを決定
@@ -281,6 +271,5 @@
      *----------------------------------------------------------------------------------------------------------------------*/
 
-    function gfMailHeaderAddr($str)
-    {
+    function gfMailHeaderAddr($str) {
         $addrs = explode(',', $str); //アドレスを配列に入れる
         $mailaddrs = array();
@@ -304,6 +293,5 @@
      * @return string テキストで表現したバックトレース
      */
-    function toStringBacktrace($arrBacktrace)
-    {
+    function toStringBacktrace($arrBacktrace) {
         $string = '';
 
@@ -328,6 +316,5 @@
      * @return string|integer エラー定数名
      */
-    function getErrorTypeName($error_type)
-    {
+    function getErrorTypeName($error_type) {
         $arrDefinedConstants = get_defined_constants(true);
 
@@ -360,6 +347,5 @@
      * @return string 現在のURL
      */
-    function getUrl()
-    {
+    function getUrl() {
         $url = '';
 
@@ -383,6 +369,5 @@
      * @return bool 管理機能か
      */
-    function isAdminFunction()
-    {
+    function isAdminFunction() {
         return defined('ADMIN_FUNCTION') && ADMIN_FUNCTION === true;
     }
@@ -393,6 +378,5 @@
      * @return bool フロント機能か
      */
-    function isFrontFunction()
-    {
+    function isFrontFunction() {
         return defined('FRONT_FUNCTION') && FRONT_FUNCTION === true;
     }
@@ -403,6 +387,5 @@
      * @return bool インストール機能か
      */
-    function isInstallFunction()
-    {
+    function isInstallFunction() {
         return defined('INSTALL_FUNCTION') && INSTALL_FUNCTION === true;
     }
@@ -415,6 +398,5 @@
      * @return string XML宣言の文字列
      */
-    function printXMLDeclaration()
-    {
+    function printXMLDeclaration() {
         $ua = $_SERVER['HTTP_USER_AGENT'];
         if (!preg_match('/MSIE/', $ua) || preg_match('/MSIE 7/', $ua)) {
Index: /branches/version-2_12-dev/data/class/SC_MobileView.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_MobileView.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_MobileView.php	(revision 22796)
@@ -22,13 +22,10 @@
  */
 
-class SC_MobileView extends SC_SiteView_Ex 
-{
-    function __construct($setPrevURL = true)
-    {
+class SC_MobileView extends SC_SiteView_Ex {
+    function __construct($setPrevURL = true) {
         parent::__construct($setPrevURL);
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
Index: /branches/version-2_12-dev/data/class/SC_Display.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Display.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Display.php	(revision 22796)
@@ -28,6 +28,5 @@
  * @version $Id$
  */
-class SC_Display
-{
+class SC_Display{
 
     var $response;
@@ -50,6 +49,5 @@
      */
 
-    function __construct($hasPrevURL = true)
-    {
+    function __construct($hasPrevURL = true) {
         $this->response = new SC_Response_Ex();
         if ($hasPrevURL) {
@@ -58,6 +56,5 @@
     }
 
-    function setPrevURL()
-    {
+    function setPrevURL() {
         // TODO SC_SiteSession で実装した方が良さげ
         $objCartSess = new SC_CartSession_Ex();
@@ -71,6 +68,5 @@
      * @param $is_admin boolean 管理画面を扱う場合 true
      */
-    function prepare($page, $is_admin = false)
-    {
+    function prepare($page, $is_admin = false) {
         if (!$this->deviceSeted || !is_null($this->view)) {
             $device = ($is_admin) ? DEVICE_TYPE_ADMIN : $this->detectDevice();
@@ -87,11 +83,9 @@
      * SC_Response::reload() のラッパーです.
      */
-    function reload($queryString = array(), $removeQueryString = false)
-    {
+    function reload($queryString = array(), $removeQueryString = false) {
         $this->response->reload($queryString, $removeQueryString);
     }
 
-    function noAction()
-    {
+    function noAction() {
         return;
     }
@@ -100,6 +94,5 @@
      * ヘッダを追加する.
      */
-    function addHeader($name, $value)
-    {
+    function addHeader($name, $value) {
         $this->response->addHeader($name, $value);
     }
@@ -109,6 +102,5 @@
      * Enter description here ...
      */
-    function setDevice($device = DEVICE_TYPE_PC)
-    {
+    function setDevice($device = DEVICE_TYPE_PC) {
 
         switch ($device) {
@@ -135,6 +127,5 @@
      * SC_View インスタンスを設定する.
      */
-    function setView($view)
-    {
+    function setView($view) {
         $this->view = $view;
     }
@@ -151,6 +142,5 @@
      * @return integer 端末種別ID
      */
-    public static function detectDevice($reset = FALSE)
-    {
+    public static function detectDevice($reset = FALSE) {
         if (is_null(SC_Display_Ex::$device) || $reset) {
             $nu = new Net_UserAgent_Mobile();
@@ -167,16 +157,13 @@
     }
 
-    function assign($val1,$val2)
-    {
+    function assign($val1,$val2) {
         $this->view->assign($val1, $val2);
     }
 
-    function assignobj($obj)
-    {
+    function assignobj($obj) {
         $this->view->assignobj($obj);
     }
 
-    function assignarray($array)
-    {
+    function assignarray($array) {
         $this->view->assignarray($array);
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @version $Id$
  */
-class SC_Batch_Update extends SC_Batch 
-{
+class SC_Batch_Update extends SC_Batch {
 
     /**
@@ -50,6 +49,5 @@
      * @return void
      */
-    function execute($target = '.')
-    {
+    function execute($target = '.') {
         $msg = '';
         $oldMask = umask(0);
@@ -198,6 +196,5 @@
      * @see http://www.php.net/glob
      */
-    function listdirs($dir)
-    {
+    function listdirs($dir) {
         static $alldirs = array();
         $dirs = glob($dir . '/*');
@@ -216,6 +213,5 @@
      * @param string $path 絶対パス
      */
-    function lfMkdirRecursive($path)
-    {
+    function lfMkdirRecursive($path) {
         $path = dirname($path);
 
@@ -240,6 +236,5 @@
     }
 
-    function makeDistInfo($bkupDistInfoArray)
-    {
+    function makeDistInfo($bkupDistInfoArray) {
         $src = "<?php\n"
              . '$distifo = array(' . "\n";
@@ -253,6 +248,5 @@
     }
 
-    function printLog($msg)
-    {
+    function printLog($msg) {
         GC_Utils_Ex::gfPrintLog($msg, DATA_REALDIR . 'logs/ownersstore_batch_update.log');
     }
Index: /branches/version-2_12-dev/data/class/SC_SiteSession.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_SiteSession.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_SiteSession.php	(revision 22796)
@@ -23,9 +23,7 @@
 
 /* カートセッション管理クラス */
-class SC_SiteSession 
-{
+class SC_SiteSession {
     /* コンストラクタ */
-    function __construct()
-    {
+    function __construct() {
         // 前ページでの登録成功判定を引き継ぐ
         $_SESSION['site']['pre_regist_success'] =
@@ -42,6 +40,5 @@
 
     /* 前ページが正当であるかの判定 */
-    function isPrePage()
-    {
+    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']) {
@@ -52,18 +49,15 @@
     }
 
-    function setNowPage($path)
-    {
+    function setNowPage($path) {
         $_SESSION['site']['now_page'] = $path;
     }
 
     /* 値の取得 */
-    function getValue($keyname)
-    {
+    function getValue($keyname) {
         return $_SESSION['site'][$keyname];
     }
 
     /* ユニークIDの取得 */
-    function getUniqId()
-    {
+    function getUniqId() {
         // ユニークIDがセットされていない場合はセットする。
         if (!isset($_SESSION['site']['uniqid']) || $_SESSION['site']['uniqid'] == '') {
@@ -74,6 +68,5 @@
 
     /* ユニークIDのセット */
-    function setUniqId()
-    {
+    function setUniqId() {
         // 予測されないようにランダム文字列を付与する。
         $_SESSION['site']['uniqid'] = SC_Utils_Ex::sfGetUniqRandomId();
@@ -81,6 +74,5 @@
 
     /* ユニークIDのチェック */
-    function checkUniqId()
-    {
+    function checkUniqId() {
         if (!empty($_POST['uniqid'])) {
             if ($_POST['uniqid'] != $_SESSION['site']['uniqid']) {
@@ -92,12 +84,10 @@
 
     /* ユニークIDの解除 */
-    function unsetUniqId()
-    {
+    function unsetUniqId() {
         $_SESSION['site']['uniqid'] = '';
     }
 
     /* 登録成功を記録 */
-    function setRegistFlag()
-    {
+    function setRegistFlag() {
         $_SESSION['site']['regist_success'] = true;
     }
Index: /branches/version-2_12-dev/data/class/SC_Cookie.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Cookie.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Cookie.php	(revision 22796)
@@ -26,12 +26,10 @@
  *
  */
-class SC_Cookie 
-{
+class SC_Cookie {
 
     var $expire;
 
     // コンストラクタ
-    function __construct($day = COOKIE_EXPIRE)
-    {
+    function __construct($day = COOKIE_EXPIRE) {
         // 有効期限
         $this->expire = time() + ($day * 24 * 3600);
@@ -39,6 +37,5 @@
 
     // クッキー書き込み
-    function setCookie($key, $val)
-    {
+    function setCookie($key, $val) {
         setcookie($key, $val, $this->expire, ROOT_URLPATH, DOMAIN_NAME);
     }
@@ -49,6 +46,5 @@
      * EC-CUBE をURLパスルート以外にインストールしている場合、上位ディレクトリの値も(劣後ではあるが)取得する点に留意。
      */
-    function getCookie($key)
-    {
+    function getCookie($key) {
         return isset($_COOKIE[$key]) ? $_COOKIE[$key] : null;
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id:SC_DB_DBFactory.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_DBFactory 
-{
+class SC_DB_DBFactory {
 
     /**
@@ -38,6 +37,5 @@
      * @return mixed DBFactory インスタンス
      */
-    function getInstance($db_type = DB_TYPE)
-    {
+    function getInstance($db_type = DB_TYPE) {
         switch ($db_type) {
             case 'mysql':
@@ -62,6 +60,5 @@
      * @return mixed データソース名またはDB接続パラメータの連想配列
      */
-    function getDSN($dsn = '')
-    {
+    function getDSN($dsn = '') {
         if (empty($dsn)) {
             if (defined('DEFAULT_DSN')) {
@@ -87,6 +84,5 @@
      * @return string データベースのバージョン
      */
-    function sfGetDBVersion($dsn = '')
-    { return null; }
+    function sfGetDBVersion($dsn = '') { return null; }
 
     /**
@@ -96,6 +92,5 @@
      * @return string MySQL 用に置換した SQL 文
      */
-    function sfChangeMySQL($sql)
-    { return null; }
+    function sfChangeMySQL($sql) { return null; }
 
     /**
@@ -105,6 +100,5 @@
      * @return string 昨日の売上高・売上件数を算出する SQL
      */
-    function getOrderYesterdaySql($method)
-    { return null; }
+    function getOrderYesterdaySql($method) { return null; }
 
     /**
@@ -114,6 +108,5 @@
      * @return string 当月の売上高・売上件数を算出する SQL
      */
-    function getOrderMonthSql($method)
-    { return null; }
+    function getOrderMonthSql($method) { return null; }
 
     /**
@@ -122,6 +115,5 @@
      * @return string 昨日のレビュー書き込み件数を算出する SQL
      */
-    function getReviewYesterdaySql()
-    { return null; }
+    function getReviewYesterdaySql() { return null; }
 
     /**
@@ -130,6 +122,5 @@
      * @return string 検索条件の SQL
      */
-    function getSendHistoryWhereStartdateSql()
-    { return null; }
+    function getSendHistoryWhereStartdateSql() { return null; }
 
     /**
@@ -138,6 +129,5 @@
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql()
-    { return null; }
+    function getDownloadableDaysWhereSql() { return null; }
 
     /**
@@ -147,6 +137,5 @@
      * @return string 連結後の SQL 文
      */
-    function concatColumn($columns)
-    { return null; }
+    function concatColumn($columns) { return null; }
 
     /**
@@ -159,6 +148,5 @@
      * @return array テーブル名の配列
      */
-    function findTableNames($expression = '')
-    { return array(); }
+    function findTableNames($expression = '') { return array(); }
 
     /**
@@ -171,6 +159,5 @@
      * @return array インデックス設定情報配列
      */
-    function sfGetCreateIndexDefinition($table, $name, $definition)
-    { return $definition; }
+    function sfGetCreateIndexDefinition($table, $name, $definition) { return $definition; }
 
     /**
@@ -180,6 +167,5 @@
      * @return void
      */
-    function initObjQuery(SC_Query &$objQuery)
-    {
+    function initObjQuery(SC_Query &$objQuery) {
     }
 
@@ -189,6 +175,5 @@
      * @return array テーブル名の配列
      */
-    function listTables(SC_Query &$objQuery)
-    {
+    function listTables(SC_Query &$objQuery) {
         $objManager =& $objQuery->conn->loadModule('Manager');
         return $objManager->listTables();
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 22567)
+++ /branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id:SC_DB_DBFactory_MYSQL.php 15267 2007-08-09 12:31:52Z nanasess $
  */
-class SC_DB_DBFactory_MYSQL extends SC_DB_DBFactory 
-{
+class SC_DB_DBFactory_MYSQL extends SC_DB_DBFactory {
 
     /** SC_Query インスタンス */
@@ -45,6 +44,5 @@
      * @return string データベースのバージョン
      */
-    function sfGetDBVersion($dsn = '')
-    {
+    function sfGetDBVersion($dsn = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
         $val = $objQuery->getOne('select version()');
@@ -59,6 +57,5 @@
      * @return string MySQL 用に置換した SQL 文
      */
-    function sfChangeMySQL($sql)
-    {
+    function sfChangeMySQL($sql) {
         // 改行、タブを1スペースに変換
         $sql = preg_replace("/[\r\n\t]/",' ',$sql);
@@ -79,6 +76,5 @@
      * @return array 文字コード情報
      */
-    function getCharSet()
-    {
+    function getCharSet() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->getAll("SHOW VARIABLES LIKE 'char%'");
@@ -92,6 +88,5 @@
      * @return string 昨日の売上高・売上件数を算出する SQL
      */
-    function getOrderYesterdaySql($method)
-    {
+    function getOrderYesterdaySql($method) {
         return 'SELECT ' . $method . '(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
@@ -106,6 +101,5 @@
      * @return string 当月の売上高・売上件数を算出する SQL
      */
-    function getOrderMonthSql($method)
-    {
+    function getOrderMonthSql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
@@ -120,6 +114,5 @@
      * @return string 昨日のレビュー書き込み件数を算出する SQL
      */
-    function getReviewYesterdaySql()
-    {
+    function getReviewYesterdaySql() {
         return 'SELECT COUNT(*) FROM dtb_review AS A '
                . 'LEFT JOIN dtb_products AS B '
@@ -136,6 +129,5 @@
      * @return string 検索条件の SQL
      */
-    function getSendHistoryWhereStartdateSql()
-    {
+    function getSendHistoryWhereStartdateSql() {
         return 'start_date BETWEEN date_add(CURRENT_TIMESTAMP,INTERVAL -5 minute) AND date_add(CURRENT_TIMESTAMP,INTERVAL 5 minute)';
     }
@@ -147,6 +139,5 @@
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order')
-    {
+    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
         return '(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD(' . $dtb_order_alias . '.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))';
     }
@@ -158,6 +149,5 @@
      * @return string 検索条件のSQL
      */
-    function getOrderTotalDaysWhereSql($type)
-    {
+    function getOrderTotalDaysWhereSql($type) {
         switch ($type) {
             case 'month':
@@ -195,6 +185,5 @@
      * @return string 年代抽出部分の SQL
      */
-    function getOrderTotalAgeColSql()
-    {
+    function getOrderTotalAgeColSql() {
         return 'TRUNC((YEAR(create_date) - YEAR(order_birth)) - (RIGHT(create_date, 5) < RIGHT(order_birth, 5)), -1)';
     }
@@ -206,6 +195,5 @@
      * @return string 連結後の SQL 文
      */
-    function concatColumn($columns)
-    {
+    function concatColumn($columns) {
         $sql = 'concat(';
         $i = 0;
@@ -230,6 +218,5 @@
      * @return array テーブル名の配列
      */
-    function findTableNames($expression = '')
-    {
+    function findTableNames($expression = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sql = 'SHOW TABLES LIKE '. $objQuery->quote('%' . $expression . '%');
@@ -246,6 +233,5 @@
      * @return string 変換後の SQL 文
      */
-    function sfChangeILIKE($sql)
-    {
+    function sfChangeILIKE($sql) {
         $changesql = preg_replace('/(^|[^\w])ILIKE([^\w]|$)/i', '$1LIKE$2', $sql);
         return $changesql;
@@ -259,6 +245,5 @@
      * @return string 変換後の SQL 文
      */
-    function sfChangeRANDOM($sql)
-    {
+    function sfChangeRANDOM($sql) {
         $changesql = preg_replace('/(^|[^\w])RANDOM\(/i', '$1RAND(', $sql);
         return $changesql;
@@ -272,6 +257,5 @@
      * @return string 変換後の SQL 文
      */
-    function sfChangeTrunc($sql)
-    {
+    function sfChangeTrunc($sql) {
         $changesql = preg_replace('/(^|[^\w])TRUNC([^\w]|$)/i', '$1TRUNCATE$2', $sql);
         return $changesql;
@@ -285,6 +269,5 @@
      * @return string 変換後の SQL 文
      */
-    function sfChangeArrayToString($sql)
-    {
+    function sfChangeArrayToString($sql) {
         if (strpos(strtoupper($sql), 'ARRAY_TO_STRING') !== FALSE) {
             preg_match_all('/ARRAY_TO_STRING.*?\(.*?ARRAY\(.*?SELECT (.+?) FROM (.+?) WHERE (.+?)\).*?\,.*?\'(.+?)\'.*?\)/is', $sql, $match, PREG_SET_ORDER);
@@ -307,6 +290,5 @@
      * @return array インデックス設定情報配列
      */
-    function sfGetCreateIndexDefinition($table, $name, $definition)
-    {
+    function sfGetCreateIndexDefinition($table, $name, $definition) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrTblInfo = $objQuery->getTableInfo($table);
@@ -328,6 +310,5 @@
      * @return string
      */
-    function getDummyFromClauseSql()
-    {
+    function getDummyFromClauseSql() {
         return 'FROM DUAL';
     }
@@ -339,6 +320,5 @@
      * @return void
      */
-    function initObjQuery(SC_Query &$objQuery)
-    {
+    function initObjQuery(SC_Query &$objQuery) {
         $objQuery->exec('SET SESSION storage_engine = InnoDB');
         $objQuery->exec("SET SESSION sql_mode = 'ANSI'");
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 22567)
+++ /branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id:SC_DB_DBFactory_PGSQL.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_DBFactory_PGSQL extends SC_DB_DBFactory 
-{
+class SC_DB_DBFactory_PGSQL extends SC_DB_DBFactory {
 
     /**
@@ -42,6 +41,5 @@
      * @return string データベースのバージョン
      */
-    function sfGetDBVersion($dsn = '')
-    {
+    function sfGetDBVersion($dsn = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
         $val = $objQuery->getOne('select version()');
@@ -59,6 +57,5 @@
      * @return string MySQL 用に置換した SQL 文
      */
-    function sfChangeMySQL($sql)
-    {
+    function sfChangeMySQL($sql) {
         return $sql;
     }
@@ -70,6 +67,5 @@
      * @return string 昨日の売上高・売上件数を算出する SQL
      */
-    function getOrderYesterdaySql($method)
-    {
+    function getOrderYesterdaySql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
@@ -84,6 +80,5 @@
      * @return string 当月の売上高・売上件数を算出する SQL
      */
-    function getOrderMonthSql($method)
-    {
+    function getOrderMonthSql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
@@ -98,6 +93,5 @@
      * @return string 昨日のレビュー書き込み件数を算出する SQL
      */
-    function getReviewYesterdaySql()
-    {
+    function getReviewYesterdaySql() {
         return 'SELECT COUNT(*) FROM dtb_review AS A '
                . 'LEFT JOIN dtb_products AS B '
@@ -114,6 +108,5 @@
      * @return string 検索条件の SQL
      */
-    function getSendHistoryWhereStartdateSql()
-    {
+    function getSendHistoryWhereStartdateSql() {
         return "start_date BETWEEN current_timestamp + '- 5 minutes' AND current_timestamp + '5 minutes'";
     }
@@ -125,6 +118,5 @@
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order')
-    {
+    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
         $baseinfo = SC_Helper_DB_Ex::sfGetBasisData();
         //downloadable_daysにNULLが入っている場合(無期限ダウンロード可能時)もあるので、NULLの場合は0日に補正
@@ -153,6 +145,5 @@
      * @return string 検索条件のSQL
      */
-    function getOrderTotalDaysWhereSql($type)
-    {
+    function getOrderTotalDaysWhereSql($type) {
         switch ($type) {
             case 'month':
@@ -190,6 +181,5 @@
      * @return string 年代抽出部分の SQL
      */
-    function getOrderTotalAgeColSql()
-    {
+    function getOrderTotalAgeColSql() {
         return 'TRUNC(CAST(EXTRACT(YEAR FROM AGE(create_date, order_birth)) AS INT), -1)';
     }
@@ -201,6 +191,5 @@
      * @return string 連結後の SQL 文
      */
-    function concatColumn($columns)
-    {
+    function concatColumn($columns) {
         $sql = '';
         $i = 0;
@@ -225,6 +214,5 @@
      * @return array テーブル名の配列
      */
-    function findTableNames($expression = '')
-    {
+    function findTableNames($expression = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sql = '   SELECT c.relname AS name, '
@@ -250,6 +238,5 @@
      * @return array 文字コード情報
      */
-    function getCharSet()
-    {
+    function getCharSet() {
         // 未実装
         return array();
@@ -261,6 +248,5 @@
      * @return string
      */
-    function getDummyFromClauseSql()
-    {
+    function getDummyFromClauseSql() {
         return '';
     }
@@ -272,6 +258,5 @@
      * @return array テーブル名の配列
      */
-    function listTables(SC_Query &$objQuery)
-    {
+    function listTables(SC_Query &$objQuery) {
         $col = 'tablename';
         $from = 'pg_tables';
Index: /branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php
===================================================================
--- /branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php	(revision 22796)
@@ -42,6 +42,5 @@
  * @version $Id:SC_DB_MasterData.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_MasterData 
-{
+class SC_DB_MasterData {
 
     // {{{ properties
@@ -71,6 +70,5 @@
      * @return array マスターデータ
      */
-    function getMasterData($name, $columns = array())
-    {
+    function getMasterData($name, $columns = array()) {
 
         $columns = $this->getDefaultColumnName($columns);
@@ -104,6 +102,5 @@
      * @return integer マスターデータの登録数
      */
-    function registMasterData($name, $columns, $masterData, $autoCommit = true)
-    {
+    function registMasterData($name, $columns, $masterData, $autoCommit = true) {
 
         $columns = $this->getDefaultColumnName($columns);
@@ -140,6 +137,5 @@
      * @return integer マスターデータの更新数
      */
-    function updateMasterData($name, $columns, $masterData, $autoCommit = true)
-    {
+    function updateMasterData($name, $columns, $masterData, $autoCommit = true) {
 
         $columns = $this->getDefaultColumnName($columns);
@@ -175,6 +171,5 @@
      * @return integer マスターデータの更新数
      */
-    function insertMasterData($name, $key, $value, $comment, $autoCommit = true)
-    {
+    function insertMasterData($name, $key, $value, $comment, $autoCommit = true) {
 
         $columns = $this->getDefaultColumnName();
@@ -208,6 +203,5 @@
      * @return integer マスターデータの削除数
      */
-    function deleteMasterData($name, $autoCommit = true)
-    {
+    function deleteMasterData($name, $autoCommit = true) {
         $this->objQuery =& SC_Query_Ex::getSingletonInstance();
         if ($autoCommit) {
@@ -231,6 +225,5 @@
      * @return bool 消去した場合 true
      */
-    function clearCache($name)
-    {
+    function clearCache($name) {
         $masterDataFile = MASTER_DATA_REALDIR . $name . '.php';
         if (is_file($masterDataFile)) {
@@ -259,6 +252,5 @@
      * @return bool キャッシュの生成に成功した場合 true
      */
-    function createCache($name, $columns = array(), $isDefine = false, $commentColumn = array())
-    {
+    function createCache($name, $columns = array(), $isDefine = false, $commentColumn = array()) {
 
         // マスターデータを取得
@@ -309,6 +301,5 @@
      * @return array マスターデータ
      */
-    function getDbMasterData($name, $columns = array())
-    {
+    function getDbMasterData($name, $columns = array()) {
 
         $columns = $this->getDefaultColumnName($columns);
@@ -342,6 +333,5 @@
      * @return array カラム名を格納した配列
      */
-    function getDefaultColumnName($columns = array())
-    {
+    function getDefaultColumnName($columns = array()) {
 
         if (!empty($columns)) {
@@ -360,6 +350,5 @@
      * @return string 定数定義の文字列
      */
-    function getMasterDataAsDefine($masterData, $comments = array())
-    {
+    function getMasterDataAsDefine($masterData, $comments = array()) {
         $data = '';
         foreach ($masterData as $key => $val) {
Index: /branches/version-2_12-dev/data/class/SC_View.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_View.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_View.php	(revision 22796)
@@ -24,6 +24,5 @@
 require_once realpath(dirname(__FILE__)) . '/../module/Smarty/libs/Smarty.class.php';
 
-class SC_View 
-{
+class SC_View {
 
     var $_smarty;
@@ -32,11 +31,9 @@
 
     // コンストラクタ
-    function __construct()
-    {
+    function __construct() {
         $this->init();
     }
 
-    function init()
-    {
+    function init() {
         $this->_smarty = new Smarty;
         $this->_smarty->left_delimiter = '<!--{';
@@ -76,12 +73,10 @@
 
     // テンプレートに値を割り当てる
-    function assign($val1, $val2)
-    {
+    function assign($val1, $val2) {
         $this->_smarty->assign($val1, $val2);
     }
 
     // テンプレートの処理結果を取得
-    function fetch($template)
-    {
+    function fetch($template) {
         return $this->_smarty->fetch($template);
     }
@@ -94,6 +89,5 @@
      * @return string
      */
-    function getResponse($template, $no_error = false)
-    {
+    function getResponse($template, $no_error = false) {
         if (!$no_error) {
             global $GLOBAL_ERR;
@@ -118,6 +112,5 @@
      * @return void
      */
-    function setPage($objPage)
-    {
+    function setPage($objPage) {
        $this->objPage = $objPage;
     }
@@ -127,6 +120,5 @@
      * @return void
      */
-    function registFilter()
-    {
+    function registFilter() {
         $this->_smarty->register_prefilter(array(&$this, 'prefilter_transform'));
         $this->_smarty->register_outputfilter(array(&$this, 'outputfilter_transform'));
@@ -139,6 +131,5 @@
      * @return string $source ソース
      */
-    function prefilter_transform($source, &$smarty)
-    {
+    function prefilter_transform($source, &$smarty) {
         if (!is_null($this->objPage)) {
             // フックポイントを実行.
@@ -155,6 +146,5 @@
      * @return string $source ソース
      */
-    function outputfilter_transform($source, &$smarty)
-    {
+    function outputfilter_transform($source, &$smarty) {
         if (!is_null($this->objPage)) {
             // フックポイントを実行.
@@ -166,6 +156,5 @@
 
     // テンプレートの処理結果を表示
-    function display($template, $no_error = false)
-    {
+    function display($template, $no_error = false) {
         if (!$no_error) {
             global $GLOBAL_ERR;
@@ -186,6 +175,5 @@
 
     // オブジェクト内の変数をすべて割り当てる。
-    function assignobj($obj)
-    {
+    function assignobj($obj) {
         $data = get_object_vars($obj);
 
@@ -196,6 +184,5 @@
 
     // 連想配列内の変数をすべて割り当てる。
-    function assignarray($array)
-    {
+    function assignarray($array) {
         foreach ($array as $key => $val) {
             $this->_smarty->assign($key, $val);
@@ -208,6 +195,5 @@
      * @param integer $device_type_id 端末種別ID
      */
-    function assignTemplatePath($device_type_id)
-    {
+    function assignTemplatePath($device_type_id) {
 
         // テンプレート変数を割り当て
@@ -224,6 +210,5 @@
 
     // デバッグ
-    function debug($var = true)
-    {
+    function debug($var = true) {
         $this->_smarty->debugging = $var;
     }
Index: /branches/version-2_12-dev/data/class/SC_MobileImage.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_MobileImage.php	(revision 22791)
+++ /branches/version-2_12-dev/data/class/SC_MobileImage.php	(revision 22796)
@@ -30,6 +30,5 @@
  * 画像変換クラス
  */
-class SC_MobileImage
-{
+class SC_MobileImage {
     /**
      * 画像を端末の解像度に合わせて変換する
@@ -39,6 +38,5 @@
      * @return string 出力
      */
-    static function handler($buffer)
-    {
+    static function handler($buffer) {
 
         // 端末情報を取得する
@@ -100,9 +98,9 @@
                 // resize_image.phpは除外
                 if (stripos($path, ROOT_URLPATH . 'resize_image.php') !== FALSE) {
-                    continue;
+                    break;
                 }
 
                 $realpath = html_entity_decode($path, ENT_QUOTES);
-                $realpath = substr_replace($realpath, HTML_REALDIR, 0, strlen(ROOT_URLPATH));
+                $realpath = preg_replace('|^' . ROOT_URLPATH . '|', HTML_REALDIR, $realpath);
                 $converted = $imageConverter->execute($realpath);
                 if (isset($converted['outputImageName'])) {
Index: /branches/version-2_12-dev/data/class/SC_SessionFactory.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_SessionFactory.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_SessionFactory.php	(revision 22796)
@@ -42,6 +42,5 @@
  * @version $Id$
  */
-class SC_SessionFactory 
-{
+class SC_SessionFactory {
 
     // }}}
@@ -53,6 +52,5 @@
      * @return SC_SessionFactory
      */
-    function getInstance()
-    {
+    function getInstance() {
 
         $type = defined('SESSION_KEEP_METHOD')
@@ -89,6 +87,5 @@
      *
      */
-    function initSession()
-    {}
+    function initSession() {}
 
     /**
@@ -97,6 +94,5 @@
      * @return boolean
      */
-    function useCookie()
-    {}
+    function useCookie() {}
 
 }
Index: /branches/version-2_12-dev/data/class/SC_Date.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Date.php	(revision 22576)
+++ /branches/version-2_12-dev/data/class/SC_Date.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 /* 日時表示用クラス */
-class SC_Date 
-{
+class SC_Date {
     var $start_year;
     var $month;
@@ -30,41 +29,31 @@
     var $end_year;
 
-    public static $arrHoliday = NULL;
-    public static $arrRegularHoliday = NULL;
-
     // コンストラクタ
-    function __construct($start_year='', $end_year='')
-    {
+    function __construct($start_year='', $end_year='') {
         if ($start_year)  $this->setStartYear($start_year);
         if ($end_year)    $this->setEndYear($end_year);
     }
 
-    function setStartYear($year)
-    {
+    function setStartYear($year) {
         $this->start_year = $year;
     }
 
-    function getStartYear()
-    {
+    function getStartYear() {
         return $this->start_year;
     }
 
-    function setEndYear($endYear)
-    {
+    function setEndYear($endYear) {
         $this->end_year = $endYear;
     }
 
-    function getEndYear()
-    {
+    function getEndYear() {
         return $this->end_year;
     }
 
-    function setMonth($month)
-    {
+    function setMonth($month) {
         $this->month = $month;
     }
 
-    function setDay($day)
-    {
+    function setDay($day) {
         $this->day = $day;
     }
@@ -80,6 +69,5 @@
      * @param string $default_key
      */
-    function getYear($year = '', $default_year = false, $default_key = '----')
-    {
+    function getYear($year = '', $default_year = false, $default_key = '----') {
         if ($year) $this->setStartYear($year);
 
@@ -105,6 +93,5 @@
     }
 
-    function getZeroYear($year = '')
-    {
+    function getZeroYear($year = '') {
         if ($year) $this->setStartYear($year);
 
@@ -124,6 +111,5 @@
     }
 
-    function getZeroMonth()
-    {
+    function getZeroMonth() {
 
         $month_array = array();
@@ -135,6 +121,5 @@
     }   
 
-    function getMonth($default = false)
-    {
+    function getMonth($default = false) {
         $month_array = array();
 
@@ -147,6 +132,5 @@
     }   
 
-    function getDay($default = false)
-    {
+    function getDay($default = false) {
         $day_array = array();
 
@@ -160,6 +144,5 @@
     }
 
-    function getHour()
-    {
+    function getHour() {
 
         $hour_array = array();
@@ -171,6 +154,5 @@
     }
 
-    function getMinutes()
-    {
+    function getMinutes() {
 
         $minutes_array = array();
@@ -182,63 +164,8 @@
     }
 
-    function getMinutesInterval()
-    {
+    function getMinutesInterval() {
 
         $minutes_array = array('00'=>'00', '30'=>'30');
         return $minutes_array;
     }
-
-    /**
-     * 休日の判定.
-     * 
-     * @param integer $year
-     * @param integer $month
-     * @param integer $day
-     * @return boolean 休日の場合はtrue
-     */
-    public function isHoliday($year, $month, $day)
-    {
-        is_null(SC_Date_Ex::$arrHoliday) and $this->setArrHoliday();
-        is_null(SC_Date_Ex::$arrRegularHoliday) and $this->setRegularHoliday();
-
-        if (!empty(SC_Date_Ex::$arrHoliday[$month])) {
-            if (in_array($day, SC_Date_Ex::$arrHoliday[$month])) {
-                return true;
-            }
-        }
-        if (!empty(SC_Date_Ex::$arrRegularHoliday)) {
-            $day = date('w', mktime(0,0,0 ,$month, $day, $year));
-            if (in_array($day, SC_Date_Ex::$arrRegularHoliday)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 休日情報をスタティック変数にセット.
-     * 
-     * @return void
-     */
-    private function setArrHoliday()
-    {
-        $objHoliday = new SC_Helper_Holiday_Ex();
-        $holiday = $objHoliday->getList();
-        $arrHoliday = array();
-        foreach ($holiday AS $val) {
-            $arrHoliday[$val['month']][] = $val['day'];
-        }
-        SC_Date_Ex::$arrHoliday = $arrHoliday;
-    }
-
-    /**
-     * 定休日情報をスタティック変数にセット.
-     * 
-     * @return void
-     */
-    private function setRegularHoliday()
-    {
-        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
-        SC_Date_Ex::$arrRegularHoliday = explode('|', $arrInfo['regular_holiday_ids']);
-    }
 }
Index: /branches/version-2_12-dev/data/class/SC_Fpdf.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Fpdf.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Fpdf.php	(revision 22796)
@@ -30,8 +30,6 @@
 define('PDF_TEMPLATE_REALDIR', TEMPLATE_ADMIN_REALDIR . 'pdf/');
 
-class SC_Fpdf extends SC_Helper_FPDI 
-{
-    function __construct($download, $title, $tpl_pdf = 'nouhinsyo1.pdf')
-    {
+class SC_Fpdf extends SC_Helper_FPDI {
+    function __construct($download, $title, $tpl_pdf = 'nouhinsyo1.pdf') {
         $this->FPDF();
         // デフォルトの設定
@@ -69,6 +67,5 @@
     }
 
-    function setData($arrData)
-    {
+    function setData($arrData) {
         $this->arrData = $arrData;
 
@@ -96,6 +93,5 @@
     }
 
-    function setShopData()
-    {
+    function setShopData() {
         // ショップ情報
 
@@ -134,6 +130,5 @@
     }
 
-    function setMessageData()
-    {
+    function setMessageData() {
         // メッセージ
         $this->lfText(27, 70, $this->arrData['msg1'], 8);  //メッセージ1
@@ -144,6 +139,5 @@
     }
 
-    function setOrderData()
-    {
+    function setOrderData() {
         $arrOrder = array();
         // DBから受注情報を読み込む
@@ -184,5 +178,5 @@
 
             // 税込金額（単価）
-            $data[1] = SC_Helper_DB_Ex::sfCalcIncTax($this->arrDisp['price'][$i], $this->arrDisp['tax_rate'][$i], $this->arrDisp['tax_rule'][$i]);
+            $data[1] = SC_Helper_DB_Ex::sfCalcIncTax($this->arrDisp['price'][$i]);
 
             // 小計（商品毎）
@@ -270,16 +264,14 @@
      * @return string 変更後の文字列
      */
-    function setEtcData()
-    {
+    function setEtcData() {
         $this->Cell(0, 10, '', 0, 1, 'C', 0, '');
         $this->SetFont('Gothic', 'B', 9);
         $this->MultiCell(0, 6, '＜ 備考 ＞', 'T', 2, 'L', 0, '');
         $this->SetFont('SJIS', '', 8);
-        $text = SC_Utils_Ex::rtrim($this->arrData['etc1'] . " \n" . $this->arrData['etc2'] . " \n" . $this->arrData['etc3']);
+        $text = SC_Utils_Ex::rtrim($this->arrData['etc1'] . "\n" . $this->arrData['etc2'] . "\n" . $this->arrData['etc3']);
         $this->MultiCell(0, 4, $text, '', 2, 'L', 0, '');
     }
 
-    function createPdf()
-    {
+    function createPdf() {
         // PDFをブラウザに送信
         ob_clean();
@@ -300,6 +292,5 @@
 
     // PDF_Japanese::Text へのパーサー
-    function lfText($x, $y, $text, $size = 0, $style = '')
-    {
+    function lfText($x, $y, $text, $size = 0, $style = '') {
         // 退避
         $bak_font_style = $this->FontStyle;
@@ -314,6 +305,5 @@
 
     // 受注データの取得
-    function lfGetOrderData($order_id)
-    {
+    function lfGetOrderData($order_id) {
         if (SC_Utils_Ex::sfIsInt($order_id)) {
             // DBから受注情報を読み込む
@@ -339,8 +329,7 @@
 
     // 受注詳細データの取得
-    function lfGetOrderDetail($order_id)
-    {
+    function lfGetOrderDetail($order_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate, tax_rate, tax_rule';
+        $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate';
         $where = 'order_id = ?';
         $objQuery->setOrder('order_detail_id');
Index: /branches/version-2_12-dev/data/class/SC_Batch.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Batch.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Batch.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id$
  */
-class SC_Batch 
-{
+class SC_Batch {
 
     // }}}
@@ -41,5 +40,4 @@
      * @return mixed バッチの実行結果
      */
-    function execute($argv = '')
-    {}
+    function execute($argv = '') {}
 }
Index: /branches/version-2_12-dev/data/class/SC_Image.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Image.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Image.php	(revision 22796)
@@ -23,11 +23,9 @@
 
 //---- アップロードファイル加工クラス(thumb.phpとセットで使用する)
-class SC_Image 
-{
+class SC_Image {
 
     var $tmp_dir;
 
-    function __construct($tmp_dir)
-    {
+    function __construct($tmp_dir) {
         // ヘッダファイル読込
         $this->tmp_dir = rtrim($tmp_dir, '/') . '/';
@@ -35,6 +33,5 @@
 
     //--- 一時ファイル生成(サムネイル画像生成用)
-    function makeTempImage($keyname, $max_width, $max_height)
-    {
+    function makeTempImage($keyname, $max_width, $max_height) {
         // 一意なIDを取得する。
         $mainname = uniqid('').'.';
@@ -47,6 +44,5 @@
 
     //--- ファイルを指定保存DIRへ移動
-    function moveTempImage($filename, $save_dir)
-    {
+    function moveTempImage($filename, $save_dir) {
         // コピー元ファイル、コピー先ディレクトリが存在する場合にのみ実行する
         $from_path = $this->tmp_dir.$filename;
@@ -62,6 +58,5 @@
 
     //---- 指定ファイルを削除
-    function deleteImage($filename, $dir)
-    {
+    function deleteImage($filename, $dir) {
         if (file_exists($dir.'/'.$filename)) {
             unlink($dir.'/'.$filename);
@@ -79,6 +74,5 @@
      * @param array 新ファイル名を格納した配列
      */
-    function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = '')
-    {
+    function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = '') {
         // 画像の最大横幅（単位：ピクセル）
         $ThmMaxWidth = LARGE_IMAGE_WIDTH;
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 22567)
+++ /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @version $Id: $
  */
-abstract class SC_Plugin_Base 
-{
+abstract class SC_Plugin_Base {
 
     protected $arrSelfInfo;
@@ -42,6 +41,5 @@
      * @return void
      */
-    function __construct(array $arrSelfInfo)
-    {
+    function __construct(array $arrSelfInfo) {
         $this->arrSelfInfo = $arrSelfInfo;
     }
@@ -92,6 +90,5 @@
      * @param integer $priority
      */
-    function register(SC_Helper_Plugin $objHelperPlugin, $priority)
-    {
+    function register(SC_Helper_Plugin $objHelperPlugin, $priority) {
         if (isset($this->arrSelfInfo['plugin_hook_point'])) {
             $arrHookPoints = $this->arrSelfInfo['plugin_hook_point'];
@@ -111,6 +108,5 @@
      * @return array $arrSelfInfo 自身のプラグイン情報
      */
-    function getPluginInfo()
-    {
+    function getPluginInfo() {
         return $this->arrSelfInfo;
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php	(revision 22796)
@@ -23,12 +23,10 @@
 
 // プラグインのユーティリティクラス.
-class SC_Plugin_Util 
-{
+class SC_Plugin_Util {
 
     /**
      * 稼働中のプラグインを取得する。
      */
-    function getEnablePlugin()
-    {
+    function getEnablePlugin() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
@@ -57,6 +55,5 @@
      * @return array $arrRet インストールされているプラグイン.
      */
-    function getAllPlugin()
-    {
+    function getAllPlugin() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
@@ -77,6 +74,5 @@
      * @return array プラグインの基本情報.
      */
-    function getPluginByPluginId($plugin_id)
-    {
+    function getPluginByPluginId($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
@@ -94,6 +90,5 @@
      * @return array プラグインの基本情報.
      */
-    function getPluginByPluginCode($plugin_code)
-    {
+    function getPluginByPluginCode($plugin_code) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
@@ -110,6 +105,5 @@
      * @return array プラグインの基本情報.
      */
-    function deletePluginByPluginId($plugin_id)
-    {
+    function deletePluginByPluginId($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'plugin_id = ?';
@@ -123,6 +117,5 @@
      * @return array $arrPluginDirectory
      */
-    function getPluginDirectory()
-    {
+    function getPluginDirectory() {
         $arrPluginDirectory = array();
         if (is_dir(PLUGIN_UPLOAD_REALDIR)) {
@@ -143,6 +136,5 @@
      * @return array フックポイントの一覧
      */
-    function getPluginHookPoint($plugin_id)
-    {
+    function getPluginHookPoint($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $cols = '*';
@@ -158,6 +150,5 @@
      * @return array $arrErr エラー情報を格納した連想配列.
      */
-    function checkExtension($key)
-    {
+    function checkExtension($key) {
         // プラグイン利用に必須のモジュール
         // 'EC-CUBEバージョン' => array('モジュール名')
Index: /branches/version-2_12-dev/data/class/pages/LC_Page.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/LC_Page.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/LC_Page.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id:LC_Page.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page 
-{
+class LC_Page {
 
     // {{{ properties
@@ -85,6 +84,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         // 開始時刻を設定する。
         $this->timeStart = microtime(true);
@@ -119,6 +117,5 @@
      * @return void
      */
-    function process()
-    {}
+    function process() {}
 
     /**
@@ -127,6 +124,5 @@
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         // ローカルフックポイントを実行.
@@ -155,6 +151,5 @@
      * @return void
      */
-    function sendResponseCSV($file_name, $data)
-    {
+    function sendResponseCSV($file_name, $data) {
         $this->objDisplay->prepare($this);
         $this->objDisplay->addHeader('Content-disposition', "attachment; filename=${file_name}");
@@ -173,6 +168,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         // 一定時間以上かかったページの場合、ログ出力する。
         // エラー画面の表示では $this->timeStart が出力されない
@@ -193,6 +187,5 @@
      * @return void
      */
-    function doLocalHookpointBefore(SC_Helper_Plugin_Ex $objPlugin)
-    {
+    function doLocalHookpointBefore(SC_Helper_Plugin_Ex $objPlugin) {
         // ローカルフックポイントを実行
         $parent_class_name = get_parent_class($this);
@@ -212,6 +205,5 @@
      * @return void
      */
-    function doLocalHookpointAfter(SC_Helper_Plugin_Ex $objPlugin)
-    {
+    function doLocalHookpointAfter(SC_Helper_Plugin_Ex $objPlugin) {
         // ローカルフックポイントを実行
         $parent_class_name = get_parent_class($this);
@@ -229,6 +221,5 @@
      *
      */
-    function getTemplate()
-    {
+    function getTemplate() {
         return $this->template;
     }
@@ -238,6 +229,5 @@
      *
      */
-    function setTemplate($template)
-    {
+    function setTemplate($template) {
         $this->template = $template;
     }
@@ -263,6 +253,5 @@
      * @see Net_URL
      */
-    function getLocation($path, $param = array(), $useSSL = 'escape')
-    {
+    function getLocation($path, $param = array(), $useSSL = 'escape') {
         $rootPath = $this->getRootPath($path);
 
@@ -297,6 +286,5 @@
      * @return string EC-CUBE のWEBルート(/html/)を / としたパス
      */
-    function getRootPath($path)
-    {
+    function getRootPath($path) {
         // Windowsの場合は, ディレクトリの区切り文字を\から/に変換する
         $path = str_replace('\\', '/', $path);
@@ -336,6 +324,5 @@
      * @deprecated 決済モジュール互換のため
      */
-    function allowClientCache()
-    {
+    function allowClientCache() {
         $this->httpCacheControl('private');
     }
@@ -348,6 +335,5 @@
      * @return void
      */
-    function httpCacheControl($mode = '')
-    {
+    function httpCacheControl($mode = '') {
         switch ($mode) {
             case 'nocache':
@@ -384,6 +370,5 @@
      * @return string $_GET['mode'] 又は $_POST['mode'] の文字列
      */
-    function getMode()
-    {
+    function getMode() {
         $pattern = '/^[a-zA-Z0-9_]+$/';
         $mode = null;
@@ -411,6 +396,5 @@
      * @return void
      */
-    function doValidToken($is_admin = false)
-    {
+    function doValidToken($is_admin = false) {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if (!SC_Helper_Session_Ex::isValidToken(false)) {
@@ -431,6 +415,5 @@
      * @return void
      */
-    function setTokenTo()
-    {
+    function setTokenTo() {
         $this->transactionid = SC_Helper_Session_Ex::getToken();
     }
@@ -441,6 +424,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
      */
-    function log($mess, $log_level)
-    {
+    function log($mess, $log_level) {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         // ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
@@ -462,6 +444,5 @@
      * @return void
      */
-    function p($val)
-    {
+    function p($val) {
         SC_Utils_Ex::sfPrintR($val);
     }
Index: /branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Preview extends LC_Page_Ex 
-{
+class LC_Page_Preview extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
 
@@ -81,6 +78,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_MyPage_Favorite extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_MyPage_Favorite extends LC_Page_AbstractMypage_Ex {
 
     // {{{ properties
@@ -48,6 +47,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = 'お気に入り一覧';
@@ -60,6 +58,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -70,8 +67,8 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
+
+        $objProduct  = new SC_Product_Ex();
         $objCustomer = new SC_Customer_Ex();
-
         $customer_id = $objCustomer->getValue('customer_id');
 
@@ -81,5 +78,4 @@
                 $this->lfDeleteFavoriteProduct($customer_id, intval($_POST['product_id']));
                 break;
-
             case 'getList':
                 // スマートフォン版のもっと見るボタン用
@@ -89,11 +85,9 @@
                 }
                 $this->arrFavorite = $this->lfGetFavoriteProduct($customer_id, $this);
-                SC_Product_Ex::setPriceTaxTo($this->arrFavorite);
+                $this->arrFavorite = $objProduct->setPriceTaxTo($this->arrFavorite);
+
 
                 echo SC_Utils_Ex::jsonEncode($this->arrFavorite);
                 SC_Response_Ex::actionExit();
-                break;
-
-            default:
                 break;
         }
@@ -115,6 +109,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -128,15 +121,14 @@
      * @return array お気に入り商品一覧
      */
-    function lfGetFavoriteProduct($customer_id, &$objPage)
-    {
+    function lfGetFavoriteProduct($customer_id, &$objPage) {
         $objQuery       = SC_Query_Ex::getSingletonInstance();
         $objProduct     = new SC_Product_Ex();
 
-        $objQuery->setOrder('f.create_date DESC');
-        $where = 'f.customer_id = ? and p.status = 1';
+        $objQuery->setOrder('create_date DESC');
+        $where = 'customer_id = ?';
         if (NOSTOCK_HIDDEN) {
             $where .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = dtb_customer_favorite_products.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
         }
-        $arrProductId  = $objQuery->getCol('f.product_id', 'dtb_customer_favorite_products f inner join dtb_products p using (product_id)', $where, array($customer_id));
+        $arrProductId  = $objQuery->getCol('product_id', 'dtb_customer_favorite_products', $where, array($customer_id));
 
         $objQuery       =& SC_Query_Ex::getSingletonInstance();
@@ -178,6 +170,5 @@
 
     /* 仕方がない処理。。 */
-    function lfMakeWhere($tablename, $arrProductId)
-    {
+    function lfMakeWhere($tablename, $arrProductId) {
 
         // 取得した表示すべきIDだけを指定して情報を取得。
@@ -193,6 +184,5 @@
 
     // お気に入り商品削除
-    function lfDeleteFavoriteProduct($customer_id, $product_id)
-    {
+    function lfDeleteFavoriteProduct($customer_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_MyPage extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_MyPage extends LC_Page_AbstractMypage_Ex {
 
     // {{{ properties
@@ -48,6 +47,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mypageno = 'index';
@@ -68,6 +66,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -78,6 +75,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
@@ -104,10 +100,7 @@
         }
         // 支払い方法の取得
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         // 1ページあたりの件数
         $this->dispNumber = SEARCH_PMAX;
-        
-        $this->json_payment = SC_Utils::jsonEncode($this->arrPayment);
-        $this->json_customer_order_status = SC_Utils::jsonEncode($this->arrCustomerOrderStatus);
     }
 
@@ -117,6 +110,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -130,6 +122,5 @@
      * @return void
      */
-    function lfGetOrderHistory($customer_id, $startno = -1)
-    {
+    function lfGetOrderHistory($customer_id, $startno = -1) {
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_History extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_History extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mypageno     = 'index';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -72,11 +69,9 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer    = new SC_Customer_Ex();
         $objDb          = new SC_Helper_DB_Ex();
         $objPurchase = new SC_Helper_Purchase_Ex();
-        $objProduct  = new SC_Product();
 
         if (!SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
@@ -84,6 +79,5 @@
         }
 
-        $order_id               = $_GET['order_id'];
-        $this->is_price_change  = false;
+        $order_id        = $_GET['order_id'];
 
         //受注データの取得
@@ -98,16 +92,7 @@
         $this->isMultiple       = count($this->arrShipping) > 1;
         // 支払い方法の取得
-        $this->arrPayment       = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment       = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         // 受注商品明細の取得
         $this->tpl_arrOrderDetail = $objPurchase->getOrderDetail($order_id);
-        foreach ($this->tpl_arrOrderDetail as $product_index => $arrOrderProductDetail) {
-            //必要なのは商品の販売金額のみなので、遅い場合は、別途SQL作成した方が良い
-            $arrTempProductDetail = $objProduct->getProductsClass($arrOrderProductDetail['product_class_id']); 
-            if($this->tpl_arrOrderDetail[$product_index]['price'] != $arrTempProductDetail['price02']) {
-                $this->is_price_change = true;
-            }
-            $this->tpl_arrOrderDetail[$product_index]['product_price'] = ($arrTempProductDetail['price02'])?$arrTempProductDetail['price02']:0;
-        }
-        
         $this->tpl_arrOrderDetail = $this->setMainListImage($this->tpl_arrOrderDetail);
         $objPurchase->setDownloadableFlgTo($this->tpl_arrOrderDetail);
@@ -125,6 +110,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -136,6 +120,5 @@
      * @return array 受注メール送信履歴の内容
      */
-    function lfGetMailHistory($order_id)
-    {
+    function lfGetMailHistory($order_id) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $col        = 'send_date, subject, template_id, send_id';
@@ -153,6 +136,5 @@
      * @return array お届け先情報
      */
-    function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY)
-    {
+    function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY) {
         $arrShipping = $objPurchase->getShippings($order_id);
 
@@ -176,6 +158,5 @@
      * @return array 画像をセットした購入履歴の配列
      */
-    function setMainListImage($arrOrderDetails)
-    {
+    function setMainListImage($arrOrderDetails) {
         $i = 0;
         foreach ($arrOrderDetails as $arrOrderDetail) {
@@ -194,6 +175,5 @@
      * @return array MIMETYPE、ファイル名をセットした購入履歴の配列
      */
-    function lfSetMimetype($arrOrderDetails)
-    {
+    function lfSetMimetype($arrOrderDetails) {
         $objHelperMobile = new SC_Helper_Mobile_Ex();
         $i = 0;
@@ -216,6 +196,5 @@
      * @param $arrOrderDetail 購入履歴の配列
      */
-    function lfSetAU($arrOrderDetails)
-    {
+    function lfSetAU($arrOrderDetails) {
         $this->isAU = false;
         // モバイル端末かつ、キャリアがAUの場合に処理を行う
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 22569)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Refusal extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Refusal extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '退会手続き(入力ページ)';
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
@@ -93,6 +89,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -104,7 +99,11 @@
      * @return void
      */
-    function lfDeleteCustomer($customer_id)
-    {
-        return SC_Helper_Customer_Ex::delete($customer_id);
+    function lfDeleteCustomer($customer_id) {
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+
+        $sqlval['del_flg']      = 1;
+        $sqlval['update_date']  = 'CURRENT_TIMESTAMP';
+        $where                  = 'customer_id = ?';
+        $objQuery->update('dtb_customer', $sqlval, $where, array($customer_id));
     }
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Delivery extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Delivery extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = 'お届け先追加･変更';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -68,6 +65,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer    = new SC_Customer_Ex();
@@ -89,5 +85,5 @@
                 }
 
-                $objAddress->deleteAddress($objFormParam->getValue('other_deliv_id'));
+                $objAddress->delete($objFormParam->getValue('other_deliv_id'));
                 break;
 
@@ -129,6 +125,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -139,6 +134,5 @@
      * @return SC_FormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('お届け先ID', 'other_deliv_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('現在ページ', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
@@ -152,6 +146,5 @@
      * return array
      */
-    function setPref($arrOtherDeliv, $arrPref)
-    {
+    function setPref($arrOtherDeliv, $arrPref) {
         if (is_array($arrOtherDeliv)) {
             foreach ($arrOtherDeliv as $key => $arrDeliv) {
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_AbstractMypage extends LC_Page_Ex 
-{
+class LC_Page_AbstractMypage extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         // mypage 共通
@@ -57,6 +55,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
 
         parent::process();
@@ -106,6 +103,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php	(revision 22591)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Change extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Change extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '会員登録内容変更(入力ページ)';
@@ -69,6 +67,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -78,6 +75,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
@@ -170,6 +166,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -183,6 +178,5 @@
      * @return void
      */
-    function lfRegistCustomerData(&$objFormParam, $customer_id)
-    {
+    function lfRegistCustomerData(&$objFormParam, $customer_id) {
         $arrRet             = $objFormParam->getHashArray();
         $sqlval             = $objFormParam->getDbArray();
@@ -198,6 +192,5 @@
      * @return array $arrErr エラーメッセージ配列
      */
-    function lfCheckError($arrRequest)
-    {
+    function lfCheckError($arrRequest) {
         // パラメーター管理クラス
         $objFormParam = new SC_FormParam_Ex();
@@ -211,6 +204,28 @@
         // エラーチェック
         $arrErr = $objFormParam->checkError();
+        // 親ウィンドウの戻り値を格納するinputタグのnameのエラーチェック
+        if (!$this->lfInputNameCheck($addData['zip01'])) {
+            $arrErr['zip01'] = '※ 入力形式が不正です。<br />';
+        }
+        if (!$this->lfInputNameCheck($arrdata['zip02'])) {
+            $arrErr['zip02'] = '※ 入力形式が不正です。<br />';
+        }
 
         return $arrErr;
     }
+
+    /**
+     * エラーチェック.
+     *
+     * @param string $value
+     * @return エラーなし：true エラー：false
+     */
+    function lfInputNameCheck($value) {
+        // 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー
+        if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
+            return false;
+        }
+
+        return true;
+    }
 }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_DownLoad extends LC_Page_Ex 
-{
+class LC_Page_Mypage_DownLoad extends LC_Page_Ex {
 
     // {{{ properties
@@ -57,6 +56,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->allowClientCache();
@@ -68,6 +66,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         ob_end_clean();
         parent::process();
@@ -81,6 +78,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // ログインチェック
@@ -109,6 +105,5 @@
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         // TODO sendResponseをオーバーライドしている為、afterフックポイントが実行されない.直接実行する.(#1790)
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
@@ -170,6 +165,5 @@
      * @return array 商品情報の配列
      */
-    function lfGetRealFileName($customer_id, $order_id, $product_id, $product_class_id)
-    {
+    function lfGetRealFileName($customer_id, $order_id, $product_id, $product_class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = <<< __EOS__
@@ -200,6 +194,5 @@
 
     /* パラメーター情報の初期化 */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('customer_id', 'customer_id', INT_LEN, 'n', array('EXIST_CHECK','NUM_CHECK'));
         $objFormParam->addParam('order_id', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
@@ -209,6 +202,5 @@
 
     /* 入力内容のチェック */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
@@ -222,6 +214,5 @@
      * @param string $sdown_filename ダウンロード時の指定ファイル名
      */
-    function lfMobileHeader($realpath,$sdown_filename)
-    {
+    function lfMobileHeader($realpath,$sdown_filename) {
         $objHelperMobile = new SC_Helper_Mobile_Ex();
         //ファイルの拡張子からコンテンツタイプを取得する
@@ -240,6 +231,5 @@
      * @param string $sdown_filename ダウンロード時の指定ファイル名
      */
-    function lfMobileAuDownload($realpath,$sdown_filename)
-    {
+    function lfMobileAuDownload($realpath,$sdown_filename) {
         //モバイル用ヘッダー出力
         $this->lfMobileHeader($realpath,$sdown_filename);
@@ -263,5 +253,6 @@
         }
         echo fread($fp, $content_length) ;
-        SC_Utils_Ex::sfFlush();
+        ob_flush();
+        flush();
     }
 
@@ -272,6 +263,5 @@
      * @param string $sdown_filename ダウンロード時の指定ファイル名
      */
-    function lfMobileDownload($realpath,$sdown_filename)
-    {
+    function lfMobileDownload($realpath,$sdown_filename) {
         //モバイル用ヘッダー出力
         $this->lfMobileHeader($realpath,$sdown_filename);
@@ -316,6 +306,6 @@
                 $buffer = fread($realpath, $chunksize);
                 print($buffer);
-                SC_Utils_Ex::sfFlush();
-                SC_Utils_Ex::extendTimeOut();
+                ob_flush();
+                flush();
                 $bytes_send += strlen($buffer);
             }
@@ -331,6 +321,5 @@
      * @param string $sdown_filename ダウンロード時の指定ファイル名
      */
-    function lfDownload($realpath,$sdown_filename)
-    {
+    function lfDownload($realpath,$sdown_filename) {
         // 拡張子を取得
         $extension = pathinfo($realpath, PATHINFO_EXTENSION);
@@ -373,6 +362,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Login extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Login extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->httpCacheControl('nocache');
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -76,6 +72,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_RefusalComplete extends LC_Page_Ex 
-{
+class LC_Page_Mypage_RefusalComplete extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title    = 'MYページ';
@@ -63,6 +61,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -75,6 +72,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -86,6 +82,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_Order extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Order extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -63,6 +60,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         //受注詳細データの取得
@@ -85,12 +81,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // 受注詳細データの取得
-    function lfGetOrderDetail($order_id)
-    {
+    function lfGetOrderDetail($order_id) {
         $objQuery       = SC_Query_Ex::getSingletonInstance();
 
@@ -110,6 +104,5 @@
 
     // 商品をカートに追加
-    function lfAddCartProducts($arrOrderDetail)
-    {
+    function lfAddCartProducts($arrOrderDetail) {
 
         $objCartSess = new SC_CartSession_Ex();
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_MailView extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_MailView extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->httpCacheControl('nocache');
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
@@ -105,6 +101,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -118,6 +113,5 @@
      * @return array
      */
-    function lfGetMailView($send_id, $customer_id)
-    {
+    function lfGetMailView($send_id, $customer_id) {
         $objQuery   = SC_Query_Ex::getSingletonInstance();
         $col        = 'subject, mail_body';
Index: /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_ChangeComplete extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_ChangeComplete extends LC_Page_AbstractMypage_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '会員登録内容変更(完了ページ)';
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -76,6 +72,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Mypage_DeliveryAddr extends LC_Page_Ex 
-{
+class LC_Page_Mypage_DeliveryAddr extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title    = 'お届け先の追加･変更';
@@ -60,6 +58,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
@@ -140,5 +136,5 @@
 
                 if ($_GET['other_deliv_id'] != '') {
-                    $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id']);
+                    $arrOtherDeliv = $objAddress->get($_SESSION['other_deliv_id']);
 
                     //不正アクセス判定
@@ -166,12 +162,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* 登録実行 */
-    function lfRegistData($objAddress, $objFormParam, $customer_id)
-    {
+    function lfRegistData($objAddress, $objFormParam, $customer_id) {
         $arrRet     = $objFormParam->getHashArray();
         $sqlval     = $objFormParam->getDbArray();
@@ -180,9 +174,8 @@
         $sqlval['customer_id'] = $customer_id;
 
-        $objAddress->registAddress($sqlval);
+        $objAddress->save($sqlval);
     }
 
-    function lfRegistDataNonMember($objFormParam)
-    {
+    function lfRegistDataNonMember($objFormParam) {
         $arrRegistColumn = $objFormParam->getDbArray();
         foreach ($arrRegistColumn as $key => $val) {
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_InputZip extends LC_Page_Ex 
-{
+class LC_Page_InputZip extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_message = '住所を検索しています。';
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $objView = new SC_SiteView_Ex(false);
 
@@ -93,6 +90,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -104,6 +100,5 @@
      * @return array $arrErr エラーメッセージ配列
      */
-    function fnErrorCheck($arrRequest)
-    {
+    function fnErrorCheck($arrRequest) {
         // パラメーター管理クラス
         $objFormParam = new SC_FormParam_Ex();
@@ -132,6 +127,5 @@
      * @return エラーなし：true エラー：false
      */
-    function lfInputNameCheck($value)
-    {
+    function lfInputNameCheck($value) {
         // 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー
         if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
Index: /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_Shopping_Complete.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Shopping_Complete extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Complete extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'ご注文完了';
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
@@ -80,6 +76,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -88,6 +83,5 @@
      * 決済モジュールから遷移する場合があるため, トークンチェックしない.
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // nothing.
     }
Index: /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Multiple extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Multiple extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'お届け先の複数指定';
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -67,6 +64,6 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
+
         $objSiteSess = new SC_SiteSession_Ex();
         $objCartSess = new SC_CartSession_Ex();
@@ -118,4 +115,6 @@
         }
         $this->arrForm = $objFormParam->getFormParamList();
+
+
     }
 
@@ -125,6 +124,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -136,6 +134,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('商品名', 'name');
@@ -146,5 +143,5 @@
         $objFormParam->addParam('メイン画像', 'main_image');
         $objFormParam->addParam('メイン一覧画像', 'main_list_image');
-        $objFormParam->addParam(SALE_PRICE_TITLE, 'price');
+        $objFormParam->addParam('販売価格', 'price');
         $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
         $objFormParam->addParam('お届け先', 'shipping', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -160,6 +157,5 @@
      * @return void
      */
-    function setParamToSplitItems(&$objFormParam, &$objCartSess)
-    {
+    function setParamToSplitItems(&$objFormParam, &$objCartSess) {
         $cartLists =& $objCartSess->getCartList($objCartSess->getKey());
         $arrItems = array();
@@ -192,6 +188,5 @@
      * @return array 配送住所のプルダウン用連想配列
      */
-    function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress, $uniqid)
-    {
+    function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress, $uniqid) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrPref = $masterData->getMasterData('mtb_pref');
@@ -234,5 +229,4 @@
             }
         }
-
         return $arrResults;
     }
@@ -244,6 +238,5 @@
      * @return array エラー情報の配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objCartSess = new SC_CartSession_Ex();
 
@@ -291,5 +284,4 @@
             }
         }
-
         return $arrErr;
     }
@@ -307,6 +299,5 @@
      * @return void
      */
-    function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess, &$objAddress)
-    {
+    function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess, &$objAddress) {
         $arrParams = $objFormParam->getSwapArray();
 
@@ -316,5 +307,5 @@
             if ($objCustomer->isLoginSuccess(true)) {
                 if ($other_deliv_id != 0) {
-                    $otherDeliv = $objAddress->getAddress($other_deliv_id);
+                    $otherDeliv = $objAddress->get($other_deliv_id);
                     foreach ($otherDeliv as $key => $val) {
                         $arrValues[$other_deliv_id]['shipping_' . $key] = $val;
Index: /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Confirm extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Confirm extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'ご入力内容のご確認';
@@ -52,5 +50,5 @@
         $this->arrMAILMAGATYPE = $masterData->getMasterData('mtb_mail_magazine_type');
         $this->arrReminder = $masterData->getMasterData('mtb_reminder');
-        $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList('service_name');
+        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'service_name');
         $this->httpCacheControl('nocache');
     }
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -73,6 +70,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCartSess = new SC_CartSession_Ex();
@@ -168,5 +164,8 @@
                 else {
                     $objPurchase->completeOrder(ORDER_NEW);
-                    SC_Helper_Purchase_Ex::sendOrderMail($this->arrForm['order_id']);
+                    $template_id = SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1;
+                    $objHelperMail->sfSendOrderMail(
+                            $this->arrForm['order_id'],
+                            $template_id);
 
                     SC_Response_Ex::sendRedirect(SHOPPING_COMPLETE_URLPATH);
@@ -185,6 +184,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22568)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Payment extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Payment extends LC_Page_Ex {
 
     // {{{ properties
@@ -51,6 +50,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_onload = 'fnCheckInputPoint();';
@@ -65,6 +63,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -77,6 +74,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objSiteSess = new SC_SiteSession_Ex();
@@ -85,5 +81,4 @@
         $objCustomer = new SC_Customer_Ex();
         $objFormParam = new SC_FormParam_Ex();
-        $objDelivery = new SC_Helper_Delivery_Ex();
 
         $this->is_multiple = $objPurchase->isMultiple();
@@ -98,5 +93,5 @@
 
         // 配送業者を取得
-        $this->arrDeliv = $objDelivery->getList($cart_key);
+        $this->arrDeliv = $objPurchase->getDeliv($cart_key);
         $this->is_single_deliv = $this->isSingleDeliv($this->arrDeliv);
 
@@ -252,6 +247,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -265,6 +259,5 @@
      * @param array $arrShipping 配送先情報の配列
      */
-    function setFormParams(&$objFormParam, $arrParam, $deliv_only, &$arrShipping)
-    {
+    function setFormParams(&$objFormParam, $arrParam, $deliv_only, &$arrShipping) {
         $this->lfInitParam($objFormParam, $deliv_only, $arrShipping);
         $objFormParam->setParam($arrParam);
@@ -280,6 +273,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping)
-    {
+    function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping) {
         $objFormParam->addParam('配送業者', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('ポイント', 'use_point', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK', 'ZERO_START'));
@@ -310,6 +302,5 @@
      * @return array 入力チェック結果の配列
      */
-    function lfCheckError(&$objFormParam, $subtotal, $max_point)
-    {
+    function lfCheckError(&$objFormParam, $subtotal, $max_point) {
         $objPurchase = new SC_Helper_Purchase_Ex();
         // 入力データを渡す。
@@ -336,6 +327,5 @@
             }
             // ポイント差し引き後の決済方法チェック
-            $objPayment = new SC_Helper_Payment_Ex();
-            $arrPayments = $objPayment->get($arrForm['payment_id']);
+            $arrPayments = $objPurchase->getPaymentsByPaymentsId($arrForm['payment_id']);
             if ($arrPayments['rule_max'] > $subtotal - $arrForm['use_point'] * POINT_VALUE) {
                 $objErr->arrErr['use_point'] = '※ 選択した支払方法では、ポイントは'.($subtotal - $arrPayments['rule_max']).'ポイントまでご利用いただけます。<br>';
@@ -351,6 +341,5 @@
      * @param array $arrDelivTime 配送時間の配列
      */
-    function saveShippings(&$objFormParam, $arrDelivTime)
-    {
+    function saveShippings(&$objFormParam, $arrDelivTime) {
         $deliv_id = $objFormParam->getValue('deliv_id');
 
@@ -378,6 +367,5 @@
      * @return void
      */
-    function lfRegistData($uniqid, $arrForm, &$objPurchase, $arrPayment)
-    {
+    function lfRegistData($uniqid, $arrForm, &$objPurchase, $arrPayment) {
 
         $arrForm['order_temp_id'] = $uniqid;
@@ -411,19 +399,9 @@
      * @return array 支払い方法, お届け時間を格納した配列
      */
-    function getSelectedDeliv(&$objPurchase, &$objCartSess, $deliv_id)
-    {
+    function getSelectedDeliv(&$objPurchase, &$objCartSess, $deliv_id) {
         $arrResults = array();
-        $arrResults['arrDelivTime'] = SC_Helper_Delivery_Ex::getDelivTime($deliv_id);
-        $total = $objCartSess->getAllProductsTotal($objCartSess->getKey());
-        $payments_deliv = SC_Helper_Delivery_Ex::getPayments($deliv_id);
-        $objPayment = new SC_Helper_Payment_Ex();
-        $payments_total = $objPayment->getByPrice($total);
-        $arrPayment = array();
-        foreach ($payments_total as $payment) {
-            if (in_array($payment['payment_id'], $payments_deliv)) {
-                $arrPayment[] = $payment;
-            }
-        }
-        $arrResults['arrPayment'] = $arrPayment;
+        $arrResults['arrDelivTime'] = $objPurchase->getDelivTime($deliv_id);
+        $total = $objCartSess->getAllProductsTotal($objCartSess->getKey(), $deliv_id);
+        $arrResults['arrPayment'] = $objPurchase->getPaymentsByPrice($total, $deliv_id);
         $arrResults['img_show'] = $this->hasPaymentImage($arrResults['arrPayment']);
         return $arrResults;
@@ -436,6 +414,5 @@
      * @return boolean 支払い方法の画像がある場合 true
      */
-    function hasPaymentImage($arrPayment)
-    {
+    function hasPaymentImage($arrPayment) {
         foreach ($arrPayment as $val) {
             if (!SC_Utils_Ex::isBlank($val['payment_image'])) {
@@ -452,6 +429,5 @@
      * @return boolean 配送業者が1社のみの場合 true
      */
-    function isSingleDeliv($arrDeliv)
-    {
+    function isSingleDeliv($arrDeliv) {
         if (count($arrDeliv) == 1) {
             return true;
@@ -468,6 +444,5 @@
      * @return string モバイル用テンプレートのパス
      */
-    function getMobileMainpage($is_single_deliv = true, $mode)
-    {
+    function getMobileMainpage($is_single_deliv = true, $mode) {
         switch ($mode) {
             case 'select_deliv':
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping extends LC_Page_Ex 
-{
+class LC_Page_Shopping extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'ログイン';
@@ -66,6 +64,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -78,6 +75,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objSiteSess = new SC_SiteSession_Ex();
@@ -276,6 +272,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -287,6 +282,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
 
         $objFormParam->addParam('お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -325,4 +319,5 @@
         $objFormParam->addParam('電話番号2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
         $objFormParam->addParam('電話番号3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('メールマガジン', 'mail_flag', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
     }
 
@@ -333,6 +328,5 @@
      * @return void
      */
-    function lfInitLoginFormParam(&$objFormParam)
-    {
+    function lfInitLoginFormParam(&$objFormParam) {
         $objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('メールアドレス', 'login_email', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -354,9 +348,7 @@
      * @return string 遷移先のパス
      */
-    function getNextLocation($product_type_id, $uniqid, &$objCustomer, &$objPurchase, &$objSiteSess)
-    {
+    function getNextLocation($product_type_id, $uniqid, &$objCustomer, &$objPurchase, &$objSiteSess) {
         switch ($product_type_id) {
             case PRODUCT_TYPE_DOWNLOAD:
-                $objPurchase->unsetAllShippingTemp(true);
                 $objPurchase->saveOrderTemp($uniqid, array(), $objCustomer);
                 $objSiteSess->setRegistFlag();
@@ -379,6 +371,5 @@
      * @param boolean $isMultiple 複数配送の場合 true
      */
-    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false)
-    {
+    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false) {
         $arrParams = $objFormParam->getHashArray();
 
@@ -423,6 +414,5 @@
      * @return array エラー情報の配
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力値の変換
         $objFormParam->convParam();
@@ -473,6 +463,5 @@
      * @return void
      */
-    function setFormParams(&$objFormParam, &$objPurchase, $uniqid)
-    {
+    function setFormParams(&$objFormParam, &$objPurchase, $uniqid) {
         $arrOrderTemp = $objPurchase->getOrderTemp($uniqid);
         if (SC_Utils_Ex::isBlank($arrOrderTemp)) {
@@ -492,9 +481,5 @@
             $objFormParam->setParam($arrShippingTemp[1]);
         } else {
-            if ($arrOrderTemp['deliv_check'] == 1) {
-                $objFormParam->setParam($arrShippingTemp[1]);
-            } else {
-                $objFormParam->setParam($arrShippingTemp[0]);
-            }
+            $objFormParam->setParam($arrShippingTemp[0]);
         }
         $objFormParam->setValue('order_email02', $arrOrderTemp['order_email']);
@@ -512,6 +497,5 @@
      * @see LC_PageError
      */
-    function lfGetErrorMessage($error)
-    {
+    function lfGetErrorMessage($error) {
         switch ($error) {
             case TEMP_LOGIN_ERROR:
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_Deliv extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Deliv extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
@@ -57,6 +55,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objSiteSess = new SC_SiteSession_Ex();
@@ -114,5 +110,5 @@
             // 削除
             case 'delete':
-                $objAddress->deleteAddress($arrForm['other_deliv_id']);
+                $objAddress->delete($arrForm['other_deliv_id']);
                 break;
 
@@ -195,6 +191,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -206,6 +201,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('その他のお届け先ID', 'other_deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('お届け先チェック', 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));
@@ -225,6 +219,5 @@
      * @return boolean お届け先チェックの値が妥当な場合 true
      */
-    function registerDeliv($other_deliv_id, $uniqid, &$objPurchase, &$objCustomer, $objAddress)
-    {
+    function registerDeliv($other_deliv_id, $uniqid, &$objPurchase, &$objCustomer, $objAddress) {
         GC_Utils_Ex::gfDebugLog('register deliv. deliv_check=' . $deliv_check);
         $arrValues = array();
@@ -235,5 +228,5 @@
         // 別のお届け先がチェックされている場合
         else {
-            $arrOtherDeliv = $objAddress->getAddress($other_deliv_id);
+            $arrOtherDeliv = $objAddress->get($other_deliv_id);
             if (!$arrOtherDeliv) {
                 return false;
Index: /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php	(revision 22796)
@@ -35,6 +35,5 @@
  * @version $Id$
  */
-class LC_Page_Shopping_LoadPaymentModule extends LC_Page_Ex 
-{
+class LC_Page_Shopping_LoadPaymentModule extends LC_Page_Ex {
 
     // }}}
@@ -46,6 +45,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
 
         $order_id = $this->getOrderId();
@@ -79,6 +76,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -94,13 +90,14 @@
      *                        失敗した場合 false
      */
-    function getModulePath($order_id)
-    {
-        $objPurchase = new SC_Helper_Purchase_Ex();
-        $objPayment = new SC_Helper_Payment_Ex();
-
-        $order = $objPurchase->getOrder($order_id);
-        $payment = $objPayment->get($order['payment_id']);
-        $module_path = $payment['module_path'];
-
+    function getModulePath($order_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $sql = <<< __EOS__
+            SELECT module_path
+            FROM dtb_payment T1
+                JOIN dtb_order T2
+                    ON T1.payment_id = T2.payment_id
+            WHERE order_id = ?
+__EOS__;
+        $module_path = $objQuery->getOne($sql, array($order_id));
         if (file_exists($module_path)) {
             return $module_path;
@@ -124,6 +121,5 @@
      *                         失敗した場合は, false を返す.
      */
-    function getOrderId()
-    {
+    function getOrderId() {
         if (isset($_SESSION['order_id'])
             && !SC_Utils_Ex::isBlank($_SESSION['order_id'])
@@ -149,6 +145,5 @@
      * 決済モジュールから遷移する場合があるため, トークンチェックしない.
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // nothing.
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_Upgrade_Download extends LC_Page_Upgrade_Base 
-{
+class LC_Page_Upgrade_Download extends LC_Page_Upgrade_Base {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process($mode)
-    {
+    function process($mode) {
         $objLog  = new LC_Upgrade_Helper_Log;
         $objLog->start($mode);
@@ -248,11 +245,9 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function initParam()
-    {
+    function initParam() {
         $this->objForm = new SC_FormParam_Ex();
         $this->objForm->addParam(
@@ -267,6 +262,5 @@
      * @param object $objRet
      */
-    function updateMdlTable($objRet)
-    {
+    function updateMdlTable($objRet) {
         $table = 'dtb_module';
         $where = 'module_id = ?';
@@ -301,6 +295,5 @@
      * @return
      */
-    function notifyDownload($mode, $arrCookies)
-    {
+    function notifyDownload($mode, $arrCookies) {
         $arrPOSTParams = array(
             'eccube_url' => HTTP_URL
@@ -315,6 +308,5 @@
      * @return boolean
      */
-    function isValidAccess($mode)
-    {
+    function isValidAccess($mode) {
         $objLog = new LC_Upgrade_Helper_Log;
         switch ($mode) {
@@ -366,6 +358,5 @@
     }
 
-    function registerUpdateLog($arrLog, $objRet)
-    {
+    function registerUpdateLog($arrLog, $objRet) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrInsert = array(
@@ -389,6 +380,5 @@
      * LC_Update_Updater::execute()で処理を実行する.
      */
-    function fileExecute($productCode)
-    {
+    function fileExecute($productCode) {
         $file = DATA_REALDIR . 'downloads/update/' . $productCode . '_update.php';
         if (file_exists($file)) {
Index: /branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php	(revision 22796)
@@ -26,6 +26,5 @@
  *
  */
-class LC_Upgrade_Helper_Log 
-{
+class LC_Upgrade_Helper_Log {
     /**
      * 開始メッセージを出力
@@ -33,6 +32,5 @@
      * @param string $mode
      */
-    function start($mode)
-    {
+    function start($mode) {
         $message = "##### $mode start #####";
         $this->log($message);
@@ -43,6 +41,5 @@
      * @param string $mode
      */
-    function end()
-    {
+    function end() {
         $message = '##### end #####';
         $this->log($message);
@@ -53,6 +50,5 @@
      * @param string $message
      */
-    function log($message)
-    {
+    function log($message) {
         GC_Utils_Ex::gfPrintLog($message, OSTORE_LOG_REALFILE);
     }
@@ -63,6 +59,5 @@
      * @param mixed $val
      */
-    function error($code, $val = null)
-    {
+    function error($code, $val = null) {
         $format = '* error! code:%s / debug:%s';
         $message = sprintf($format, $code, serialize($val));
Index: /branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php	(revision 22796)
@@ -4,6 +4,5 @@
  *
  */
-class LC_Upgrade_Helper_Json extends Services_JSON 
-{
+class LC_Upgrade_Helper_Json extends Services_JSON {
     /** */
     var $arrData = array(
@@ -19,6 +18,5 @@
      * @return SC_Upgrade_Helper_Json
      */
-    function __construct()
-    {
+    function __construct() {
         parent::Services_JSON();
     }
@@ -28,11 +26,9 @@
      *
      */
-    function isError()
-    {
+    function isError() {
         return $this->isSuccess() ? false : true;
     }
 
-    function isSuccess()
-    {
+    function isSuccess() {
         if ($this->arrData['status'] === OSTORE_STATUS_SUCCESS) {
             return true;
@@ -47,6 +43,5 @@
      * @param unknown_type $errMessage
      */
-    function setError($errCode)
-    {
+    function setError($errCode) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrOStoreErrMsg = $masterData->getMasterData('mtb_ownersstore_err');
@@ -64,6 +59,5 @@
      * @param mixed $data
      */
-    function setSuccess($data = array(), $msg = '')
-    {
+    function setSuccess($data = array(), $msg = '') {
         $this->arrData['status'] = OSTORE_STATUS_SUCCESS;
         $this->arrData['data']   = $data;
@@ -75,6 +69,5 @@
      *
      */
-    function display()
-    {
+    function display() {
         header('Content-Type: text/javascript; charset=UTF-8');
         echo $this->encode($this->arrData);
@@ -92,6 +85,5 @@
      * @see SC_Utils_Ex::jsonDecode
      */
-    function decode($str)
-    {
+    function decode($str) {
         return SC_Utils_Ex::jsonDecode($str);
     }
Index: /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	(revision 22796)
@@ -12,8 +12,6 @@
  * @version $Id$
  */
-class LC_Page_Upgrade_Base extends LC_Page_Ex 
-{
-    function isValidIP()
-    {
+class LC_Page_Upgrade_Base extends LC_Page_Ex {
+    function isValidIP() {
         $objLog  = new LC_Upgrade_Helper_Log;
         $masterData = new SC_DB_MasterData_Ex();
@@ -36,6 +34,5 @@
      * @return boolean
      */
-    function autoUpdateEnable($product_id)
-    {
+    function autoUpdateEnable($product_id) {
         $where = 'module_id = ?';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -58,6 +55,5 @@
      * @return string|object レスポンスボディ|エラー時にはPEAR::Errorオブジェクトを返す.
      */
-    function request($mode, $arrParams = array(), $arrCookies = array())
-    {
+    function request($mode, $arrParams = array(), $arrCookies = array()) {
         $objReq = new HTTP_Request();
         $objReq->setUrl(OSTORE_URL . 'upgrade/index.php');
@@ -80,6 +76,5 @@
     }
 
-    function isLoggedInAdminPage()
-    {
+    function isLoggedInAdminPage() {
         $objSess = new SC_Session_Ex();
 
@@ -95,11 +90,9 @@
      * @return string
      */
-    function createSeed()
-    {
+    function createSeed() {
         return sha1(uniqid(rand(), true) . time());
     }
 
-    function getPublicKey()
-    {
+    function getPublicKey() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('*', 'dtb_ownersstore_settings');
@@ -112,6 +105,5 @@
      * オーナーズストアからの POST のため, トークンチェックしない.
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // nothing.
     }
Index: /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Upgrade_ProductsList extends LC_Page_Upgrade_Base 
-{
+class LC_Page_Upgrade_ProductsList extends LC_Page_Upgrade_Base {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process($mode)
-    {
+    function process($mode) {
         $objLog  = new LC_Upgrade_Helper_Log;
         $objJson = new LC_Upgrade_Helper_Json;
@@ -160,6 +157,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Upgrade_SiteCheck extends LC_Page_Upgrade_Base 
-{
+class LC_Page_Upgrade_SiteCheck extends LC_Page_Upgrade_Base {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {}
+    function init() {}
 
     /**
@@ -51,6 +49,5 @@
      * @return void
      */
-    function process($mode)
-    {
+    function process($mode) {
         $objLog  = new LC_Upgrade_Helper_LOG;
         $objJson = new LC_Upgrade_Helper_Json;
@@ -81,5 +78,4 @@
      * @return void
      */
-    function destroy()
-    {}
+    function destroy() {}
 }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_CSS extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_CSS extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/css.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objLayout = new SC_Helper_PageLayout_Ex();
@@ -146,6 +142,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -157,6 +152,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('CSSファイル名', 'css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
@@ -178,6 +172,5 @@
      * @return boolean 登録が成功した場合 true; 失敗した場合 false
      */
-    function doRegister($css_dir, $css_name, $old_css_name, $css_path, $css_data)
-    {
+    function doRegister($css_dir, $css_name, $old_css_name, $css_path, $css_data) {
         $objFileManager = new SC_Helper_FileManager_Ex();
 
@@ -203,6 +196,5 @@
      * @return boolean 削除が成功した場合 true; 失敗した場合 false
      */
-    function doDelete($css_path)
-    {
+    function doDelete($css_path) {
         if (!unlink($css_path)) {
             $this->arrErr['err'] = '※ CSSの削除に失敗しました<br />';
@@ -218,6 +210,5 @@
      * @return array ファイルリスト
      */
-    function getCSSList($css_dir)
-    {
+    function getCSSList($css_dir) {
         $objFileManager = new SC_Helper_FileManager_Ex();
 
@@ -240,6 +231,5 @@
      * @return array エラーメッセージの配列
      */
-    function lfCheckError(&$objFormParam, &$arrErr)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
@@ -276,6 +266,5 @@
      * @return string CSSディレクトリ
      */
-    function getCSSDir($device_type_id)
-    {
+    function getCSSDir($device_type_id) {
         return SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id, true) . 'css/';
     }
@@ -286,6 +275,5 @@
      * @return boolean 
      */
-    function checkPath($str)
-    {
+    function checkPath($str) {
         // 含む場合はfalse
         if (preg_match('|\./|', $str)) {
Index: /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_Header extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_Header extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/header.tpl';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -73,6 +70,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -125,6 +121,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -136,6 +131,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('division', 'division', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
@@ -150,6 +144,5 @@
      * @return array エラーメッセージの配列
      */
-    function lfCheckError(&$objFormParam, &$arrErr)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
@@ -167,6 +160,5 @@
      * @return integer|boolean 登録が成功した場合 true; 失敗した場合 false
      */
-    function doRegister(&$objFormParam)
-    {
+    function doRegister(&$objFormParam) {
         $division = $objFormParam->getValue('division');
         $contents = $objFormParam->getValue($division);
@@ -187,6 +179,5 @@
      * @return string|boolean 成功した場合, テンプレートのパス; 失敗した場合 false
      */
-    function getTemplatePath($device_type_id, $division)
-    {
+    function getTemplatePath($device_type_id, $division) {
         $tpl_path = SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id) . '/' . $division . '.tpl';
         if (file_exists($tpl_path)) {
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_MainEdit extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_MainEdit extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/main_edit.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objLayout = new SC_Helper_PageLayout_Ex();
@@ -145,6 +141,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -158,6 +153,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -178,6 +172,5 @@
      * @return array ページデータの配列
      */
-    function getTplMainpage($device_type_id, $page_id, &$objLayout)
-    {
+    function getTplMainpage($device_type_id, $page_id, &$objLayout) {
         $arrPageData = $objLayout->getPageProperties($device_type_id, $page_id);
 
@@ -203,6 +196,5 @@
      *                         失敗した場合 false
      */
-    function doRegister(&$objFormParam, &$objLayout)
-    {
+    function doRegister(&$objFormParam, &$objLayout) {
         $filename = $objFormParam->getValue('filename');
         $arrParams['device_type_id'] = $objFormParam->getValue('device_type_id');
@@ -259,6 +251,5 @@
      * @return integer ページID
      */
-    function registerPage($arrParams, &$objLayout)
-    {
+    function registerPage($arrParams, &$objLayout) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -304,6 +295,5 @@
      * @return array エラーメッセージの配列
      */
-    function lfCheckError(&$objFormParam, &$arrErr)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
@@ -354,6 +344,5 @@
      * @return boolean 作成に成功した場合 true
      */
-    function createPHPFile($filename)
-    {
+    function createPHPFile($filename) {
         $path = USER_REALDIR . $filename . '.php';
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_Template extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_Template extends LC_Page_Admin_Ex {
 
     // }}}
@@ -42,6 +41,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/template.tpl';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -73,6 +70,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -142,6 +138,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -153,6 +148,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('template_code', 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK'));
@@ -168,6 +162,5 @@
      * @return void
      */
-    function doUpdateMasterData($template_code, $device_type_id)
-    {
+    function doUpdateMasterData($template_code, $device_type_id) {
         $masterData = new SC_DB_MasterData_Ex();
 
@@ -204,6 +197,5 @@
      * @return void
      */
-    function updateBloc($filepath)
-    {
+    function updateBloc($filepath) {
         $sql = file_get_contents($filepath);
         if ($sql !== false) {
@@ -227,6 +219,5 @@
      * @return boolean 成功した場合 true; 失敗した場合 false
      */
-    function doDelete($template_code, $device_type_id)
-    {
+    function doDelete($template_code, $device_type_id) {
         if ($template_code == $this->getTemplateName($device_type_id)
                 || $template_code == $this->getTemplateName($device_type_id, true)) {
@@ -276,6 +267,5 @@
      * @return boolean 成功した場合 true; 失敗した場合 false
      */
-    function doRegister($template_code, $device_type_id)
-    {
+    function doRegister($template_code, $device_type_id) {
 
         $tpl_dir = USER_TEMPLATE_REALDIR . $template_code . '/';
@@ -307,6 +297,5 @@
      * @return boolean 成功した場合 true; 失敗した場合 false
      */
-    function doDownload($template_code)
-    {
+    function doDownload($template_code) {
         $from_dir = USER_TEMPLATE_REALDIR . $template_code . '/';
         $to_dir = SMARTY_TEMPLATES_REALDIR . $template_code . '/_packages/';
@@ -329,6 +318,5 @@
      * @return array テンプレート情報の配列
      */
-    function getAllTemplates($device_type_id)
-    {
+    function getAllTemplates($device_type_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->select('*', 'dtb_templates', 'device_type_id = ?', array($device_type_id));
@@ -342,6 +330,5 @@
      * @return string テンプレート名
      */
-    function getTemplateName($device_type_id, $isDefault = false)
-    {
+    function getTemplateName($device_type_id, $isDefault = false) {
         switch ($device_type_id) {
             case DEVICE_TYPE_MOBILE:
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_UpDown extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_UpDown extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/up_down.tpl';
@@ -63,6 +61,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -76,6 +73,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -114,6 +110,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -125,6 +120,5 @@
      * @return object SC_UploadFileのインスタンス
      */
-    function lfInitUploadFile($objForm)
-    {
+    function lfInitUploadFile($objForm) {
         $pkg_dir = SMARTY_TEMPLATES_REALDIR . $objForm->getValue('template_code');
         $objUpFile = new SC_UploadFile_Ex(TEMPLATE_TEMP_REALDIR, $pkg_dir);
@@ -139,6 +133,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('テンプレートコード', 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK'));
         $objFormParam->addParam('テンプレート名', 'template_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -153,6 +146,5 @@
      * @return array エラー情報を格納した連想配列, エラーが無ければ(多分)nullを返す
      */
-    function lfCheckError(&$objFormParam, &$objUpFile)
-    {
+    function lfCheckError(&$objFormParam, &$objUpFile) {
         $arrErr = $objFormParam->checkError();
         $template_code = $objFormParam->getValue('template_code');
@@ -205,6 +197,5 @@
      * @return boolean 成功した場合 true; 失敗した場合 false
      */
-    function doUpload($objFormParam, $objUpFile)
-    {
+    function doUpload($objFormParam, $objUpFile) {
         $template_code = $objFormParam->getValue('template_code');
         $template_name = $objFormParam->getValue('template_name');
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 22610)
+++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design_Bloc extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_Bloc extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/bloc.tpl';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -73,6 +70,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -86,5 +82,4 @@
         $this->device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC);
 
-        $objBloc = new SC_Helper_Bloc_Ex($this->device_type_id);
         $objLayout = new SC_Helper_PageLayout_Ex();
 
@@ -93,7 +88,7 @@
             case 'confirm':
                 if (!$is_error) {
-                    $this->arrErr = $this->lfCheckError($objFormParam, $this->arrErr, $objBloc);
+                    $this->arrErr = $this->lfCheckError($objFormParam, $this->arrErr, $objLayout);
                     if (SC_Utils_Ex::isBlank($this->arrErr)) {
-                        $result = $this->doRegister($objFormParam, $objBloc);
+                        $result = $this->doRegister($objFormParam, $objLayout);
                         if ($result !== false) {
                             $arrPram = array(
@@ -113,5 +108,5 @@
             case 'delete':
                 if (!$is_error) {
-                    if ($this->doDelete($objFormParam, $objBloc)) {
+                    if ($this->doDelete($objFormParam, $objLayout)) {
                         $arrPram = array(
                             'device_type_id' => $this->device_type_id,
@@ -135,8 +130,8 @@
         if (!$is_error) {
             // ブロック一覧を取得
-            $this->arrBlocList = $objBloc->getList();
+            $this->arrBlocList = $objLayout->getBlocs($this->device_type_id);
             // bloc_id が指定されている場合にはブロックデータの取得
             if (!SC_Utils_Ex::isBlank($this->bloc_id)) {
-                $arrBloc = $this->getBlocTemplate($this->bloc_id, $objBloc);
+                $arrBloc = $this->getBlocTemplate($this->device_type_id, $this->bloc_id, $objLayout);
                 $objFormParam->setParam($arrBloc);
             }
@@ -155,6 +150,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -166,6 +160,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('ブロックID', 'bloc_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -178,12 +171,20 @@
      * ブロックのテンプレートを取得する.
      *
+     * @param integer $device_type_id 端末種別ID
      * @param integer $bloc_id ブロックID
-     * @param SC_Helper_Bloc_Ex $objBloc SC_Helper_Bloc_Ex インスタンス
+     * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
      * @return array ブロック情報の配列
      */
-    function getBlocTemplate($bloc_id, SC_Helper_Bloc_Ex &$objBloc)
-    {
-        $arrBloc = $objBloc->get($bloc_id);
-        return $arrBloc;
+    function getBlocTemplate($device_type_id, $bloc_id, &$objLayout) {
+        $arrBloc = $objLayout->getBlocs($device_type_id, 'bloc_id = ?', array($bloc_id));
+        if (SC_Utils_Ex::isAbsoluteRealPath($arrBloc[0]['tpl_path'])) {
+            $tpl_path = $arrBloc[0]['tpl_path'];
+        } else {
+            $tpl_path = SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id) . BLOC_DIR . $arrBloc[0]['tpl_path'];
+        }
+        if (file_exists($tpl_path)) {
+            $arrBloc[0]['bloc_html'] = file_get_contents($tpl_path);
+        }
+        return $arrBloc[0];
     }
 
@@ -195,18 +196,56 @@
      *
      * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param SC_Helper_Bloc $objBloc SC_Helper_Bloc インスタンス
+     * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
      * @return integer|boolean 登録が成功した場合, 登録したブロックID;
      *                         失敗した場合 false
      */
-    function doRegister(&$objFormParam, SC_Helper_Bloc_Ex &$objBloc)
-    {
+    function doRegister(&$objFormParam, &$objLayout) {
         $arrParams = $objFormParam->getHashArray();
-        $result = $objBloc->save($arrParams);
-
-        if (!$result) {
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->begin();
+
+        // blod_id が空の場合は新規登録
+        $is_new = SC_Utils_Ex::isBlank($arrParams['bloc_id']);
+        $bloc_dir = $objLayout->getTemplatePath($arrParams['device_type_id']) . BLOC_DIR;
+        // 既存データの重複チェック
+        if (!$is_new) {
+            $arrExists = $objLayout->getBlocs($arrParams['device_type_id'], 'bloc_id = ?', array($arrParams['bloc_id']));
+
+            // 既存のファイルが存在する場合は削除しておく
+            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
+            if (file_exists($exists_file)) {
+                unlink($exists_file);
+            }
+        }
+
+        $table = 'dtb_bloc';
+        $arrValues = $objQuery->extractOnlyColsOf($table, $arrParams);
+        $arrValues['tpl_path'] = $arrParams['filename'] . '.tpl';
+        $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
+
+        // 新規登録
+        if ($is_new || SC_Utils_Ex::isBlank($arrExists)) {
+            $objQuery->setOrder('');
+            $arrValues['bloc_id'] = 1 + $objQuery->max('bloc_id', $table, 'device_type_id = ?',
+                                                       array($arrValues['device_type_id']));
+            $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
+            $objQuery->insert($table, $arrValues);
+        }
+        // 更新
+        else {
+            $objQuery->update($table, $arrValues, 'bloc_id = ? AND device_type_id = ?',
+                              array($arrValues['bloc_id'], $arrValues['device_type_id']));
+        }
+
+        $bloc_path = $bloc_dir . $arrValues['tpl_path'];
+        if (!SC_Helper_FileManager_Ex::sfWriteFile($bloc_path, $arrParams['bloc_html'])) {
             $this->arrErr['err'] = '※ ブロックの書き込みに失敗しました<br />';
-        }
-
-        return $result;
+            $objQuery->rollback();
+            return false;
+        }
+
+        $objQuery->commit();
+        return $arrValues['bloc_id'];
     }
 
@@ -215,17 +254,41 @@
      *
      * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param SC_Helper_Bloc $objBloc SC_Helper_Bloc インスタンス
+     * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
      * @return boolean 登録が成功した場合 true; 失敗した場合 false
      */
-    function doDelete(&$objFormParam, SC_Helper_Bloc_Ex &$objBloc)
-    {
+    function doDelete(&$objFormParam, &$objLayout) {
         $arrParams = $objFormParam->getHashArray();
-        $result = $objBloc->delete($arrParams['bloc_id']);
-
-        if (!$result) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->begin();
+
+        $arrExists = $objLayout->getBlocs($arrParams['device_type_id'], 'bloc_id = ? AND deletable_flg = 1',
+                                          array($arrParams['bloc_id']));
+        $is_error = false;
+        if (!SC_Utils_Ex::isBlank($arrExists)) {
+            $objQuery->delete('dtb_bloc', 'bloc_id = ? AND device_type_id = ?',
+                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
+            $objQuery->delete('dtb_blocposition', 'bloc_id = ? AND device_type_id = ?',
+                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
+
+            $bloc_dir = $objLayout->getTemplatePath($arrParams['device_type_id']) . BLOC_DIR;
+            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
+
+            // ファイルの削除
+            if (file_exists($exists_file)) {
+                if (!unlink($exists_file)) {
+                    $is_error = true;
+                }
+            }
+        } else {
+            $is_error = true;
+        }
+
+        if ($is_error) {
             $this->arrErr['err'] = '※ ブロックの削除に失敗しました<br />';
-        }
-
-        return $result;
+            $objQuery->rollback();
+            return false;
+        }
+        $objQuery->commit();
+        return true;
     }
 
@@ -236,6 +299,5 @@
      * @return array エラーメッセージの配列
      */
-    function lfCheckError(&$objFormParam, &$arrErr, SC_Helper_Bloc_Ex &$objBloc)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr, &$objLayout) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
@@ -252,5 +314,5 @@
             $arrValues[] = $arrParams['bloc_id'];
         }
-        $arrBloc = $objBloc->getWhere($where, $arrValues);
+        $arrBloc = $objLayout->getBlocs($arrParams['device_type_id'], $where, $arrValues);
         if (!SC_Utils_Ex::isBlank($arrBloc)) {
             $objErr->arrErr['filename'] = '※ 同じファイル名のデータが存在しています。別のファイル名を入力してください。<br />';
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Design extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/index.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objLayout = new SC_Helper_PageLayout_Ex();
@@ -152,6 +148,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -164,6 +159,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam, $bloc_cnt = 0)
-    {
+    function lfInitParam(&$objFormParam, $bloc_cnt = 0) {
         $objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -187,6 +181,5 @@
      * @return array レイアウト情報の配列
      */
-    function getLayout($device_type_id, $page_id, &$objLayout)
-    {
+    function getLayout($device_type_id, $page_id, &$objLayout) {
         $arrResults = array();
         $i = 0;
@@ -219,6 +212,5 @@
      * @return void
      */
-    function copyBloc(&$arrDest, $arrFrom, $cnt)
-    {
+    function copyBloc(&$arrDest, $arrFrom, $cnt) {
         $arrDest[$cnt]['target_id'] = $this->arrTarget[$arrFrom['target_id']];
         $arrDest[$cnt]['bloc_id'] = $arrFrom['bloc_id'];
@@ -235,6 +227,5 @@
      * @return bool 存在する場合 true
      */
-    function existsBloc($arrBloc, $arrToBlocs)
-    {
+    function existsBloc($arrBloc, $arrToBlocs) {
         foreach ($arrToBlocs as $arrToBloc) {
             if ($arrBloc['bloc_id'] === $arrToBloc['bloc_id']) {
@@ -252,6 +243,5 @@
      * @return string プレビューを行う tpl_mainpage ファイル名
      */
-    function savePreviewData($page_id, &$objLayout)
-    {
+    function savePreviewData($page_id, &$objLayout) {
         $arrPageData = $objLayout->getPageProperties(DEVICE_TYPE_PC, $page_id);
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -268,6 +258,5 @@
      * @return void
      */
-    function placingBlocs(&$objFormParam, $is_preview = false)
-    {
+    function placingBlocs(&$objFormParam, $is_preview = false) {
         $page_id = $is_preview ? 0 : $objFormParam->getValue('page_id');
         $device_type_id = $objFormParam->getValue('device_type_id');
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'ownersstore/plugin.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         // パラメーター管理クラス
         $objFormParam = new SC_FormParam_Ex();
@@ -217,6 +213,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -229,6 +224,5 @@
      * @return void
      */
-    function initParam(&$objFormParam, $mode)
-    {
+    function initParam(&$objFormParam, $mode) {
         $objFormParam->addParam('mode', 'mode', INT_LEN, '', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('plugin_id', 'plugin_id', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -245,6 +239,5 @@
      * @return void
      */
-    function initUploadFile(&$objUpFile, $key)
-    {
+    function initUploadFile(&$objUpFile, $key) {
         $objUpFile->addFile('プラグインファイル', $key, explode(',', PLUGIN_EXTENSION), FILE_SIZE, true, 0, 0, false);
     }
@@ -257,6 +250,5 @@
      * @return array エラー情報を格納した連想配列.
      */
-    function checkUploadFile($file_key)
-    {
+    function checkUploadFile($file_key) {
         $objErr = new SC_CheckError_Ex();
         // 拡張子チェック
@@ -276,6 +268,5 @@
      * @return boolean インストール済の場合true インストールされていない場合false
      */
-    function isInstalledPlugin($plugin_code)
-    {
+    function isInstalledPlugin($plugin_code) {
         $plugin = SC_Plugin_Util_Ex::getPluginByPluginCode($plugin_code);
         if (!empty($plugin)) {
@@ -294,6 +285,5 @@
      * @return string $plugin_code プラグインコード.
      */
-    function getPluginCode($file_name)
-    {
+    function getPluginCode($file_name) {
         // 分解
         $array_ext = explode('.', $file_name);
@@ -310,6 +300,5 @@
      * @return string $plugin_dir_path プラグイン保存ディレクトリのパス.
      */
-    function getPluginDir($plugin_code)
-    {
+    function getPluginDir($plugin_code) {
         $plugin_dir_path = PLUGIN_UPLOAD_REALDIR . $plugin_code . '/';
         return $plugin_dir_path;
@@ -322,6 +311,5 @@
      * @return string $plugin_dir_path プラグイン保存ディレクトリのパス.
      */
-    function getHtmlPluginDir($plugin_code)
-    {
+    function getHtmlPluginDir($plugin_code) {
         $plugin_html_dir_path = PLUGIN_HTML_REALDIR . $plugin_code . '/';
         return $plugin_html_dir_path;
@@ -335,6 +323,5 @@
      * @return string $plugin_file_path クラスファイルのパス.
      */
-    function getPluginFilePath($plugin_code , $plugin_class)
-    {
+    function getPluginFilePath($plugin_code , $plugin_class) {
         $plugin_file_path = $this->getPluginDir($plugin_code) . $plugin_class . '.php';
         return $plugin_file_path;
@@ -348,6 +335,5 @@
      * @return array エラー情報を格納した連想配列.
      */
-    function installPlugin($archive_file_name, $key)
-    {
+    function installPlugin($archive_file_name, $key) {
         // 一時展開ディレクトリにファイルがある場合は事前に削除.
         $arrFileHash = SC_Helper_FileManager_Ex::sfGetFileList(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR);
@@ -439,6 +425,5 @@
      * @param string $plugin_html_dir_path プラグイン毎に生成されるhtmlディレクトリのパス.
      */
-    function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir_path ='')
-    {
+    function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir_path ='') {
         // 一時ディレクトリを削除.
         SC_Helper_FileManager_Ex::deleteFile($temp_dir, false);
@@ -459,6 +444,5 @@
      * @return array プラグイン情報の配列
      */
-    function getPluginInfo(ReflectionClass $objReflection)
-    {
+    function getPluginInfo(ReflectionClass $objReflection) {
         $arrStaticProps = $objReflection->getStaticProperties();
         $arrConstants   = $objReflection->getConstants();
@@ -498,6 +482,5 @@
      * @return array エラー情報を格納した連想配列.
      */
-    function checkPluginConstants(ReflectionClass $objReflection, $dir_path)
-    {
+    function checkPluginConstants(ReflectionClass $objReflection, $dir_path) {
         $arrErr = array();
         // プラグイン情報を取得
@@ -568,6 +551,5 @@
      * @return array エラー情報を格納した連想配列.
      */
-    function updatePlugin($target_plugin, $upload_file_name)
-    {
+    function updatePlugin($target_plugin, $upload_file_name) {
         // アップデート前に不要なファイルを消しておきます.
         SC_Helper_FileManager_Ex::deleteFile(DOWNLOADS_TEMP_PLUGIN_UPDATE_DIR, false);
@@ -617,6 +599,5 @@
      * @return array エラー情報を格納した連想配列.
      */
-    function unpackPluginFile($unpack_file_name, $unpack_dir_path, $file_key)
-    {
+    function unpackPluginFile($unpack_file_name, $unpack_dir_path, $file_key) {
         $arrErr = array();
         // 解凍ディレクトリディレクトリを作成し、一時ディレクトリからファイルを移動
@@ -649,6 +630,5 @@
      * @return array エラー情報を格納した連想配列.
      */
-    function uninstallPlugin($plugin)
-    {
+    function uninstallPlugin($plugin) {
         $arrErr = array();
         // プラグインファイルを読み込みます.
@@ -684,6 +664,5 @@
      * @return array $arrErr エラー情報を格納した連想配列.
      */
-    function enablePlugin($plugin)
-    {
+    function enablePlugin($plugin) {
         $arrErr = array();
         // クラスファイルを読み込み.
@@ -710,6 +689,5 @@
      * @return array $arrErr エラー情報を格納した連想配列.
      */
-    function disablePlugin($plugin)
-    {
+    function disablePlugin($plugin) {
         $arrErr = array();
         // クラスファイルを読み込み.
@@ -738,6 +716,5 @@
      * @return integer 更新件数
      */
-    function updatePriority($plugin_id, $priority)
-    {
+    function updatePriority($plugin_id, $priority) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATEする値を作成する。
@@ -756,6 +733,5 @@
      * @return array エラー情報を格納した連想配列.
      */
-    function registerData($arrPluginInfo)
-    {
+    function registerData($arrPluginInfo) {
 
         // プラグイン情報をDB登録.
@@ -829,6 +805,5 @@
      * @return array $arrErr エラー情報を格納した連想配列.
      */
-    function requirePluginFile($file_path, $key)
-    {
+    function requirePluginFile($file_path, $key) {
         $arrErr = array();
         if (file_exists($file_path)) {
@@ -849,6 +824,5 @@
      *
      */
-    function execPlugin($obj, $class_name, $exec_func)
-    {
+    function execPlugin($obj, $class_name, $exec_func) {
         $arrErr = array();
         if (method_exists($class_name, $exec_func) === true) {
@@ -869,6 +843,5 @@
      * @return boolean Archive_Tar::extractModify()のエラー
      */
-    function unpackPluginArchive($path)
-    {
+    function unpackPluginArchive($path) {
         // 圧縮フラグTRUEはgzip解凍をおこなう
         $tar = new Archive_Tar($path, true);
@@ -896,6 +869,5 @@
      * @return integer 更新件数
      */
-    function updatePluginEnable($plugin_id, $enable_flg)
-    {
+    function updatePluginEnable($plugin_id, $enable_flg) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATEする値を作成する。
@@ -915,6 +887,5 @@
      * @return array $arrErr エラー情報を格納した連想配列.
      */
-    function deletePlugin($plugin_id, $plugin_code)
-    {
+    function deletePlugin($plugin_id, $plugin_code) {
         $arrErr = array();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -943,6 +914,5 @@
      * @return boolean
      */
-    function isContainsFile($plugin_dir, $file_name)
-    {
+    function isContainsFile($plugin_dir, $file_name) {
         if (file_exists($plugin_dir) && is_dir($plugin_dir)) {
             if ($handle = opendir($plugin_dir)) {
@@ -963,6 +933,5 @@
      * @return boolean
      */
-    function checkContainsFile($tar_obj, $file_path)
-    {
+    function checkContainsFile($tar_obj, $file_path) {
         // ファイル一覧を取得
         $arrayFile = $tar_obj->listContent();
@@ -979,6 +948,5 @@
      * @return void
      */
-    function makeDir($dir_path)
-    {
+    function makeDir($dir_path) {
         // ディレクトリ作成
         if (!file_exists($dir_path)) {
@@ -993,6 +961,5 @@
      * @return string $conflict_alert_message メッセージ
      */
-    function checkConflictPlugin($plugin_id)
-    {
+    function checkConflictPlugin($plugin_id) {
         // フックポイントを取得します.
         $hookPoints = $this->getHookPoint($plugin_id);
@@ -1029,6 +996,5 @@
      * @return boolean.
      */
-    function isError($error)
-    {
+    function isError($error) {
         if (is_array($error) && count($error) > 0) {
             return true;
@@ -1043,6 +1009,5 @@
      * @return array フックポイントの連想配列.
      */
-    function getHookPoint($plugin_id)
-    {
+    function getHookPoint($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Settings extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore_Settings extends LC_Page_Admin_Ex {
 
     /** SC_FormParamのインスタンス */
@@ -52,6 +51,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -69,6 +67,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -80,6 +77,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         switch ($this->getMode()) {
             // 入力内容をDBへ登録する
@@ -98,6 +94,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -110,6 +105,5 @@
      * @return void
      */
-    function execRegisterMode()
-    {
+    function execRegisterMode() {
         // パラメーターオブジェクトの初期化
         $this->initRegisterMode();
@@ -140,6 +134,5 @@
      * @return void
      */
-    function initRegisterMode()
-    {
+    function initRegisterMode() {
         // 前後の空白を削除
         if (isset($_POST['public_key'])) {
@@ -160,6 +153,5 @@
      * @return array エラー情報を格納した連想配列
      */
-    function validateRegistermode()
-    {
+    function validateRegistermode() {
         return $this->objForm->checkError();
     }
@@ -172,6 +164,5 @@
      * @return void
      */
-    function execDefaultMode()
-    {
+    function execDefaultMode() {
         $this->arrForm = $this->getOwnersStoreSettings();
     }
@@ -183,6 +174,5 @@
      * @return void
      */
-    function registerOwnersStoreSettings($arrSettingsData)
-    {
+    function registerOwnersStoreSettings($arrSettingsData) {
         $table = 'dtb_ownersstore_settings';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -202,6 +192,5 @@
      * @return array
      */
-    function getOwnersStoreSettings()
-    {
+    function getOwnersStoreSettings() {
         $table   = 'dtb_ownersstore_settings';
         $colmuns = '*';
Index: /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Log extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore_Log extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -59,6 +57,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -70,6 +67,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         switch ($this->getMode()) {
             case 'detail':
@@ -95,11 +91,9 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function getLogs()
-    {
+    function getLogs() {
         $sql =<<<END
 SELECT
@@ -120,6 +114,5 @@
     }
 
-    function initParam()
-    {
+    function initParam() {
         $objForm = new SC_FormParam_Ex();
         $objForm->addParam('log_id', 'log_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -128,6 +121,5 @@
     }
 
-    function getLogDetail($log_id)
-    {
+    function getLogDetail($log_id) {
             $sql =<<<END
 SELECT
Index: /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Module extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore_Module extends LC_Page_Admin_Ex {
 
     var $tpl_subno = 'index';
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -60,6 +58,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -71,6 +68,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         // nothing.
     }
@@ -81,6 +77,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Pdf extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_Pdf extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/pdf_input.tpl';
@@ -67,6 +65,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -78,6 +75,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -120,6 +116,5 @@
      * PDF作成フォームのデフォルト値の生成
      */
-    function createFromValues($order_id,$pdf_order_id)
-    {
+    function createFromValues($order_id,$pdf_order_id) {
         // ここが$arrFormの初登場ということを明示するため宣言する。
         $arrForm = array();
@@ -155,6 +150,5 @@
      * @param SC_FormParam $objFormParam
      */
-    function createPdf(&$objFormParam)
-    {
+    function createPdf(&$objFormParam) {
 
         $arrErr = $this->lfCheckError($objFormParam);
@@ -182,6 +176,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -191,6 +184,5 @@
      *  @param SC_FormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('注文番号', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('注文番号', 'pdf_order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -215,10 +207,8 @@
      */
 
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
-        $arrParams = $objFormParam->getHashArray();
+        $arrRet = $objFormParam->getHashArray();
         $arrErr = $objFormParam->checkError();
-        $objError = new SC_CheckError_Ex($arrParams);
 
         $year = $objFormParam->getValue('year');
@@ -242,8 +232,5 @@
             $arrErr['day'] = '発行日は1〜31の間で入力してください。';
         }
-        
-        $objError->doFunc(array('発行日', 'year', 'month', 'day'), array('CHECK_DATE'));
-        $arrErr = array_merge($arrErr, $objError->arrErr);
-        
+
         return $arrErr;
     }
Index: /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Multiple extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_Multiple extends LC_Page_Admin_Ex {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/multiple.tpl';
@@ -59,6 +57,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -70,6 +67,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->setTemplate($this->tpl_mainpage);
@@ -82,6 +78,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_MailView extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_MailView extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/mail_view.tpl';
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $send_id = $_GET['send_id'];
@@ -85,6 +81,5 @@
      * @param int $send_id
      */
-    function getMailHistory($send_id)
-    {
+    function getMailHistory($send_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'subject, mail_body';
@@ -99,6 +94,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id: LC_Page_Admin_Order_Disp.php 20767 2011-03-22 10:07:32Z nanasess $
  */
-class LC_Page_Admin_Order_Disp extends LC_Page_Admin_Order_Ex 
-{
+class LC_Page_Admin_Order_Disp extends LC_Page_Admin_Order_Ex {
 
     var $arrShippingKeys = array(
@@ -76,6 +75,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/disp.tpl';
@@ -91,8 +89,8 @@
 
         // 支払い方法の取得
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         // 配送業者の取得
-        $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList();
+        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name');
     }
 
@@ -102,6 +100,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -113,6 +110,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPurchase = new SC_Helper_Purchase_Ex();
@@ -130,5 +126,5 @@
         $this->arrForm = $objFormParam->getFormParamList();
         $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
-        $this->arrDelivTime = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
+        $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
 
@@ -141,6 +137,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -152,6 +147,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // 検索条件のパラメータを初期化
         parent::lfInitParam($objFormParam);
@@ -200,6 +194,4 @@
         $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam('消費税率', 'tax_rate');
-        $objFormParam->addParam('課税規則', 'tax_rule');
 
         // DB読込用
@@ -265,6 +257,5 @@
      * @return void
      */
-    function setOrderToFormParam(&$objFormParam, $order_id)
-    {
+    function setOrderToFormParam(&$objFormParam, $order_id) {
         $objPurchase = new SC_Helper_Purchase_Ex();
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/index.tpl';
@@ -73,5 +71,5 @@
 
         // 支払い方法の取得
-        $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         $this->httpCacheControl('nocache');
@@ -83,6 +81,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -94,6 +91,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -103,11 +99,9 @@
         $this->arrForm = $objFormParam->getFormParamList();
 
-        $objPurchase = new SC_Helper_Purchase_Ex();
-
         switch ($this->getMode()) {
             // 削除
             case 'delete':
-                $order_id = $objFormParam->getValue('order_id');
-                $objPurchase->cancelOrder($order_id, ORDER_CANCEL, true);
+                $this->doDelete('order_id = ?',
+                                array($objFormParam->getValue('order_id')));
                 // 削除後に検索結果を表示するため breakしない
 
@@ -148,10 +142,5 @@
                         // 全件削除(ADMIN_MODE)
                         case 'delete_all':
-                            $page_max = 0;
-                            $arrResults = $this->findOrders($where, $arrWhereVal,
-                                                           $page_max, 0, $order);
-                            foreach ($arrResults as $element) {
-                                $objPurchase->cancelOrder($element['order_id'], ORDER_CANCEL, true);
-                            }
+                            $this->doDelete($where, $arrWhereVal);
                             break;
 
@@ -186,6 +175,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -197,6 +185,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('注文番号1', 'search_order_id1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('注文番号2', 'search_order_id2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -245,6 +232,5 @@
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
@@ -284,6 +270,5 @@
      * @return void
      */
-    function buildQuery($key, &$where, &$arrValues, &$objFormParam)
-    {
+    function buildQuery($key, &$where, &$arrValues, &$objFormParam) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         switch ($key) {
@@ -295,9 +280,9 @@
             case 'search_order_name':
                 $where .= ' AND ' . $dbFactory->concatColumn(array('order_name01', 'order_name02')) . ' LIKE ?';
-                $arrValues[] = sprintf('%%%s%%', preg_replace('/[ 　]/u', '', $objFormParam->getValue($key)));
+                $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key));
                 break;
             case 'search_order_kana':
                 $where .= ' AND ' . $dbFactory->concatColumn(array('order_kana01', 'order_kana02')) . ' LIKE ?';
-                $arrValues[] = sprintf('%%%s%%', preg_replace('/[ 　]/u', '', $objFormParam->getValue($key)));
+                $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key));
                 break;
             case 'search_order_id1':
@@ -419,6 +404,5 @@
      * @return void
      */
-    function doDelete($where, $arrParam = array())
-    {
+    function doDelete($where, $arrParam = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sqlval['del_flg']     = 1;
@@ -438,6 +422,5 @@
      * @return void
      */
-    function doOutputCSV($where, $arrVal, $order)
-    {
+    function doOutputCSV($where, $arrVal, $order) {
         if ($where != '') {
             $where = " WHERE $where ";
@@ -455,6 +438,5 @@
      * @return integer 検索結果の行数
      */
-    function getNumberOfLines($where, $arrValues)
-    {
+    function getNumberOfLines($where, $arrValues) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->count('dtb_order', $where, $arrValues);
@@ -471,10 +453,7 @@
      * @return array 受注の検索結果
      */
-    function findOrders($where, $arrValues, $limit, $offset, $order)
-    {
+    function findOrders($where, $arrValues, $limit, $offset, $order) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        if ($limit != 0) {
-            $objQuery->setLimitOffset($limit, $offset);
-        }
+        $objQuery->setLimitOffset($limit, $offset);
         $objQuery->setOrder($order);
         return $objQuery->select('*', 'dtb_order', $where, $arrValues);
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_ProductSelect extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_ProductSelect extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/product_select.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -82,5 +78,4 @@
 
         $this->tpl_no = $this->getNo(array($_GET,$_POST));
-        $this->shipping_id = $this->getShippingId(array($_GET,$_POST));
 
         switch ($this->getMode()) {
@@ -106,6 +101,5 @@
                 $this->tpl_javascript .= $this->getTplJavascript($objProduct);
                 $js_fnOnLoad = $this->getFnOnload($this->arrProducts);
-                $this->tpl_javascript .= 'function fnOnLoad()
-                {' . $js_fnOnLoad . '}';
+                $this->tpl_javascript .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
                 $this->tpl_onload .= 'fnOnLoad();';
                 // 規格1クラス名
@@ -138,6 +132,5 @@
      * @param SC_Product $objProduct
      */
-    function getProductList($arrProductId, &$objProduct)
-    {
+    function getProductList($arrProductId, &$objProduct) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -153,6 +146,5 @@
      * @param array $arrProducts
      */
-    function getFnOnload($arrProducts)
-    {
+    function getFnOnload($arrProducts) {
         foreach ($arrProducts as $arrProduct) {
             $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});";
@@ -165,6 +157,5 @@
      * @param SC_Product $objProduct
      */
-    function getTplJavascript(&$objProduct)
-    {
+    function getTplJavascript(&$objProduct) {
         return 'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
     }
@@ -175,6 +166,5 @@
      * @param SC_Product $objProduct
      */
-    function getProducts($whereAndBind,&$objProduct, $page_max, $startno)
-    {
+    function getProducts($whereAndBind,&$objProduct, $page_max, $startno) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
@@ -196,6 +186,5 @@
      * @param SC_Product $objProduct
      */
-    function getLineCount($whereAndBind,&$objProduct)
-    {
+    function getLineCount($whereAndBind,&$objProduct) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
@@ -213,6 +202,5 @@
      * @param SC_FormParam $objFormParam
      */
-    function createWhere(&$objFormParam,&$objDb)
-    {
+    function createWhere(&$objFormParam,&$objDb) {
         $arrForm = $objFormParam->getHashArray();
         $where = 'alldtl.del_flg = 0';
@@ -254,6 +242,5 @@
      * @param unknown_type $globalParams
      */
-    function getNo($globalParams)
-    {
+    function getNo($globalParams) {
         foreach ($globalParams as $params) {
             if (isset($params['no']) && $params['no']!= '') {
@@ -265,25 +252,9 @@
 
     /**
-     * リクエストパラメーター shipping_id を取ってくる。
-     * @param unknown_type $globalParams
-     */
-    function getShippingId($globalParams)
-    {
-        foreach ($globalParams as $params) {
-            if (isset($params['shipping_id']) && $params['shipping_id']!= '') {
-                return intval($params['shipping_id']);
-            }
-        }
-        return null;
-    }
-
-
-    /**
      * 取得している並び順で並び替え
      * @param $arrProduct_id
      * @param $productList
      */
-    function sortProducts($arrProduct_id,$productList)
-    {
+    function sortProducts($arrProduct_id,$productList) {
         $products  = array();
         foreach ($productList as $item) {
@@ -301,6 +272,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -310,6 +280,5 @@
      * @param SC_FormParam $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('オーダーID', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -317,5 +286,4 @@
         $objFormParam->addParam('商品コード', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
-        $objFormParam->addParam('届け先ID', 'shipping_id', LTEXT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
 }
Index: /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php	(revision 22584)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Mail extends LC_Page_Admin_Order_Ex 
-{
+class LC_Page_Admin_Order_Mail extends LC_Page_Admin_Order_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/mail.tpl';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -73,6 +70,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $post = $_POST;
         //一括送信用の処理
@@ -157,6 +153,5 @@
      * @var int order_id
      */
-    function getMailHistory($order_id)
-    {
+    function getMailHistory($order_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'send_date, subject, template_id, send_id';
@@ -171,6 +166,5 @@
      * @param SC_FormParam $objFormParam
      */
-    function doSend(&$objFormParam)
-    {
+    function doSend(&$objFormParam) {
         $arrErr = $objFormParam->checkerror();
 
@@ -197,6 +191,5 @@
      * @param SC_FormParam $objFormParam
      */
-    function confirm(&$objFormParam)
-    {
+    function confirm(&$objFormParam) {
         $arrErr = $objFormParam->checkerror();
         // メールの送信
@@ -225,22 +218,14 @@
      * @param SC_FormParam $objFormParam
      */
-    function changeData(&$objFormParam)
-    {
-        $template_id = $objFormParam->getValue('template_id');
-
-        // 未選択時
-        if (strlen($template_id) === 0) {
-            $mailTemplates = null;
-        }
-        // 有効選択時
-        elseif (SC_Utils_Ex::sfIsInt($template_id)) {
-            $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-            $mailTemplates = $objMailtemplate->get($template_id);
-        }
-        // 不正選択時
-        else {
-            trigger_error('テンプレートの指定が不正。', E_USER_ERROR);
-        }
-
+    function changeData(&$objFormParam) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        if (!SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
+            trigger_error('テンプレートが指定されていません。', E_USER_ERROR);
+        }
+
+        $where = 'template_id = ?';
+        $arrWhereVal = array($objFormParam->getValue('template_id'));
+        $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
         if (empty($mailTemplates)) {
             foreach (array('subject','header','footer') as $key) {
@@ -259,6 +244,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -268,6 +252,5 @@
      * @param SC_FormParam $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // 検索条件のパラメーターを初期化
         parent::lfInitParam($objFormParam);
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Status extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_Status extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/status.tpl';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -73,6 +70,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -89,5 +85,5 @@
 
         //支払方法の取得
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         switch ($this->getMode()) {
@@ -126,6 +122,5 @@
      *  @param SC_FormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('注文番号', 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('変更前対応状況', 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -141,6 +136,5 @@
      *  @param SC_FormParam
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
         $arrRet = $objFormParam->getHashArray();
@@ -156,12 +150,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // 対応状況一覧の表示
-    function lfStatusDisp($status,$pageno)
-    {
+    function lfStatusDisp($status,$pageno) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -198,6 +190,5 @@
      * 対応状況の更新
      */
-    function lfStatusMove($statusId, $arrOrderId)
-    {
+    function lfStatusMove($statusId, $arrOrderId) {
         $objPurchase = new SC_Helper_Purchase_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -224,6 +215,5 @@
      * 受注テーブルの論理削除
      */
-    function lfDelete($arrOrderId)
-    {
+    function lfDelete($arrOrderId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -232,8 +222,16 @@
         }
 
-        $objPurchase = new SC_Helper_Purchase_Ex();
+        $arrUpdate = array(
+            'del_flg'      => 1,
+            'update_date'  => 'CURRENT_TIMESTAMP',
+        );
+
+        $objQuery->begin();
+
         foreach ($arrOrderId as $orderId) {
-            $objPurchase->cancelOrder($orderId, ORDER_CANCEL, true);
-        }
+            $objQuery->update('dtb_order', $arrUpdate, 'order_id = ?', array($orderId));
+        }
+
+        $objQuery->commit();
 
         $this->tpl_onload = "window.alert('選択項目を削除しました。');";
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_Edit extends LC_Page_Admin_Order_Ex 
-{
+class LC_Page_Admin_Order_Edit extends LC_Page_Admin_Order_Ex {
 
     var $arrShippingKeys = array(
@@ -68,19 +67,4 @@
     );
 
-    var $arrProductKeys = array(
-        'product_id',
-        'product_class_id',
-        'product_type_id',
-        'point_rate',
-        'product_code',
-        'product_name',
-        'classcategory_name1',
-        'classcategory_name2',
-        'quantity',
-        'price',
-        'tax_rate',
-        'tax_rule'
-    );
-
     // }}}
     // {{{ functions
@@ -91,6 +75,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/edit.tpl';
@@ -110,10 +93,8 @@
 
         // 支払い方法の取得
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         // 配送業者の取得
-        $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList();
-
-        $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
+        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name');
 
         $this->httpCacheControl('nocache');
@@ -125,6 +106,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -136,6 +116,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPurchase = new SC_Helper_Purchase_Ex();
@@ -185,6 +164,4 @@
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
-                //複数配送時に各商品の総量を設定
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
@@ -202,6 +179,4 @@
                     $objFormParam->setParam($_POST);
                     $objFormParam->convParam();
-                    //複数配送時に各商品の総量を設定
-                    $this->setProductsQuantity($objFormParam);
                     $this->arrErr = $this->lfCheckError($objFormParam);
                     if (SC_Utils_Ex::isBlank($this->arrErr)) {
@@ -227,6 +202,4 @@
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
-                //複数配送時に各商品の総量を設定
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
@@ -238,6 +211,4 @@
                 $delete_no = $objFormParam->getValue('delete_no');
                 $this->doDeleteProduct($delete_no, $objFormParam);
-                //複数配送時に各商品の総量を設定
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
@@ -248,6 +219,4 @@
                 $objFormParam->convParam();
                 $this->doRegisterProduct($objFormParam);
-                //複数配送時に各商品の総量を設定
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
@@ -257,24 +226,10 @@
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
-                $customer_birth = $this->setCustomerTo($objFormParam->getValue('edit_customer_id'),
+                $this->setCustomerTo($objFormParam->getValue('edit_customer_id'),
                                      $objFormParam);
-                // 加算ポイントの計算
-                if (USE_POINT === true && $this->tpl_mode == 'add'){
-                    $birth_point = 0;
-                    if ($customer_birth){
-                        $arrRet = preg_split('|[- :/]|', $customer_birth);
-                        $birth_date = intval($arrRet[1]);
-                        $now_date   = intval(date('m'));
-                        // 誕生日月であった場合
-                        if ($birth_date == $now_date) {
-                            $birth_point = BIRTH_MONTH_POINT;
-                        }
-                    }
-                    $objFormParam->setValue("birth_point",$birth_point);
-                }
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
 
-                // 複数配送設定表示
+            // 複数配送設定表示
             case 'multiple':
                 $objFormParam->setParam($_POST);
@@ -283,5 +238,5 @@
                 break;
 
-                // 複数配送設定を反映
+            // 複数配送設定を反映
             case 'multiple_set_to':
                 $this->lfInitMultipleParam($objFormParam);
@@ -291,5 +246,5 @@
                 break;
 
-                // お届け先の追加
+            // お届け先の追加
             case 'append_shipping':
                 $objFormParam->setParam($_POST);
@@ -302,390 +257,379 @@
         }
 
-        $this->arrForm        = $objFormParam->getFormParamList();
+        $this->arrForm = $objFormParam->getFormParamList();
         $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
-        $this->top_shipping_id      = array_shift((array_keys($this->arrAllShipping)));
-        $this->arrDelivTime   = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
+        $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
         $this->tpl_onload .= $this->getAnchorKey($objFormParam);
+        $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         if ($arrValuesBefore['payment_id'])
             $this->arrPayment[$arrValuesBefore['payment_id']] = $arrValuesBefore['payment_method'];
-    }
-
-/**
- * デストラクタ.
- *
- * @return void
- */
-function destroy()
-{
-    parent::destroy();
-}
-
-/**
- * パラメーター情報の初期化を行う.
- *
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @return void
- */
-function lfInitParam(&$objFormParam)
-{
-    // 検索条件のパラメーターを初期化
-    parent::lfInitParam($objFormParam);
-
-    // お客様情報
-    $objFormParam->addParam('注文者 お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
-    $objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('都道府県', 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('住所1', 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('住所2', 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('電話番号1', 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('電話番号2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('電話番号3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX番号1', 'order_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX番号2', 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX番号3', 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-
-    // 受注商品情報
-    $objFormParam->addParam('値引き', 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('送料', 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('手数料', 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-
-    // ポイント機能ON時のみ
-    if (USE_POINT !== false) {
-        $objFormParam->addParam('利用ポイント', 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    }
-
-    $objFormParam->addParam('配送業者', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('お支払い方法', 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('対応状況', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('お支払方法名称', 'payment_method');
-
-
-    // 受注詳細情報
-    $objFormParam->addParam('商品種別ID', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('単価', 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('ポイント付与率', 'point_rate');
-    $objFormParam->addParam('商品コード', 'product_code');
-    $objFormParam->addParam('商品名', 'product_name');
-    $objFormParam->addParam('規格名1', 'classcategory_name1');
-    $objFormParam->addParam('規格名2', 'classcategory_name2');
-    $objFormParam->addParam('税率', 'tax_rate');
-    $objFormParam->addParam('課税規則', 'tax_rule');
-    $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-
-    // DB読込用
-    $objFormParam->addParam('小計', 'subtotal');
-    $objFormParam->addParam('合計', 'total');
-    $objFormParam->addParam('支払い合計', 'payment_total');
-    $objFormParam->addParam('加算ポイント', 'add_point');
-    $objFormParam->addParam('お誕生日ポイント', 'birth_point', null, 'n', array(), 0);
-    $objFormParam->addParam('消費税合計', 'tax');
-    $objFormParam->addParam('最終保持ポイント', 'total_point');
-    $objFormParam->addParam('会員ID', 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('会員ID', 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('現在のポイント', 'customer_point');
-    $objFormParam->addParam('受注前ポイント', 'point');
-    $objFormParam->addParam('注文番号', 'order_id');
-    $objFormParam->addParam('受注日', 'create_date');
-    $objFormParam->addParam('発送日', 'commit_date');
-    $objFormParam->addParam('備考', 'message');
-    $objFormParam->addParam('入金日', 'payment_date');
-    $objFormParam->addParam('端末種別', 'device_type_id');
-    $objFormParam->addParam('税率', 'order_tax_rate');
-    $objFormParam->addParam('課税規則', 'order_tax_rule');
-
-    // 複数情報
-    $objFormParam->addParam('配送数', 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('配送ID', 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0);
-    $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('都道府県', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('住所1', 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('住所2', 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('電話番号1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('電話番号2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('電話番号3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX番号1', 'shipping_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX番号2', 'shipping_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX番号3', 'shipping_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('お届け時間ID', 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('お届け日(年)', 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('お届け日(月)', 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('お届け日(日)', 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('お届け日', 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('配送商品数量', 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-
-    $objFormParam->addParam('商品規格ID', 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('商品コード', 'shipment_product_code');
-    $objFormParam->addParam('商品名', 'shipment_product_name');
-    $objFormParam->addParam('規格名1', 'shipment_classcategory_name1');
-    $objFormParam->addParam('規格名2', 'shipment_classcategory_name2');
-    $objFormParam->addParam('単価', 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('数量', 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-
-    $objFormParam->addParam('商品項番', 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('追加商品規格ID', 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('修正商品規格ID', 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('対象届け先ID', 'select_shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('アンカーキー', 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-}
-
-/**
- * 複数配送用フォームの初期化を行う.
- *
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @return void
- */
-function lfInitMultipleParam(&$objFormParam)
-{
-    $objFormParam->addParam('商品規格ID', 'multiple_product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('商品コード', 'multiple_product_code', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('商品名', 'multiple_product_name', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('規格1', 'multiple_classcategory_name1', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('規格2', 'multiple_classcategory_name2', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('単価', 'multiple_price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('数量', 'multiple_quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('お届け先', 'multiple_shipping_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-}
-
-/**
- * 複数配送入力フォームで入力された値を SC_FormParam へ設定する.
- *
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @return void
- */
-function setMultipleItemTo(&$objFormParam)
-{
-    $arrMultipleKey = array('multiple_shipping_id',
-            'multiple_product_class_id',
-            'multiple_product_name',
-            'multiple_product_code',
-            'multiple_classcategory_name1',
-            'multiple_classcategory_name2',
-            'multiple_price',
-            'multiple_quantity');
-    $arrMultipleParams = $objFormParam->getSwapArray($arrMultipleKey);
-
-    /*
-     * 複数配送フォームの入力値を shipping_id ごとにマージ
-     *
-     * $arrShipmentItem[お届け先ID][商品規格ID]['shipment_(key)'] = 値
-     */
-    $arrShipmentItem = array();
-    foreach ($arrMultipleParams as $arrMultiple) {
-        $shipping_id = $arrMultiple['multiple_shipping_id'];
-        $product_class_id = $arrMultiple['multiple_product_class_id'];
-        foreach ($arrMultiple as $key => $val) {
-            if ($key == 'multiple_quantity') {
-                $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] += $val;
-            } else {
-                $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] = $val;
-            }
-        }
-    }
-
-    /*
-     * フォームのお届け先ごとの配列を生成
-     *
-     * $arrShipmentForm['(key)'][$shipping_id][$item_index] = 値
-     * $arrProductQuantity[$shipping_id] = お届け先ごとの配送商品数量
-     */
-    $arrShipmentForm = array();
-    $arrProductQuantity = array();
-    $arrShippingIds = $objFormParam->getValue('shipping_id');
-    foreach ($arrShippingIds as $shipping_id) {
-        $item_index = 0;
-        foreach ($arrShipmentItem[$shipping_id] as $product_class_id => $shipment_item) {
-            foreach ($shipment_item as $key => $val) {
-                $arrShipmentForm[$key][$shipping_id][$item_index] = $val;
-            }
-            // 受注商品の数量を設定
-            $arrQuantity[$product_class_id] += $shipment_item['shipment_quantity'];
-            $item_index++;
-        }
-        // お届け先ごとの配送商品数量を設定
-        $arrProductQuantity[$shipping_id] = count($arrShipmentItem[$shipping_id]);
-    }
-
-    $objFormParam->setParam($arrShipmentForm);
-    $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
-
-    // 受注商品の数量を変更
-    $arrDest = array();
-    foreach ($objFormParam->getValue('product_class_id') as $n => $order_product_class_id) {
-        $arrDest['quantity'][$n] = 0;
-    }
-    foreach ($arrQuantity as $product_class_id => $quantity) {
+
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+
+    /**
+     * パラメーター情報の初期化を行う.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
+     * @return void
+     */
+    function lfInitParam(&$objFormParam) {
+        // 検索条件のパラメーターを初期化
+        parent::lfInitParam($objFormParam);
+
+        // お客様情報
+        $objFormParam->addParam('注文者 お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
+        $objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('都道府県', 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('住所1', 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('住所2', 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('電話番号1', 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('電話番号2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('電話番号3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX番号1', 'order_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX番号2', 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX番号3', 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+
+        // 受注商品情報
+        $objFormParam->addParam('値引き', 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('送料', 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('手数料', 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+
+        // ポイント機能ON時のみ
+        if (USE_POINT !== false) {
+            $objFormParam->addParam('利用ポイント', 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        }
+
+        $objFormParam->addParam('配送業者', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('お支払い方法', 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('対応状況', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('お支払方法名称', 'payment_method');
+
+        // 受注詳細情報
+        $objFormParam->addParam('商品種別ID', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('単価', 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('ポイント付与率', 'point_rate');
+        $objFormParam->addParam('商品コード', 'product_code');
+        $objFormParam->addParam('商品名', 'product_name');
+        $objFormParam->addParam('規格名1', 'classcategory_name1');
+        $objFormParam->addParam('規格名2', 'classcategory_name2');
+        $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+
+        // DB読込用
+        $objFormParam->addParam('小計', 'subtotal');
+        $objFormParam->addParam('合計', 'total');
+        $objFormParam->addParam('支払い合計', 'payment_total');
+        $objFormParam->addParam('加算ポイント', 'add_point');
+        $objFormParam->addParam('お誕生日ポイント', 'birth_point', null, 'n', array(), 0);
+        $objFormParam->addParam('消費税合計', 'tax');
+        $objFormParam->addParam('最終保持ポイント', 'total_point');
+        $objFormParam->addParam('会員ID', 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('会員ID', 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('現在のポイント', 'customer_point');
+        $objFormParam->addParam('受注前ポイント', 'point');
+        $objFormParam->addParam('注文番号', 'order_id');
+        $objFormParam->addParam('受注日', 'create_date');
+        $objFormParam->addParam('発送日', 'commit_date');
+        $objFormParam->addParam('備考', 'message');
+        $objFormParam->addParam('入金日', 'payment_date');
+        $objFormParam->addParam('端末種別', 'device_type_id');
+
+        // 複数情報
+        $objFormParam->addParam('配送数', 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('配送ID', 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0);
+        $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('都道府県', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('住所1', 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('住所2', 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('電話番号1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('電話番号2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('電話番号3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX番号1', 'shipping_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX番号2', 'shipping_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX番号3', 'shipping_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('お届け時間ID', 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('お届け日(年)', 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('お届け日(月)', 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('お届け日(日)', 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('お届け日', 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('配送商品数量', 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+
+        $objFormParam->addParam('商品規格ID', 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('商品コード', 'shipment_product_code');
+        $objFormParam->addParam('商品名', 'shipment_product_name');
+        $objFormParam->addParam('規格名1', 'shipment_classcategory_name1');
+        $objFormParam->addParam('規格名2', 'shipment_classcategory_name2');
+        $objFormParam->addParam('単価', 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('数量', 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+
+        $objFormParam->addParam('商品項番', 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('追加商品規格ID', 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('修正商品規格ID', 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('アンカーキー', 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+    }
+
+    /**
+     * 複数配送用フォームの初期化を行う.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
+     * @return void
+     */
+    function lfInitMultipleParam(&$objFormParam) {
+        $objFormParam->addParam('商品規格ID', 'multiple_product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('商品コード', 'multiple_product_code', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('商品名', 'multiple_product_name', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('規格1', 'multiple_classcategory_name1', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('規格2', 'multiple_classcategory_name2', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('単価', 'multiple_price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('数量', 'multiple_quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('お届け先', 'multiple_shipping_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+    }
+
+    /**
+     * 複数配送入力フォームで入力された値を SC_FormParam へ設定する.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
+     * @return void
+     */
+    function setMultipleItemTo(&$objFormParam) {
+        $arrMultipleKey = array('multiple_shipping_id',
+                                'multiple_product_class_id',
+                                'multiple_product_name',
+                                'multiple_product_code',
+                                'multiple_classcategory_name1',
+                                'multiple_classcategory_name2',
+                                'multiple_price',
+                                'multiple_quantity');
+        $arrMultipleParams = $objFormParam->getSwapArray($arrMultipleKey);
+
+        /*
+         * 複数配送フォームの入力値を shipping_id ごとにマージ
+         *
+         * $arrShipmentItem[お届け先ID][商品規格ID]['shipment_(key)'] = 値
+         */
+        $arrShipmentItem = array();
+        foreach ($arrMultipleParams as $arrMultiple) {
+            $shipping_id = $arrMultiple['multiple_shipping_id'];
+            $product_class_id = $arrMultiple['multiple_product_class_id'];
+            foreach ($arrMultiple as $key => $val) {
+                if ($key == 'multiple_quantity') {
+                    $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] += $val;
+                } else {
+                    $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] = $val;
+                }
+            }
+        }
+
+        /*
+         * フォームのお届け先ごとの配列を生成
+         *
+         * $arrShipmentForm['(key)'][$shipping_id][$item_index] = 値
+         * $arrProductQuantity[$shipping_id] = お届け先ごとの配送商品数量
+         */
+        $arrShipmentForm = array();
+        $arrProductQuantity = array();
+        $arrShippingIds = $objFormParam->getValue('shipping_id');
+        foreach ($arrShippingIds as $shipping_id) {
+            $item_index = 0;
+            foreach ($arrShipmentItem[$shipping_id] as $product_class_id => $shipment_item) {
+                foreach ($shipment_item as $key => $val) {
+                    $arrShipmentForm[$key][$shipping_id][$item_index] = $val;
+                }
+                // 受注商品の数量を設定
+                $arrQuantity[$product_class_id] += $shipment_item['shipment_quantity'];
+                $item_index++;
+            }
+            // お届け先ごとの配送商品数量を設定
+            $arrProductQuantity[$shipping_id] = count($arrShipmentItem[$shipping_id]);
+        }
+
+        $objFormParam->setParam($arrShipmentForm);
+        $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
+
+        // 受注商品の数量を変更
+        $arrDest = array();
         foreach ($objFormParam->getValue('product_class_id') as $n => $order_product_class_id) {
-            if ($product_class_id == $order_product_class_id) {
-                $arrDest['quantity'][$n] = $quantity;
-            }
-        }
-    }
-    $objFormParam->setParam($arrDest);
-}
-
-/**
- * 受注データを取得して, SC_FormParam へ設定する.
- *
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @param integer $order_id 取得元の受注ID
- * @return void
- */
-function setOrderToFormParam(&$objFormParam, $order_id)
-{
-    $objPurchase = new SC_Helper_Purchase_Ex();
-
-    // 受注詳細を設定
-    $arrOrderDetail = $objPurchase->getOrderDetail($order_id, false);
-    $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrOrderDetail));
-
-    $arrShippingsTmp = $objPurchase->getShippings($order_id);
-    $arrShippings = array();
-    foreach ($arrShippingsTmp as $row) {
-        // お届け日の処理
-        if (!SC_Utils_Ex::isBlank($row['shipping_date'])) {
-            $ts = strtotime($row['shipping_date']);
-            $row['shipping_date_year'] = date('Y', $ts);
-            $row['shipping_date_month'] = date('n', $ts);
-            $row['shipping_date_day'] = date('j', $ts);
-        }
-        $arrShippings[$row['shipping_id']] = $row;
-    }
-    $objFormParam->setValue('shipping_quantity', count($arrShippings));
-    $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrShippings));
-
-    /*
-     * 配送商品を設定
-     *
-     * $arrShipmentItem['shipment_(key)'][$shipping_id][$item_index] = 値
-     * $arrProductQuantity[$shipping_id] = お届け先ごとの配送商品数量
-     */
-    $arrProductQuantity = array();
-    $arrShipmentItem = array();
-    foreach ($arrShippings as $shipping_id => $arrShipping) {
-        $arrProductQuantity[$shipping_id] = count($arrShipping['shipment_item']);
-        foreach ($arrShipping['shipment_item'] as $item_index => $arrItem) {
-            foreach ($arrItem as $item_key => $item_val) {
-                $arrShipmentItem['shipment_' . $item_key][$shipping_id][$item_index] = $item_val;
-            }
-        }
-    }
-    $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
-    $objFormParam->setParam($arrShipmentItem);
-
-    /*
-     * 受注情報を設定
-     * $arrOrderDetail と項目が重複しており, $arrOrderDetail は連想配列の値
-     * が渡ってくるため, $arrOrder で上書きする.
-     */
-    $arrOrder = $objPurchase->getOrder($order_id);
-    $objFormParam->setParam($arrOrder);
-
-    // ポイントを設定
-    list($db_point, $rollback_point) = SC_Helper_DB_Ex::sfGetRollbackPoint(
+            $arrDest['quantity'][$n] = 0;
+        }
+        foreach ($arrQuantity as $product_class_id => $quantity) {
+            foreach ($objFormParam->getValue('product_class_id') as $n => $order_product_class_id) {
+                if ($product_class_id == $order_product_class_id) {
+                    $arrDest['quantity'][$n] = $quantity;
+                }
+            }
+        }
+        $objFormParam->setParam($arrDest);
+    }
+
+    /**
+     * 受注データを取得して, SC_FormParam へ設定する.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
+     * @param integer $order_id 取得元の受注ID
+     * @return void
+     */
+    function setOrderToFormParam(&$objFormParam, $order_id) {
+        $objPurchase = new SC_Helper_Purchase_Ex();
+
+        // 受注詳細を設定
+        $arrOrderDetail = $objPurchase->getOrderDetail($order_id, false);
+        $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrOrderDetail));
+
+        $arrShippingsTmp = $objPurchase->getShippings($order_id);
+        $arrShippings = array();
+        foreach ($arrShippingsTmp as $row) {
+            // お届け日の処理
+            if (!SC_Utils_Ex::isBlank($row['shipping_date'])) {
+                $ts = strtotime($row['shipping_date']);
+                $row['shipping_date_year'] = date('Y', $ts);
+                $row['shipping_date_month'] = date('n', $ts);
+                $row['shipping_date_day'] = date('j', $ts);
+            }
+            $arrShippings[$row['shipping_id']] = $row;
+        }
+        $objFormParam->setValue('shipping_quantity', count($arrShippings));
+        $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrShippings));
+
+        /*
+         * 配送商品を設定
+         *
+         * $arrShipmentItem['shipment_(key)'][$shipping_id][$item_index] = 値
+         * $arrProductQuantity[$shipping_id] = お届け先ごとの配送商品数量
+         */
+        $arrProductQuantity = array();
+        $arrShipmentItem = array();
+        foreach ($arrShippings as $shipping_id => $arrShipping) {
+            $arrProductQuantity[$shipping_id] = count($arrShipping['shipment_item']);
+            foreach ($arrShipping['shipment_item'] as $item_index => $arrItem) {
+                foreach ($arrItem as $item_key => $item_val) {
+                    $arrShipmentItem['shipment_' . $item_key][$shipping_id][$item_index] = $item_val;
+                }
+            }
+        }
+        $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
+        $objFormParam->setParam($arrShipmentItem);
+
+        /*
+         * 受注情報を設定
+         * $arrOrderDetail と項目が重複しており, $arrOrderDetail は連想配列の値
+         * が渡ってくるため, $arrOrder で上書きする.
+         */
+        $arrOrder = $objPurchase->getOrder($order_id);
+        $objFormParam->setParam($arrOrder);
+
+        // ポイントを設定
+        list($db_point, $rollback_point) = SC_Helper_DB_Ex::sfGetRollbackPoint(
             $order_id, $arrOrder['use_point'], $arrOrder['add_point'], $arrOrder['status']
-            );
-    $objFormParam->setValue('total_point', $db_point);
-    $objFormParam->setValue('point', $rollback_point);
-
-    if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) {
-        $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($objFormParam->getValue('customer_id'));
-        $objFormParam->setValue('customer_point', $arrCustomer['point']);
-    }
-}
-
-/**
- * 入力内容のチェックを行う.
- *
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @return array エラーメッセージの配列
- */
-function lfCheckError(&$objFormParam)
-{
-    $objProduct = new SC_Product_Ex();
-
-    $arrErr = $objFormParam->checkError();
-
-    if (!SC_Utils_Ex::isBlank($objErr->arrErr)) {
+        );
+        $objFormParam->setValue('total_point', $db_point);
+        $objFormParam->setValue('point', $rollback_point);
+
+        if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) {
+            $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($objFormParam->getValue('customer_id'));
+            $objFormParam->setValue('customer_point', $arrCustomer['point']);
+        }
+    }
+
+    /**
+     * 入力内容のチェックを行う.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
+     * @return array エラーメッセージの配列
+     */
+    function lfCheckError(&$objFormParam) {
+        $objProduct = new SC_Product_Ex();
+
+        $arrErr = $objFormParam->checkError();
+
+        if (!SC_Utils_Ex::isBlank($objErr->arrErr)) {
+            return $arrErr;
+        }
+
+        $arrValues = $objFormParam->getHashArray();
+
+        // 商品の種類数
+        $max = count($arrValues['quantity']);
+        $subtotal = 0;
+        $totalpoint = 0;
+        $totaltax = 0;
+        for ($i = 0; $i < $max; $i++) {
+            // 小計の計算
+            $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i]) * $arrValues['quantity'][$i];
+            // 小計の計算
+            $totaltax += SC_Helper_DB_Ex::sfTax($arrValues['price'][$i]) * $arrValues['quantity'][$i];
+            // 加算ポイントの計算
+            $totalpoint += SC_Utils_Ex::sfPrePoint($arrValues['price'][$i], $arrValues['point_rate'][$i]) * $arrValues['quantity'][$i];
+
+            // 在庫数のチェック
+            $arrProduct = $objProduct->getDetailAndProductsClass($arrValues['product_class_id'][$i]);
+
+            // 編集前の値と比較するため受注詳細を取得
+            $objPurchase = new SC_Helper_Purchase_Ex();
+            $arrOrderDetail = SC_Utils_Ex::sfSwapArray($objPurchase->getOrderDetail($objFormParam->getValue('order_id'), false));
+
+            if ($arrProduct['stock_unlimited'] != '1'
+                && $arrProduct['stock'] < $arrValues['quantity'][$i] - $arrOrderDetail['quantity'][$i]) {
+                $class_name1 = $arrValues['classcategory_name1'][$i];
+                $class_name1 = SC_Utils_Ex::isBlank($class_name1) ? 'なし' : $class_name1;
+                $class_name2 = $arrValues['classcategory_name2'][$i];
+                $class_name2 = SC_Utils_Ex::isBlank($class_name2) ? 'なし' : $class_name2;
+                $arrErr['quantity'][$i] .= $arrValues['product_name'][$i]
+                    . '/(' . $class_name1 . ')/(' . $class_name2 . ') の在庫が不足しています。 設定できる数量は「'
+                    . ($arrOrderDetail['quantity'][$i] + $arrProduct['stock']) . '」までです。<br />';
+            }
+        }
+
+        // 消費税
+        $arrValues['tax'] = $totaltax;
+        // 小計
+        $arrValues['subtotal'] = $subtotal;
+        // 合計
+        $arrValues['total'] = $subtotal - $arrValues['discount'] + $arrValues['deliv_fee'] + $arrValues['charge'];
+        // お支払い合計
+        $arrValues['payment_total'] = $arrValues['total'] - ($arrValues['use_point'] * POINT_VALUE);
+
+        // 加算ポイント
+        $arrValues['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($totalpoint, $arrValues['use_point']);
+
+        // 最終保持ポイント
+        $arrValues['total_point'] = $objFormParam->getValue('point') - $arrValues['use_point'];
+
+        if ($arrValues['total'] < 0) {
+            $arrErr['total'] = '合計額がマイナス表示にならないように調整して下さい。<br />';
+        }
+
+        if ($arrValues['payment_total'] < 0) {
+            $arrErr['payment_total'] = 'お支払い合計額がマイナス表示にならないように調整して下さい。<br />';
+        }
+
+        if ($arrValues['total_point'] < 0) {
+            $arrErr['use_point'] = '最終保持ポイントがマイナス表示にならないように調整して下さい。<br />';
+        }
+
+        $objFormParam->setParam($arrValues);
         return $arrErr;
     }
-
-    $arrValues = $objFormParam->getHashArray();
-
-    // 商品の種類数
-    $max = count($arrValues['quantity']);
-    $subtotal = 0;
-    $totalpoint = 0;
-    $totaltax = 0;
-    for ($i = 0; $i < $max; $i++) {
-        // 小計の計算
-        $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i];
-        // 小計の計算
-        $totaltax += SC_Utils_Ex::sfTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i];
-        // 加算ポイントの計算
-        $totalpoint += SC_Utils_Ex::sfPrePoint($arrValues['price'][$i], $arrValues['point_rate'][$i]) * $arrValues['quantity'][$i];
-
-        // 在庫数のチェック
-        $arrProduct = $objProduct->getDetailAndProductsClass($arrValues['product_class_id'][$i]);
-
-        // 編集前の値と比較するため受注詳細を取得
-        $objPurchase = new SC_Helper_Purchase_Ex();
-        $arrOrderDetail = SC_Utils_Ex::sfSwapArray($objPurchase->getOrderDetail($objFormParam->getValue('order_id'), false));
-
-        if ($arrProduct['stock_unlimited'] != '1'
-                && $arrProduct['stock'] < $arrValues['quantity'][$i] - $arrOrderDetail['quantity'][$i]) {
-            $class_name1 = $arrValues['classcategory_name1'][$i];
-            $class_name1 = SC_Utils_Ex::isBlank($class_name1) ? 'なし' : $class_name1;
-            $class_name2 = $arrValues['classcategory_name2'][$i];
-            $class_name2 = SC_Utils_Ex::isBlank($class_name2) ? 'なし' : $class_name2;
-            $arrErr['quantity'][$i] .= $arrValues['product_name'][$i]
-                . '/(' . $class_name1 . ')/(' . $class_name2 . ') の在庫が不足しています。 設定できる数量は「'
-                . ($arrOrderDetail['quantity'][$i] + $arrProduct['stock']) . '」までです。<br />';
-        }
-    }
-
-    // 消費税
-    $arrValues['tax'] = $totaltax;
-    // 小計
-    $arrValues['subtotal'] = $subtotal;
-    // 合計
-    $arrValues['total'] = $subtotal - $arrValues['discount'] + $arrValues['deliv_fee'] + $arrValues['charge'];
-    // お支払い合計
-    $arrValues['payment_total'] = $arrValues['total'] - ($arrValues['use_point'] * POINT_VALUE);
-
-    // 加算ポイント
-    $arrValues['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($totalpoint, $arrValues['use_point']) + $arrValues['birth_point'];
-
-    // 最終保持ポイント
-    $arrValues['total_point'] = $objFormParam->getValue('point') - $arrValues['use_point'];
-
-    if ($arrValues['total'] < 0) {
-        $arrErr['total'] = '合計額がマイナス表示にならないように調整して下さい。<br />';
-    }
-
-    if ($arrValues['payment_total'] < 0) {
-        $arrErr['payment_total'] = 'お支払い合計額がマイナス表示にならないように調整して下さい。<br />';
-    }
-
-    if ($arrValues['total_point'] < 0) {
-        $arrErr['use_point'] = '最終保持ポイントがマイナス表示にならないように調整して下さい。<br />';
-    }
-
-    $objFormParam->setParam($arrValues);
-    return $arrErr;
-}
 
     /**
@@ -701,6 +645,5 @@
      * エラー発生時は負数を返す。
      */
-    function doRegister($order_id, &$objPurchase, &$objFormParam, &$message, &$arrValuesBefore)
-    {
+    function doRegister($order_id, &$objPurchase, &$objFormParam, &$message, &$arrValuesBefore) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -729,6 +672,4 @@
                 'classcategory_name1',
                 'classcategory_name2',
-                'tax_rate',
-                'tax_rule'
         ));
 
@@ -781,8 +722,7 @@
         $arrAllShipmentItem = $objFormParam->getSwapArray($this->arrShipmentItemKeys);
 
-        $arrDelivTime = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
-        //商品単価を複数配送にも適応
+        $arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
+
         $arrShippingValues = array();
-        $arrIsNotQuantityUp = array();
         foreach ($arrAllShipping as $shipping_index => $arrShipping) {
             $shipping_id = $arrShipping['shipping_id'];
@@ -794,12 +734,4 @@
                                               $arrShipping['shipping_date_day']);
 
-            //商品単価を複数配送にも反映する
-            foreach ($arrDetail as $product_detail) {
-                foreach ($arrAllShipmentItem[$shipping_index]['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) {
-                    if($product_detail['product_class_id'] == $shipment_product_class_id){
-                        $arrAllShipmentItem[$shipping_index]['shipment_price'][$relation_index] = $product_detail['price'];
-                    }
-                }
-            }
             // 配送業者IDを取得
             $arrShippingValues[$shipping_index]['deliv_id'] = $objFormParam->getValue('deliv_id');
@@ -823,5 +755,4 @@
             }
         }
-
         $objPurchase->registerShipping($order_id, $arrShippingValues, false);
         $objQuery->commit();
@@ -837,13 +768,72 @@
      * @return void
      */
-    function doRegisterProduct(&$objFormParam)
-    {
+    function doRegisterProduct(&$objFormParam) {
         $product_class_id = $objFormParam->getValue('add_product_class_id');
         if (SC_Utils_Ex::isBlank($product_class_id)) {
             $product_class_id = $objFormParam->getValue('edit_product_class_id');
             $changed_no = $objFormParam->getValue('no');
-            $this->shipmentEditProduct($objFormParam, $product_class_id, $changed_no);
-        }else{
-            $this->shipmentAddProduct($objFormParam, $product_class_id);
+        }
+        // FXIME バリデーションを通さず $objFormParam の値で DB 問い合わせしている。(管理機能ため、さほど問題は無いと思うものの…)
+
+        // 商品規格IDが指定されていない場合、例外エラーを発生
+        if (strlen($product_class_id) === 0) {
+            trigger_error('商品規格指定なし', E_USER_ERROR);
+        }
+
+        // 選択済みの商品であれば数量を1増やす
+        $exists = false;
+        $arrExistsProductClassIds = $objFormParam->getValue('product_class_id');
+        foreach ($arrExistsProductClassIds as $key => $value) {
+            $exists_product_class_id = $arrExistsProductClassIds[$key];
+            if ($exists_product_class_id == $product_class_id) {
+                $exists = true;
+                $exists_no = $key;
+                $arrExistsQuantity = $objFormParam->getValue('quantity');
+                $arrExistsQuantity[$key]++;
+                $objFormParam->setValue('quantity', $arrExistsQuantity);
+            }
+        }
+
+        // 新しく商品を追加した場合はフォームに登録
+        // 商品を変更した場合は、該当行を変更
+        if (!$exists) {
+            $objProduct = new SC_Product_Ex();
+            $arrProduct = $objProduct->getDetailAndProductsClass($product_class_id);
+
+            // 一致する商品規格がない場合、例外エラーを発生
+            if (empty($arrProduct)) {
+                trigger_error('商品規格一致なし', E_USER_ERROR);
+            }
+
+            $arrProduct['quantity'] = 1;
+            $arrProduct['price'] = $arrProduct['price02'];
+            $arrProduct['product_name'] = $arrProduct['name'];
+
+            $arrUpdateKeys = array(
+                'product_id', 'product_class_id', 'product_type_id', 'point_rate',
+                'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2',
+                'quantity', 'price',
+            );
+            foreach ($arrUpdateKeys as $key) {
+                $arrValues = $objFormParam->getValue($key);
+                // FIXME getValueで文字列が返る場合があるので配列であるかをチェック
+                if (!is_array($arrValues)) {
+                    $arrValues = array();
+                }
+
+                if (isset($changed_no)) {
+                    $arrValues[$changed_no] = $arrProduct[$key];
+                } else {
+                    $added_no = 0;
+                    if (is_array($arrExistsProductClassIds)) {
+                        $added_no = count($arrExistsProductClassIds);
+                    }
+                    $arrValues[$added_no] = $arrProduct[$key];
+                }
+                $objFormParam->setValue($key, $arrValues);
+            }
+        } elseif (isset($changed_no) && $exists_no != $changed_no) {
+            // 変更したが、選択済みの商品だった場合は、変更対象行を削除。
+            $this->doDeleteProduct($changed_no, $objFormParam);
         }
     }
@@ -856,31 +846,19 @@
      * @return void
      */
-    function doDeleteProduct($delete_no, &$objFormParam)
-    {
-
-        $select_shipping_id    = $objFormParam->getValue('select_shipping_id');
-
-        //変更前のproduct_class_idが他の届け先にも存在するか
-        $arrPreShipmentProductClassIds = $objFormParam->getValue('shipment_product_class_id');
-        $arrPreProductClassIds         = $objFormParam->getValue('product_class_id');
-        $delete_product_class_id       = $arrPreShipmentProductClassIds[$select_shipping_id][$delete_no];
-
-        //配送先データ削除
-        $arrNewShipments = $this->deleteShipment($objFormParam, $this->arrShipmentItemKeys , $select_shipping_id, $delete_no);
-        $objFormParam->setParam($arrNewShipments);
-
-        $is_product_delete = true;
-        foreach ($arrNewShipments['shipment_product_class_id'] as $shipping_id => $arrShipmentProductClassIds) {
-            foreach ($arrShipmentProductClassIds as $relation_index => $shipment_product_class_id) {
-                if(in_array($delete_product_class_id, $arrShipmentProductClassIds)){
-                    $is_product_delete = false;
-                    break;
-                }
-            }
-        }
-
-        //商品情報から削除
-        if($is_product_delete){
-            $this->checkDeleteProducts($objFormParam, $arrPreProductClassIds, $delete_product_class_id, $this->arrProductKeys);
+    function doDeleteProduct($delete_no, &$objFormParam) {
+        $arrDeleteKeys = array(
+            'product_id', 'product_class_id', 'product_type_id', 'point_rate',
+            'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2',
+            'quantity', 'price',
+        );
+        foreach ($arrDeleteKeys as $key) {
+            $arrNewValues = array();
+            $arrValues = $objFormParam->getValue($key);
+            foreach ($arrValues as $index => $val) {
+                if ($index != $delete_no) {
+                    $arrNewValues[] = $val;
+                }
+            }
+            $objFormParam->setValue($key, $arrNewValues);
         }
     }
@@ -892,6 +870,5 @@
      * @return void
      */
-    function addShipping(&$objFormParam)
-    {
+    function addShipping(&$objFormParam) {
         $objFormParam->setValue('shipping_quantity',
                                 $objFormParam->getValue('shipping_quantity') + 1);
@@ -908,6 +885,5 @@
      * @return void
      */
-    function setCustomerTo($customer_id, &$objFormParam)
-    {
+    function setCustomerTo($customer_id, &$objFormParam) {
         $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id);
         foreach ($arrCustomer as $key => $val) {
@@ -916,6 +892,4 @@
         $objFormParam->setValue('customer_id', $customer_id);
         $objFormParam->setValue('customer_point', $arrCustomer['point']);
-
-        return $arrCustomer['birth'];
     }
 
@@ -926,6 +900,5 @@
      * @return アンカーキーの文字列
      */
-    function getAnchorKey(&$objFormParam)
-    {
+    function getAnchorKey(&$objFormParam) {
         $ancor_key = $objFormParam->getValue('anchor_key');
         if (!SC_Utils_Ex::isBlank($ancor_key)) {
@@ -934,247 +907,3 @@
         return '';
     }
-
-    /**
-     * 商品を追加
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param integer $add_product_class_id 追加商品規格ID
-     * @return void
-     */
-    function shipmentAddProduct(&$objFormParam, $add_product_class_id)
-    {
-
-        //複数配送に商品情報追加
-        $select_shipping_id = $objFormParam->getValue('select_shipping_id');
-
-        //届け先に選択済みの商品がある場合
-        $arrShipmentProducts = $this->getShipmentProducts($objFormParam);
-
-        if(in_array($add_product_class_id, $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id])){
-            foreach ($arrShipmentProducts['shipment_product_class_id'][$select_shipping_id] as $relation_index => $shipment_product_class_id) {
-                if($shipment_product_class_id == $add_product_class_id){
-                    $arrShipmentProducts['shipment_quantity'][$select_shipping_id][$relation_index]++;
-                    break;
-                }
-            }
-        }else{
-
-            //届け先に選択商品がない場合
-            $objProduct = new SC_Product_Ex();
-            $arrAddProductInfo = $objProduct->getDetailAndProductsClass($add_product_class_id);
-
-            $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id][] = $add_product_class_id;
-            $arrShipmentProducts['shipment_product_code'][$select_shipping_id][]     = $arrAddProductInfo['product_code'];
-            $arrShipmentProducts['shipment_product_name'][$select_shipping_id][]     = $arrAddProductInfo['name'];
-            $arrShipmentProducts['shipment_price'][$select_shipping_id][]            = $arrAddProductInfo['price02'];
-            $arrShipmentProducts['shipment_quantity'][$select_shipping_id][]         = 1;
-
-            //受注商品情報に追加
-            $arrPreProductClassIds = $objFormParam->getValue('product_class_id');
-            $arrProducts = $this->checkInsertOrderProducts($objFormParam, $arrPreProductClassIds, $add_product_class_id, $arrAddProductInfo);
-            $objFormParam->setParam($arrProducts);
-        }
-        $objFormParam->setParam($arrShipmentProducts);
-    }
-
-    /**
-     * 商品を変更
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param integer $add_product_class_id 変更商品規格ID
-     * @param integer $change_no 変更対象
-     * @return void
-     */
-    function shipmentEditProduct(&$objFormParam, $edit_product_class_id, $change_no)
-    {
-        $arrPreProductClassIds = $objFormParam->getValue('product_class_id');
-        $select_shipping_id    = $objFormParam->getValue('select_shipping_id');
-
-        $arrShipmentProducts = $this->getShipmentProducts($objFormParam);
-
-        //既にあるデータは１つだけ数量を１増やす
-        $pre_shipment_product_class_id = $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id][$change_no];
-        if($pre_shipment_product_class_id == $edit_product_class_id) {
-            $arrShipmentProducts['shipment_quantity'][$select_shipping_id][$change_no] ++;
-        }elseif(in_array($edit_product_class_id, $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id])){
-            //配送先データ削除
-            $arrShipmentProducts = $this->deleteShipment($objFormParam, $this->arrShipmentItemKeys , $select_shipping_id, $change_no);
-            foreach ($arrShipmentProducts['shipment_product_class_id'][$select_shipping_id] as $relation_index => $shipment_product_class_id) {
-                if($shipment_product_class_id == $edit_product_class_id){
-                    $arrShipmentProducts['shipment_quantity'][$select_shipping_id][$relation_index] ++;
-                    break;
-                }
-            }
-        }else{
-            $objProduct = new SC_Product_Ex();
-            $arrAddProductInfo = $objProduct->getDetailAndProductsClass($edit_product_class_id);
-
-            //上書き
-            $this->changeShipmentProducts($arrShipmentProducts, $arrAddProductInfo, $select_shipping_id, $change_no);
-            //受注商品情報に追加
-            $arrProducts = $this->checkInsertOrderProducts($objFormParam, $arrPreProductClassIds, $edit_product_class_id, $arrAddProductInfo);
-            $objFormParam->setParam($arrProducts);
-        }
-        $objFormParam->setParam($arrShipmentProducts);
-
-        //更新のみの場合、全配列を持っていないので、新しい配列を取得
-        $arrNewShipmentProducts = $this->getShipmentProducts($objFormParam);
-        $is_product_delete = true;
-        //変更前のproduct_class_idが他の届け先にも存在するか
-        foreach ($arrNewShipmentProducts['shipment_product_class_id'] as $shipping_id => $arrShipmentProductClassIds) {
-            if(in_array($pre_shipment_product_class_id, $arrShipmentProductClassIds)){
-                $is_product_delete = false;
-                break;
-            }
-        }
-
-        //商品情報から削除
-        if($is_product_delete){
-            $this->checkDeleteProducts($objFormParam, $arrPreProductClassIds, $pre_shipment_product_class_id, $this->arrProductKeys);
-        }
-    }
-
-    /**
-     * 複数配送のパラメータを取り出す 
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @return array 配送データ
-     */
-    function getShipmentProducts(&$objFormParam)
-    {
-        $arrShipmentProducts['shipment_product_class_id']    = $objFormParam->getValue('shipment_product_class_id');
-        $arrShipmentProducts['shipment_product_code']        = $objFormParam->getValue('shipment_product_code');
-        $arrShipmentProducts['shipment_product_name']        = $objFormParam->getValue('shipment_product_name');
-        $arrShipmentProducts['shipment_classcategory_name1'] = $objFormParam->getValue('shipment_classcategory_name1');
-        $arrShipmentProducts['shipment_classcategory_name2'] = $objFormParam->getValue('shipment_classcategory_name2');
-        $arrShipmentProducts['shipment_price']               = $objFormParam->getValue('shipment_price');
-        $arrShipmentProducts['shipment_quantity']            = $objFormParam->getValue('shipment_quantity');
-
-        return $arrShipmentProducts;
-    }
-
-    /**
-     * 変更対象のデータを上書きする
-     *
-     * @param array   $arrShipmentProducts  変更対象配列
-     * @param array   $arrProductInfo       上書きデータ
-     * @param integer $shipping_id          配送先ID
-     * @param array   $no                   変更対象
-     * @return void
-     */
-    function changeShipmentProducts(&$arrShipmentProducts, $arrProductInfo, $shipping_id, $no)
-    {
-        $arrShipmentProducts['shipment_product_class_id'][$shipping_id][$no]    = $arrProductInfo['product_class_id'];
-        $arrShipmentProducts['shipment_product_code'][$shipping_id][$no]        = $arrProductInfo['product_code'];
-        $arrShipmentProducts['shipment_product_name'][$shipping_id][$no]        = $arrProductInfo['name'];
-        $arrShipmentProducts['shipment_classcategory_name1'][$shipping_id][$no] = $arrProductInfo['classcategory_name1'];
-        $arrShipmentProducts['shipment_classcategory_name2'][$shipping_id][$no] = $arrProductInfo['classcategory_name2'];
-        $arrShipmentProducts['shipment_price'][$shipping_id][$no]               = $arrProductInfo['price02'];
-        $arrShipmentProducts['shipment_quantity'][$shipping_id][$no]            = 1;
-    }
-
-    /**
-     * 商品側の総量計算&セット
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @return void
-     */
-    function setProductsQuantity(&$objFormParam)
-    {
-        $arrShipmentsItems = $objFormParam->getSwapArray(array('shipment_product_class_id','shipment_quantity'));
-        foreach ($arrShipmentsItems as $arritems) {
-            foreach ($arritems['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) {
-                $arrUpdateQuantity[$shipment_product_class_id] += $arritems['shipment_quantity'][$relation_index];
-            }
-        }
-
-        $arrProductsClass = $objFormParam->getValue('product_class_id');
-        $arrProductsQuantity = $objFormParam->getValue('quantity');
-        foreach ($arrProductsClass as $relation_key => $product_class_id) {
-            $arrQuantity['quantity'][$relation_key] = $arrUpdateQuantity[$product_class_id];
-        }
-        $objFormParam->setParam($arrQuantity);
-    }
-
-    /**
-     * 削除対象の確認、削除をする
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param array   $arrProductClassIds　     削除対象配列の商品規格ID
-     * @param integer $delete_product_class_id　削除商品規格ID
-     * @param array   $arrDeleteKeys            削除項目
-     * @return void
-     */
-    function checkDeleteProducts(&$objFormParam, $arrProductClassIds, $delete_product_class_id, $arrDeleteKeys)
-    {
-        foreach ($arrProductClassIds as $relation_index => $product_class_id) {
-            //product_class_idの重複はないので、１つ削除したら完了
-            if($product_class_id == $delete_product_class_id){
-                foreach ($arrDeleteKeys as $delete_key) {
-                    $arrProducts = $objFormParam->getValue($delete_key);
-                    foreach ($arrProducts as $index => $product_info) {
-                        if($index != $relation_index){
-                            $arrUpdateParams[$delete_key][] = $product_info;
-                        }
-                    }
-                    $objFormParam->setParam($arrUpdateParams);
-                }
-                break;
-            }
-        }
-    }
-
-    /**
-     * 配送先商品の削除の削除
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param array   $arrShipmentDeleteKeys   削除項目
-     * @param integer $delete_shipping_id　    削除配送ID
-     * @param array   $delete_no               削除対象
-     * @return void
-     */
-    function deleteShipment(&$objFormParam, $arrShipmentDeletKeys, $delete_shipping_id, $delete_no)
-    {
-            foreach ($arrShipmentDeletKeys as $delete_key) {
-                $arrShipments = $objFormParam->getValue($delete_key);
-                foreach ($arrShipments as $shipp_id => $arrKeyData){
-                    foreach ($arrKeyData as $relation_index => $shipment_info) {
-                        if($relation_index != $delete_no || $shipp_id != $delete_shipping_id){
-                            $arrUpdateParams[$delete_key][$shipp_id][] = $shipment_info;
-                        }
-                    }
-                }
-            }
-            //$objFormParam->setParam($arrUpdateParams);
-            return $arrUpdateParams;
-        }
-
-
-    /**
-     * 受注商品一覧側に商品を追加
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param array   $arrProductClassIds　     対象配列の商品規格ID
-     * @param integer $indert_product_class_id　追加商品規格ID
-     * @param array   $arrAddProductInfo        追加データ
-     * @return array  $arrAddProducts           更新データ
-     */
-    function checkInsertOrderProducts(&$objFormParam, $arrProductClassIds, $insert_product_class_id, $arrAddProductInfo)
-    {
-        if(!in_array($insert_product_class_id, $arrProductClassIds)){
-            $arrAddProductInfo['product_name'] = ($arrAddProductInfo['product_name'])? $arrAddProductInfo['product_name']:$arrAddProductInfo['name'];
-            $arrAddProductInfo['price']        = ($arrAddProductInfo['price'])? $arrAddProductInfo['price']:$arrAddProductInfo['price02'];
-            $arrAddProductInfo['quantity']     = 1;
-            $arrAddProductInfo['tax_rate']     = ($objFormParam->getValue('order_tax_rate') == '')? $this->arrInfo['tax']     :$objFormParam->getValue('order_tax_rate');
-            $arrAddProductInfo['tax_rule']     = ($objFormParam->getValue('order_tax_rule') == '')? $this->arrInfo['tax_rule']:$objFormParam->getValue('order_tax_rule');
-            foreach ($this->arrProductKeys as $insert_key) {
-                $arrAddProducts[$insert_key]   = $objFormParam->getValue($insert_key);
-                $arrAddProducts[$insert_key][] = $arrAddProductInfo[$insert_key];
-            }
-            return $arrAddProducts;
-        }else{
-            //受注商品の数量は、複数配送側の集計で出しているので、重複しても数量を増やさない。
-            return null;
-        }
-    }
 }
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 22582)
+++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_Recommend extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_Recommend extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/recommend.tpl';
@@ -60,6 +58,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -71,32 +68,37 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
         $objFormParam->setParam($_POST);
         $objFormParam->convParam();
-        $arrPost = $objFormParam->getHashArray();
-
-        $objRecommend = new SC_Helper_Recommend_Ex();
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objDb = new SC_Helper_DB_Ex();
 
         switch ($this->getMode()) {
-            case 'down': //商品の並び替えをする。
-                $objRecommend->rankDown($arrPost['best_id']);
-                $arrItems = $this->getRecommendProducts($objRecommend);
-                break;
-
-            case 'up': //商品の並び替えをする。
-                $objRecommend->rankUp($arrPost['best_id']);
-                $arrItems = $this->getRecommendProducts($objRecommend);
+            case 'down': //商品の並び替えをする。おすすめはデータベースの登録が昇順なので、Modeを逆にする。
+                $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'];
+                $objDb->sfRankDown('dtb_best_products','best_id',$best_id);
+                $arrPost = $objFormParam->getHashArray();
+                $arrItems = $this->getRecommendProducts();
                 break;
 
             case 'regist': // 商品を登録する。
                 $this->arrErr = $this->lfCheckError($objFormParam);
+                $arrPost = $objFormParam->getHashArray();
                 // 登録処理にエラーがあった場合は商品選択の時と同じ処理を行う。
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     $member_id = $_SESSION['member_id'];
-                    $this->insertRecommendProduct($arrPost,$member_id,$objRecommend);
-                    $arrItems = $this->getRecommendProducts($objRecommend);
+                    $this->insertRecommendProduct($arrPost,$member_id);
+                    $arrItems = $this->getRecommendProducts();
                 } else {
                     $arrItems = $this->setProducts($arrPost, $arrItems);
@@ -107,7 +109,8 @@
             case 'delete': // 商品を削除する。
                 $this->arrErr = $this->lfCheckError($objFormParam);
+                $arrPost = $objFormParam->getHashArray();
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
-                    $this->deleteProduct($arrPost, $objRecommend);
-                    $arrItems = $this->getRecommendProducts($objRecommend);
+                    $this->deleteProduct($arrPost);
+                    $arrItems = $this->getRecommendProducts();
                 }
                 $this->tpl_onload = "window.alert('削除しました');";
@@ -117,10 +120,10 @@
                 $arrPost = $objFormParam->getHashArray();
                 if (SC_Utils_Ex::isBlank($this->arrErr['rank']) && SC_Utils_Ex::isBlank($this->arrErr['product_id'])) {
-                    $arrItems = $this->setProducts($arrPost, $this->getRecommendProducts($objRecommend));
+                    $arrItems = $this->setProducts($arrPost, $this->getRecommendProducts());
                     $this->checkRank = $arrPost['rank'];
                 }
                 break;
             default:
-                $arrItems = $this->getRecommendProducts($objRecommend);
+                $arrItems = $this->getRecommendProducts();
                 break;
         }
@@ -140,6 +143,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -149,7 +151,5 @@
      * @param Object $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
-        $objFormParam->addParam('おすすめ商品ID', 'best_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -163,6 +163,5 @@
      * @return Array エラー内容
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
@@ -172,24 +171,17 @@
     /**
      * 既に登録されている内容を取得する
-     * @param Object $objRecommend
      * @return Array $arrReturnProducts データベースに登録されているおすすめ商品の配列
      */
-    function getRecommendProducts(SC_Helper_Recommend_Ex &$objRecommend)
-    {
-        $arrList = $objRecommend->getList();
-        // product_id の一覧を作成
-        $product_ids = array();
-        foreach ($arrList as $value) {
-            $product_ids[] = $value['product_id'];
-        }
-
-        $objProduct = new SC_Product_Ex;
-        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $arrProducts = $objProduct->getListByProductIds($objQuery, $product_ids);
+    function getRecommendProducts() {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = 'dtb_products.name,dtb_products.main_list_image,dtb_best_products.*';
+        $table = 'dtb_best_products INNER JOIN dtb_products ON dtb_best_products.product_id = dtb_products.product_id';
+        $where = 'dtb_best_products.del_flg = 0';
+        $order = 'rank';
+        $objQuery->setOrder($order);
+        $arrProducts = $objQuery->select($col, $table, $where);
 
         $arrReturnProducts = array();
-        foreach ($arrList as $data) {
-            $data['main_list_image'] = $arrProducts[$data['product_id']]['main_list_image'];
-            $data['name'] = $arrProducts[$data['product_id']]['name'];
+        foreach ($arrProducts as $data) {
             $arrReturnProducts[$data['rank']] = $data;
         }
@@ -201,10 +193,9 @@
      * @param Array $arrPost POSTの値を格納した配列
      * @param Integer $member_id 登録した管理者を示すID
-     * @param Object $objRecommend
-     */
-    function insertRecommendProduct($arrPost,$member_id, SC_Helper_Recommend_Ex &$objRecommend)
-    {
+     */
+    function insertRecommendProduct($arrPost,$member_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
         // 古いおすすめ商品のデータを削除する。
-        $this->deleteProduct($arrPost, $objRecommend);
+        $this->deleteProduct($arrPost);
 
         $sqlval = array();
@@ -214,5 +205,8 @@
         $sqlval['comment'] = $arrPost['comment'];
         $sqlval['creator_id'] = $member_id;
-        $objRecommend->save($sqlval);
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id');
+        $objQuery->insert('dtb_best_products', $sqlval);
     }
 
@@ -220,16 +214,11 @@
      * データを削除する
      * @param Array $arrPost POSTの値を格納した配列
-     * @param Object $objRecommend
-     * @return void
-     */
-    function deleteProduct($arrPost, SC_Helper_Recommend_Ex &$objRecommend)
-    {
-        if ($arrPost['best_id']) {
-            $target = $arrPost['best_id'];
-        } else {
-            $recommend = $objRecommend->getByRank($arrPost['rank']);
-            $target = $recommend['best_id'];
-        }
-        $objRecommend->delete($target);
+     */
+    function deleteProduct($arrPost) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $table = 'dtb_best_products';
+        $where = 'category_id = ? AND rank = ?';
+        $arrWhereVal = array($arrPost['category_id'],$arrPost['rank']);
+        $objQuery->delete($table, $where, $arrWhereVal);
     }
 
@@ -237,16 +226,14 @@
      * 商品情報を取得する
      * @param Integer $product_id 商品ID
-     * @return Array $return 商品のデータを格納した配列
-     */
-    function getProduct($product_id)
-    {
-        $objProduct = new SC_Product_Ex();
-        $arrProduct = $objProduct->getDetail($product_id);
-        $return = array(
-            'product_id' => $arrProduct['product_id'],
-            'main_list_image' => $arrProduct['main_list_image'],
-            'name' => $arrProduct['name']
-        );
-        return $return;
+     * @return Array $arrProduct 商品のデータを格納した配列
+     */
+    function getProduct($product_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = 'product_id,main_list_image,name';
+        $table = 'dtb_products';
+        $where = 'product_id = ? AND del_flg = 0';
+        $arrWhereVal = array($product_id);
+        $arrProduct = $objQuery->select($col, $table, $where, $arrWhereVal);
+        return $arrProduct[0];
     }
 
@@ -256,6 +243,5 @@
      * @param Array $arrItems フロントに表示される商品の情報を格納した配列
      */
-    function setProducts($arrPost,$arrItems)
-    {
+    function setProducts($arrPost,$arrItems) {
         $arrProduct = $this->getProduct($arrPost['product_id']);
         if (count($arrProduct) > 0) {
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileManager extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_FileManager extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/file_manager.tpl';
@@ -59,6 +57,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -70,6 +67,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // フォーム操作クラス
@@ -209,6 +205,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -220,6 +215,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // 共通定義
         $this->lfInitParamCommon($objFormParam);
@@ -232,6 +226,5 @@
      * @return void
      */
-    function lfInitParamModeMove(&$objFormParam)
-    {
+    function lfInitParamModeMove(&$objFormParam) {
         // 共通定義
         $this->lfInitParamCommon($objFormParam);
@@ -245,6 +238,5 @@
      * @return void
      */
-    function lfInitParamModeView(&$objFormParam)
-    {
+    function lfInitParamModeView(&$objFormParam) {
         // 共通定義
         $this->lfInitParamCommon($objFormParam);
@@ -258,6 +250,5 @@
      * @return void
      */
-    function lfInitParamModeCreate(&$objFormParam)
-    {
+    function lfInitParamModeCreate(&$objFormParam) {
         // 共通定義
         $this->lfInitParamCommon($objFormParam);
@@ -272,6 +263,5 @@
      * @return void
      */
-    function lfInitParamCommon(&$objFormParam)
-    {
+    function lfInitParamCommon(&$objFormParam) {
         $objFormParam->addParam('ルートディレクトリ', 'top_dir', MTEXT_LEN, 'a', array());
         $objFormParam->addParam('現在の階層ディレクトリ', 'now_dir', MTEXT_LEN, 'a', array());
@@ -287,6 +277,5 @@
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('ファイル', 'upload_file', array(), FILE_SIZE, true, 0, 0, false);
     }
@@ -298,6 +287,5 @@
      * @return array $setParam テンプレートに渡す値
      */
-    function createSetParam($arrVal)
-    {
+    function createSetParam($arrVal) {
         $setParam = $arrVal;
         // Windowsの場合は, ディレクトリの区切り文字を\から/に変換する
@@ -317,6 +305,5 @@
      * @return void
      */
-    function setDispParam($key, $val)
-    {
+    function setDispParam($key, $val) {
         $this->$key = $val;
     }
@@ -329,6 +316,5 @@
      * @return boolean ディレクトリ作成できたかどうか
      */
-    function tryCreateDir($objFileManager, $objFormParam)
-    {
+    function tryCreateDir($objFileManager, $objFormParam) {
         $create_dir_flg = false;
         $create_dir = rtrim($objFormParam->getValue('now_dir'), '/');
@@ -346,6 +332,5 @@
      * @return boolean ファイル表示するかどうか
      */
-    function tryView(&$objFormParam)
-    {
+    function tryView(&$objFormParam) {
         $view_flg = false;
         $now_dir = $this->lfCheckSelectDir($objFormParam, dirname($objFormParam->getValue('select_file')));
@@ -363,6 +348,5 @@
      * @return void
      */
-    function setParentDir($objFormParam)
-    {
+    function setParentDir($objFormParam) {
         $parent_dir = $this->lfGetParentDir($objFormParam->getValue('now_dir'));
         $this->setDispParam('tpl_parent_dir', $parent_dir);
@@ -375,6 +359,5 @@
      * @return void
      */
-    function setDispPath($objFormParam)
-    {
+    function setDispPath($objFormParam) {
         $tpl_now_dir = '';
         // Windows 環境で DIRECTORY_SEPARATOR が JavaScript に渡るとエスケープ文字と勘違いするので置換
@@ -392,6 +375,5 @@
      * @return void
      */
-    function setDispError($key, $value)
-    {
+    function setDispError($key, $value) {
         // 既にエラーがある場合は、処理しない
         if (SC_Utils_Ex::isBlank($this->arrErr[$key])) {
@@ -406,6 +388,5 @@
      * @return void
      */
-    function setTplOnLoad($tpl_onload)
-    {
+    function setTplOnLoad($tpl_onload) {
         $this->tpl_onload .= $tpl_onload;
     }
@@ -418,6 +399,5 @@
      * @return string $select_dir 選択ディレクトリ
      */
-    function lfCheckSelectDir($objFormParam, $dir)
-    {
+    function lfCheckSelectDir($objFormParam, $dir) {
         $select_dir = '';
         $top_dir = $objFormParam->getValue('top_dir');
@@ -444,6 +424,5 @@
      * @return string $parent_dir 親ディレクトリ
      */
-    function lfGetParentDir($dir)
-    {
+    function lfGetParentDir($dir) {
         $parent_dir = '';
         $dir = rtrim($dir, '/');
@@ -464,6 +443,5 @@
      * @return void
      */
-    function setDispTree($objFileManager, $objFormParam)
-    {
+    function setDispTree($objFileManager, $objFormParam) {
         $tpl_onload = '';
         // ツリーを表示する divタグid, ツリー配列変数名, 現在ディレクトリ, 選択ツリーhidden名, ツリー状態hidden名, mode hidden名
@@ -497,6 +475,5 @@
      * @return void
      */
-    function setIsTopDir($objFormParam)
-    {
+    function setIsTopDir($objFormParam) {
         // トップディレクトリか調査
         $is_top_dir = false;
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileView extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_FileView extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
@@ -93,6 +89,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -104,6 +99,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('ファイル名', 'file', MTEXT_LEN, 'a', array('EXIST_CHECK'));
     }
@@ -115,6 +109,5 @@
      * @return boolen $file_check_flg エラーチェックの結果
      */
-    function checkErrorDispFile($objFormParam)
-    {
+    function checkErrorDispFile($objFormParam) {
         $file_check_flg = false;
 
@@ -134,6 +127,5 @@
      * @return void
      */
-    function execFileView($objFormParam)
-    {
+    function execFileView($objFormParam) {
         $file = $objFormParam->getValue('file');
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CSV extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_CSV extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/csv.tpl';
@@ -63,6 +61,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -74,6 +71,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -121,6 +117,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('編集種別', 'tpl_subno_csv', STEXT_LEN, 'a', array('ALNUM_CHECK', 'MAX_LENGTH_CHECK'), 'product');
         $objFormParam->addParam('出力設定リスト', 'output_list', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK', 'EXIST_CHECK'));
@@ -136,6 +131,5 @@
      * @return array SwapArrayしたカラム設定
      */
-    function lfGetCSVColumn($csv_id, $csv_status_flg = '', $order ='rank, no')
-    {
+    function lfGetCSVColumn($csv_id, $csv_status_flg = '', $order ='rank, no') {
         $objCSV = new SC_Helper_CSV_Ex();
         if (SC_Utils_Ex::sfIsInt($csv_id)) {
@@ -158,6 +152,5 @@
      * @return array 選択済みカラム列情報
      */
-    function lfGetSelected($csv_id)
-    {
+    function lfGetSelected($csv_id) {
         $arrData = $this->lfGetCSVColumn($csv_id, CSV_COLUMN_STATUS_FLG_ENABLE);
         if (!isset($arrData['no'])) {
@@ -173,6 +166,5 @@
      * @return array 選択済みカラム列情報
      */
-    function lfGetOptions($csv_id)
-    {
+    function lfGetOptions($csv_id) {
         $arrData = $this->lfGetCSVColumn($csv_id);
         if (!isset($arrData['no'])) {
@@ -189,6 +181,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -200,6 +191,5 @@
      * @return integer CSV_ID
      */
-    function lfGetCsvId($subno_csv)
-    {
+    function lfGetCsvId($subno_csv) {
         $objCSV = new SC_Helper_CSV_Ex();
         $arrKey = array_keys($objCSV->arrSubnavi,$subno_csv);
@@ -219,6 +209,5 @@
      * @return boolean 成功:true
      */
-    function lfSetDefaultCsvOutput($csv_id)
-    {
+    function lfSetDefaultCsvOutput($csv_id) {
         $arrData = $this->lfGetCSVColumn($csv_id, '', $order = 'no');
         if (!isset($arrData['no'])) {
@@ -235,6 +224,5 @@
      * @return boolean 成功:true
      */
-    function lfUpdCsvOutput($csv_id, $arrData = array())
-    {
+    function lfUpdCsvOutput($csv_id, $arrData = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // ひとまず、全部使用しないで更新する
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CsvSql extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_CsvSql extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/csv_sql.tpl';
@@ -59,6 +57,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -70,6 +67,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         // パラメーター管理クラス
         $objFormParam = new SC_FormParam_Ex();
@@ -146,6 +142,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('SQL ID', 'sql_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('CSV出力対象SQL ID', 'csv_output_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'), '', false);
@@ -161,6 +156,5 @@
      * @return array エラー配列
      */
-    function lfCheckConfirmError(&$objFormParam)
-    {
+    function lfCheckConfirmError(&$objFormParam) {
         // パラメーターの基本チェック
         $arrErr = $objFormParam->checkError();
@@ -189,6 +183,5 @@
      * @return array エラー配列
      */
-    function lfCheckPreviewError(&$objFormParam)
-    {
+    function lfCheckPreviewError(&$objFormParam) {
         // パラメーターの基本チェック
         $arrErr = $objFormParam->checkError();
@@ -209,6 +202,5 @@
      * @return array エラー配列
      */
-    function lfCheckDeleteError(&$objFormParam)
-    {
+    function lfCheckDeleteError(&$objFormParam) {
         // パラメーターの基本チェック
         $arrErr = $objFormParam->checkError();
@@ -228,6 +220,5 @@
      * @return array エラー配列
      */
-    function lfCheckOutputError(&$objFormParam)
-    {
+    function lfCheckOutputError(&$objFormParam) {
         // パラメーターの基本チェック
         $arrErr = $objFormParam->checkError();
@@ -246,6 +237,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -256,6 +246,5 @@
      * @return array テーブル名一覧
      */
-    function lfGetTableList()
-    {
+    function lfGetTableList() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // 実テーブル上のカラム設定を見に行く仕様に変更 ref #476
@@ -281,6 +270,5 @@
      * @return array カラム一覧の配列
      */
-    function lfGetColList($table)
-    {
+    function lfGetColList($table) {
         if (SC_Utils_Ex::isBlank($table)) {
             return array();
@@ -300,6 +288,5 @@
      * @return array 取得結果の配列
      */
-    function lfGetSqlList($where = '' , $arrVal = array())
-    {
+    function lfGetSqlList($where = '' , $arrVal = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_csv_sql';
@@ -314,6 +301,5 @@
      * @return string エラー内容
      */
-    function lfCheckSQL($sql)
-    {
+    function lfCheckSQL($sql) {
         // FIXME: 意図的に new SC_Query しています。 force_runをtrueにする必要があるので.本当はqueryの引数で制御したい。ref SC_Query
         $objQuery = new SC_Query_Ex('', true);
@@ -333,6 +319,5 @@
      * @return mixed 表示用パラメーター
      */
-    function lfGetSqlData(&$objFormParam)
-    {
+    function lfGetSqlData(&$objFormParam) {
         // 編集中データがある場合
         if (!SC_Utils_Ex::isBlank($objFormParam->getValue('sql_name'))
@@ -355,6 +340,5 @@
      * @return void
      */
-    function lfDoCsvOutput($sql_id)
-    {
+    function lfDoCsvOutput($sql_id) {
         $arrData = $this->lfGetSqlList('sql_id = ?', array($sql_id));
         $sql = 'SELECT ' . $arrData[0]['csv_sql'] . ' ';
@@ -387,6 +371,5 @@
      * @return integer $sql_id SQL_IDを返す
      */
-    function lfUpdData($sql_id, $arrSqlVal)
-    {
+    function lfUpdData($sql_id, $arrSqlVal) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_csv_sql';
@@ -412,6 +395,5 @@
      * @return boolean 実行結果 true：成功
      */
-    function lfDelData($sql_id)
-    {
+    function lfDelData($sql_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_csv_sql';
@@ -432,6 +414,5 @@
      * @return array 不許可ワード配列
      */
-    function lfGetSqlDenyList()
-    {
+    function lfGetSqlDenyList() {
         $arrList = array(';'
             ,'CREATE\s'
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents_RecommendSearch extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_RecommendSearch extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainno = 'contents';
@@ -57,6 +55,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -68,6 +65,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -117,6 +113,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -126,10 +121,8 @@
      * @param Object $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('商品ID', 'search_name', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('商品ID', 'search_category_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK'));
         $objFormParam->addParam('商品コード', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('商品ステータス', 'search_status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('ページ番号', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK'));
     }
@@ -140,6 +133,5 @@
      * @return Array エラー内容
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
@@ -153,6 +145,5 @@
      * @param SC_FormParam $objFormParam
      */
-    function createWhere(&$objFormParam,&$objDb)
-    {
+    function createWhere(&$objFormParam,&$objDb) {
         $arrForm = $objFormParam->getHashArray();
         $where = 'alldtl.del_flg = 0';
@@ -179,8 +170,4 @@
                     $bind[] = '%'.$val.'%';
                     break;
-                case 'search_status':
-                    $where .= ' AND alldtl.status = ?';
-                    $bind[] = $val;
-                    break;
                 default:
                     break;
@@ -199,6 +186,5 @@
      * @param SC_Product $objProduct
      */
-    function getLineCount($whereAndBind,&$objProduct)
-    {
+    function getLineCount($whereAndBind,&$objProduct) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
@@ -215,6 +201,5 @@
      * @param SC_Product $objProduct
      */
-    function getProducts($whereAndBind,&$objProduct, $page_max, $startno)
-    {
+    function getProducts($whereAndBind,&$objProduct, $page_max, $startno) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
@@ -233,6 +218,5 @@
      * @param SC_Product $objProduct
      */
-    function getProductList($arrProductId, &$objProduct)
-    {
+    function getProductList($arrProductId, &$objProduct) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
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 22581)
+++ /branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Contents extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/index.tpl';
@@ -68,6 +66,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -79,88 +76,83 @@
      * @return void
      */
-    function action()
-    {
-
-        $objNews = new SC_Helper_News_Ex();
-
+    function action() {
+
+        $objDb = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
         $objFormParam->setParam($_POST);
         $objFormParam->convParam();
-
         $news_id = $objFormParam->getValue('news_id');
 
         //---- 新規登録/編集登録
         switch ($this->getMode()) {
-            case 'edit':
+            case 'regist':
+                $arrPost = $objFormParam->getHashArray();
                 $this->arrErr = $this->lfCheckError($objFormParam);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['news_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
-                }
-
-                if (count($this->arrErr) <= 0) {
-                    // POST値の引き継ぎ
-                    $arrParam = $objFormParam->getHashArray();
-                    // 登録実行
-                    $res_news_id = $this->doRegist($news_id, $arrParam, $objNews);
-                    if ($res_news_id !== FALSE) {
-                        // 完了メッセージ
-                        $news_id = $res_news_id;
-                        $this->tpl_onload = "alert('登録が完了しました。');";
+                if (SC_Utils_Ex::isBlank($this->arrErr)) {
+                    // ニュースIDの値がPOSTされて来た場合は既存データの編集とみなし、
+                    // 更新メソッドを呼び出す。
+                    // ニュースIDが存在しない場合は新規登録を行う。
+                    $arrPost['link_method'] = $this->checkLinkMethod($arrPost['link_method']);
+                    $arrPost['news_date'] = $this->getRegistDate($arrPost);
+                    $member_id = $_SESSION['member_id'];
+                    if (strlen($news_id) > 0 && is_numeric($news_id)) {
+                        $this->lfNewsUpdate($arrPost,$member_id);
+                    } else {
+                        $this->lfNewsInsert($arrPost,$member_id);
                     }
-                }
-                // POSTデータを引き継ぐ
-                $this->tpl_news_id = $news_id;
-                break;
-
-            case 'pre_edit':
-                $news = $objNews->get($news_id);
-                list($news['year'],$news['month'],$news['day']) = $this->splitNewsDate($news['cast_news_date']);
-                $objFormParam->setParam($news);
-
-                // POSTデータを引き継ぐ
-                $this->tpl_news_id = $news_id;
-                break;
-
+                    $news_id = '';
+                    $this->tpl_onload = "window.alert('編集が完了しました');";
+                } else {
+                    $this->arrForm = $arrPost;
+                }
+                break;
+            case 'search':
+                if (is_numeric($news_id)) {
+                    list($this->arrForm) = $this->getNews($news_id);
+                    list($this->arrForm['year'],$this->arrForm['month'],$this->arrForm['day']) = $this->splitNewsDate($this->arrForm['cast_news_date']);
+                    $this->edit_mode = 'on';
+                }
+                break;
             case 'delete':
             //----　データ削除
-                $objNews->delete($news_id);
-                //自分にリダイレクト（再読込による誤動作防止）
-                SC_Response_Ex::reload();
-                break;
-
+                if (is_numeric($news_id)) {
+                    $pre_rank = $this->getRankByNewsId($news_id);
+                    $this->computeRankForDelete($news_id,$pre_rank);
+
+                    SC_Response_Ex::reload();             //自分にリダイレクト（再読込による誤動作防止）
+                }
+                break;
+            case 'move':
             //----　表示順位移動
-            case 'up':
-                $objNews->rankUp($news_id);
-
-                // リロード
-                SC_Response_Ex::reload();
-                break;
-
-            case 'down':
-                $objNews->rankDown($news_id);
-
-                // リロード
-                SC_Response_Ex::reload();
-                break;
-
+                if (strlen($news_id) > 0 && is_numeric($news_id) == true) {
+                    $term = $objFormParam->getValue('term');
+                    if ($term == 'up') {
+                        $objDb->sfRankUp('dtb_news', 'news_id', $news_id);
+                    } else if ($term == 'down') {
+                        $objDb->sfRankDown('dtb_news', 'news_id', $news_id);
+                    }
+
+                    $this->objDisplay->reload();
+                }
+                break;
             case 'moveRankSet':
             //----　指定表示順位移動
                 $input_pos = $this->getPostRank($news_id);
                 if (SC_Utils_Ex::sfIsInt($input_pos)) {
-                    $objNews->moveRank($news_id, $input_pos);
-                }
-                SC_Response_Ex::reload();
-                break;
-
+                    $objDb->sfMoveRank('dtb_news', 'news_id', $news_id, $input_pos);
+
+                    $this->objDisplay->reload();
+                }
+                break;
             default:
                 break;
         }
 
-        $this->arrNews = $objNews->getList();
+        $this->arrNews = $this->getNews();
+        $this->tpl_news_id = $news_id;
         $this->line_max = count($this->arrNews);
-
-        $this->arrForm = $objFormParam->getFormParamList();
+        $this->max_rank = $this->getRankMax();
+
     }
 
@@ -170,6 +162,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -180,6 +171,5 @@
      * @return Array エラー内容
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
@@ -192,6 +182,5 @@
      * @param Object $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('news_id', 'news_id');
         $objFormParam->addParam('日付(年)', 'year', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -202,22 +191,50 @@
         $objFormParam->addParam('本文', 'news_comment', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('別ウィンドウで開く', 'link_method', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-    }
-
-    /**
-     * 登録処理を実行.
-     * 
-     * @param integer $news_id
-     * @param array $sqlval
-     * @param object $objNews
-     * @return multiple
-     */
-    function doRegist($news_id, $sqlval, SC_Helper_News_Ex $objNews)
-    {
+        $objFormParam->addParam('ランク移動', 'term', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+    }
+
+    /**
+     * 新着記事のデータの登録を行う
+     * @param Array $arrPost POSTデータの配列
+     * @param Integer $member_id 登録した管理者のID
+     */
+    function lfNewsInsert($arrPost,$member_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // rankの最大+1を取得する
+        $rank_max = $this->getRankMax();
+        $rank_max = $rank_max + 1;
+
+        $table = 'dtb_news';
+        $sqlval = array();
+        $news_id = $objQuery->nextVal('dtb_news_news_id');
         $sqlval['news_id'] = $news_id;
-        $sqlval['creator_id'] = $_SESSION['member_id'];
-        $sqlval['link_method'] = $this->checkLinkMethod($sqlval['link_method']);
-        $sqlval['news_date'] = $this->getRegistDate($sqlval);
-        unset($sqlval['year'], $sqlval['month'], $sqlval['day']);
-        return $objNews->save($sqlval);
+        $sqlval['news_date'] = $arrPost['news_date'];
+        $sqlval['news_title'] = $arrPost['news_title'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['news_url'] = $arrPost['news_url'];
+        $sqlval['link_method'] = $arrPost['link_method'];
+        $sqlval['news_comment'] = $arrPost['news_comment'];
+        $sqlval['rank'] = $rank_max;
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $objQuery->insert($table, $sqlval);
+    }
+
+    function lfNewsUpdate($arrPost,$member_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $table = 'dtb_news';
+        $sqlval = array();
+        $sqlval['news_date'] = $arrPost['news_date'];
+        $sqlval['news_title'] = $arrPost['news_title'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['news_url'] = $arrPost['news_url'];
+        $sqlval['news_comment'] = $arrPost['news_comment'];
+        $sqlval['link_method'] = $arrPost['link_method'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'news_id = ?';
+        $arrValIn = array($arrPost['news_id']);
+        $objQuery->update($table, $sqlval, $where, $arrValIn);
     }
 
@@ -227,6 +244,5 @@
      * @return string 登録日を示す文字列
      */
-    function getRegistDate($arrPost)
-    {
+    function getRegistDate($arrPost) {
         $registDate = $arrPost['year'] .'/'. $arrPost['month'] .'/'. $arrPost['day'];
         return $registDate;
@@ -238,6 +254,5 @@
      * @return int
      */
-    function checkLinkMethod($link_method)
-    {
+    function checkLinkMethod($link_method) {
         if (strlen($link_method) == 0) {
             $link_method = 1;
@@ -247,10 +262,65 @@
 
     /**
+     * ニュース記事を取得する。
+     * @param Integer news_id ニュースID
+     */
+    function getNews($news_id = '') {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = '*, cast(news_date as date) as cast_news_date';
+        $table = 'dtb_news';
+        $order = 'rank DESC';
+        if (strlen($news_id) == 0) {
+            $where = 'del_flg = 0';
+            $arrWhereVal = array();
+        } else {
+            $where = 'del_flg = 0 AND news_id = ?';
+            $arrWhereVal = array($news_id);
+        }
+        $objQuery->setOrder($order);
+        return $objQuery->select($col, $table, $where, $arrWhereVal);
+    }
+
+    /**
+     * 指定されたニュースのランクの値を取得する。
+     * @param Integer $news_id
+     */
+    function getRankByNewsId($news_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = 'rank';
+        $table = 'dtb_news';
+        $where = 'del_flg = 0 AND news_id = ?';
+        $arrWhereVal = array($news_id);
+        list($rank) = $objQuery->select($col, $table, $where, $arrWhereVal);
+        return $rank['rank'];
+    }
+
+    /**
+     * 削除する新着情報以降のrankを1つ繰り上げる。
+     * @param Integer $news_id
+     * @param Integer $rank
+     */
+    function computeRankForDelete($news_id,$rank) {
+        SC_Helper_DB_Ex::sfDeleteRankRecord('dtb_news', 'news_id', $news_id);
+    }
+
+    /**
      * ニュースの日付の値をフロントでの表示形式に合わせるために分割
      * @param String $news_date
      */
-    function splitNewsDate($news_date)
-    {
+    function splitNewsDate($news_date) {
         return explode('-', $news_date);
+    }
+
+    /**
+     * ランクの最大値の値を返す。
+     * @return Intger $max ランクの最大値の値
+     */
+    function getRankMax() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = 'MAX(rank) as max';
+        $table = 'dtb_news';
+        $where = 'del_flg = 0';
+        list($result) = $objQuery->select($col, $table, $where);
+        return $result['max'];
     }
 
@@ -260,6 +330,5 @@
      * @param Integer $news_id
      */
-    function getPostRank($news_id)
-    {
+    function getPostRank($news_id) {
         if (strlen($news_id) > 0 && is_numeric($news_id) == true) {
             $key = 'pos-' . $news_id;
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Index extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Index extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'login.tpl';
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -76,6 +72,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -115,6 +110,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('ID', 'login_id', ID_MAX_LEN, '', array('EXIST_CHECK', 'ALNUM_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('PASSWORD', 'password', ID_MAX_LEN, '', array('EXIST_CHECK', 'ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -129,6 +123,5 @@
      * @return array $arrErr エラー配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 書式チェック
         $arrErr = $objFormParam->checkError();
@@ -151,6 +144,5 @@
      * @return boolean ログイン情報が有効な場合 true
      */
-    function lfIsLoginMember($login_id, $pass)
-    {
+    function lfIsLoginMember($login_id, $pass) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //パスワード、saltの取得
@@ -175,6 +167,5 @@
      * @return void
      */
-    function lfDoLogin($login_id)
-    {
+    function lfDoLogin($login_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //メンバー情報取得
@@ -199,6 +190,5 @@
      * @return string $sid 設定したセッションのセッションID
      */
-    function lfSetLoginSession($member_id, $login_id, $authority, $login_name, $last_login)
-    {
+    function lfSetLoginSession($member_id, $login_id, $authority, $login_name, $last_login) {
         $objSess = new SC_Session_Ex();
         // 認証済みの設定
@@ -227,6 +217,5 @@
      * @return void
      */
-    function lfSetLoginData($sid, $member_id, $login_id, $authority, $last_login)
-    {
+    function lfSetLoginData($sid, $member_id, $login_id, $authority, $last_login) {
         // ログイン記録ログ出力
         $str_log = "login: user=$login_id($member_id) auth=$authority "
@@ -251,6 +240,5 @@
      * @return void
      */
-    function lfSetIncorrectData($error_login_id)
-    {
+    function lfSetIncorrectData($error_login_id) {
         GC_Utils_Ex::gfPrintLog($error_login_id . ' password incorrect.');
     }
Index: /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Home extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Home extends LC_Page_Admin_Ex {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'home.tpl';
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // DBバージョンの取得
@@ -116,6 +112,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -126,6 +121,5 @@
      * @return string PHPバージョン情報
      */
-    function lfGetPHPVersion()
-    {
+    function lfGetPHPVersion() {
         return 'PHP ' . phpversion();
     }
@@ -136,6 +130,5 @@
      * @return mixed DBバージョン情報
      */
-    function lfGetDBVersion()
-    {
+    function lfGetDBVersion() {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         return $dbFactory->sfGetDBVersion();
@@ -147,6 +140,5 @@
      * @return integer 会員数
      */
-    function lfGetCustomerCnt()
-    {
+    function lfGetCustomerCnt() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'COUNT(customer_id)';
@@ -162,6 +154,5 @@
      * @return integer 結果数値
      */
-    function lfGetOrderYesterday($method)
-    {
+    function lfGetOrderYesterday($method) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -178,6 +169,5 @@
      * @return integer 結果数値
      */
-    function lfGetOrderMonth($method)
-    {
+    function lfGetOrderMonth($method) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $month = date('Y/m', mktime());
@@ -194,6 +184,5 @@
      * @return integer 会員の保持ポイント合計
      */
-    function lfGetTotalCustomerPoint()
-    {
+    function lfGetTotalCustomerPoint() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -209,6 +198,5 @@
      * @return integer 昨日のレビュー書き込み数
      */
-    function lfGetReviewYesterday()
-    {
+    function lfGetReviewYesterday() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -224,6 +212,5 @@
      * @return integer レビュー書き込み非表示数
      */
-    function lfGetReviewNonDisp()
-    {
+    function lfGetReviewNonDisp() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -238,6 +225,5 @@
      * @return array 品切れ商品一覧
      */
-    function lfGetSoldOut()
-    {
+    function lfGetSoldOut() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -246,5 +232,5 @@
         $where = 'product_id IN ('
                . 'SELECT product_id FROM dtb_products_class '
-               . 'WHERE del_flg = 0 AND stock_unlimited = ? AND stock <= 0)'
+               . 'WHERE stock_unlimited = ? AND stock <= 0)'
                . ' AND del_flg = 0';
         return $objQuery->select($cols, $table, $where, array(UNLIMITED_FLG_LIMITED));
@@ -256,6 +242,5 @@
      * @return array 新規受付一覧配列
      */
-    function lfGetNewOrder()
-    {
+    function lfGetNewOrder() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -314,6 +299,5 @@
      * @return array 取得した情報配列
      */
-    function lfGetInfo()
-    {
+    function lfGetInfo() {
         // 更新情報の取得ON/OFF確認
         if (!ECCUBE_INFO) return array();
Index: /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Logout extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Logout extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
     }
@@ -63,6 +60,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->lfDoLogout();
@@ -77,6 +73,5 @@
      * @return void
      */
-    function lfDoLogout()
-    {
+    function lfDoLogout() {
         $objSess = new SC_Session_Ex();
         $objSess->logout();
@@ -88,6 +83,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22570)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Kiyaku extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Kiyaku extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/kiyaku.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,16 +66,21 @@
      * @return void
      */
-    function action()
-    {
-
-        $objKiyaku = new SC_Helper_Kiyaku_Ex();
+    function action() {
+
+        $objDb = new SC_Helper_DB_Ex();
 
         $mode = $this->getMode();
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($mode, $objFormParam);
-        $objFormParam->setParam($_POST);
+        $objFormParam->setParam($_REQUEST);
         $objFormParam->convParam();
-
-        $kiyaku_id = $objFormParam->getValue('kiyaku_id');
+        $this->arrErr = $this->lfCheckError($mode, $objFormParam);
+        $is_error = (!SC_Utils_Ex::isBlank($this->arrErr));
+
+        $this->kiyaku_id = $objFormParam->getValue('kiyaku_id');
+        if ($is_error) {
+            trigger_error('', E_USER_ERROR);
+            return;
+        }
 
         // 要求判定
@@ -86,56 +88,49 @@
             // 編集処理
             case 'confirm':
-                // エラーチェック
-                $this->arrErr = $this->lfCheckError($objFormParam, $objKiyaku);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['kiyaku_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
-                }
-
-                if (SC_Utils_Ex::isBlank($this->arrErr)) {
-                    // POST値の引き継ぎ
-                    $arrParam = $objFormParam->getHashArray();
-                    // 登録実行
-                    $res_kiyaku_id = $this->doRegist($kiyaku_id, $arrParam, $objKiyaku);
-                    if ($res_kiyaku_id !== FALSE) {
-                        // 完了メッセージ
-                        $kiyaku_id = $res_kiyaku_id;
-                        $this->tpl_onload = "alert('登録が完了しました。');";
+                // POST値の引き継ぎ
+                $this->arrForm = $_POST;
+
+                if (!$is_error) {
+                    if ($this->kiyaku_id == '') {
+                        $result = $this->lfInsertClass($this->arrForm, $_SESSION['member_id']);    // 新規作成
+                    } else {
+                        $result = $this->lfUpdateClass($this->arrForm, $this->kiyaku_id);    // 既存編集
+                    }
+
+                    if ($result !== FALSE) {
+                        $arrPram = array(
+                            'kiyaku_id' => $result,
+                            'msg' => 'on',
+                        );
+
+                        SC_Response_Ex::reload($arrPram, true);
+                        SC_Response_Ex::actionExit();
                     }
                 }
-
-                // 編集中の規約IDを渡す
-                $this->tpl_kiyaku_id = $kiyaku_id;
                 break;
             // 削除
             case 'delete':
-                $objKiyaku->delete($kiyaku_id);
-                break;
-
-            // 編集前処理
-            case 'pre_edit':
-                // 編集項目を取得する。
-                $arrKiyakuData = $objKiyaku->get($kiyaku_id);
-                $objFormParam->setParam($arrKiyakuData);
-
-                // 編集中の規約IDを渡す
-                $this->tpl_kiyaku_id = $kiyaku_id;
-                break;
-
-            case 'down':
-                $objKiyaku->rankDown($kiyaku_id);
+                $objDb->sfDeleteRankRecord('dtb_kiyaku', 'kiyaku_id', $this->kiyaku_id, '', true);
 
                 // 再表示
                 $this->objDisplay->reload();
                 break;
-
-            case 'up':
-                $objKiyaku->rankUp($kiyaku_id);
+            case 'down':
+                $objDb->sfRankDown('dtb_kiyaku', 'kiyaku_id', $this->kiyaku_id);
 
                 // 再表示
                 $this->objDisplay->reload();
                 break;
-
+            case 'up':
+                $objDb->sfRankUp('dtb_kiyaku', 'kiyaku_id', $this->kiyaku_id);
+
+                // 再表示
+                $this->objDisplay->reload();
+                break;
             default:
+                if (isset($_GET['msg']) && $_GET['msg'] == 'on') {
+                    // 完了メッセージ
+                    $this->tpl_onload = "alert('登録が完了しました。');";
+                }
                 break;
         }
@@ -143,7 +138,23 @@
         $this->arrForm = $objFormParam->getFormParamList();
 
-        // 規約一覧を取得
-        $this->arrKiyaku = $objKiyaku->getList();
-}
+        if (!$is_error) {
+            // 規約一覧を取得
+            $this->arrKiyaku = $this->lfGetKiyakuList();
+            // kiyaku_id が指定されている場合には規約データの取得
+            if (!SC_Utils_Ex::isBlank($this->kiyaku_id)) {
+                // 編集項目を取得する。
+                $arrKiyakuData = $this->lfGetKiyakuDataByKiyakuID($this->kiyaku_id);
+
+                // 入力項目にカテゴリ名を入力する。
+                $this->arrForm['kiyaku_title'] = $arrKiyakuData[0]['kiyaku_title'];
+                $this->arrForm['kiyaku_text'] = $arrKiyakuData[0]['kiyaku_text'];
+                // POSTデータを引き継ぐ
+                $this->tpl_kiyaku_id = $this->kiyaku_id;
+            }
+        } else {
+            // 画面にエラー表示しないため, ログ出力
+            GC_Utils_Ex::gfPrintLog('Error: ' . print_r($this->arrErr, true));
+        }
+    }
 
     /**
@@ -152,34 +163,60 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    /**
-     * 登録処理を実行.
-     * 
-     * @param integer $kiyaku_id
-     * @param array $sqlval
-     * @param object $objKiyaku
-     * @return multiple
-     */
-    function doRegist($kiyaku_id, $sqlval, SC_Helper_Kiyaku_Ex &$objKiyaku)
-    {
-        $sqlval['kiyaku_id'] = $kiyaku_id;
-        $sqlval['creator_id'] = $_SESSION['member_id'];
-        return $objKiyaku->save($sqlval);
-    }
-
-    function lfInitParam($mode, &$objFormParam)
-    {
+    /* DBへの挿入 */
+    function lfInsertClass($arrData, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // INSERTする値を作成する。
+        $sqlval = array();
+        $sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
+        $sqlval['kiyaku_text'] = $arrData['kiyaku_text'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['rank'] = $objQuery->max('rank', 'dtb_kiyaku') + 1;
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        // INSERTの実行
+        $sqlval['kiyaku_id'] = $objQuery->nextVal('dtb_kiyaku_kiyaku_id');
+        $ret = $objQuery->insert('dtb_kiyaku', $sqlval);
+        return ($ret) ? $sqlval['kiyaku_id'] : FALSE;
+    }
+
+    function lfGetKiyakuDataByKiyakuID($kiyaku_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'kiyaku_id = ?';
+        return $objQuery->select('kiyaku_text, kiyaku_title', 'dtb_kiyaku', $where, array($kiyaku_id));
+    }
+
+    function lfGetKiyakuList() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'del_flg <> 1';
+        $objQuery->setOrder('rank DESC');
+        return $objQuery->select('kiyaku_title, kiyaku_text, kiyaku_id', 'dtb_kiyaku', $where);
+    }
+
+    /* DBへの更新 */
+    function lfUpdateClass($arrData, $kiyaku_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // UPDATEする値を作成する。
+        $sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
+        $sqlval['kiyaku_text'] = $arrData['kiyaku_text'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'kiyaku_id = ?';
+        // UPDATEの実行
+        $ret = $objQuery->update('dtb_kiyaku', $sqlval, $where, array($kiyaku_id));
+        return ($ret) ? $kiyaku_id : FALSE;
+    }
+
+    function lfInitParam($mode, &$objFormParam) {
         switch ($mode) {
             case 'confirm':
-            case 'pre_edit':
                 $objFormParam->addParam('規約タイトル', 'kiyaku_title', SMTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('規約内容', 'kiyaku_text', MLTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('規約ID', 'kiyaku_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-                break;
             case 'delete':
+            case 'pre_edit':
             case 'down':
             case 'up':
@@ -194,16 +231,16 @@
      *
      * @param string $mode
-     * @param object $objKiyaku
      * @return array
      */
-    function lfCheckError($objFormParam, SC_Helper_Kiyaku_Ex &$objKiyaku)
-    {
+    function lfCheckError($mode, $objFormParam) {
         $arrErr = $objFormParam->checkError();
-        $arrForm = $objFormParam->getHashArray();
-
-        $isTitleExist = $objKiyaku->isTitleExist($arrForm['kiyaku_title'], $arrForm['kiyaku_id']);
-        // 編集中のレコード以外に同じ名称が存在する場合
-        if ($isTitleExist) {
-            $arrErr['name'] = '※ 既に同じ内容の登録が存在します。<br />';
+        if (!isset($arrErr['name']) && $mode == 'confirm') {
+            $post = $objFormParam->getHashArray();
+            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $arrRet = $objQuery->select('kiyaku_id, kiyaku_title', 'dtb_kiyaku', 'del_flg = 0 AND kiyaku_title = ?', array($post['kiyaku_title']));
+            // 編集中のレコード以外に同じ名称が存在する場合
+            if ($arrRet[0]['kiyaku_id'] != $post['kiyaku_id'] && $arrRet[0]['kiyaku_title'] == $post['kiyaku_title']) {
+                $arrErr['name'] = '※ 既に同じ内容の登録が存在します。<br>';
+            }
         }
         return $arrErr;
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Payment extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Payment extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/payment.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPayment = new SC_Helper_Payment_Ex();
@@ -118,6 +114,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_PaymentInput extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_PaymentInput extends LC_Page_Admin_Ex {
 
     // {{{ properties
@@ -48,6 +47,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/payment_input.tpl';
@@ -63,6 +61,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -74,6 +71,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPayment = new SC_Helper_Payment_Ex();
@@ -164,12 +160,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* ファイル情報の初期化 */
-    function lfInitFile()
-    {
+    function lfInitFile() {
         $this->objUpFile->addFile('ロゴ画像', 'payment_image', array('gif','jpeg','jpg','png'), IMAGE_SIZE, false, CLASS_IMAGE_WIDTH, CLASS_IMAGE_HEIGHT);
         return $this->objUpFile;
@@ -177,6 +171,5 @@
 
     /* パラメーター情報の初期化 */
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfInitParam($mode, &$objFormParam) {
 
         switch ($mode) {
@@ -219,8 +212,8 @@
 
     /* DBへデータを登録する */
-    function lfRegistData(&$objFormParam, SC_Helper_Payment_Ex $objPayment, $member_id, $payment_id = '')
-    {
+    function lfRegistData(&$objFormParam, SC_Helper_Payment_Ex $objPayment, $member_id, $payment_id = '') {
 
         $sqlval = array_merge($objFormParam->getHashArray(), $this->objUpFile->getDBFileList());
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $sqlval['payment_id'] = $payment_id;
         $sqlval['creator_id'] = $member_id;
@@ -236,6 +229,5 @@
 
     /* 入力内容のチェック */
-    function lfCheckError($post, $objFormParam, SC_Helper_Payment_Ex $objPayment)
-    {
+    function lfCheckError($post, $objFormParam, SC_Helper_Payment_Ex $objPayment) {
 
         // DBのデータを取得
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/index.tpl';
@@ -70,6 +68,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -81,36 +78,57 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
+
         $objDb = new SC_Helper_DB_Ex();
-        $objFormParam = new SC_FormParam_Ex();
-
-
-        $this->lfInitParam($objFormParam, $_POST);
-        $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "');";
-
-        if ($this->getMode() === 'confirm') {
+
+        if ($objDb->sfGetBasisExists()) {
+            $this->tpl_mode = 'update';
+        } else {
+            $this->tpl_mode = 'insert';
+        }
+
+        if (!empty($_POST)) {
+
+            $objFormParam = new SC_FormParam_Ex();
+            $this->lfInitParam($objFormParam, $_POST);
             $objFormParam->setParam($_POST);
             $objFormParam->convParam();
 
             $this->arrErr = $this->lfCheckError($objFormParam);
-
-            if (!empty($this->arrErr)) {
-                $this->arrForm = $objFormParam->getHashArray();
-                return;
+            $post = $objFormParam->getHashArray();
+
+            $this->arrForm = $post;
+
+            if (count($this->arrErr) == 0) {
+                switch ($this->getMode()) {
+                    // 既存編集
+                    case 'update':
+                        $this->lfUpdateData($this->arrForm);
+                        break;
+                    // 新規作成
+                    case 'insert':
+                        $this->lfInsertData($this->arrForm);
+                        break;
+                    default:
+                        break;
+                }
+                $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "'); window.alert('SHOPマスターの登録が完了しました。');";
             }
-
-            $arrData = $objFormParam->getDbArray();
-            SC_Helper_DB_Ex::registerBasisData($arrData);
-
-            // キャッシュファイル更新
-            $objDb->sfCreateBasisDataCache();
-            $this->tpl_onload .= "window.alert('SHOPマスターの登録が完了しました。');";
-        }
-
-        $arrRet = $objDb->sfGetBasisData(true);
-        $objFormParam->setParam($arrRet);
-        $this->arrForm = $objFormParam->getHashArray();
-        $this->arrForm['regular_holiday_ids'] = explode('|', $this->arrForm['regular_holiday_ids']);
+            if (empty($this->arrForm['regular_holiday_ids'])) {
+                $this->arrSel = array();
+            } else {
+                $this->arrSel = $this->arrForm['regular_holiday_ids'];
+            }
+        } else {
+            $arrCol = $this->lfGetCol();
+            $col    = SC_Utils_Ex::sfGetCommaList($arrCol);
+            $arrRet = $objDb->sfGetBasisData(true, $col);
+            $this->arrForm = $arrRet;
+
+            $regular_holiday_ids = explode('|', $this->arrForm['regular_holiday_ids']);
+            $this->arrForm['regular_holiday_ids'] = $regular_holiday_ids;
+            $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "');";
+        }
+
     }
 
@@ -120,33 +138,79 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    /**
-     * 前方互換用
-     *
-     * @deprecated 2.12.4
-     */
-    function lfUpdateData($arrData)
-    {
-        trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
-        SC_Helper_DB_Ex::registerBasisData($arrData);
-    }
-
-    /**
-     * 前方互換用
-     *
-     * @deprecated 2.12.4
-     */
-    function lfInsertData($arrData)
-    {
-        trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
-        SC_Helper_DB_Ex::registerBasisData($arrData);
-    }
-
-    function lfInitParam(&$objFormParam, $post)
-    {
+    // 基本情報用のカラムを取り出す。
+    function lfGetCol() {
+        $arrCol = array(
+            'company_name',
+            'company_kana',
+            'shop_name',
+            'shop_kana',
+            'shop_name_eng',
+            'zip01',
+            'zip02',
+            'pref',
+            'addr01',
+            'addr02',
+            'tel01',
+            'tel02',
+            'tel03',
+            'fax01',
+            'fax02',
+            'fax03',
+            'business_hour',
+            'email01',
+            'email02',
+            'email03',
+            'email04',
+            'tax',
+            'tax_rule',
+            'free_rule',
+            'good_traded',
+            'message',
+            'regular_holiday_ids',
+            'latitude',
+            'longitude',
+            'downloadable_days',
+            'downloadable_days_unlimited'
+        );
+        return $arrCol;
+    }
+
+    function lfUpdateData($array) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $arrCol = $this->lfGetCol();
+        foreach ($arrCol as $val) {
+            //配列の場合は、パイプ区切りの文字列に変換
+            if (is_array($array[$val])) {
+                $sqlval[$val] = implode('|', $array[$val]);
+            } else {
+                $sqlval[$val] = $array[$val];
+            }
+        }
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        // UPDATEの実行
+        $ret = $objQuery->update('dtb_baseinfo', $sqlval);
+
+        GC_Utils_Ex::gfPrintLog('dtb_baseinfo に UPDATE を実行しました。');
+    }
+
+    function lfInsertData($array) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $arrCol = $this->lfGetCol();
+        foreach ($arrCol as $val) {
+            $sqlval[$val] = $array[$val];
+        }
+        $sqlval['id'] = 1;
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        // INSERTの実行
+        $ret = $objQuery->insert('dtb_baseinfo', $sqlval);
+
+        GC_Utils_Ex::gfPrintLog('dtb_baseinfo に INSERT を実行しました。');
+    }
+
+    function lfInitParam(&$objFormParam, $post) {
         $objFormParam->addParam('会社名', 'company_name', STEXT_LEN, 'KVa',  array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('会社名(フリガナ)', 'company_kana', STEXT_LEN, 'KVC',  array('KANA_CHECK','MAX_LENGTH_CHECK'));
@@ -192,6 +256,6 @@
             $objFormParam->addParam('ダウンロード無制限', 'downloadable_days_unlimited', array('EXIST_CHECK'));
         }
-        $objFormParam->addParam('緯度', 'latitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
-        $objFormParam->addParam('軽度', 'longitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
+        $objFormParam->addParam('緯度', 'latitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('軽度', 'longitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK'));
 
         $objFormParam->addParam('定休日', 'regular_holiday_ids', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));
@@ -199,6 +263,5 @@
 
     // 入力エラーチェック
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $arrErr = $objFormParam->checkError();
         $post = $objFormParam->getHashArray();
@@ -211,4 +274,7 @@
         $objErr->doFunc(array('FAX', 'fax01', 'fax02', 'fax03'), array('TEL_CHECK'));
 
+        $objErr->doFunc(array('緯度', 'latitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK'));
+        $objErr->doFunc(array('経度', 'longitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK'));
+
         return array_merge((array)$arrErr, (array)$objErr->arrErr);
     }
Index: /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php	(revision 22584)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Mail extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Mail extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/mail.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,9 +66,7 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $masterData = new SC_DB_MasterData_Ex();
-        $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
 
         $mode = $this->getMode();
@@ -91,7 +86,7 @@
         switch ($mode) {
             case 'id_set':
-                    $mailtemplate = $objMailtemplate->get($post['template_id']);
-                    if ($mailtemplate) {
-                        $this->arrForm = $mailtemplate;
+                    $result = $this->lfGetMailTemplateByTemplateID($post['template_id']);
+                    if ($result) {
+                        $this->arrForm = $result[0];
                     } else {
                         $this->arrForm['template_id'] = $post['template_id'];
@@ -107,5 +102,5 @@
                     } else {
                         // 正常
-                        $this->lfRegistMailTemplate($this->arrForm, $_SESSION['member_id'], $objMailtemplate);
+                        $this->lfRegistMailTemplate($this->arrForm, $_SESSION['member_id']);
 
                         // 完了メッセージ
@@ -125,22 +120,38 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function lfRegistMailTemplate($post, $member_id, SC_Helper_Mailtemplate_Ex $objMailtemplate)
-    {
-        $post['creator_id'] = $member_id;
-        $objMailtemplate->save($post);
+    function lfGetMailTemplateByTemplateID($template_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $sql = 'SELECT * FROM dtb_mailtemplate WHERE template_id = ?';
+        return $objQuery->getAll($sql, array($template_id));
     }
 
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfRegistMailTemplate($post, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $post['creator_id'] = $member_id;
+        $post['update_date'] = 'CURRENT_TIMESTAMP';
+
+        $sql = 'SELECT * FROM dtb_mailtemplate WHERE template_id = ?';
+        $template_data = $objQuery->getAll($sql, array($post['template_id']));
+        if ($template_data) {
+            $sql_where = 'template_id = ?';
+            $objQuery->update('dtb_mailtemplate', $post, $sql_where, array(addslashes($post['template_id'])));
+        } else {
+            $objQuery->insert('dtb_mailtemplate', $post);
+        }
+
+    }
+
+    function lfInitParam($mode, &$objFormParam) {
         switch ($mode) {
             case 'regist':
                 $objFormParam->addParam('メールタイトル', 'subject', MTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('ヘッダー', 'header', LTEXT_LEN, 'KVa', array('SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('SPTAB_CHECK','MAX_LENGTH_CHECK'));
+                $objFormParam->addParam('ヘッダー', 'header', LTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
+                $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('テンプレート', 'template_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
             case 'id_set':
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Delivery extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Delivery extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/delivery.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,8 +69,7 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
-        $objDeliv = new SC_Helper_Delivery_Ex();
+        $objDb = new SC_Helper_DB_Ex();
         $mode = $this->getMode();
 
@@ -92,15 +88,15 @@
             case 'delete':
                 // ランク付きレコードの削除
-                $objDeliv->delete($_POST['deliv_id']);
+                $objDb->sfDeleteRankRecord('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
 
                 $this->objDisplay->reload(); // PRG pattern
                 break;
             case 'up':
-                $objDeliv->rankUp($_POST['deliv_id']);
+                $objDb->sfRankUp('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
 
                 $this->objDisplay->reload(); // PRG pattern
                 break;
             case 'down':
-                $objDeliv->rankDown($_POST['deliv_id']);
+                $objDb->sfRankDown('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
 
                 $this->objDisplay->reload(); // PRG pattern
@@ -109,6 +105,22 @@
                 break;
         }
-        $this->arrDelivList = $objDeliv->getList();
+        $this->arrDelivList = $this->lfGetDelivList();
 
+    }
+
+    /**
+     * 配送業者一覧の取得
+     *
+     * @return array
+     */
+    function lfGetDelivList() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $col = 'deliv_id, name, service_name';
+        $where = 'del_flg = 0';
+        $table = 'dtb_deliv';
+        $objQuery->setOrder('rank DESC');
+
+        return $objQuery->select($col, $table, $where);
     }
 
@@ -119,6 +131,5 @@
      * @return array
      */
-    function lfCheckError($mode, &$objFormParam)
-    {
+    function lfCheckError($mode, &$objFormParam) {
         $arrErr = array();
         switch ($mode) {
@@ -143,6 +154,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_DeliveryInput extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_DeliveryInput extends LC_Page_Admin_Ex {
     // }}}
     // {{{ functions
@@ -42,6 +41,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/delivery_input.tpl';
@@ -51,5 +49,5 @@
         $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrProductType = $masterData->getMasterData('mtb_product_type');
-        $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         $this->tpl_maintitle = '基本情報管理';
         $this->tpl_subtitle = '配送方法設定';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -73,7 +70,6 @@
      * @return void
      */
-    function action()
-    {
-        $objFormParam = new SC_FormParam_Ex();
+    function action() {
+
         $this->lfInitParam($this->mode, $objFormParam);
         $objFormParam->setParam($_POST);
@@ -109,12 +105,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* パラメーター情報の初期化 */
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfInitParam($mode, &$objFormParam) {
         $objFormParam = new SC_FormParam_Ex();
 
@@ -154,10 +148,9 @@
      * @return $deliv_id
      */
-    function lfRegistData($arrRet, $member_id)
-    {
-        $objDelivery = new SC_Helper_Delivery_Ex();
+    function lfRegistData($arrRet, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->begin();
 
         // 入力データを渡す。
-        $sqlval['deliv_id'] = $arrRet['deliv_id'];
         $sqlval['name'] = $arrRet['name'];
         $sqlval['service_name'] = $arrRet['service_name'];
@@ -166,45 +159,108 @@
         $sqlval['product_type_id'] = $arrRet['product_type_id'];
         $sqlval['creator_id'] = $member_id;
-
-        // お届け時間
-        $sqlval['deliv_time'] = array();
-        for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
-            $keyname = "deliv_time$cnt";
-            if ($arrRet[$keyname] != '') {
-                $sqlval['deliv_time'][$cnt] = $arrRet[$keyname];
-            }
-        }
-
-        // 配送料
-        if (INPUT_DELIV_FEE) {
-            $sqlval['deliv_fee'] = array();
-            // 配送料金の設定
-            for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
-                $keyname = "fee$cnt";
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+
+        // deliv_id が決まっていた場合
+        if ($arrRet['deliv_id'] != '') {
+            $deliv_id = $arrRet['deliv_id'];
+            $where = 'deliv_id = ?';
+            $objQuery->update('dtb_deliv', $sqlval, $where, array($deliv_id));
+
+            // お届け時間の登録
+            $table = 'dtb_delivtime';
+            $where = 'deliv_id = ? AND time_id = ?';
+            for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
+                $sqlval = array();
+                $keyname = 'deliv_time'.$cnt;
+                $arrWhereVal = array($deliv_id, $cnt);
+                // 既存データの有無を確認
+                $curData = $objQuery->select('*', $table, $where, $arrWhereVal);
+
+                if (strcmp($arrRet[$keyname], '') != 0) {
+                    $sqlval['deliv_time'] = $arrRet[$keyname];
+
+                    // 入力が空ではなく、DBに情報があれば更新
+                    if (count($curData)) {
+                        $objQuery->update($table, $sqlval, $where, $arrWhereVal);
+                    }
+                    // DBに情報がなければ登録
+                    else {
+                        $sqlval['deliv_id'] = $deliv_id;
+                        $sqlval['time_id'] = $cnt;
+                        $objQuery->insert($table, $sqlval);
+                    }
+                }
+                // 入力が空で、DBに情報がある場合は削除
+                else if (count($curData)) {
+                    $objQuery->delete($table, $where, $arrWhereVal);
+                }
+            }
+
+            // 配送料の登録
+            if (INPUT_DELIV_FEE) {
+                for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
+                    $keyname = 'fee'.$cnt;
+                    if (strcmp($arrRet[$keyname], '') != 0) {
+                        $sqlval = array('fee' => $arrRet[$keyname]);
+                        $objQuery->update('dtb_delivfee', $sqlval, 'deliv_id = ? AND fee_id = ?', array($deliv_id, $cnt));
+                    }
+                }
+            }
+        } else {
+            // 登録する配送業者IDの取得
+            $deliv_id = $objQuery->nextVal('dtb_deliv_deliv_id');
+            $sqlval['deliv_id'] = $deliv_id;
+            $sqlval['rank'] = $objQuery->max('rank', 'dtb_deliv') + 1;
+            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+            // INSERTの実行
+            $objQuery->insert('dtb_deliv', $sqlval);
+
+            $sqlval = array();
+            // お届け時間の設定
+            for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
+                $keyname = "deliv_time$cnt";
                 if ($arrRet[$keyname] != '') {
-                    $fee = array();
-                    $fee['fee_id'] = $cnt;
-                    $fee['fee'] = $arrRet[$keyname];
-                    $fee['pref'] = $cnt;
-                    $sqlval['deliv_fee'][$cnt] = $fee;
-                }
-            }
-        }
-
-        // 支払い方法
-        $sqlval['payment_ids'] = array();
-        foreach ($arrRet['payment_ids'] as $payment_id) {
-            $sqlval['payment_ids'][] = $payment_id;
-        }
-
-        $deliv_id = $objDelivery->save($sqlval);
-
+                    $sqlval['deliv_id'] = $deliv_id;
+                    $sqlval['time_id'] = $cnt;
+                    $sqlval['deliv_time'] = $arrRet[$keyname];
+                    // INSERTの実行
+                    $objQuery->insert('dtb_delivtime', $sqlval);
+                }
+            }
+
+            if (INPUT_DELIV_FEE) {
+                $sqlval = array();
+                // 配送料金の設定
+                for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
+                    $keyname = "fee$cnt";
+                    if ($arrRet[$keyname] != '') {
+                        $sqlval['deliv_id'] = $deliv_id;
+                        $sqlval['fee'] = $arrRet[$keyname];
+                        $sqlval['pref'] = $cnt;
+                        // INSERTの実行
+                        $sqlval['fee_id'] = $cnt;
+                        $objQuery->insert('dtb_delivfee', $sqlval);
+                    }
+                }
+            }
+        }
+
+        $objQuery->delete('dtb_payment_options', 'deliv_id = ?', array($arrRet['deliv_id']));
+        $sqlval = array();
+        $i = 1;
+        foreach ($arrRet['payment_ids'] as $val) {
+            $sqlval['deliv_id'] = $deliv_id;
+            $sqlval['payment_id'] = $val;
+            $sqlval['rank'] = $i;
+            $objQuery->insert('dtb_payment_options', $sqlval);
+            $i++;
+        }
+        $objQuery->commit();
         return $deliv_id;
     }
 
     /* 配送業者情報の取得 */
-    function lfGetDelivData(&$objFormParam)
-    {
-        $objDelivery = new SC_Helper_Delivery_Ex();
+    function lfGetDelivData(&$objFormParam) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $deliv_id = $objFormParam->getValue('deliv_id');
@@ -213,30 +269,36 @@
         $this->lfInitParam('edit', $objFormParam);
 
-        $arrDeliv = $objDelivery->get($deliv_id);
-
-        // お届け時間
-        $deliv_times = array();
-        foreach ($arrDeliv['deliv_time'] as $value) {
-            $deliv_times[]['deliv_time'] = $value;
-        }
-        $objFormParam->setParamList($deliv_times, 'deliv_time');
-        unset($arrDeliv['deliv_time']);
-        // 配送料金
-        $deliv_fee = array();
-        foreach ($arrDeliv['deliv_fee'] as $value) {
-            $deliv_fee[]['fee'] = $value['fee'];
-        }
-        $objFormParam->setParamList($deliv_fee, 'fee');
-        unset($arrDeliv['deliv_fee']);
+        // 配送業者一覧の取得
+        $col = 'deliv_id, name, service_name, remark, confirm_url, product_type_id';
+        $where = 'deliv_id = ?';
+        $table = 'dtb_deliv';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $objFormParam->setParam($arrRet[0]);
+        // お届け時間の取得
+        $col = 'deliv_time';
+        $where = 'deliv_id = ?  ORDER BY time_id';
+        $table = 'dtb_delivtime';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $objFormParam->setParamList($arrRet, 'deliv_time');
+        // 配送料金の取得
+        $col = 'fee';
+        $where = 'deliv_id = ? ORDER BY pref';
+        $table = 'dtb_delivfee';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $objFormParam->setParamList($arrRet, 'fee');
         // 支払方法
-        $objFormParam->setValue('payment_ids', $arrDeliv['payment_ids']);
-        unset($arrDeliv['payment_ids']);
-        // 配送業者
-        $objFormParam->setParam($arrDeliv);
+        $col = 'payment_id';
+        $where = 'deliv_id = ? ORDER BY rank';
+        $table = 'dtb_payment_options';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $arrPaymentIds = array();
+        foreach ($arrRet as $val) {
+            $arrPaymentIds[] = $val['payment_id'];
+        }
+        $objFormParam->setValue('payment_ids', $arrPaymentIds);
     }
 
     /* 入力内容のチェック */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
         $arrRet =  $objFormParam->getHashArray();
@@ -246,6 +308,12 @@
         if (!isset($objErr->arrErr['name'])) {
             // 既存チェック
-            $objDelivery = new SC_Helper_Delivery_Ex();
-            if ($objDelivery->checkExist($arrRet)) {
+            $objDb = new SC_Helper_DB_Ex();
+            if ($arrRet['deliv_id'] == '') {
+                $ret = $objDb->sfIsRecord('dtb_deliv', 'service_name', array($arrRet['service_name']));
+            } else {
+                $objQuery =& SC_Query_Ex::getSingletonInstance();
+                $ret = (($objQuery->count('dtb_deliv', 'deliv_id != ? AND service_name = ? ', array($arrRet['deliv_id'], $arrRet['service_name'])) > 0)? true : false);
+            }
+            if ($ret) {
                 $objErr->arrErr['service_name'] = '※ 同じ名称の組み合わせは登録できません。<br>';
             }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Tradelaw extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Tradelaw extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/tradelaw.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -121,12 +117,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* パラメーター情報の初期化 */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('販売業者', 'law_company', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('運営責任者', 'law_manager', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -144,14 +138,13 @@
         $objFormParam->addParam('メールアドレス', 'law_email', null, 'KVa', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
         $objFormParam->addParam('URL', 'law_url', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'URL_CHECK'));
-        $objFormParam->addParam('必要料金', 'law_term01', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('注文方法', 'law_term02', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('支払方法', 'law_term03', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('支払期限', 'law_term04', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('引き渡し時期', 'law_term05', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('返品・交換について', 'law_term06', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('必要料金', 'law_term01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('注文方法', 'law_term02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('支払方法', 'law_term03', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('支払期限', 'law_term04', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('引き渡し時期', 'law_term05', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('返品・交換について', 'law_term06', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    function lfUpdateData($sqlval)
-    {
+    function lfUpdateData($sqlval) {
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -160,6 +153,5 @@
     }
 
-    function lfInsertData($sqlval)
-    {
+    function lfInsertData($sqlval) {
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -169,6 +161,5 @@
 
     /* 入力内容のチェック */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
         $arrRet =  $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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Seo extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Seo extends LC_Page_Admin_Ex {
 
     // {{{ properties
@@ -48,6 +47,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/seo.tpl';
@@ -69,6 +67,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -80,6 +77,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // データの取得
@@ -136,6 +132,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -147,6 +142,5 @@
      * @return integer 更新結果
      */
-    function lfUpdPageData($arrUpdData = array())
-    {
+    function lfUpdPageData($arrUpdData = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -166,6 +160,5 @@
     }
 
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfInitParam($mode, &$objFormParam) {
         $objFormParam->addParam('デバイスID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -182,6 +175,5 @@
      * @return array 表示データ
      */
-    function lfSetData($arrPageData, $arrDispData)
-    {
+    function lfSetData($arrPageData, $arrDispData) {
 
         foreach ($arrPageData as $device_key => $arrVal) {
@@ -204,6 +196,5 @@
      * @return array $arrRet ページデータ($arrRet[デバイスタイプID])
      */
-    function lfGetSeoPageData()
-    {
+    function lfGetSeoPageData() {
         $objLayout = new SC_Helper_PageLayout_Ex();
 
Index: /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php	(revision 22575)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Holiday extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Holiday extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/holiday.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,8 +66,7 @@
      * @return void
      */
-    function action()
-    {
-
-        $objHoliday = new SC_Helper_Holiday_Ex();
+    function action() {
+
+        $objDb = new SC_Helper_DB_Ex();
 
         $objDate = new SC_Date_Ex();
@@ -80,10 +76,20 @@
         $mode = $this->getMode();
 
-        $objFormParam = new SC_FormParam_Ex();
-        $this->lfInitParam($mode, $objFormParam);
-        $objFormParam->setParam($_POST);
-        $objFormParam->convParam();
-
-        $holiday_id = $objFormParam->getValue('holiday_id');
+        if (!empty($_POST)) {
+
+            $objFormParam = new SC_FormParam_Ex();
+            $this->lfInitParam($mode, $objFormParam);
+            $objFormParam->setParam($_POST);
+            $objFormParam->convParam();
+            $holiday_id = $objFormParam->getValue('holiday_id');
+
+            $this->arrErr = $this->lfCheckError($mode, $objFormParam);
+            if (!empty($this->arrErr['holiday_id'])) {
+                trigger_error('', E_USER_ERROR);
+                return;
+            }
+
+            $post = $objFormParam->getHashArray();
+        }
 
         // 要求判定
@@ -91,40 +97,45 @@
             // 編集処理
             case 'edit':
-                $this->arrErr = $this->lfCheckError($objFormParam, $objHoliday);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['holiday_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
+                // POST値の引き継ぎ
+                $this->arrForm = $this->arrForm = $_POST;
+
+                if (count($this->arrErr) <= 0) {
+                    // 新規作成
+                    if ($post['holiday_id'] == '') {
+                        $this->lfInsertClass($this->arrForm, $_SESSION['member_id']);
+                    }
+                    // 既存編集
+                    else {
+                        $this->lfUpdateClass($this->arrForm, $post['holiday_id']);
+                    }
+
+                    // 再表示
+                    $this->objDisplay->reload();
+                } else {
+                    // POSTデータを引き継ぐ
+                    $this->tpl_holiday_id = $post['holiday_id'];
                 }
-
-                if (count($this->arrErr) <= 0) {
-                    // POST値の引き継ぎ
-                    $arrParam = $objFormParam->getHashArray();
-                    // 登録実行
-                    $res_holiday_id = $this->doRegist($holiday_id, $arrParam, $objHoliday);
-                    if ($res_holiday_id !== FALSE) {
-                        // 完了メッセージ
-                        $holiday_id = $res_holiday_id;
-                        $this->tpl_onload = "alert('登録が完了しました。');";
-                    }
-                }
-                // POSTデータを引き継ぐ
-                $this->tpl_holiday_id = $holiday_id;
-
                 break;
             // 削除
             case 'delete':
-                $objHoliday->delete($holiday_id);
+                $objDb->sfDeleteRankRecord('dtb_holiday', 'holiday_id', $post['holiday_id'], '', true);
+
+                // 再表示
+                $this->objDisplay->reload();
                 break;
             // 編集前処理
             case 'pre_edit':
                 // 編集項目を取得する。
-                $arrHolidayData = $objHoliday->get($holiday_id);
-                $objFormParam->setParam($arrHolidayData);
-
+                $arrHolidayData = $this->lfGetHolidayDataByHolidayID($post['holiday_id']);
+
+                // 入力項目にカテゴリ名を入力する。
+                $this->arrForm['title'] = $arrHolidayData[0]['title'];
+                $this->arrForm['month'] = $arrHolidayData[0]['month'];
+                $this->arrForm['day'] = $arrHolidayData[0]['day'];
                 // POSTデータを引き継ぐ
-                $this->tpl_holiday_id = $holiday_id;
+                $this->tpl_holiday_id = $post['holiday_id'];
                 break;
             case 'down':
-                $objHoliday->rankDown($holiday_id);
+                $objDb->sfRankDown('dtb_holiday', 'holiday_id', $post['holiday_id']);
 
                 // 再表示
@@ -132,5 +143,5 @@
                 break;
             case 'up':
-                $objHoliday->rankUp($holiday_id);
+                $objDb->sfRankUp('dtb_holiday', 'holiday_id', $post['holiday_id']);
 
                 // 再表示
@@ -141,7 +152,8 @@
         }
 
-        $this->arrForm = $objFormParam->getFormParamList();
-
-        $this->arrHoliday = $objHoliday->getList();
+        $this->arrHoliday = $this->lfGetHolidayList();
+        // POSTデータを引き継ぐ
+        $this->tpl_holiday_id = $holiday_id;
+
     }
 
@@ -151,39 +163,68 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    /**
-     * 登録処理を実行.
-     * 
-     * @param integer $holiday_id
-     * @param array $sqlval
-     * @param object $objHoliday
-     * @return multiple
-     */
-    function doRegist($holiday_id, $sqlval, SC_Helper_Holiday_Ex $objHoliday)
-    {
-        $sqlval['holiday_id'] = $holiday_id;
-        $sqlval['creator_id'] = $_SESSION['member_id'];
-        return $objHoliday->save($sqlval);
-    }
-
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfGetHolidayDataByHolidayID($holiday_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'holiday_id = ?';
+        return $objQuery->select('title, month, day', 'dtb_holiday', $where, array($holiday_id));
+    }
+
+    function lfGetHolidayList() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'del_flg <> 1';
+        $objQuery->setOrder('rank DESC');
+        return $objQuery->select('holiday_id, title, month, day', 'dtb_holiday', $where);
+    }
+
+    /* DBへの挿入 */
+    function lfInsertClass($arrData, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // INSERTする値を作成する。
+        $sqlval['title'] = $arrData['title'];
+        $sqlval['month'] = $arrData['month'];
+        $sqlval['day'] = $arrData['day'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['rank'] = $objQuery->max('rank', 'dtb_holiday') + 1;
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        // INSERTの実行
+        $sqlval['holiday_id'] = $objQuery->nextVal('dtb_holiday_holiday_id');
+        $ret = $objQuery->insert('dtb_holiday', $sqlval);
+        return $ret;
+    }
+
+    /* DBへの更新 */
+    function lfUpdateClass($arrData) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // UPDATEする値を作成する。
+        $sqlval['title'] = $arrData['title'];
+        $sqlval['month'] = $arrData['month'];
+        $sqlval['day'] = $arrData['day'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'holiday_id = ?';
+        // UPDATEの実行
+        $ret = $objQuery->update('dtb_holiday', $sqlval, $where, array($arrData['holiday_id']));
+        return $ret;
+    }
+
+    function lfInitParam($mode, &$objFormParam) {
         switch ($mode) {
             case 'edit':
-            case 'pre_edit':
                 $objFormParam->addParam('タイトル', 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('月', 'month', INT_LEN, 'n', array('SELECT_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('日', 'day', INT_LEN, 'n', array('SELECT_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('定休日ID', 'holiday_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-                break;
+                // breakしない
             case 'delete':
+            case 'pre_edit':
             case 'down':
             case 'up':
+                $objFormParam->addParam('定休日ID', 'holiday_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+                break;
             default:
-                $objFormParam->addParam('定休日ID', 'holiday_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 break;
         }
@@ -193,16 +234,26 @@
      * 入力エラーチェック
      *
-     * @param object $objFormParam
-     * @param object $objHoliday
+     * @param string $mode
      * @return array
      */
-    function lfCheckError(&$objFormParam, SC_Helper_Holiday_Ex &$objHoliday)
-    {
+    function lfCheckError($mode, &$objFormParam) {
+        $objFormParam->convParam();
         $arrErr = $objFormParam->checkError();
-        $arrForm = $objFormParam->getHashArray();
-
-        // 編集中のレコード以外に同じ日付が存在する場合
-        if ($objHoliday->isDateExist($arrForm['month'], $arrForm['day'], $arrForm['holiday_id'])) {
-            $arrErr['date'] = '※ 既に同じ日付の登録が存在します。<br>';
+        $post = $objFormParam->getHashArray();
+
+        if (!isset($arrErr['date'])) {
+            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $where = 'del_flg = 0 AND month = ? AND day = ?';
+            $arrWhereVal = array($post['month'], $post['day']);
+            if (!empty($post['holiday_id'])) {
+                $where .= ' AND holiday_id <> ?';
+                $arrWhereVal[] = $post['holiday_id'];
+            }
+            $arrRet = $objQuery->select('count(holiday_id) as count', 'dtb_holiday', $where, $arrWhereVal);
+
+            // 編集中のレコード以外に同じ日付が存在する場合
+            if ($arrRet[0]['count'] > 0) {
+                $arrErr['date'] = '※ 既に同じ日付の登録が存在します。<br>';
+            }
         }
         return $arrErr;
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Point extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Point extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/point.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -120,18 +116,15 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* パラメーター情報の初期化 */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('ポイント付与率', 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('会員登録時付与ポイント', 'welcome_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
 
-    function lfUpdateData($post)
-    {
+    function lfUpdateData($post) {
         // 入力データを渡す。
         $sqlval = $post;
@@ -142,6 +135,5 @@
     }
 
-    function lfInsertData($post)
-    {
+    function lfInsertData($post) {
         // 入力データを渡す。
         $sqlval = $post;
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php	(revision 22796)
@@ -44,6 +44,5 @@
  * @version $Id:LC_Page_Admin_Basis_ZipInstall.php 16741 2007-11-08 00:43:24Z adachi $
  */
-class LC_Page_Admin_Basis_ZipInstall extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_ZipInstall extends LC_Page_Admin_Ex {
 
     /** CSVの行数 */
@@ -67,6 +66,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/zip_install.tpl';
@@ -86,6 +84,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -97,6 +94,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -169,11 +165,9 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function lfAutoCommitZip()
-    {
+    function lfAutoCommitZip() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -190,6 +184,5 @@
      * @return void
      */
-    function lfDeleteZip()
-    {
+    function lfDeleteZip() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -206,6 +199,5 @@
      * @return void
      */
-    function lfInitParam($tpl_mode, &$objFormParam)
-    {
+    function lfInitParam($tpl_mode, &$objFormParam) {
         if ($tpl_mode == 'manual') {
             $objFormParam->addParam('開始行', 'startRowNum', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -218,6 +210,5 @@
      * @return void
      */
-    function insertMtbZip($start = 1)
-    {
+    function insertMtbZip($start = 1) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -283,6 +274,5 @@
             <!--
                 // 完了画面
-                function complete()
-                {
+                function complete() {
                     document.open('text/html','replace');
                     document.clear();
@@ -301,6 +291,5 @@
     }
 
-    function openZipCsv()
-    {
+    function openZipCsv() {
         $this->convertZipCsv();
         $fp = fopen(ZIP_CSV_UTF8_REALFILE, 'r');
@@ -311,6 +300,5 @@
     }
 
-    function convertZipCsv()
-    {
+    function convertZipCsv() {
         if (file_exists(ZIP_CSV_UTF8_REALFILE)) return;
 
@@ -333,12 +321,10 @@
     }
 
-    function countMtbZip()
-    {
+    function countMtbZip() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->count('mtb_zip');
     }
 
-    function countZipCsv()
-    {
+    function countZipCsv() {
         $line = 0;
         $fp = $this->openZipCsv();
@@ -365,6 +351,5 @@
      * @return void
      */
-    function lfDownloadZipFileFromJp()
-    {
+    function lfDownloadZipFileFromJp() {
         // Proxy経由を可能とする。
         // TODO Proxyの設定は「data/module/HTTP/Request.php」内の「function HTTP_Request」へ記述する。いずれは、外部設定としたい。
@@ -395,6 +380,5 @@
      * @return void
      */
-    function lfExtractZipFile()
-    {
+    function lfExtractZipFile() {
         $zip = zip_open($this->zip_csv_temp_realfile);
         if (!is_resource($zip)) {
@@ -449,6 +433,5 @@
      * @return string CSV の更新日時 (整形済みテキスト)
      */
-    function lfGetCsvDatetime()
-    {
+    function lfGetCsvDatetime() {
         return date('Y/m/d H:i:s', filemtime(ZIP_CSV_REALFILE));
     }
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 22569)
+++ /branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Customer extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Customer extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'customer/index.tpl';
@@ -88,6 +86,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -99,6 +96,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -151,6 +147,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -162,6 +157,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
         $objFormParam->addParam('編集対象会員ID', 'edit_customer_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
@@ -174,6 +168,5 @@
      * @return array エラー配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
     }
@@ -185,7 +178,16 @@
      * @return boolean true:成功 false:失敗
      */
-    function lfDoDeleteCustomer($customer_id)
-    {
-        return SC_Helper_Customer_Ex::delete($customer_id);
+    function lfDoDeleteCustomer($customer_id) {
+        $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, 'del_flg = 0');
+        if (SC_Utils_Ex::isBlank($arrData)) {
+            //対象となるデータが見つからない。
+            return false;
+        }
+        // XXXX: 仮会員は物理削除となっていたが論理削除に変更。
+        $arrVal = array(
+            'del_flg' => '1',
+        );
+        SC_Helper_Customer_Ex::sfEditCustomerData($arrVal, $customer_id);
+        return true;
     }
 
@@ -196,6 +198,5 @@
      * @return boolean true:成功 false:失敗
      */
-    function lfDoResendMail($customer_id)
-    {
+    function lfDoResendMail($customer_id) {
         $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id);
         if (SC_Utils_Ex::isBlank($arrData) or $arrData['del_flg'] == 1) {
@@ -216,6 +217,5 @@
      * @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
      */
-    function lfDoSearch($arrParam)
-    {
+    function lfDoSearch($arrParam) {
         return SC_Helper_Customer_Ex::sfGetSearchData($arrParam);
     }
@@ -227,6 +227,5 @@
      * @return boolean true:成功 false:失敗
      */
-    function lfDoCSV($arrParam)
-    {
+    function lfDoCSV($arrParam) {
         $objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
         $order = 'update_date DESC, customer_id DESC';
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Edit extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Customer_Edit extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'customer/edit.tpl';
@@ -68,5 +66,6 @@
 
         // 支払い方法種別
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $objDb = new SC_Helper_DB_Ex();
+        $this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
     }
 
@@ -76,6 +75,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -87,6 +85,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -201,6 +198,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -212,6 +208,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // 会員項目のパラメーター取得
         SC_Helper_Customer_Ex::sfCustomerEntryParam($objFormParam, true);
@@ -228,6 +223,5 @@
      * @return void
      */
-    function lfInitSearchParam(&$objFormParam)
-    {
+    function lfInitSearchParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
         // 初回受け入れ時用
@@ -241,6 +235,5 @@
      * @return array エラー配列
      */
-    function lfCheckErrorSearchParam(&$objFormParam)
-    {
+    function lfCheckErrorSearchParam(&$objFormParam) {
         return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
     }
@@ -252,6 +245,5 @@
      * @return array エラー配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam, true);
 
@@ -292,6 +284,5 @@
      * @return array エラー配列
      */
-    function lfRegistData(&$objFormParam)
-    {
+    function lfRegistData(&$objFormParam) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         // 登録用データ取得
@@ -322,6 +313,5 @@
      * @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
      */
-    function lfPurchaseHistory($customer_id, $pageno = 0)
-    {
+    function lfPurchaseHistory($customer_id, $pageno = 0) {
         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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Customer_SearchCustomer extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Customer_SearchCustomer extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'customer/search_customer.tpl';
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -102,6 +98,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -113,6 +108,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
     }
@@ -124,6 +118,5 @@
      * @return array エラー配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
     }
@@ -135,6 +128,5 @@
      * @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
      */
-    function lfDoSearch($arrParam)
-    {
+    function lfDoSearch($arrParam) {
         return SC_Helper_Customer_Ex::sfGetSearchData($arrParam);
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/index.tpl';
@@ -85,6 +83,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -96,6 +93,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -185,6 +181,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -196,6 +191,5 @@
      * @return void
      */
-    function lfInitParamSearchCustomer(&$objFormParam)
-    {
+    function lfInitParamSearchCustomer(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
         $objFormParam->addParam('配信形式', 'search_htmlmail', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
@@ -209,6 +203,5 @@
      * @return void
      */
-    function lfAddParamSelectTemplate(&$objFormParam)
-    {
+    function lfAddParamSelectTemplate(&$objFormParam) {
         $objFormParam->addParam('メール形式', 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK'));
         $objFormParam->addParam('Subject', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -223,6 +216,5 @@
      * @return array key:template_id value:サブジェクト【配信形式】
      */
-    function lfGetMailTemplateList($arrTemplate)
-    {
+    function lfGetMailTemplateList($arrTemplate) {
         if (is_array($arrTemplate)) {
             foreach ($arrTemplate as $line) {
@@ -240,6 +232,5 @@
      * @return void
      */
-    function lfGetTemplateData(&$objFormParam, $template_id)
-    {
+    function lfGetTemplateData(&$objFormParam, $template_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setOrder('template_id DESC');
@@ -254,6 +245,5 @@
      * @return integer 登録した行の dtb_send_history.send_id の値
      */
-    function lfRegisterData(&$objFormParam)
-    {
+    function lfRegisterData(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -299,6 +289,5 @@
      * @return array
      */
-    function lfGetMailQuery($send_id)
-    {
+    function lfGetMailQuery($send_id) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
Index: /branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_History extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_History extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/history.tpl';
@@ -59,6 +57,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -70,6 +67,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
@@ -95,6 +91,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -106,6 +101,5 @@
      * @return array( integer 全体件数, mixed メール配信データ一覧配列, mixed SC_PageNaviオブジェクト)
      */
-    function lfDoSearch($search_pageno = 1)
-    {
+    function lfDoSearch($search_pageno = 1) {
 
         // 引数の初期化
@@ -146,6 +140,5 @@
      * @return void
      */
-    function lfDeleteHistory($send_id)
-    {
+    function lfDeleteHistory($send_id) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
             $objQuery->update('dtb_send_history',
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Preview extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_Preview extends LC_Page_Admin_Ex {
 
     // }}}
@@ -42,6 +41,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = 'プレビュー';
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objMailHelper = new SC_Helper_Mail_Ex();
@@ -98,6 +94,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Template extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_Template extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/template.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objMailHelper = new SC_Helper_Mail_Ex();
@@ -97,6 +93,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -107,6 +102,5 @@
      * @return void
      */
-    function lfDeleteMailTemplate($template_id)
-    {
+    function lfDeleteMailTemplate($template_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->update('dtb_mailmaga_template',
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Mail_TemplateInput extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_TemplateInput extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/template_input.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objMailHelper = new SC_Helper_Mail_Ex();
@@ -119,6 +115,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -131,6 +126,5 @@
      * @return void
      */
-    function lfRegistData(&$objFormParam, $template_id = null)
-    {
+    function lfRegistData(&$objFormParam, $template_id = null) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -160,6 +154,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('メール形式', 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK'));
         $objFormParam->addParam('Subject', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
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 22578)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Maker extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Maker extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/maker.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,8 +66,6 @@
      * @return void
      */
-    function action()
-    {
-
-        $objMaker = new SC_Helper_Maker_Ex();
+    function action() {
+
         $objFormParam = new SC_FormParam_Ex();
 
@@ -87,4 +82,7 @@
         $maker_id = $objFormParam->getValue('maker_id');
 
+        // 変換後のPOST値を取得
+        $this->arrForm  = $objFormParam->getHashArray();
+
         // モードによる処理切り替え
         switch ($this->getMode()) {
@@ -92,38 +90,35 @@
             // 編集処理
             case 'edit':
+            // 入力文字の変換
+
                 // エラーチェック
-                $this->arrErr = $this->lfCheckError($objFormParam, $objMaker);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['maker_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
+                $this->arrErr = $this->lfCheckError($this->arrForm, $objFormParam);
+                if (count($this->arrErr) <= 0) {
+                    if ($this->arrForm['maker_id'] == '') {
+                        // メーカー情報新規登録
+                        $this->lfInsert($this->arrForm);
+                    } else {
+                        // メーカー情報編集
+                        $this->lfUpdate($this->arrForm);
+                    }
+
+                    // 再表示
+                    $this->objDisplay->reload();
+                } else {
+                    // POSTデータを引き継ぐ
+                    $this->tpl_maker_id = $this->arrForm['maker_id'];
                 }
-
-                if (count($this->arrErr) <= 0) {
-                    // POST値の引き継ぎ
-                    $arrParam = $objFormParam->getHashArray();
-                    // 登録実行
-                    $res_maker_id = $this->doRegist($maker_id, $arrParam, $objMaker);
-                    if ($res_maker_id !== FALSE) {
-                        // 完了メッセージ
-                        $maker_id = $res_maker_id;
-                        $this->tpl_onload = "alert('登録が完了しました。');";
-                    }
-                }
-                // POSTデータを引き継ぐ
-                $this->tpl_maker_id = $maker_id;
                 break;
 
             // 編集前処理
             case 'pre_edit':
-                $maker = $objMaker->get($maker_id);
-                $objFormParam->setParam($maker);
-
-                // POSTデータを引き継ぐ
-                $this->tpl_maker_id = $maker_id;
+                $this->arrForm = $this->lfPreEdit($this->arrForm, $this->arrForm['maker_id']);
+                $this->tpl_maker_id = $this->arrForm['maker_id'];
                 break;
 
             // メーカー順変更
             case 'up':
-                $objMaker->rankUp($maker_id);
+            case 'down':
+                $this->lfRankChange($this->arrForm['maker_id'], $this->getMode());
 
                 // リロード
@@ -131,6 +126,7 @@
                 break;
 
-            case 'down':
-                $objMaker->rankDown($maker_id);
+            // 削除
+            case 'delete':
+                $this->lfDelete($this->arrForm['maker_id']);
 
                 // リロード
@@ -138,20 +134,13 @@
                 break;
 
-            // 削除
-            case 'delete':
-                $objMaker->delete($maker_id);
-
-                // リロード
-                SC_Response_Ex::reload();
-                break;
-
             default:
                 break;
         }
 
-        $this->arrForm = $objFormParam->getFormParamList();
-
         // メーカー情報読み込み
-        $this->arrMaker = $objMaker->getList();
+        $this->arrMaker = $this->lfDisp();
+        // POSTデータを引き継ぐ
+        $this->tpl_maker_id = $maker_id;
+
     }
 
@@ -161,6 +150,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -172,6 +160,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('メーカーID', 'maker_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('メーカー名', 'name', SMTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -179,16 +166,110 @@
 
     /**
-     * 登録処理を実行.
-     * 
-     * @param integer $maker_id
-     * @param array $sqlval
-     * @param object $objMaker
-     * @return multiple
-     */
-    function doRegist($maker_id, $sqlval, SC_Helper_Maker_Ex $objMaker)
-    {
-        $sqlval['maker_id'] = $maker_id;
+     * メーカー情報表示.
+     *
+     * @return array $arrMaker メーカー情報
+     */
+    function lfDisp() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // 削除されていないメーカー情報を表示する
+        $where = 'del_flg = 0';
+        $objQuery->setOrder('rank DESC');
+        $arrMaker = array();
+        $arrMaker = $objQuery->select('maker_id, name', 'dtb_maker', $where);
+        return $arrMaker;
+    }
+
+    /**
+     * メーカー情報新規登録.
+     *
+     * @param array $arrForm メーカー情報
+     * @return void
+     */
+    function lfInsert(&$arrForm) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // INSERTする値を作成する
+        $sqlval['name'] = $arrForm['name'];
+        $sqlval['rank'] = $objQuery->max('rank', 'dtb_maker') + 1;
         $sqlval['creator_id'] = $_SESSION['member_id'];
-        return $objMaker->save($sqlval);
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['maker_id'] = $objQuery->nextVal('dtb_maker_maker_id');
+
+        // INSERTの実行
+        $objQuery->insert('dtb_maker', $sqlval);
+    }
+
+    /**
+     * メーカー情報更新.
+     *
+     * @param array $arrForm メーカー情報
+     * @return void
+     */
+    function lfUpdate(&$arrForm) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // UPDATEする値を作成する
+        $sqlval['name'] = $arrForm['name'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'maker_id = ?';
+
+        // UPDATEの実行
+        $objQuery->update('dtb_maker', $sqlval, $where, array($arrForm['maker_id']));
+    }
+
+    /**
+     * メーカー情報削除.
+     *
+     * @param integer $maker_id メーカーID
+     * @return void
+     */
+    function lfDelete($maker_id) {
+        $objDb = new SC_Helper_DB_Ex();
+        $objDb->sfDeleteRankRecord('dtb_maker', 'maker_id', $maker_id, '', true);
+    }
+
+    /**
+     * メーカー情報順番変更.
+     *
+     * @param  integer $maker_id メーカーID
+     * @param  string  $mode up か down のモードを示す文字列
+     * @return void
+     */
+    function lfRankChange($maker_id, $mode) {
+        $objDb = new SC_Helper_DB_Ex();
+
+        switch ($mode) {
+            case 'up':
+                $objDb->sfRankUp('dtb_maker', 'maker_id', $maker_id);
+                break;
+
+            case 'down':
+                $objDb->sfRankDown('dtb_maker', 'maker_id', $maker_id);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * メーカー情報編集前処理.
+     *
+     * @param array   $arrForm メーカー情報
+     * @param integer $maker_id メーカーID
+     * @return array  $arrForm メーカー名を追加
+     */
+    function lfPreEdit(&$arrForm, $maker_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // 編集項目を取得する
+        $where = 'maker_id = ?';
+        $arrMaker = array();
+        $arrMaker = $objQuery->select('name', 'dtb_maker', $where, array($maker_id));
+        $arrForm['name'] = $arrMaker[0]['name'];
+
+        return $arrForm;
     }
 
@@ -196,17 +277,20 @@
      * 入力エラーチェック.
      *
+     * @param  array $arrForm メーカー情報
      * @return array $objErr->arrErr エラー内容
      */
-    function lfCheckError(&$objFormParam, SC_Helper_Maker_Ex &$objMaker)
-    {
+    function lfCheckError(&$arrForm, &$objFormParam) {
 
         $arrErr = $objFormParam->checkError();
-        $arrForm = $objFormParam->getHashArray();
+        if (!empty($arrErr)) {
+            return $arrErr;
+        }
 
         // maker_id の正当性チェック
         if (!empty($arrForm['maker_id'])) {
+            $objDb = new SC_Helper_DB_Ex();
             if (!SC_Utils_Ex::sfIsInt($arrForm['maker_id'])
                 || SC_Utils_Ex::sfIsZeroFilling($arrForm['maker_id'])
-                || !$objMaker->get($arrForm['maker_id'])
+                || !$objDb->sfIsRecord('dtb_maker', 'maker_id', array($arrForm['maker_id']))
             ) {
                 // maker_idが指定されていて、且つその値が不正と思われる場合はエラー
@@ -215,12 +299,10 @@
         }
         if (!isset($arrErr['name'])) {
-            $arrMaker = $objMaker->getByName($arrForm['name']);
+            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $arrMaker = array();
+            $arrMaker = $objQuery->select('maker_id, name', 'dtb_maker', 'del_flg = 0 AND name = ?', array($arrForm['name']));
 
             // 編集中のレコード以外に同じ名称が存在する場合
-            if (
-                    !SC_Utils_Ex::isBlank($arrMaker)
-                    && $arrMaker['maker_id'] != $arrForm['maker_id']
-                    && $arrMaker['name'] == $arrForm['name']
-                ) {
+            if ($arrMaker[0]['maker_id'] != $arrForm['maker_id'] && $arrMaker[0]['name'] == $arrForm['name']) {
                 $arrErr['name'] = '※ 既に同じ内容の登録が存在します。<br />';
             }
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 22582)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/index.tpl';
@@ -59,5 +57,5 @@
         $this->arrPRODUCTSTATUS_COLOR = $masterData->getMasterData('mtb_product_status_color');
 
-        $objDate = new SC_Date_Ex();
+        $objDate = new SC_Date();
         // 登録・更新検索開始年
         $objDate->setStartYear(RELEASE_YEAR);
@@ -80,6 +78,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -91,6 +88,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -191,6 +187,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -202,6 +197,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
 
         // POSTされる値
@@ -234,6 +228,5 @@
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
@@ -245,6 +238,5 @@
 
     // カテゴリIDをキー、カテゴリ名を値にする配列を返す。
-    function lfGetIDName($arrCatKey, $arrCatVal)
-    {
+    function lfGetIDName($arrCatKey, $arrCatVal) {
         $max = count($arrCatKey);
         for ($cnt = 0; $cnt < $max; $cnt++) {
@@ -263,12 +255,6 @@
      * @return void
      */
-    function doDelete($where, $arrParam = array())
-    {
+    function doDelete($where, $arrParam = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $arrRet = $objQuery->getCol('product_id', "dtb_products", $where, $arrParam);
-        $product_ids = array();
-        foreach ($arrRet as $value) {
-            $product_ids[] = $value['product_id'];
-        }
         $sqlval['del_flg']     = 1;
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
@@ -276,8 +262,5 @@
         $objQuery->update('dtb_products_class', $sqlval, "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
         $objQuery->delete('dtb_customer_favorite_products', "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
-
-        $objRecomment = new SC_Helper_Recommend_Ex();
-        $objRecomment->deleteByProductIDs($product_ids);
-
+        $objQuery->delete('dtb_best_products', "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
         $objQuery->update('dtb_products', $sqlval, $where, $arrParam);
         $objQuery->commit();
@@ -299,6 +282,5 @@
      * @return void
      */
-    function buildQuery($key, &$where, &$arrValues, &$objFormParam, &$objDb)
-    {
+    function buildQuery($key, &$where, &$arrValues, &$objFormParam, &$objDb) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         switch ($key) {
@@ -385,6 +367,5 @@
      * @return integer 検索結果の行数
      */
-    function getNumberOfLines($where, $arrValues)
-    {
+    function getNumberOfLines($where, $arrValues) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->count('dtb_products', $where, $arrValues);
@@ -402,6 +383,5 @@
      * @return array 商品の検索結果
      */
-    function findProducts($where, $arrValues, $limit, $offset, $order, &$objProduct)
-    {
+    function findProducts($where, $arrValues, $limit, $offset, $order, &$objProduct) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
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 22578)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Product extends LC_Page_Admin_Products_Ex 
-{
+class LC_Page_Admin_Products_Product extends LC_Page_Admin_Products_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product.tpl';
@@ -58,5 +56,5 @@
         $this->arrSTATUS_IMAGE = $masterData->getMasterData('mtb_status_image');
         $this->arrDELIVERYDATE = $masterData->getMasterData('mtb_delivery_date');
-        $this->arrMaker = SC_Helper_Maker_Ex::getIDValueList();
+        $this->arrMaker = SC_Helper_DB_Ex::sfGetIDValueList('dtb_maker', 'maker_id', 'name');
         $this->arrAllowedTag = $masterData->getMasterData('mtb_allowed_tag');
     }
@@ -67,6 +65,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -78,6 +75,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -298,6 +294,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -311,6 +306,5 @@
      * @return void
      */
-    function lfInitFormParam_PreEdit(&$objFormParam, $arrPost)
-    {
+    function lfInitFormParam_PreEdit(&$objFormParam, $arrPost) {
         $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->setParam($arrPost);
@@ -325,6 +319,5 @@
      * @return void
      */
-    function lfInitFormParam(&$objFormParam, $arrPost)
-    {
+    function lfInitFormParam(&$objFormParam, $arrPost) {
         $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('商品名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -394,6 +387,5 @@
      * @return void
      */
-    function lfInitFormParam_UploadImage(&$objFormParam)
-    {
+    function lfInitFormParam_UploadImage(&$objFormParam) {
         $objFormParam->addParam('image_key', 'image_key', '', '', array());
     }
@@ -406,6 +398,5 @@
      * @return void
      */
-    function lfInitFormParam_UploadDown(&$objFormParam)
-    {
+    function lfInitFormParam_UploadDown(&$objFormParam) {
         $objFormParam->addParam('down_key', 'down_key', '', '', array());
     }
@@ -418,6 +409,5 @@
      * @return void
      */
-    function lfInitFormParam_RecommendSelect(&$objFormParam)
-    {
+    function lfInitFormParam_RecommendSelect(&$objFormParam) {
         $objFormParam->addParam('anchor_key', 'anchor_key', '', '', array());
         $objFormParam->addParam('select_recommend_no', 'select_recommend_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -431,6 +421,5 @@
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('一覧-メイン画像', 'main_list_image', array('jpg', 'gif', 'png'),IMAGE_SIZE, false, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
         $objUpFile->addFile('詳細-メイン画像', 'main_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT);
@@ -449,6 +438,5 @@
      * @return void
      */
-    function lfInitDownFile(&$objDownFile)
-    {
+    function lfInitDownFile(&$objDownFile) {
         $objDownFile->addFile('ダウンロード販売用ファイル', 'down_file', explode(',', DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0);
     }
@@ -463,6 +451,5 @@
      * @return array エラー情報を格納した連想配列
      */
-    function lfCheckError_Edit(&$objFormParam, &$objUpFile, &$objDownFile, $arrForm)
-    {
+    function lfCheckError_Edit(&$objFormParam, &$objUpFile, &$objDownFile, $arrForm) {
         $objErr = new SC_CheckError_Ex($arrForm);
         $arrErr = array();
@@ -506,6 +493,5 @@
      * @return void
      */
-    function lfCheckError_RecommendSelect(&$arrForm, &$arrErr)
-    {
+    function lfCheckError_RecommendSelect(&$arrForm, &$arrErr) {
         $select_recommend_no = $arrForm['select_recommend_no'];
         $select_recommend_id = $arrForm['recommend_id' . $select_recommend_no];
@@ -516,6 +502,6 @@
                     continue;
                 }
-                $delete_key = 'recommend_delete'.intval(str_replace('recommend_id','',$key));
-                if ($select_recommend_id == $arrForm[$key] && $arrForm[$delete_key] != 1) {
+
+                if ($select_recommend_id == $arrForm[$key]) {
                     // 重複した場合、選択されたデータをリセットする
                     $arrForm['recommend_id' . $select_recommend_no] = '';
@@ -533,6 +519,5 @@
      * @return array 検索パラメーター配列
      */
-    function lfGetSearchParam($arrPost)
-    {
+    function lfGetSearchParam($arrPost) {
         $arrSearchParam = array();
         $objFormParam = new SC_FormParam_Ex();
@@ -554,6 +539,5 @@
      * @return array フォームパラメーター配列
      */
-    function lfGetFormParam_PreEdit(&$objUpFile, &$objDownFile, $product_id)
-    {
+    function lfGetFormParam_PreEdit(&$objUpFile, &$objDownFile, $product_id) {
         $arrForm = array();
 
@@ -575,6 +559,5 @@
      * @return array フォームパラメーター配列
      */
-    function lfGetFormParam_Complete(&$objFormParam)
-    {
+    function lfGetFormParam_Complete(&$objFormParam) {
         $arrForm = $objFormParam->getHashArray();
         $arrForm['category_id'] = unserialize($arrForm['category_id']);
@@ -593,6 +576,5 @@
      * @return array 表示用フォームパラメーター配列
      */
-    function lfSetViewParam_InputPage(&$objUpFile, &$objDownFile, &$arrForm)
-    {
+    function lfSetViewParam_InputPage(&$objUpFile, &$objDownFile, &$arrForm) {
         // カテゴリマスターデータ取得
         $objDb = new SC_Helper_DB_Ex();
@@ -636,6 +618,5 @@
      * @return array 表示用フォームパラメーター配列
      */
-    function lfSetViewParam_ConfirmPage(&$objUpFile, &$objDownFile, &$arrForm)
-    {
+    function lfSetViewParam_ConfirmPage(&$objUpFile, &$objDownFile, &$arrForm) {
         // カテゴリ表示用
         $arrForm['arrCategoryId'] = $arrForm['category_id'];
@@ -657,6 +638,5 @@
      * @return void
      */
-    function lfSetScaleImage(&$objUpFile, $image_key)
-    {
+    function lfSetScaleImage(&$objUpFile, $image_key) {
         $subno = str_replace('sub_large_image', '', $image_key);
         switch ($image_key) {
@@ -683,6 +663,5 @@
      * @return void
      */
-    function lfCopyProductImageFiles(&$objUpFile)
-    {
+    function lfCopyProductImageFiles(&$objUpFile) {
         $arrKey = $objUpFile->keyname;
         $arrSaveFile = $objUpFile->save_file;
@@ -702,6 +681,5 @@
      * @return void
      */
-    function lfMakeScaleImage(&$objUpFile, $from_key, $to_key, $forced = false)
-    {
+    function lfMakeScaleImage(&$objUpFile, $from_key, $to_key, $forced = false) {
         $arrImageKey = array_flip($objUpFile->keyname);
         $from_path = '';
@@ -741,6 +719,5 @@
      * @return void
      */
-    function lfDeleteTempFile(&$objUpFile, $image_key)
-    {
+    function lfDeleteTempFile(&$objUpFile, $image_key) {
         // TODO: SC_UploadFile::deleteFileの画像削除条件見直し要
         $arrTempFile = $objUpFile->temp_file;
@@ -775,6 +752,5 @@
      * @return void
      */
-    function lfSaveUploadFiles(&$objUpFile, &$objDownFile, $product_id)
-    {
+    function lfSaveUploadFiles(&$objUpFile, &$objDownFile, $product_id) {
         // TODO: SC_UploadFile::moveTempFileの画像削除条件見直し要
         $objImage = new SC_Image_Ex($objUpFile->temp_dir);
@@ -810,6 +786,5 @@
      * @return boolean
      */
-    function lfHasSameProductImage($product_id, $arrImageKey, $image_file_name)
-    {
+    function lfHasSameProductImage($product_id, $arrImageKey, $image_file_name) {
         if (!SC_Utils_Ex::sfIsInt($product_id)) return false;
         if (!$arrImageKey) return false;
@@ -844,6 +819,5 @@
      * @return array 商品データ配列
      */
-    function lfGetProductData_FromDB($product_id)
-    {
+    function lfGetProductData_FromDB($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrProduct = array();
@@ -908,6 +882,5 @@
      * @return array 関連商品データ配列
      */
-    function lfGetRecommendProductsData_FromDB($product_id)
-    {
+    function lfGetRecommendProductsData_FromDB($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRecommendProducts = array();
@@ -936,6 +909,5 @@
      * @return array 関連商品データ配列
      */
-    function lfGetRecommendProducts(&$arrForm)
-    {
+    function lfGetRecommendProducts(&$arrForm) {
         $arrRecommend = array();
 
@@ -964,6 +936,5 @@
      * @return array カテゴリマスターデータ配列
      */
-    function lfGetCategoryList_Edit()
-    {
+    function lfGetCategoryList_Edit() {
         $objDb = new SC_Helper_DB_Ex();
         $arrCategoryList = array();
@@ -984,6 +955,5 @@
      * @return string ページonload用JavaScript
      */
-    function lfSetOnloadJavaScript_InputPage($anchor_hash = '')
-    {
+    function lfSetOnloadJavaScript_InputPage($anchor_hash = '') {
         return "fnCheckStockLimit('" . DISABLED_RGB . "'); fnMoveSelect('category_id_unselect', 'category_id');" . $anchor_hash;
     }
@@ -997,6 +967,5 @@
      * @return integer 登録商品ID
      */
-    function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList)
-    {
+    function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
@@ -1146,6 +1115,5 @@
      * @return void
      */
-    function lfInsertDummyProductClass($arrList)
-    {
+    function lfInsertDummyProductClass($arrList) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
@@ -1180,6 +1148,5 @@
      * @return void
      */
-    function lfUpdateProductClass($arrList)
-    {
+    function lfUpdateProductClass($arrList) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sqlval = array();
@@ -1200,6 +1167,5 @@
      * @return void
      */
-    function lfInsertRecommendProducts(&$objQuery, $arrList, $product_id)
-    {
+    function lfInsertRecommendProducts(&$objQuery, $arrList, $product_id) {
         // 一旦関連商品をすべて削除する
         $objQuery->delete('dtb_recommend_products', 'product_id = ?', array($product_id));
@@ -1233,6 +1199,5 @@
      * @return boolean エラーフラグ
      */
-    function lfCopyProductClass($arrList, &$objQuery)
-    {
+    function lfCopyProductClass($arrList, &$objQuery) {
         // 複製元のdtb_products_classを取得（規格なしのため、1件のみの取得）
         $col = '*';
@@ -1284,6 +1249,5 @@
      * @return string
      */
-    function lfGetAddSuffix($to_key)
-    {
+    function lfGetAddSuffix($to_key) {
         if ( IMAGE_RENAME === true) return;
 
@@ -1312,6 +1276,5 @@
      * @return boolean true: サブ情報あり, false: サブ情報なし
      */
-    function hasSubProductData($arrSubProductData)
-    {
+    function hasSubProductData($arrSubProductData) {
         $has_subproduct_data = false;
 
@@ -1339,6 +1302,5 @@
      * @return <type>
      */
-    function getAnchorHash($anchor_key)
-    {
+    function getAnchorHash($anchor_key) {
         if ($anchor_key != '') {
             return "location.hash='#" . htmlspecialchars($anchor_key) . "'";
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductSelect extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ProductSelect extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product_select.tpl';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,6 +69,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -102,6 +98,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -113,6 +108,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('カテゴリ', 'search_category_id', STEXT_LEN, 'n');
         $objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa');
@@ -121,6 +115,5 @@
 
     /* 商品検索結果取得 */
-    function lfGetProducts(&$objDb)
-    {
+    function lfGetProducts(&$objDb) {
         $where = 'del_flg = 0';
         $arrWhereVal = array();
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 22578)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 22796)
@@ -34,6 +34,5 @@
  * FIXME 同一商品IDで商品規格違いを登録できない。(更新は可能)
  */
-class LC_Page_Admin_Products_UploadCSV extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_UploadCSV extends LC_Page_Admin_Ex {
 
     // }}}
@@ -61,6 +60,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/upload_csv.tpl';
@@ -76,6 +74,6 @@
         $this->arrDELIVERYDATE = $masterData->getMasterData('mtb_delivery_date');
         $this->arrProductType = $masterData->getMasterData('mtb_product_type');
-        $this->arrMaker = SC_Helper_Maker_Ex::getIDValueList();
-        $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrMaker = SC_Helper_DB_Ex::sfGetIDValueList('dtb_maker', 'maker_id', 'name');
+        $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         $this->arrAllowedTag = $masterData->getMasterData('mtb_allowed_tag');
@@ -88,6 +86,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -99,6 +96,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->objDb = new SC_Helper_DB_Ex();
@@ -125,6 +121,4 @@
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam, $arrCSVFrame);
-
-        $this->max_upload_csv_size = SC_Utils_Ex::getUnitDataSize(CSV_SIZE);
 
         $objFormParam->setHtmlDispNameArray();
@@ -148,6 +142,5 @@
      * @return void
      */
-    function addRowResult($line_count, $message)
-    {
+    function addRowResult($line_count, $message) {
         $this->arrRowResult[] = $line_count . '行目：' . $message;
     }
@@ -160,88 +153,14 @@
      * @return void
      */
-    function addRowErr($line_count, $message)
-    {
+    function addRowErr($line_count, $message) {
         $this->arrRowErr[] = $line_count . '行目：' . $message;
     }
 
     /**
-     * CSVファイルを読み込んで、保存処理を行う
-     *
-     * @param $objFormParam
-     * @param $fp CSVファイルポインタ
-     * @param $objQuery 保存を行うためのクエリ(指定がない場合、テストのみを行う)
-     * @return boolean errFlag. 読み込みに失敗した場合true
-     */
-    function lfReadCSVFile(&$objFormParam, &$fp, $objQuery = null)
-    {
-        $dry_run = ($objQuery===null) ? true : false;
-        // 登録対象の列数
-        $col_max_count = $objFormParam->getCount();
-        // 行数
-        $line_count = 0;
-        // 処理に失敗した場合にtrue
-        $errFlag = false;
-
-        while (!feof($fp)) {
-            $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
-
-            // 行カウント
-            $line_count++;
-            // ヘッダ行はスキップ
-            if ($line_count == 1) {
-                continue;
-            }
-            // 空行はスキップ
-            if (empty($arrCSV)) {
-                continue;
-            }
-            // 列数が多すぎる場合はエラー、列数が少ない場合は未設定として配列を補う
-            $col_count = count($arrCSV);
-            if ($col_count > $col_max_count) {
-                $this->addRowErr($line_count, '※ 項目数が' . $col_count . '個検出されました。項目数は' . $col_max_count . '個になります。');
-                $errFlag = true;
-                break;
-            } elseif ($col_count < $col_max_count) {
-                $arrCSV = array_pad($arrCSV, $col_max_count, "");
-                if (!$dry_run) {
-                    $this->addRowResult($line_count, ($col_count + 1) . "項目以降を空欄として読み込みました");
-                }
-            }
-
-            // シーケンス配列を格納する。
-            $objFormParam->setParam($arrCSV, true);
-            $arrRet = $objFormParam->getHashArray();
-            $objFormParam->setParam($arrRet);
-            // 入力値の変換
-            $objFormParam->convParam();
-
-            // <br>なしでエラー取得する。
-            $arrCSVErr = $this->lfCheckError($objFormParam);
-            if (count($arrCSVErr) > 0) {
-                foreach ($arrCSVErr as $err) {
-                    $this->addRowErr($line_count, $err);
-                }
-                $errFlag = true;
-                break;
-            }
-
-            if (!$dry_run) {
-                $this->lfRegistProduct($objQuery, $line_count, $objFormParam);
-                $arrParam = $objFormParam->getHashArray();
-
-                $this->addRowResult($line_count, '商品ID：'.$arrParam['product_id'] . ' / 商品名：' . $arrParam['name']);
-            }
-            SC_Utils_Ex::extendTimeOut();
-        }
-        return $errFlag;
-    }
-
-    /**
      * CSVアップロードを実行します.
      *
      * @return void
      */
-    function doUploadCsv(&$objFormParam, &$objUpFile)
-    {
+    function doUploadCsv(&$objFormParam, &$objUpFile) {
         // ファイルアップロードのチェック
         $this->arrErr['csv_file'] = $objUpFile->makeTempFile('csv_file');
@@ -271,13 +190,68 @@
         $this->arrFormKeyList = $objFormParam->getKeyList();
 
+        // 登録対象の列数
+        $col_max_count = $objFormParam->getCount();
+        // 行数
+        $line_count = 0;
+
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
 
-        // CSVからの読み込み、入力エラーチェック
-        $errFlag = $this->lfReadCSVFile($objFormParam, $fp);
-        if (!$errFlag) {
-            rewind($fp);
-            // CSVからの読み込み、保存 
-            $errFlag = $this->lfReadCSVFile($objFormParam, $fp, $objQuery);
+        $errFlag = false;
+        $all_line_checked = false;
+
+        while (!feof($fp)) {
+            $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
+
+            // 全行入力チェック後に、ファイルポインターを先頭に戻す
+            if (feof($fp) && !$all_line_checked) {
+                rewind($fp);
+                $line_count = 0;
+                $all_line_checked = true;
+                continue;
+            }
+
+            // 行カウント
+            $line_count++;
+            // ヘッダ行はスキップ
+            if ($line_count == 1) {
+                continue;
+            }
+            // 空行はスキップ
+            if (empty($arrCSV)) {
+                continue;
+            }
+            // 列数が異なる場合はエラー
+            $col_count = count($arrCSV);
+            if ($col_max_count != $col_count) {
+                $this->addRowErr($line_count, '※ 項目数が' . $col_count . '個検出されました。項目数は' . $col_max_count . '個になります。');
+                $errFlag = true;
+                break;
+            }
+            // シーケンス配列を格納する。
+            $objFormParam->setParam($arrCSV, true);
+            $arrRet = $objFormParam->getHashArray();
+            $objFormParam->setParam($arrRet);
+            // 入力値の変換
+            $objFormParam->convParam();
+            // <br>なしでエラー取得する。
+            $arrCSVErr = $this->lfCheckError($objFormParam);
+
+            // 入力エラーチェック
+            if (count($arrCSVErr) > 0) {
+                foreach ($arrCSVErr as $err) {
+                    $this->addRowErr($line_count, $err);
+                }
+                $errFlag = true;
+                break;
+            }
+
+            if ($all_line_checked) {
+                $this->lfRegistProduct($objQuery, $line_count, $objFormParam);
+                $arrParam = $objFormParam->getHashArray();
+
+                $this->addRowResult($line_count, '商品ID：'.$arrParam['product_id'] . ' / 商品名：' . $arrParam['name']);
+            }
+            SC_Utils_Ex::extendTimeOut();
         }
 
@@ -304,6 +278,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -314,6 +287,5 @@
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('CSVファイル', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false);
     }
@@ -325,6 +297,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam, &$arrCSVFrame)
-    {
+    function lfInitParam(&$objFormParam, &$arrCSVFrame) {
         // 固有の初期値調整
         $arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame);
@@ -371,6 +342,5 @@
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
         $arrRet =  $objFormParam->getHashArray();
@@ -393,6 +363,5 @@
      * @return void
      */
-    function lfInitTableInfo()
-    {
+    function lfInitTableInfo() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $this->arrProductColumn = $objQuery->listTableFields('dtb_products');
@@ -409,10 +378,8 @@
      * @return void
      */
-    function lfRegistProduct($objQuery, $line = '', &$objFormParam)
-    {
+    function lfRegistProduct($objQuery, $line = '', &$objFormParam) {
         $objProduct = new SC_Product_Ex();
         // 登録データ対象取得
         $arrList = $objFormParam->getHashArray();
-
         // 登録時間を生成(DBのCURRENT_TIMESTAMPだとcommitした際、すべて同一の時間になってしまう)
         $arrList['update_date'] = $this->lfGetDbFormatTimeWithLine($line);
@@ -480,25 +447,9 @@
      * @return void
      */
-    function lfRegistProductClass($objQuery, $arrList, $product_id, $product_class_id)
-    {
+    function lfRegistProductClass($objQuery, $arrList, $product_id, $product_class_id) {
         $objProduct = new SC_Product_Ex();
-
-        // FIXME: dtb_csvテーブルの中で古いカラム名(右辺)が設定されている。sfArrayIntersectKeysでフィルタされてしまうので、名称を変更する必要がある
-        if (array_key_exists('classcategory_id', $arrList) && $arrList['classcategory_id'] != '') {
-            $arrList['classcategory_id1'] = $arrList['classcategory_id'];
-        }
-        if (array_key_exists('parent_classcategory_id', $arrList) && $arrList['classcategory_id'] != '') {
-            $arrList['classcategory_id2'] = $arrList['parent_classcategory_id'];
-        }
-
         // 商品規格登録情報を生成する。
         // 商品規格テーブルのカラムに存在しているもののうち、Form投入設定されていないデータは上書きしない。
         $sqlval = SC_Utils_Ex::sfArrayIntersectKeys($arrList, $this->arrProductClassColumn);
-
-        // 商品IDが設定されており、規格IDが設定されていなければ、既存の規格ID取得を試みる(product_class_idは必須入力項目ではない)
-        if ($product_class_id == '' && $product_id != '') {
-            $product_class_id = SC_Utils_Ex::sfGetProductClassId($product_id, $sqlval['classcategory_id1'], $sqlval['classcategory_id2']);
-            $sqlval['product_class_id'] = $product_class_id;
-        }
 
         if ($product_class_id == '') {
@@ -532,6 +483,5 @@
      * @return void
      */
-    function lfRegistReccomendProducts($objQuery, $arrList, $product_id)
-    {
+    function lfRegistReccomendProducts($objQuery, $arrList, $product_id) {
         $objQuery->delete('dtb_recommend_products', 'product_id = ?', array($product_id));
         for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) {
@@ -561,6 +511,5 @@
      * @return array $arrCSVFrame CSV構造配列
      */
-    function lfSetParamDefaultValue(&$arrCSVFrame)
-    {
+    function lfSetParamDefaultValue(&$arrCSVFrame) {
         foreach ($arrCSVFrame as $key => $val) {
             switch ($val['col']) {
@@ -592,6 +541,5 @@
      * @return $sqlval 登録情報配列
      */
-    function lfSetProductDefaultData(&$sqlval)
-    {
+    function lfSetProductDefaultData(&$sqlval) {
         //新規登録時のみ設定する項目
         if ($sqlval['product_id'] == '') {
@@ -617,6 +565,5 @@
      * @return $sqlval 登録情報配列
      */
-    function lfSetProductClassDefaultData(&$sqlval, $upload_flg)
-    {
+    function lfSetProductClassDefaultData(&$sqlval, $upload_flg) {
         //新規登録時のみ設定する項目
         if ($sqlval['product_class_id'] == '') {
@@ -637,5 +584,5 @@
 
         // 在庫無制限フラグ列を利用する場合、
-        if (array_key_exists('stock_unlimited', $sqlval) and $sqlval['stock_unlimited'] != '') {
+        if (array_key_exists('stock_unlimited', $sqlval)) {
             // 在庫無制限フラグ = 無制限の場合、
             if ($sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) {
@@ -669,6 +616,5 @@
      * @return array エラー配列
      */
-    function lfCheckErrorDetail($item, $arrErr)
-    {
+    function lfCheckErrorDetail($item, $arrErr) {
         // 規格IDの存在チェック
         // FIXME 規格分類ID自体のが有効かを主眼においたチェックをすべきと感じる。
@@ -688,13 +634,5 @@
                     $arrErr['product_class_id'] = '※ 指定の商品IDと商品規格IDの組合せは正しくありません。';
                 }
-
-                // product_class_idは(product_id, classcategory_id1, classcategory_id2)に対して一意。既に異なるproduct_class_idが存在した場合はエラー
-                $classcategory_id1 = $item['classcategory_id'] ? $item['classcategory_id'] : 0;
-                $classcategory_id2 = $item['parent_classcategory_id'] ? $item['parent_classcategory_id'] : 0;
-                $product_class_id = SC_Utils_Ex::sfGetProductClassId($item['product_id'], $classcategory_id1, $classcategory_id2);
-                if ($product_class_id && $product_class_id != $item['product_class_id']) {
-                    $arrErr['product_class_id'] = '※ 指定の商品ID/規格分類と、商品規格IDの組合せは正しくありません。';
-                }
-             }
+            }
         }
         // 表示ステータスの存在チェック
@@ -764,12 +702,12 @@
         // ダウンロード商品チェック
         if (array_search('product_type_id', $this->arrFormKeyList) !== FALSE
-            && $item['product_type_id'] != PRODUCT_TYPE_DOWNLOAD
+            && $item['product_type_id'] == PRODUCT_TYPE_NORMAL
         ) {
             //実商品の場合
             if ($item['down_filename'] != '') {
-                $arrErr['down_filename'] = '※ ダウンロード商品ではない場合、ダウンロードファイル名は入力できません。';
+                $arrErr['down_filename'] = '※ 実商品の場合はダウンロードファイル名は入力できません。';
             }
             if ($item['down_realfilename'] != '') {
-                $arrErr['down_realfilename'] = '※ ダウンロード商品ではない場合、ダウンロード商品用ファイルアップロードは入力できません。';
+                $arrErr['down_realfilename'] = '※ 実商品の場合はダウンロード商品用ファイルアップロードは入力できません。';
             }
         } elseif (array_search('product_type_id', $this->arrFormKeyList) !== FALSE
@@ -796,6 +734,5 @@
      * @return string $time DB保存用の時間文字列
      */
-    function lfGetDbFormatTimeWithLine($line_no = '')
-    {
+    function lfGetDbFormatTimeWithLine($line_no = '') {
         $time = date('Y-m-d H:i:s');
         // 秒以下を生成
@@ -816,6 +753,5 @@
      * @return boolean true:有効なデータがある false:有効ではない
      */
-    function lfIsArrayRecordMulti($arr, $keyname, $item, $delimiter = ',')
-    {
+    function lfIsArrayRecordMulti($arr, $keyname, $item, $delimiter = ',') {
         if (array_search($keyname, $this->arrFormKeyList) === FALSE) {
             return true;
@@ -848,6 +784,5 @@
      * @return boolean true:有効なデータがある false:有効ではない
      */
-    function lfIsDbRecordMulti($table, $tblkey, $keyname, $item, $delimiter = ',')
-    {
+    function lfIsDbRecordMulti($table, $tblkey, $keyname, $item, $delimiter = ',') {
         if (array_search($keyname, $this->arrFormKeyList) === FALSE) {
             return true;
@@ -880,6 +815,5 @@
      * @return boolean true:有効なデータがある false:有効ではない
      */
-    function lfIsDbRecord($table, $keyname, $item)
-    {
+    function lfIsDbRecord($table, $keyname, $item) {
         if (array_search($keyname, $this->arrFormKeyList) !== FALSE  //入力対象である
             && $item[$keyname] != ''   // 空ではない
@@ -899,6 +833,5 @@
      * @return boolean true:有効なデータがある false:有効ではない
      */
-    function lfIsArrayRecord($arr, $keyname, $item)
-    {
+    function lfIsArrayRecord($arr, $keyname, $item) {
         if (array_search($keyname, $this->arrFormKeyList) !== FALSE //入力対象である
             && $item[$keyname] != '' // 空ではない
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Review extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Review extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/review.tpl';
@@ -78,6 +76,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -89,6 +86,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -139,6 +135,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -150,6 +145,5 @@
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
         $arrRet =  $objFormParam->getHashArray();
@@ -181,6 +175,5 @@
      * @return void
      */
-    function lfDeleteReview($review_id)
-    {
+    function lfDeleteReview($review_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sqlval['del_flg'] = 1;
@@ -194,6 +187,5 @@
      * @return array hidden情報
      */
-    function lfSetHidden($arrForm)
-    {
+    function lfSetHidden($arrForm) {
         $arrHidden = array();
         foreach ($arrForm AS $key=>$val) {
@@ -221,6 +213,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('投稿者名', 'search_reviewer_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
         $objFormParam->addParam('投稿者URL', 'search_reviewer_url', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
@@ -247,6 +238,5 @@
      * @return void
      */
-    function lfDoOutputCsv($where, $arrWhereVal)
-    {
+    function lfDoOutputCsv($where, $arrWhereVal) {
         $objCSV = new SC_Helper_CSV_Ex();
         if ($where != '') {
@@ -262,6 +252,5 @@
      * @return array WHERE文、判定値
      */
-    function lfGetWhere($arrForm)
-    {
+    function lfGetWhere($arrForm) {
         //削除されていない商品を検索
         $where = 'A.del_flg = 0 AND B.del_flg = 0';
@@ -355,6 +344,5 @@
      * @return array レビュー一覧
      */
-    function lfGetReview($arrForm, $where, $arrWhereVal)
-    {
+    function lfGetReview($arrForm, $where, $arrWhereVal) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_Admin_Products_ClassCategory.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_Products_ClassCategory extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ClassCategory extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/classcategory.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -146,6 +142,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -157,6 +152,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('規格ID', 'class_id', INT_LEN, 'n', array('NUM_CHECK'));
         $objFormParam->addParam('規格分類名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
@@ -170,6 +164,5 @@
      * @return array 規格分類情報
      */
-    function lfGetClassCat($class_id)
-    {
+    function lfGetClassCat($class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -186,6 +179,5 @@
      * @return string 規格名
      */
-    function lfGetClassName($class_id)
-    {
+    function lfGetClassName($class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -201,6 +193,5 @@
      * @return string 規格分類名
      */
-    function lfGetClassCatName($classcategory_id)
-    {
+    function lfGetClassCatName($classcategory_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'classcategory_id = ?';
@@ -215,6 +206,5 @@
      * @return integer 更新件数
      */
-    function lfInsertClass($arrForm)
-    {
+    function lfInsertClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
@@ -244,6 +234,5 @@
      * @return integer 更新件数
      */
-    function lfUpdateClass($arrForm)
-    {
+    function lfUpdateClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATEする値を作成する。
@@ -262,6 +251,5 @@
      * @return array エラー配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrForm = $objFormParam->getHashArray();
@@ -289,6 +277,5 @@
      * @return boolean 新規商品追加の場合 true
      */
-    function lfCheckInsert($classcategory_id)
-    {
+    function lfCheckInsert($classcategory_id) {
         //classcategory_id のあるなしで新規規格分類化かどうかを判定
         if (empty($classcategory_id)) {
@@ -306,6 +293,5 @@
      * @return void
      */
-    function lfDeleteClassCat($class_id, $classcategory_id)
-    {
+    function lfDeleteClassCat($class_id, $classcategory_id) {
         $objDb = new SC_Helper_DB_Ex();
         $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id);
@@ -319,6 +305,5 @@
      * @return void
      */
-    function lfUpRank($class_id, $classcategory_id)
-    {
+    function lfUpRank($class_id, $classcategory_id) {
         $objDb = new SC_Helper_DB_Ex();
         $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id);
@@ -332,6 +317,5 @@
      * @return void
      */
-    function lfDownRank($class_id, $classcategory_id)
-    {
+    function lfDownRank($class_id, $classcategory_id) {
         $objDb = new SC_Helper_DB_Ex();
         $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id);
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Class extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Class extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/class.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -143,6 +139,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -154,6 +149,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('規格名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('規格ID', 'class_id', INT_LEN, 'n', array('NUM_CHECK'));
@@ -165,6 +159,5 @@
      * @return array 規格情報
      */
-    function lfGetClass()
-    {
+    function lfGetClass() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -181,6 +174,5 @@
      * @return string 規格名
      */
-    function lfGetClassName($class_id)
-    {
+    function lfGetClassName($class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'class_id = ?';
@@ -195,6 +187,5 @@
      * @return integer 更新件数
      */
-    function lfInsertClass($arrForm)
-    {
+    function lfInsertClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // INSERTする値を作成する。
@@ -216,6 +207,5 @@
      * @return integer 更新件数
      */
-    function lfUpdateClass($arrForm)
-    {
+    function lfUpdateClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATEする値を作成する。
@@ -235,6 +225,5 @@
      * @return integer 削除件数
      */
-    function lfDeleteClass($class_id)
-    {
+    function lfDeleteClass($class_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -252,6 +241,5 @@
      * @return array エラー配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrForm = $objFormParam->getHashArray();
@@ -279,6 +267,5 @@
      * @return boolean 新規商品追加の場合 true
      */
-    function lfCheckInsert($arrForm)
-    {
+    function lfCheckInsert($arrForm) {
         //class_id のあるなしで新規商品かどうかを判定
         if (empty($arrForm['class_id'])) {
@@ -294,6 +281,5 @@
      * @return void
      */
-    function lfUpRank($class_id)
-    {
+    function lfUpRank($class_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankUp('dtb_class', 'class_id', $class_id);
@@ -305,6 +291,5 @@
      * @return void
      */
-    function lfDownRank($class_id)
-    {
+    function lfDownRank($class_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankDown('dtb_class', 'class_id', $class_id);
Index: /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductClass extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ProductClass extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product_class.tpl';
@@ -62,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -73,6 +70,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // 商品マスターの検索条件パラメーターを初期化
@@ -169,6 +165,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -180,6 +175,5 @@
      * @return void
      */
-    function initParam(&$objFormParam)
-    {
+    function initParam(&$objFormParam) {
         // 商品マスター検索パラメーター引き継ぎ
         $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -231,6 +225,5 @@
      * @param integer $product_id 登録を行う商品ID
      */
-    function registerProductClass($arrList, $product_id, $total)
-    {
+    function registerProductClass($arrList, $product_id, $total) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
@@ -315,6 +308,5 @@
      * @return array エラーの配列
      */
-    function lfCheckSelectClass()
-    {
+    function lfCheckSelectClass() {
         $objErr = new SC_CheckError_Ex();
         $objErr->doFunc(array('規格1', 'class_id1'), array('EXIST_CHECK'));
@@ -330,6 +322,5 @@
      * @return array エラー結果の配列
      */
-    function lfCheckProductsClass(&$objFormParam)
-    {
+    function lfCheckProductsClass(&$objFormParam) {
         $arrValues = $objFormParam->getHashArray();
         $arrErr = $objFormParam->checkError();
@@ -382,10 +373,10 @@
                  * 通常商品チェック
                  */
-                else if ($arrValues['product_type_id'][$i] != PRODUCT_TYPE_DOWNLOAD) {
+                else if ($arrValues['product_type_id'][$i] == PRODUCT_TYPE_NORMAL) {
                     if (!SC_Utils_Ex::isBlank($arrValues['down_filename'][$i])) {
-                        $arrErr['down_filename'][$i] = '※ ダウンロード商品ではない場合、ダウンロードファイル名を設定できません。<br />';
+                        $arrErr['down_filename'][$i] = '※ 通常商品の場合はダウンロードファイル名を設定できません。<br />';
                     }
                     if (!SC_Utils_Ex::isBlank($arrValues['down_realfilename'][$i])) {
-                        $arrErr['down_realfilename'][$i] = '※ ダウンロード商品ではない場合、ダウンロード商品用ファイルをアップロードできません。<br />ファイルを取り消してください。<br />';
+                        $arrErr['down_realfilename'][$i] = '※ 実商品の場合はダウンロード商品用ファイルをアップロードできません。<br />ファイルを取り消してください。<br />';
                     }
                 }
@@ -404,6 +395,5 @@
      * @return void
      */
-    function doDisp(&$objFormParam)
-    {
+    function doDisp(&$objFormParam) {
         $product_id = $objFormParam->getValue('product_id');
         $class_id1 = $objFormParam->getValue('class_id1');
@@ -441,6 +431,5 @@
      * @return void
      */
-    function initDispParam(&$objFormParam)
-    {
+    function initDispParam(&$objFormParam) {
         // 登録チェックボックス初期化(すべてチェックを外す)
         $objFormParam->setValue('check', '');
@@ -460,6 +449,5 @@
      * @param bool $usepostValue
      */
-    function doPreEdit(&$objFormParam)
-    {
+    function doPreEdit(&$objFormParam) {
         $product_id = $objFormParam->getValue('product_id');
         $objProduct = new SC_Product_Ex();
@@ -538,6 +526,5 @@
      * @return void
      */
-    function doDelete($product_id)
-    {
+    function doDelete($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -576,6 +563,5 @@
      * @return void
      */
-    function doFileUpload(&$objFormParam)
-    {
+    function doFileUpload(&$objFormParam) {
         $index   = $objFormParam->getValue('upload_index');
         $arrDownRealFiles = $objFormParam->getValue('down_realfilename');
@@ -639,6 +625,5 @@
      * @return void
      */
-    function doFileDelete(&$objFormParam)
-    {
+    function doFileDelete(&$objFormParam) {
         $objImage = new SC_Image_Ex(DOWN_TEMP_REALDIR);
         $arrRealFileName = $objFormParam->getValue('down_realfilename');
@@ -655,6 +640,5 @@
      * @return void
      */
-    function doUploadComplete(&$objFormParam)
-    {
+    function doUploadComplete(&$objFormParam) {
         $objImage = new SC_Image_Ex(DOWN_TEMP_REALDIR);
         $arrRealFileName = $objFormParam->getValue('down_realfilename');
@@ -673,6 +657,5 @@
      * @return array 規格と規格分類の配列
      */
-    function getAllClassCategory($class_id1, $class_id2 = null)
-    {
+    function getAllClassCategory($class_id1, $class_id2 = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -714,6 +697,5 @@
      * @return string 商品名の文字列
      */
-    function getProductName($product_id)
-    {
+    function getProductName($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->get('name', 'dtb_products', 'product_id = ?', array($product_id));
@@ -726,6 +708,5 @@
      * @return array 規格分類の登録された, すべての規格
      */
-    function getAllClass()
-    {
+    function getAllClass() {
         $arrClass = SC_Helper_DB_Ex::sfGetIDValueList('dtb_class', 'class_id', 'name');
 
@@ -752,6 +733,5 @@
      * @return array 商品規格の配列
      */
-    function getProductsClass($product_id)
-    {
+    function getProductsClass($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'product_code, price01, price02, stock, stock_unlimited, sale_limit, deliv_fee, point_rate';
@@ -771,6 +751,5 @@
      * @return void
      */
-    function fillCheckboxesValue($key, $size)
-    {
+    function fillCheckboxesValue($key, $size) {
         if (empty($_POST[$key])) {
             $_POST[$key] = array_pad(array(), $size, '');
Index: /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ReviewEdit extends LC_Page_Admin_Products_Review 
-{
+class LC_Page_Admin_Products_ReviewEdit extends LC_Page_Admin_Products_Review {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/review_edit.tpl';
@@ -64,6 +62,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -75,6 +72,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター情報の初期化
@@ -92,5 +88,5 @@
                 $this->arrErr = $objFormParam->checkError();
                 // エラー無し
-                if (SC_Utils_Ex::isBlank($this->arrErr)) {
+                if (!SC_Utils_Ex::isBlank($this->arrErr)) {
                     // レビュー情報の更新
                     $this->lfRegistReviewData($this->arrForm['review_id'], $objFormParam);
@@ -113,6 +109,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -124,6 +119,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // 検索条件のパラメーターを初期化
         parent::lfInitParam($objFormParam);
@@ -148,6 +142,5 @@
      * @return array レビュー情報
      */
-    function lfGetReviewData($review_id)
-    {
+    function lfGetReviewData($review_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $select='review_id, A.product_id, reviewer_name, sex, recommend_level, ';
@@ -169,6 +162,5 @@
      * @return void
      */
-    function lfRegistReviewData($review_id, &$objFormParam)
-    {
+    function lfRegistReviewData($review_id, &$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrValues = $objFormParam->getDbArray();
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 22597)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductRank extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ProductRank extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product_rank.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,9 +66,8 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
-        $objCategory = new SC_Helper_Category_Ex();
 
         $this->tpl_pageno = isset($_POST['pageno']) ? $_POST['pageno'] : '';
@@ -104,9 +100,9 @@
         }
 
-        $this->arrTree = $objCategory->getTree();
-        $this->arrParentID = $objCategory->getTreeTrail($this->arrForm['parent_category_id']);     
+        $this->arrTree = $objDb->sfGetCatTree($this->arrForm['parent_category_id']);
         $this->arrProductsList = $this->lfGetProduct($this->arrForm['parent_category_id']);
-        $arrBread = $objCategory->getTreeTrail($this->arrForm['parent_category_id'], FALSE);
-        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode(array_reverse($arrBread));
+        $arrBread = array();
+        $objDb->findTree($this->arrTree, $this->arrForm['parent_category_id'], $arrBread);
+        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode($arrBread);
 
     }
@@ -117,12 +113,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* 商品読み込み */
-    function lfGetProduct($category_id)
-    {
+    function lfGetProduct($category_id) {
         // FIXME SC_Product クラスを使用した実装
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -157,6 +151,5 @@
      * 商品の数値指定での並び替え実行
      */
-    function lfRenumber($parent_category_id)
-    {
+    function lfRenumber($parent_category_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -183,18 +176,15 @@
     }
 
-    function lfRankUp(&$objDb, $parent_category_id, $product_id)
-    {
+    function lfRankUp(&$objDb, $parent_category_id, $product_id) {
         $where = 'category_id = ' . SC_Utils_Ex::sfQuoteSmart($parent_category_id);
         $objDb->sfRankUp('dtb_product_categories', 'product_id', $product_id, $where);
     }
 
-    function lfRankDown(&$objDb, $parent_category_id, $product_id)
-    {
+    function lfRankDown(&$objDb, $parent_category_id, $product_id) {
         $where = 'category_id = ' . SC_Utils_Ex::sfQuoteSmart($parent_category_id);
         $objDb->sfRankDown('dtb_product_categories', 'product_id', $product_id, $where);
     }
 
-    function lfRankMove(&$objDb, $parent_category_id, $product_id)
-    {
+    function lfRankMove(&$objDb, $parent_category_id, $product_id) {
         $key = 'pos-'.$product_id;
         $input_pos = mb_convert_kana($_POST[$key], 'n');
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 22597)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Products_Category extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Category extends LC_Page_Admin_Ex {
 
     // {{{ properties
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_maintitle = '商品管理';
@@ -61,6 +59,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72,10 +69,8 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb      = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
-        $objCategory = new SC_Helper_Category_Ex();
 
         // 入力パラメーター初期化
@@ -184,9 +179,9 @@
         $this->arrList = $this->findCategoiesByParentCategoryId($parent_category_id);
         // カテゴリツリーを取得
-        $this->arrTree = $objCategory->getTree();
-        $this->arrParentID = $objCategory->getTreeTrail($parent_category_id);
+        $this->arrTree = $objDb->sfGetCatTree($parent_category_id);
         // ぱんくずの生成
-        $arrBread = $objCategory->getTreeTrail($this->arrForm['parent_category_id'], FALSE);
-        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode(array_reverse($arrBread));
+        $arrBread = array();
+        $objDb->findTree($this->arrTree, $parent_category_id, $arrBread);
+        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode($arrBread);
 
     }
@@ -206,6 +201,5 @@
      * @return void
      */
-    function doDelete(&$objFormParam, &$objDb)
-    {
+    function doDelete(&$objFormParam, &$objDb) {
         $category_id = $objFormParam->getValue('category_id');
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -237,10 +231,12 @@
      * @return void
      */
-    function doPreEdit(&$objFormParam)
-    {
+    function doPreEdit(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
-        $objCategory = new SC_Helper_Category_Ex();
-        $arrRes = $objCategory->get($category_id);
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // 編集対象のカテゴリ名をDBより取得する
+        $where = 'category_id = ?';
+        $arrRes = $objQuery->getRow('*', 'dtb_category', $where, array($category_id));
 
         $objFormParam->setParam($arrRes);
@@ -261,6 +257,5 @@
      * @return void
      */
-    function doEdit(&$objFormParam)
-    {
+    function doEdit(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
@@ -298,6 +293,5 @@
      * @return void
      */
-    function checkError(&$objFormParam, $add)
-    {
+    function checkError(&$objFormParam, $add) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -354,6 +348,5 @@
      * @return void
      */
-    function doUp(&$objFormParam)
-    {
+    function doUp(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
@@ -382,6 +375,5 @@
      * @return void
      */
-    function doDown(&$objFormParam)
-    {
+    function doDown(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
@@ -410,6 +402,5 @@
      * @return void
      */
-    function initParam(&$objFormParam)
-    {
+    function initParam(&$objFormParam) {
         $objFormParam->addParam('親カテゴリID', 'parent_category_id', null, null, array());
         $objFormParam->addParam('カテゴリID', 'category_id', null, null, array());
@@ -427,6 +418,5 @@
      * @return array カテゴリの配列
      */
-    function findCategoiesByParentCategoryId($parent_category_id)
-    {
+    function findCategoiesByParentCategoryId($parent_category_id) {
         if (!$parent_category_id) {
             $parent_category_id = 0;
@@ -445,6 +435,5 @@
      * @return void
      */
-    function updateCategory($category_id, $arrCategory)
-    {
+    function updateCategory($category_id, $arrCategory) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -463,6 +452,5 @@
      * @return void
      */
-    function registerCategory($arrCategory)
-    {
+    function registerCategory($arrCategory) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -510,6 +498,5 @@
      * @param 超えている場合 true
      */
-    function isOverLevel($parent_category_id)
-    {
+    function isOverLevel($parent_category_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $level = $objQuery->get('level', 'dtb_category', 'category_id = ?', array($parent_category_id));
@@ -522,12 +509,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // 並びが1つ下のIDを取得する。
-    function lfGetDownRankID($objQuery, $table, $pid_name, $id_name, $id)
-    {
+    function lfGetDownRankID($objQuery, $table, $pid_name, $id_name, $id) {
         // 親IDを取得する。
         $col = "$pid_name";
@@ -550,6 +535,5 @@
 
     // 並びが1つ上のIDを取得する。
-    function lfGetUpRankID($objQuery, $table, $pid_name, $id_name, $id)
-    {
+    function lfGetUpRankID($objQuery, $table, $pid_name, $id_name, $id) {
         // 親IDを取得する。
         $col = "$pid_name";
@@ -571,6 +555,5 @@
     }
 
-    function lfCountChilds($objQuery, $table, $pid_name, $id_name, $id)
-    {
+    function lfCountChilds($objQuery, $table, $pid_name, $id_name, $id) {
         $objDb = new SC_Helper_DB_Ex();
         // 子ID一覧を取得
@@ -579,6 +562,5 @@
     }
 
-    function lfUpRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count)
-    {
+    function lfUpRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count) {
         $objDb = new SC_Helper_DB_Ex();
         // 子ID一覧を取得
@@ -592,6 +574,5 @@
     }
 
-    function lfDownRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count)
-    {
+    function lfDownRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count) {
         $objDb = new SC_Helper_DB_Ex();
         // 子ID一覧を取得
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $$Id$$
  */
-class LC_Page_Admin_Products_UploadCSVCategory extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_UploadCSVCategory extends LC_Page_Admin_Ex {
 
     // {{{ properties
@@ -67,6 +66,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/upload_csv_category.tpl';
@@ -87,6 +85,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -98,6 +95,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // CSV管理ヘルパー
@@ -122,6 +118,4 @@
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam, $arrCSVFrame);
-
-        $this->max_upload_csv_size = SC_Utils_Ex::getUnitDataSize(CSV_SIZE);
 
         $objFormParam->setHtmlDispNameArray();
@@ -145,6 +139,5 @@
      * @return void
      */
-    function addRowResult($line_count, $message)
-    {
+    function addRowResult($line_count, $message) {
         $this->arrRowResult[] = $line_count . '行目：' . $message;
     }
@@ -157,6 +150,5 @@
      * @return void
      */
-    function addRowErr($line_count, $message)
-    {
+    function addRowErr($line_count, $message) {
         $this->arrRowErr[] = $line_count . '行目：' . $message;
     }
@@ -170,6 +162,5 @@
      * @return void
      */
-    function doUploadCsv(&$objFormParam, &$objUpFile)
-    {
+    function doUploadCsv(&$objFormParam, &$objUpFile) {
         // ファイルアップロードのチェック
         $objUpFile->makeTempFile('csv_file');
@@ -269,6 +260,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -279,6 +269,5 @@
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('CSVファイル', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false);
     }
@@ -290,6 +279,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam, &$arrCSVFrame)
-    {
+    function lfInitParam(&$objFormParam, &$arrCSVFrame) {
         // 固有の初期値調整
         $arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame);
@@ -336,6 +324,5 @@
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
         $arrRet =  $objFormParam->getHashArray();
@@ -358,6 +345,5 @@
      * @return void
      */
-    function lfInitTableInfo()
-    {
+    function lfInitTableInfo() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $this->arrRegistColumn = $objQuery->listTableFields('dtb_category');
@@ -373,6 +359,5 @@
      * @return integer カテゴリID
      */
-    function lfRegistCategory($objQuery, $line, &$objFormParam)
-    {
+    function lfRegistCategory($objQuery, $line, &$objFormParam) {
         // 登録データ対象取得
         $arrList = $objFormParam->getHashArray();
@@ -420,6 +405,5 @@
      * @return array $arrCSVFrame CSV構造配列
      */
-    function lfSetParamDefaultValue(&$arrCSVFrame)
-    {
+    function lfSetParamDefaultValue(&$arrCSVFrame) {
         foreach ($arrCSVFrame as $key => $val) {
             switch ($val['col']) {
@@ -443,6 +427,5 @@
      * @return $sqlval 登録情報配列
      */
-    function lfSetCategoryDefaultData(&$sqlval)
-    {
+    function lfSetCategoryDefaultData(&$sqlval) {
         if ($sqlval['del_flg'] == '') {
             $sqlval['del_flg'] = '0'; //有効
@@ -464,6 +447,5 @@
      * @return array エラー配列
      */
-    function lfCheckErrorDetail($item, $arrErr)
-    {
+    function lfCheckErrorDetail($item, $arrErr) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         /*
@@ -533,6 +515,5 @@
      * @return integer カテゴリID
      */
-    function registerCategory($parent_category_id, $category_name, $creator_id, $category_id = null)
-    {
+    function registerCategory($parent_category_id, $category_name, $creator_id, $category_id = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -589,6 +570,5 @@
      * @return string $time DB保存用の時間文字列
      */
-    function lfGetDbFormatTimeWithLine($line_no = '')
-    {
+    function lfGetDbFormatTimeWithLine($line_no = '') {
         $time = date('Y-m-d H:i:s');
         // 秒以下を生成
@@ -608,6 +588,5 @@
      * @return boolean true:有効なデータがある false:有効ではない
      */
-    function lfIsDbRecord($table, $keyname, $item)
-    {
+    function lfIsDbRecord($table, $keyname, $item) {
         if (array_search($keyname, $this->arrFormKeyList) !== FALSE  //入力対象である
             && $item[$keyname] != ''   // 空ではない
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_Total extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Total extends LC_Page_Admin_Ex {
 
     // }}}
@@ -42,6 +41,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         // GDライブラリのインストール判定
@@ -93,6 +91,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -104,6 +101,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         if (isset($_GET['draw_image']) && $_GET['draw_image'] != '') {
@@ -174,12 +170,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* デフォルト値の取得 */
-    function lfGetDateDefault()
-    {
+    function lfGetDateDefault() {
         $year = date('Y');
         $month = date('m');
@@ -208,6 +202,5 @@
 
     /* パラメーター情報の初期化 */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // デフォルト値の取得
         $arrList = $this->lfGetDateDefault();
@@ -232,6 +225,5 @@
 
     /* 入力内容のチェック */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
 
         $objFormParam->convParam();
@@ -259,6 +251,5 @@
 
     /* サブナビを移動しても日付が残るようにセッションに入力期間を記録する */
-    function lfSaveDateSession($session, $arrForm)
-    {
+    function lfSaveDateSession($session, $arrForm) {
 
         // session の初期化をする
@@ -275,6 +266,5 @@
 
     /* 日付の初期値 */
-    function lfGetDateInit()
-    {
+    function lfGetDateInit() {
         $search_startyear_m     = $search_startyear  = $search_endyear  = date('Y');
         $search_startmonth_m    = $search_startmonth = $search_endmonth = date('m');
@@ -285,6 +275,5 @@
 
     /* フォームで入力された日付を適切な形にする */
-    function lfSetStartEndDate(&$objFormParam)
-    {
+    function lfSetStartEndDate(&$objFormParam) {
         $arrRet = $objFormParam->getHashArray();
 
@@ -305,6 +294,5 @@
 
     /* 折れ線グラフの作成 */
-    function lfGetGraphLine($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate, $xincline)
-    {
+    function lfGetGraphLine($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate, $xincline) {
 
         $ret_path = '';
@@ -364,6 +352,5 @@
 
     // 円グラフの作成
-    function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = '')
-    {
+    function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = '') {
 
         $ret_path = '';
@@ -409,6 +396,5 @@
 
     // 棒グラフの作成
-    function lfGetGraphBar($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate)
-    {
+    function lfGetGraphBar($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate) {
         $ret_path = '';
 
@@ -456,6 +442,5 @@
 
     // グラフ用のPNGファイル名
-    function lfGetGraphPng($keyname)
-    {
+    function lfGetGraphPng($keyname) {
 
         if ($_POST['search_startyear_m'] != '') {
@@ -468,6 +453,5 @@
 
     // 会員、非会員集計のWHERE分の作成
-    function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id')
-    {
+    function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id') {
         $where = '';
         // 取得日付の指定
@@ -512,6 +496,5 @@
 
     /** 会員別集計 **/
-    function lfGetOrderMember($type, $sdate, $edate)
-    {
+    function lfGetOrderMember($type, $sdate, $edate) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
 
@@ -554,6 +537,5 @@
 
     /** 商品別集計 **/
-    function lfGetOrderProducts($type, $sdate, $edate)
-    {
+    function lfGetOrderProducts($type, $sdate, $edate) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
 
@@ -592,6 +574,5 @@
 
     /** 職業別集計 **/
-    function lfGetOrderJob($type, $sdate, $edate)
-    {
+    function lfGetOrderJob($type, $sdate, $edate) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         list($where, $arrWhereVal) = $this->lfGetWhereMember('dtb_order.create_date', $sdate, $edate, $type);
@@ -629,6 +610,5 @@
 
     /** 年代別集計 **/
-    function lfGetOrderAge($type, $sdate, $edate)
-    {
+    function lfGetOrderAge($type, $sdate, $edate) {
 
         $objQuery = SC_Query_Ex::getSingletonInstance();
@@ -668,6 +648,5 @@
     /** 期間別集計 **/
     // todo あいだの日付埋める
-    function lfGetOrderTerm($type, $sdate, $edate)
-    {
+    function lfGetOrderTerm($type, $sdate, $edate) {
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
@@ -725,6 +704,5 @@
      * 期間中の日付を埋める
      */
-    function lfAddBlankLine($arrResults, $type, $st, $ed)
-    {
+    function lfAddBlankLine($arrResults, $type, $st, $ed) {
 
         $arrDateList = $this->lfDateTimeArray($type, $st, $ed);
@@ -752,6 +730,5 @@
      *
      */
-    function lfDateTimeArray($type, $st, $ed)
-    {
+    function lfDateTimeArray($type, $st, $ed) {
         switch ($type) {
             case 'month':
@@ -794,6 +771,5 @@
      * 合計を付与する
      */
-    function lfAddTotalLine($arrResults)
-    {
+    function lfAddTotalLine($arrResults) {
         // 検索結果が0でない場合
         if (count($arrResults) > 0) {
@@ -814,11 +790,10 @@
 
     // 必要なカラムのみ抽出する(CSVデータで取得する)
-    function lfGetDataColCSV($arrData, $arrDataCol)
-    {
+    function lfGetDataColCSV($arrData, $arrDataCol) {
         $max = count($arrData);
         $csv_data = '';
         for ($i = 0; $i < $max; $i++) {
             foreach ($arrDataCol as $val) {
-                $arrRet[$i][$val] = ($arrData[$i][$val]) ? $arrData[$i][$val] : "0";
+                $arrRet[$i][$val] = $arrData[$i][$val];
             }
             // 期間別集計の合計行の「期間」項目に不要な値が表示されてしまわない様、'合計'と表示する
@@ -831,6 +806,5 @@
     }
 
-    function lfGetCSVColum($page)
-    {
+    function lfGetCSVColum($page) {
         switch ($page) {
             // 商品別集計
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Input extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Input extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -52,5 +50,4 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrAUTHORITY = $masterData->getMasterData('mtb_authority');
-        $this->arrWORK = $masterData->getMasterData('mtb_work');
 
         $this->tpl_subtitle = 'メンバー登録/編集';
@@ -63,6 +60,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -74,11 +70,10 @@
      * @return void
      */
-    function action()
-    {
-        $objFormParam = new SC_FormParam_Ex();
+    function action() {
 
         // ページ送りの処理 $_REQUEST['pageno']が信頼しうる値かどうかチェックする。
         $this->tpl_pageno = $this->lfCheckPageNo($_REQUEST['pageno']);
 
+        $objFormParam = new SC_FormParam_Ex();
         $arrErr = array();
         $arrForm = array();
@@ -186,6 +181,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -199,6 +193,6 @@
      * @return void
      */
-    function initForm(&$objFormParam, &$arrParams, $mode = '')
-    {
+    function initForm(&$objFormParam, &$arrParams, $mode = '') {
+
         $objFormParam->addParam('メンバーID', 'member_id', INT_LEN, 'n', array('NUM_CHECK'));
         $objFormParam->addParam('名前', 'name', STEXT_LEN, 'KV', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -228,6 +222,5 @@
      * @return array エラー情報の連想配列
      */
-    function validateData(&$objFormParam, &$arrParams, $mode)
-    {
+    function validateData(&$objFormParam, &$arrParams, $mode) {
         $arrErr = $objFormParam->checkError();
         if (isset($arrErr) && count($arrErr) > 0) return $arrErr;
@@ -242,28 +235,28 @@
             $objErr->doFunc(array('ログインID', 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK'));
         }
-        $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02') ,array('EQUAL_CHECK'));
+    $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02') ,array('EQUAL_CHECK'));
 
         $arrErr = $objErr->arrErr;
 
         switch ($mode) {
-            case 'new':
-                // 管理者名が登録済みでないか
-                if ($this->memberDataExists('name = ? AND del_flg = 0', $arrParams['name'])) {
-                    $arrErr['name'] = '既に登録されている名前なので利用できません。<br>';
-                }
+        case 'new':
+            // 管理者名が登録済みでないか
+            if ($this->memberDataExists('name = ? AND del_flg = 0', $arrParams['name'])) {
+                $arrErr['name'] = '既に登録されている名前なので利用できません。<br>';
+            }
+            // ログインIDが登録済みでないか
+            if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) {
+                $arrErr['login_id'] = '既に登録されているIDなので利用できません。<br>';
+            }
+            break;
+        case 'edit':
+            // ログインIDが変更されている場合はチェックする。
+            if ($arrParams['login_id'] != $arrParams['old_login_id']) {
                 // ログインIDが登録済みでないか
                 if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) {
                     $arrErr['login_id'] = '既に登録されているIDなので利用できません。<br>';
                 }
-                break;
-            case 'edit':
-                // ログインIDが変更されている場合はチェックする。
-                if ($arrParams['login_id'] != $arrParams['old_login_id']) {
-                    // ログインIDが登録済みでないか
-                    if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) {
-                        $arrErr['login_id'] = '既に登録されているIDなので利用できません。<br>';
-                    }
-                }
-                break;
+            }
+            break;
         }
 
@@ -277,6 +270,5 @@
      * @return array 管理者データの連想配列, 無い場合は空の配列を返す
      */
-    function getMemberData($id)
-    {
+    function getMemberData($id) {
         $table   = 'dtb_member';
         $columns = 'name,department,login_id,authority, work';
@@ -294,6 +286,5 @@
      * @return boolean 登録済みならtrue, 未登録ならfalse
      */
-    function memberDataExists($where, $val)
-    {
+    function memberDataExists($where, $val) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -311,6 +302,5 @@
      * @return integer $clean_pageno チェック後のページの番号
      */
-    function lfCheckPageNo($pageno)
-    {
+    function lfCheckPageNo($pageno) {
 
         $clean_pageno = '';
@@ -335,6 +325,5 @@
      * @return void
      */
-    function insertMemberData($arrMemberData)
-    {
+    function insertMemberData($arrMemberData) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -366,6 +355,5 @@
      * @return void
      */
-    function updateMemberData($member_id, $arrMemberData)
-    {
+    function updateMemberData($member_id, $arrMemberData) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -59,5 +57,6 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrAUTHORITY = $masterData->getMasterData('mtb_authority');
-        $this->arrWORK = $masterData->getMasterData('mtb_work');
+        $this->arrWORK[0]   = '非稼働';
+        $this->arrWORK[1]   = '稼働';
     }
 
@@ -67,6 +66,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -78,6 +76,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // ADMIN_ID以外の管理者件数を取得
@@ -106,6 +103,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -118,6 +114,5 @@
      * @return integer 件数
      */
-    function getMemberCount($where)
-    {
+    function getMemberCount($where) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_member';
@@ -132,6 +127,5 @@
      * @return array 管理者データの連想配列
      */
-    function getMemberData($startno)
-    {
+    function getMemberData($startno) {
         $col = 'member_id,name,department,login_id,authority,rank,work';
         $from = 'dtb_member';
@@ -151,6 +145,5 @@
      * @return integer $clean_pageno チェック後のページの番号
      */
-    function lfCheckPageNo($pageno)
-    {
+    function lfCheckPageNo($pageno) {
 
         $clean_pageno = '';
Index: /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Parameter extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Parameter extends LC_Page_Admin_Ex {
 
     // {{{ properties
@@ -54,6 +53,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/parameter.tpl';
@@ -69,6 +67,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -80,6 +77,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $masterData = new SC_DB_MasterData_Ex();
@@ -123,6 +119,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -136,6 +131,5 @@
      * @return void
      */
-    function update(&$arrKeys, &$arrForm)
-    {
+    function update(&$arrKeys, &$arrForm) {
         $data = array();
         $masterData = new SC_DB_MasterData_Ex();
@@ -158,6 +152,5 @@
      * @return void
      */
-    function errorCheck(&$arrKeys, &$arrForm)
-    {
+    function errorCheck(&$arrKeys, &$arrForm) {
         $objErr = new SC_CheckError_Ex($arrForm);
         for ($i = 0; $i < count($arrKeys); $i++) {
@@ -175,6 +168,5 @@
      * @return array パラメーターのキーの配列
      */
-    function getParamKeys(&$masterData)
-    {
+    function getParamKeys(&$masterData) {
         $keys = array();
         $i = 0;
Index: /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_AdminArea extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_AdminArea extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/adminarea.tpl';
@@ -59,6 +57,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -70,6 +67,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         if (strpos(HTTPS_URL,'https://') !== FALSE) {
@@ -123,6 +119,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -135,6 +130,5 @@
      * @return void
      */
-    function initParam(&$objFormParam, &$arrParams)
-    {
+    function initParam(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('ディレクトリ名', 'admin_dir', ID_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
@@ -153,6 +147,5 @@
      * @return void
      */
-    function lfCheckAdminArea(&$arrForm, &$arrErr)
-    {
+    function lfCheckAdminArea(&$arrForm, &$arrErr) {
         $admin_dir = trim($arrForm['admin_dir']) . '/';
 
@@ -173,6 +166,5 @@
 
     //管理機能ディレクトリのリネームと CONFIG_REALFILE の変更
-    function lfUpdateAdminData(&$arrForm)
-    {
+    function lfUpdateAdminData(&$arrForm) {
         $admin_dir = trim($arrForm['admin_dir']) . '/';
         $admin_force_ssl = 'false';
Index: /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Bkup extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Bkup extends LC_Page_Admin_Ex {
 
     /** リストア中にエラーが発生したか */
@@ -52,6 +51,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/bkup.tpl';
@@ -70,6 +68,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -81,6 +78,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex;
@@ -224,6 +220,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -236,6 +231,5 @@
      * @return void
      */
-    function initParam(&$objFormParam, &$arrParams)
-    {
+    function initParam(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('バックアップ名', 'bkup_name', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB', 'FILE_NAME_CHECK_BY_NOUPLOAD'));
@@ -254,6 +248,5 @@
      * @return $arrErr
      */
-    function lfCheckError(&$arrForm, $mode)
-    {
+    function lfCheckError(&$arrForm, $mode) {
 
         switch ($mode) {
@@ -291,6 +284,5 @@
      * @return boolean|int 結果。true:成功 int:失敗 FIXME 本来は int ではなく、エラーメッセージを戻すべき
      */
-    function lfCreateBkupData($bkup_name, $work_dir)
-    {
+    function lfCreateBkupData($bkup_name, $work_dir) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $csv_autoinc = '';
@@ -374,6 +366,5 @@
      * @return boolean true (true:固定 false:中断)
      */
-    function cbOutputCSV($data)
-    {
+    function cbOutputCSV($data) {
         $line = '';
         if ($this->first_line) {
@@ -396,6 +387,5 @@
      * @return string $ret
      */
-    function lfGetAutoIncrement()
-    {
+    function lfGetAutoIncrement() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrSequences = $objQuery->listSequences();
@@ -418,6 +408,5 @@
 
     // バックアップテーブルにデータを更新する
-    function lfUpdBkupData($data)
-    {
+    function lfUpdBkupData($data) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -433,6 +422,5 @@
      * バックアップの一覧を取得する
      */
-    function lfGetBkupData($sql_option = '', $filter_bkup_name = '')
-    {
+    function lfGetBkupData($sql_option = '', $filter_bkup_name = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -486,6 +474,5 @@
      * @return void
      */
-    function lfRestore($bkup_name, $bkup_dir, $bkup_ext, $mode)
-    {
+    function lfRestore($bkup_name, $bkup_dir, $bkup_ext, $mode) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -539,6 +526,5 @@
      * @return void
      */
-    function lfExeInsertSQL(&$objQuery, $dir, $mode)
-    {
+    function lfExeInsertSQL(&$objQuery, $dir, $mode) {
 
         $tbl_flg = false;
@@ -609,6 +595,5 @@
      * シーケンス生成器を復元する
      */
-    function restoreSequence(&$objQuery, $csv)
-    {
+    function restoreSequence(&$objQuery, $csv) {
         // csvファイルからデータの取得
         $arrCsvData = file($csv);
@@ -629,6 +614,5 @@
 
     // 選択したバックアップをDBから削除
-    function lfDeleteBackUp(&$arrForm, $bkup_dir, $bkup_ext)
-    {
+    function lfDeleteBackUp(&$arrForm, $bkup_dir, $bkup_ext) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
Index: /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Log extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Log extends LC_Page_Admin_Ex {
 
     var $arrLogList = array();
@@ -42,6 +41,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/log.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex;
@@ -98,6 +94,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -108,6 +103,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('ファイル', 'log', null, '', array());
         $objFormParam->addParam('行数', 'line_max', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), 50);
@@ -119,6 +113,5 @@
      * @return array $arrLogs 取得したログ
      */
-    function getEccubeLog($log_path_base)
-    {
+    function getEccubeLog($log_path_base) {
 
         $index = 0;
@@ -167,6 +160,5 @@
      * セキュリティ面をカバーする役割もある。
      */
-    function getLogPath($log_name)
-    {
+    function getLogPath($log_name) {
         if (strlen($log_name) === 0) {
             return LOG_REALFILE;
@@ -184,6 +176,5 @@
      * @return void
      */
-    function loadLogList()
-    {
+    function loadLogList() {
         $this->arrLogList[''] = '標準ログファイル';
         $this->arrLogList['CUSTOMER'] = '会員ログイン ログファイル';
Index: /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Delete extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Delete extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex;
@@ -97,6 +93,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -109,6 +104,5 @@
      * @return void
      */
-    function initParam(&$objFormParam, &$arrParams)
-    {
+    function initParam(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('pageno', 'pageno', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK', 'EXIST_CHECK'));
@@ -124,6 +118,5 @@
      * @return void
      */
-    function deleteMember($id)
-    {
+    function deleteMember($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
@@ -142,6 +135,5 @@
      * @return void|UPDATE の結果フラグ
      */
-    function renumberRank(&$objQuery, $id)
-    {
+    function renumberRank(&$objQuery, $id) {
 
         // ランクの取得
@@ -163,6 +155,5 @@
      * @return void|UPDATE の結果フラグ
      */
-    function deleteRecode(&$objQuery, $id)
-    {
+    function deleteRecode(&$objQuery, $id) {
 
         // Updateする値を作成する.
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_System extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_System extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/system.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -96,6 +92,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -108,6 +103,5 @@
      * @return void
      */
-    function initForm(&$objFormParam, &$arrParams)
-    {
+    function initForm(&$objFormParam, &$arrParams) {
         $objFormParam->addParam('mode', 'mode', INT_LEN, '', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->setParam($arrParams);
@@ -119,6 +113,5 @@
      * @return array システム情報
      */
-    function getSystemInfo()
-    {
+    function getSystemInfo() {
         $objDB = SC_DB_DBFactory_Ex::getInstance();
 
Index: /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Masterdata extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Masterdata extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/masterdata.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->arrMasterDataName = $this->getMasterDataNames(array('mtb_pref', 'mtb_zip', 'mtb_constants'));
@@ -108,6 +104,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -121,6 +116,5 @@
      * @return string $master_data_name 選択しているマスターデータのテーブル名
      */
-    function checkMasterDataName(&$arrParams, &$arrMasterDataName)
-    {
+    function checkMasterDataName(&$arrParams, &$arrMasterDataName) {
 
         if (in_array($arrParams['master_data_name'], $arrMasterDataName)) {
@@ -140,6 +134,5 @@
      * @return array マスターデータ名の配列
      */
-    function getMasterDataNames($ignores = array())
-    {
+    function getMasterDataNames($ignores = array()) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $arrMasterDataName = $dbFactory->findTableNames('mtb_');
@@ -165,6 +158,5 @@
      * @return void|string エラーが発生した場合はエラーメッセージを返す.
      */
-    function checkUniqueID(&$arrParams)
-    {
+    function checkUniqueID(&$arrParams) {
 
         $arrId = $arrParams['id'];
@@ -192,6 +184,5 @@
      * @return void
      */
-    function registMasterData($arrParams, &$masterData, $master_data_name)
-    {
+    function registMasterData($arrParams, &$masterData, $master_data_name) {
 
         $arrTmp = array();
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Editdb extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Editdb extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/editdb.tpl';
@@ -58,6 +56,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -98,6 +94,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -110,6 +105,5 @@
      * @return void
      */
-    function initForm(&$objFormParam, &$arrParams)
-    {
+    function initForm(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('モード', 'mode', INT_LEN, 'n', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
@@ -122,6 +116,5 @@
     }
 
-    function lfDoChange(&$objFormParam)
-    {
+    function lfDoChange(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrTarget = $this->lfGetTargetData($objFormParam);
@@ -148,6 +141,5 @@
     }
 
-    function lfGetTargetData(&$objFormParam)
-    {
+    function lfGetTargetData(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrIndexFlag    = $objFormParam->getValue('indexflag');
@@ -192,6 +184,5 @@
      * @return void
      */
-    function lfGetIndexList()
-    {
+    function lfGetIndexList() {
         // データベースからインデックス設定一覧を取得する
         $objQuery =& SC_Query_Ex::getSingletonInstance();
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin_System_Rank extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Rank extends LC_Page_Admin_Ex {
     // }}}
     // {{{ functions
@@ -42,6 +41,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -52,6 +50,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -63,6 +60,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // チェック後のデータを格納
@@ -112,12 +108,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // ランキングを上げる。
-    function lfRunkUp($id)
-    {
+    function lfRunkUp($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -149,6 +143,5 @@
 
     // ランキングを下げる。
-    function lfRunkDown($id)
-    {
+    function lfRunkDown($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Admin extends LC_Page_Ex 
-{
+class LC_Page_Admin extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->template = MAIN_FRAME;
 
@@ -89,6 +87,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
     }
 
@@ -98,6 +95,5 @@
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         // ローカルフックポイントを実行
@@ -124,6 +120,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -134,6 +129,5 @@
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
      */
-    function log($mess, $log_level='Info')
-    {
+    function log($mess, $log_level='Info') {
         trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
         // ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
Index: /branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Unsupported extends LC_Page_Ex 
-{
+class LC_Page_Unsupported extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '未対応デバイス';
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -61,6 +58,5 @@
     }
 
-    function action()
-    {
+    function action() {
 
 
@@ -72,6 +68,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Error_SystemError extends LC_Page_Error 
-{
+class LC_Page_Error_SystemError extends LC_Page_Error {
 
     /** PEAR_Error */
@@ -53,6 +52,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'システムエラー';
@@ -64,6 +62,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -75,6 +72,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->tpl_error = 'システムエラーが発生しました。<br />大変お手数ですが、サイト管理者までご連絡ください。';
@@ -98,6 +94,5 @@
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         $this->adminPage = GC_Utils_Ex::isAdminFunction();
 
@@ -118,6 +113,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -126,6 +120,5 @@
      * トランザクショントークンに関して処理しないようにオーバーライド
      */
-    function doValidToken()
-    {
+    function doValidToken() {
     }
 
@@ -133,6 +126,5 @@
      * トランザクショントークンに関して処理しないようにオーバーライド
      */
-    function setTokenTo()
-    {
+    function setTokenTo() {
     }
 
@@ -142,6 +134,5 @@
      * @return string
      */
-    function sfGetErrMsg()
-    {
+    function sfGetErrMsg() {
         $errmsg = '';
         $errmsg .= $this->lfGetErrMsgHead();
@@ -175,6 +166,5 @@
      * @return string
      */
-    function lfGetErrMsgHead()
-    {
+    function lfGetErrMsgHead() {
         $errmsg = '';
         $errmsg .= GC_Utils_Ex::getUrl() . "\n";
@@ -192,6 +182,5 @@
      * @return void
      */
-    function addDebugMsg($debugMsg)
-    {
+    function addDebugMsg($debugMsg) {
         $this->arrDebugMsg[] = rtrim($debugMsg, "\n");
     }
Index: /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_Error.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Error extends LC_Page_Ex 
-{
+class LC_Page_Error extends LC_Page_Ex {
 
     // {{{ properties
@@ -62,6 +61,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->tpl_mainpage = 'error.tpl';
         $this->tpl_title = 'エラー';
@@ -72,7 +70,4 @@
         $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         $objHelperPlugin->arrRegistedPluginActions = array();
-
-        // キャッシュから店舗情報取得（DBへの接続は行わない）
-        $this->arrSiteInfo = SC_Helper_DB_Ex::sfGetBasisDataCache(false);
     }
 
@@ -82,6 +77,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -94,6 +88,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->type) {
@@ -181,6 +174,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -189,6 +181,5 @@
      * エラーページではトランザクショントークンの自動検証は行わない
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // queit.
     }
Index: /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Error_DispError extends LC_Page_Admin_Ex 
-{
+class LC_Page_Error_DispError extends LC_Page_Admin_Ex {
 
     // }}}
@@ -46,6 +45,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->template = LOGIN_FRAME;
         $this->tpl_mainpage = 'login_error.tpl';
@@ -57,7 +55,4 @@
         $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         $objHelperPlugin->arrRegistedPluginActions = array();
-
-        // キャッシュから店舗情報取得（DBへの接続は行わない）
-        $this->arrSiteInfo = SC_Helper_DB_Ex::sfGetBasisDataCache(false);
     }
 
@@ -67,6 +62,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -78,6 +72,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->type) {
@@ -107,6 +100,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -115,6 +107,5 @@
      * エラーページではトランザクショントークンの自動検証は行わない
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // queit.
     }
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 22608)
+++ /branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Cart extends LC_Page_Ex 
-{
+class LC_Page_Cart extends LC_Page_Ex {
 
     // {{{ properties
@@ -54,6 +53,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '現在のカゴの中';
@@ -68,6 +66,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -80,6 +77,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCartSess = new SC_CartSession_Ex();
@@ -108,18 +104,4 @@
         }
 
-        $objFormParam4OpenCategoryTree =
-            $this->lfInitParam4OpenCategoryTree($_REQUEST);
-        if ($objFormParam4OpenCategoryTree->getValue('product_id')) {
-            $arrQueryString = array(
-                'product_id' => $objFormParam4OpenCategoryTree->getValue(
-                    'product_id'),
-            );
-        } else {
-            $arrQueryString = array(
-                'category_id' => $objFormParam4OpenCategoryTree->getValue(
-                    'category_id'),
-            );
-        }
-
         switch ($this->mode) {
             case 'confirm':
@@ -140,5 +122,6 @@
                 $objCartSess->upQuantity($cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
@@ -146,5 +129,6 @@
                 $objCartSess->downQuantity($cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
@@ -152,5 +136,6 @@
                 $objCartSess->setQuantity($objFormParam->getValue('quantity'), $cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
@@ -158,5 +143,6 @@
                 $objCartSess->delProduct($cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
@@ -187,8 +173,5 @@
         $this->tpl_all_total_inctax = $totalIncTax;
 
-        $this->tpl_category_id =
-            $objFormParam4OpenCategoryTree->getValue('category_id');
-        $this->tpl_product_id =
-            $objFormParam4OpenCategoryTree->getValue('product_id');
+        $this->tpl_category_id = $objFormParam->getValue('category_id');
 
         // ログイン判定
@@ -215,6 +198,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -225,9 +207,10 @@
      * @return object
      */
-    function lfInitParam($arrRequest)
-    {
+    function lfInitParam($arrRequest) {
         $objFormParam = new SC_FormParam_Ex();
         $objFormParam->addParam('カートキー', 'cartKey', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('カートナンバー', 'cart_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        // PC版での値引き継ぎ用
+        $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         // スマートフォン版での数量変更用
         $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -240,31 +223,9 @@
 
     /**
-     * PC版での開いているカテゴリーツリーの維持用の入力値
-     *
-     * @return object
-     */
-    function lfInitParam4OpenCategoryTree($arrRequest)
-    {
-        $objFormParam = new SC_FormParam_Ex();
-
-        $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n',
-            array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n',
-            array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-
-        // 値の取得
-        $objFormParam->setParam($arrRequest);
-        // 入力値の変換
-        $objFormParam->convParam();
-        return $objFormParam;
-    }
-
-    /**
      * order_temp_id の更新
      *
      * @return
      */
-    function lfUpdateOrderTempid($pre_uniqid,$uniqid)
-    {
+    function lfUpdateOrderTempid($pre_uniqid,$uniqid) {
         $sqlval['order_temp_id'] = $uniqid;
         $where = 'order_temp_id = ?';
@@ -282,6 +243,5 @@
      * @return void
      */
-    function lfGetCartPrevUrl(&$session,$referer)
-    {
+    function lfGetCartPrevUrl(&$session,$referer) {
         if (!preg_match('/cart/', $referer)) {
             if (!empty($session['cart_referer_url'])) {
@@ -307,6 +267,5 @@
      * @return void
      */
-    function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey)
-    {
+    function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey) {
         // 正常に登録されたことを記録しておく
         $objSiteSess->setRegistFlag();
Index: /branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Contact extends LC_Page_Ex 
-{
+class LC_Page_Contact extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
@@ -68,6 +66,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -80,6 +77,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -144,6 +140,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -158,6 +153,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
 
         $objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -184,6 +178,5 @@
      * @return array 入力チェック結果の配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力データを渡す。
         $arrForm =  $objFormParam->getHashArray();
@@ -199,6 +192,5 @@
      * @return void
      */
-    function lfSendMail(&$objPage)
-    {
+    function lfSendMail(&$objPage) {
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
         $objPage->tpl_shopname = $CONF['shop_name'];
Index: /branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Contact_Complete extends LC_Page_Ex 
-{
+class LC_Page_Contact_Complete extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'お問い合わせ(完了ページ)';
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // do nothing...
@@ -80,6 +76,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Regist extends LC_Page_Ex 
-{
+class LC_Page_Regist extends LC_Page_Ex {
 
     // {{{ properties
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
@@ -96,6 +92,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -108,6 +103,5 @@
      * @return string $arrRegist['secret_key'] 本登録ID
      */
-    function lfRegistData($array)
-    {
+    function lfRegistData($array) {
         $objQuery                   = SC_Query_Ex::getSingletonInstance();
         $arrRegist['secret_key']    = SC_Helper_Customer_Ex::sfGetUniqSecretKey(); //本登録ID発行
@@ -129,6 +123,5 @@
      * @return array エラーの配列
      */
-    function lfCheckError($array)
-    {
+    function lfCheckError($array) {
         $objErr     = new SC_CheckError_Ex($array);
 
@@ -152,6 +145,5 @@
      * @return void
      */
-    function lfSendRegistMail($registSecretKey)
-    {
+    function lfSendRegistMail($registSecretKey) {
         $objQuery       = SC_Query_Ex::getSingletonInstance();
         $objCustomer    = new SC_Customer_Ex();
Index: /branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_Regist_Complete.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Regist_Complete extends LC_Page_Ex 
-{
+class LC_Page_Regist_Complete extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '会員登録(完了ページ)';
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -77,6 +73,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_Abouts.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Abouts extends LC_Page_Ex 
-{
+class LC_Page_Abouts extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_page_category = 'abouts';
@@ -57,6 +55,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->objSiteInfo->data = SC_Helper_DB_Ex::sfGetBasisData();
@@ -85,6 +81,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Charge extends LC_Page_Ex 
-{
+class LC_Page_Guide_Charge extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -76,6 +72,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_About extends LC_Page_Ex 
-{
+class LC_Page_Guide_About extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     $masterData = new SC_DB_MasterData_Ex();
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -78,6 +74,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php	(revision 22570)
+++ /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Kiyaku extends LC_Page_Ex 
-{
+class LC_Page_Guide_Kiyaku extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->lfGetKiyaku(intval($_GET['page']), $this);
@@ -78,6 +74,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -90,8 +85,8 @@
      * @return void
      */
-    function lfGetKiyaku($index, &$objPage)
-    {
-        $objKiyaku = new SC_Helper_Kiyaku_Ex();
-        $arrKiyaku = $objKiyaku->getList();
+    function lfGetKiyaku($index, &$objPage) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank DESC');
+        $arrKiyaku = $objQuery->select('kiyaku_title, kiyaku_text', 'dtb_kiyaku', 'del_flg <> 1');
 
         $number = count($arrKiyaku);
Index: /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Privacy extends LC_Page_Ex 
-{
+class LC_Page_Guide_Privacy extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -76,6 +72,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Guide extends LC_Page_Ex 
-{
+class LC_Page_Guide extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -76,6 +72,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Guide_Usage extends LC_Page_Ex 
-{
+class LC_Page_Guide_Usage extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -76,6 +72,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22580)
+++ /branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Forgot extends LC_Page_Ex 
-{
+class LC_Page_Forgot extends LC_Page_Ex {
 
     // {{{ properties
@@ -57,6 +56,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'パスワードを忘れた方';
@@ -77,6 +75,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -89,6 +86,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // パラメーター管理クラス
@@ -151,6 +147,5 @@
      * @return string エラー文字列 問題が無ければNULL
      */
-    function lfCheckForgotMail(&$arrForm, &$arrReminder)
-    {
+    function lfCheckForgotMail(&$arrForm, &$arrReminder) {
         $errmsg = NULL;
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -180,6 +175,5 @@
      * @return void
      */
-    function lfInitMailCheckParam(&$objFormParam, $device_type)
-    {
+    function lfInitMailCheckParam(&$objFormParam, $device_type) {
         $objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
@@ -199,6 +193,5 @@
      * @return string エラー文字列 問題が無ければNULL
      */
-    function lfCheckForgotSecret(&$arrForm, &$arrReminder)
-    {
+    function lfCheckForgotSecret(&$arrForm, &$arrReminder) {
         $errmsg = '';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -260,6 +253,5 @@
      * @return void
      */
-    function lfInitSecretCheckParam(&$objFormParam, $device_type)
-    {
+    function lfInitSecretCheckParam(&$objFormParam, $device_type) {
         // メールチェックと同等のチェックを再度行う
         $this->lfInitMailCheckParam($objFormParam, $device_type);
@@ -275,6 +267,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -291,6 +282,5 @@
      * FIXME: メールテンプレート編集の方に足すのが望ましい
      */
-    function lfSendMail(&$CONF, $email, $customer_name, $new_password)
-    {
+    function lfSendMail(&$CONF, $email, $customer_name, $new_password) {
         // パスワード変更お知らせメール送信
         $objMailText = new SC_SiteView_Ex(false);
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 22570)
+++ /branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_Kiyaku extends LC_Page_Ex 
-{
+class LC_Page_Entry_Kiyaku extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'ご利用規約';
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $arrKiyaku = $this->lfGetKiyakuData();
@@ -87,6 +83,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -101,6 +96,5 @@
      * @return string 規約の内容をテキストエリアで表示するように整形したデータ
      */
-    function lfMakeKiyakuText($arrKiyaku, $max, $offset)
-    {
+    function lfMakeKiyakuText($arrKiyaku, $max, $offset) {
         $this->tpl_kiyaku_text = '';
         for ($i = 0; $i < $max; $i++) {
@@ -118,8 +112,10 @@
      * @return array $arrKiyaku 規約の配列
      */
-    function lfGetKiyakuData()
-    {
-        $objKiyaku = new SC_Helper_Kiyaku_Ex();
-        $arrKiyaku = $objKiyaku->getList();
+    function lfGetKiyakuData() {
+
+        $objQuery   = SC_Query_Ex::getSingletonInstance();
+
+        $objQuery->setOrder('rank DESC');
+        $arrKiyaku  = $objQuery->select('kiyaku_title, kiyaku_text', 'dtb_kiyaku', 'del_flg <> 1');
 
         return $arrKiyaku;
@@ -134,6 +130,5 @@
      * @return int
      */
-    function lfSetOffset($offset)
-    {
+    function lfSetOffset($offset) {
         return is_numeric($offset) === true ? intval($offset) : 1;
     }
Index: /branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_EmailMobile extends LC_Page_Ex 
-{
+class LC_Page_Entry_EmailMobile extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer    = new SC_Customer_Ex();
@@ -99,6 +95,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -110,6 +105,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('メールアドレス', 'email_mobile', null, 'a',
                                 array('NO_SPTAB', 'EXIST_CHECK', 'CHANGE_LOWER', 'EMAIL_CHAR_CHECK', 'EMAIL_CHECK', 'MOBILE_EMAIL_CHECK'));
@@ -124,6 +118,5 @@
      * @return array エラー情報の配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objFormParam->convParam();
         $objErr         = new SC_CheckError_Ex();
@@ -147,6 +140,5 @@
      * @return void
      */
-    function lfRegistEmailMobile($email_mobile, $customer_id)
-    {
+    function lfRegistEmailMobile($email_mobile, $customer_id) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         $objQuery->update('dtb_customer',
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 22591)
+++ /branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_Entry.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Entry extends LC_Page_Ex 
-{
+class LC_Page_Entry extends LC_Page_Ex {
 
     // {{{ properties
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData         = new SC_DB_MasterData_Ex();
@@ -66,6 +64,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -77,6 +74,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -171,6 +167,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -184,6 +179,5 @@
      * @return uniqid
      */
-    function lfRegistCustomerData($sqlval)
-    {
+    function lfRegistCustomerData($sqlval) {
         SC_Helper_Customer_Ex::sfEditCustomerData($sqlval);
         return $sqlval['secret_key'];
@@ -201,6 +195,5 @@
      * @return $arrResults
      */
-    function lfMakeSqlVal(&$objFormParam)
-    {
+    function lfMakeSqlVal(&$objFormParam) {
         $arrForm                = $objFormParam->getHashArray();
         $arrResults             = $objFormParam->getDbArray();
@@ -237,6 +230,5 @@
      * @return void
      */
-    function lfSendMail($uniqid, $arrForm)
-    {
+    function lfSendMail($uniqid, $arrForm) {
         $CONF           = SC_Helper_DB_Ex::sfGetBasisData();
 
@@ -293,6 +285,5 @@
      * @return boolean kiyaku.php からの妥当な遷移であれば true
      */
-    function lfCheckReferer(&$post, $referer)
-    {
+    function lfCheckReferer(&$post, $referer) {
 
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE
@@ -310,6 +301,5 @@
      * @return array $arrErr エラーメッセージ配列
      */
-    function lfCheckError($arrRequest)
-    {
+    function lfCheckError($arrRequest) {
         // パラメーター管理クラス
         $objFormParam = new SC_FormParam_Ex();
@@ -323,6 +313,28 @@
         // エラーチェック
         $arrErr = $objFormParam->checkError();
+        // 親ウィンドウの戻り値を格納するinputタグのnameのエラーチェック
+        if (!$this->lfInputNameCheck($addData['zip01'])) {
+            $arrErr['zip01'] = '※ 入力形式が不正です。<br />';
+        }
+        if (!$this->lfInputNameCheck($arrdata['zip02'])) {
+            $arrErr['zip02'] = '※ 入力形式が不正です。<br />';
+        }
 
         return $arrErr;
     }
+
+    /**
+     * エラーチェック.
+     *
+     * @param string $value
+     * @return エラーなし：true エラー：false
+     */
+    function lfInputNameCheck($value) {
+        // 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー
+        if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
+            return false;
+        }
+
+        return true;
+    }
 }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Entry_Complete extends LC_Page_Ex 
-{
+class LC_Page_Entry_Complete extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->httpCacheControl('nocache');
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // カートが空かどうかを確認する。
@@ -96,6 +92,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php	(revision 22796)
@@ -51,6 +51,5 @@
  * :TODO: filemtime 関数を使えば、静的なページの更新時間も取得できそう
  */
-class LC_Page_Sitemap extends LC_Page_Ex 
-{
+class LC_Page_Sitemap extends LC_Page_Ex {
 
     // }}}
@@ -71,6 +70,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -85,6 +83,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         // ページのデータを取得
         // FIXME PCサイトのみに限定している。ある程度妥当だとは思うが、よりベターな方法はないだろうか。
@@ -143,6 +140,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -159,6 +155,5 @@
      * TODO Smarty に移行すべき?
      */
-    function createSitemap($loc, $lastmod = '', $changefreq = '', $priority = '')
-    {
+    function createSitemap($loc, $lastmod = '', $changefreq = '', $priority = '') {
         printf("\t<url>\n");
         printf("\t\t<loc>%s</loc>\n", htmlentities($loc, ENT_QUOTES, 'UTF-8'));
@@ -181,6 +176,5 @@
      * @return array TOPページの情報
      */
-    function getTopPage($arrPageList)
-    {
+    function getTopPage($arrPageList) {
         $arrRet = array();
         foreach ($arrPageList as $arrPage) {
@@ -198,6 +192,5 @@
      * @return array 編集可能ページ
      */
-    function getEditablePage($arrPageList)
-    {
+    function getEditablePage($arrPageList) {
         $arrRet = array();
         foreach ($arrPageList as $arrPage) {
@@ -214,6 +207,5 @@
      * @return array 検索エンジンからアクセス可能な商品一覧ページの情報
      */
-    function getAllProducts()
-    {
+    function getAllProducts() {
 
         // XXX: 商品登録の無いカテゴリは除外する方が良い気もする
@@ -237,6 +229,5 @@
      * @return array 検索エンジンからアクセス可能な商品詳細ページの情報
      */
-    function getAllDetail()
-    {
+    function getAllDetail() {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         $sql = 'SELECT product_id, update_date FROM dtb_products WHERE del_flg = 0 AND status = 1';
@@ -261,6 +252,5 @@
      * @return array $arrPageList ブロック情報
      */
-    function getPageData($where = '', $arrVal = '')
-    {
+    function getPageData($where = '', $arrVal = '') {
         $objQuery = SC_Query_Ex::getSingletonInstance();     // DB操作オブジェクト
         $sql = '';                      // データ取得SQL生成用
@@ -312,6 +302,5 @@
      * @return void
      */
-    function date2W3CDatetime($date)
-    {
+    function date2W3CDatetime($date) {
         $arr = array();
         // 正規表現で文字列を抽出
Index: /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviHeader extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_NaviHeader extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
 
@@ -83,6 +79,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -96,6 +91,5 @@
      * @return array $arrCartList カートデータ配列
      */
-    function lfGetCartData($objCart, $arrInfo, $cartKeys)
-    {
+    function lfGetCartData($objCart, $arrInfo, $cartKeys) {
         $cartList = array();
         foreach ($cartKeys as $key) {
Index: /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginFooter extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_LoginFooter extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
     }
@@ -74,6 +70,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_FrontParts_Bloc_Login.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_Bloc_Login extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Login extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_login = false;
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
@@ -104,6 +100,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -114,6 +109,5 @@
      * @return boolean
      */
-    function lfCheckDisableLogout()
-    {
+    function lfCheckDisableLogout() {
         $masterData = new SC_DB_MasterData_Ex();
         $arrDisableLogout = $masterData->getMasterData('mtb_disable_logout');
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 22576)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $ $
  */
-class LC_Page_FrontParts_Bloc_Calendar extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Calendar extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -65,7 +62,10 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
+        // 休日取得取得
+        $this->arrHoliday = $this->lfGetHoliday();
+        // 定休日取得取得
+        $this->arrRegularHoliday = $this->lfGetRegularHoliday();
         // カレンダーデータ取得
         $this->arrCalendar = $this->lfGetCalendar(2);
@@ -79,6 +79,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -90,7 +89,5 @@
      * @return array カレンダー情報の配列を返す
      */
-    function lfGetCalendar($disp_month = 1)
-    {
-        $objDate = new SC_Date_Ex();
+    function lfGetCalendar($disp_month = 1) {
         $arrCalendar = array();
         $today = date('Y/m/d');
@@ -112,5 +109,5 @@
                 $arrCalendar[$j][$i]['month']       = $month;
                 $arrCalendar[$j][$i]['day']         = $objDay->day;
-                $arrCalendar[$j][$i]['holiday']     = $objDate->isHoliday($year, $month, $objDay->day);
+                $arrCalendar[$j][$i]['holiday']     = $this->lfCheckHoliday($year, $month, $objDay->day);
                 $arrCalendar[$j][$i]['today']       = $today === sprintf('%04d/%02d/%02d', $year, $month, $objDay->day);
 
@@ -121,3 +118,55 @@
         return $arrCalendar;
     }
+
+    /**
+     * 休日取得.
+     *
+     * @return array $arrHoliday 休日情報の配列を返す
+     */
+    function lfGetHoliday() {
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank DESC');
+
+        $where = 'del_flg <> 1';
+        $arrRet = $objQuery->select('month, day', 'dtb_holiday', $where);
+        foreach ($arrRet AS $key=>$val) {
+            $arrHoliday[$val['month']][] = $val['day'];
+        }
+        return $arrHoliday;
+    }
+
+    /**
+     * 定休日取得.
+     *
+     * @return array $arrRegularHoliday 定休日情報の配列を返す
+     */
+    function lfGetRegularHoliday() {
+        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
+        $arrRegularHoliday = explode('|', $arrInfo['regular_holiday_ids']);
+        return $arrRegularHoliday;
+    }
+
+    /**
+     * 休日チェック取得.
+     *
+     * @param integer $year 年
+     * @param integer $month 月
+     * @param integer $day 日
+     * @return boolean 休日の場合trueを返す
+     */
+    function lfCheckHoliday($year, $month, $day) {
+        if (!empty($this->arrHoliday[$month])) {
+            if (in_array($day, $this->arrHoliday[$month])) {
+                return true;
+            }
+        }
+        if (!empty($this->arrRegularHoliday)) {
+            $day = date('w', mktime(0,0,0 ,$month, $day, $year));
+            if (in_array($day, $this->arrRegularHoliday)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_FrontParts_Bloc_Cart.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_Bloc_Cart extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Cart extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCart = new SC_CartSession_Ex();
@@ -83,6 +79,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -94,6 +89,5 @@
      * @return array カートデータ配列
      */
-    function lfGetCartData(&$objCart)
-    {
+    function lfGetCartData(&$objCart) {
         $arrCartKeys = $objCart->getKeys();
         foreach ($arrCartKeys as $cart_key) {
Index: /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php	(revision 22582)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id: LC_Page_FrontParts_Bloc_Best5 - Copy.php -1   $
  */
-class LC_Page_FrontParts_Bloc_Recommend extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Recommend extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // 基本情報を渡す
@@ -82,6 +78,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -92,40 +87,39 @@
      * @return array $arrBestProducts 検索結果配列
      */
-    function lfGetRanking()
-    {
-        $objRecommend = new SC_Helper_Recommend_Ex();
+    function lfGetRanking() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objProduct = new SC_Product_Ex();
 
         // おすすめ商品取得
-        $arrRecommends = $objRecommend->getList(RECOMMEND_NUM);
+        $col = 'T1.best_id, T1.category_id, T1.rank, T1.product_id, T1.title, T1.comment, T1.create_date, T1.update_date';
+        $table = 'dtb_best_products as T1 INNER JOIN dtb_products as T2 ON T1.product_id = T2.product_id';
+        $where = 'T1.del_flg = 0 and T2.status = 1';
+        $objQuery->setOrder('T1.rank');
+        $objQuery->setLimit(RECOMMEND_NUM);
+        $arrBestProducts = $objQuery->select($col, $table, $where);
 
-        $response = array();
-        if (count($arrRecommends) > 0) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        if (count($arrBestProducts) > 0) {
             // 商品一覧を取得
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $objProduct = new SC_Product_Ex();
             // where条件生成&セット
             $arrProductId = array();
-            foreach ($arrRecommends as $key => $val) {
+            $where = 'product_id IN (';
+            foreach ($arrBestProducts as $key => $val) {
                 $arrProductId[] = $val['product_id'];
             }
-            $arrProducts = $objProduct->getListByProductIds($objQuery, $arrProductId);
-
-            // 税込金額を設定する
-            SC_Product_Ex::setIncTaxToProducts($arrProducts);
-
+            // 取得
+            $arrProductList = $objProduct->getListByProductIds($objQuery, $arrProductId);
             // おすすめ商品情報にマージ
-            foreach ($arrRecommends as $key => $value) {
-                if (isset($arrProducts[$value['product_id']])) {
-                    $product = $arrProducts[$value['product_id']];
-                    if (!NOSTOCK_HIDDEN || ($product['status'] == 1 && ($product['stock_max'] >= 1 || $product['stock_unlimited_max'] == 1))) {
-                        $response[] = array_merge($value, $arrProducts[$value['product_id']]);
-                    }
+            foreach ($arrBestProducts as $key => $value) {
+                $arrRow =& $arrBestProducts[$key];
+                if (isset($arrProductList[$arrRow['product_id']])) {
+                    $arrRow = array_merge($arrRow, $arrProductList[$arrRow['product_id']]);
                 } else {
                     // 削除済み商品は除外
-                    unset($arrRecommends[$key]);
+                    unset($arrBestProducts[$key]);
                 }
             }
         }
-        return $response;
+        return $arrBestProducts;
     }
 }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_FrontParts_Bloc_SearchProducts.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_Bloc_SearchProducts extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_SearchProducts extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // 商品ID取得
@@ -90,6 +86,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -100,6 +95,5 @@
      * @return string $product_id 商品ID
      */
-    function lfGetProductId()
-    {
+    function lfGetProductId() {
         $product_id = '';
         if (isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id'])) {
@@ -114,6 +108,5 @@
      * @return string $category_id カテゴリID
      */
-    function lfGetCategoryId()
-    {
+    function lfGetCategoryId() {
         $category_id = '';
         if (isset($_GET['category_id']) && $_GET['category_id'] != '' && is_numeric($_GET['category_id'])) {
@@ -128,6 +121,5 @@
      * @return string $maker_id メーカーID
      */
-    function lfGetMakerId()
-    {
+    function lfGetMakerId() {
         $maker_id = '';
         if (isset($_GET['maker_id']) && $_GET['maker_id'] != '' && is_numeric($_GET['maker_id'])) {
@@ -142,6 +134,5 @@
      * @return array $arrCategoryId 選択中のカテゴリID
      */
-    function lfGetSelectedCategoryId($product_id, $category_id)
-    {
+    function lfGetSelectedCategoryId($product_id, $category_id) {
         // 選択中のカテゴリIDを判定する
         $objDb = new SC_Helper_DB_Ex();
@@ -155,6 +146,5 @@
      * @return array $arrMakerId 選択中のメーカーID
      */
-    function lfGetSelectedMakerId($product_id, $maker_id)
-    {
+    function lfGetSelectedMakerId($product_id, $maker_id) {
         // 選択中のメーカーIDを判定する
         $objDb = new SC_Helper_DB_Ex();
@@ -168,6 +158,5 @@
      * @return array $arrCategoryList カテゴリ検索用選択リスト
      */
-    function lfGetCategoryList()
-    {
+    function lfGetCategoryList() {
         $objDb = new SC_Helper_DB_Ex();
         // カテゴリ検索用選択リスト
@@ -188,6 +177,5 @@
      * @return array $arrMakerList メーカー検索用選択リスト
      */
-    function lfGetMakerList()
-    {
+    function lfGetMakerList() {
         $objDb = new SC_Helper_DB_Ex();
         // メーカー検索用選択リスト
Index: /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviFooter extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_NaviFooter extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
     }
@@ -74,6 +70,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22581)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_News extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_News extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,6 @@
      * @return void
      */
-    function action()
-    {
-
-        $objNews = new SC_Helper_News_Ex();
+    function action() {
+
         $objFormParam = new SC_FormParam_Ex();
         switch ($this->getMode()) {
@@ -76,6 +71,6 @@
                 $this->arrErr = $objFormParam->checkError(false);
                 if (empty($this->arrErr)) {
-                    $arrData = $objFormParam->getHashArray();
-                    $json = $this->lfGetNewsForJson($arrData, $objNews);
+
+                    $json = $this->lfGetNewsForJson($objFormParam);
                     echo $json;
                     SC_Response_Ex::actionExit();
@@ -91,6 +86,6 @@
                 $this->arrErr = $objFormParam->checkError(false);
                 if (empty($this->arrErr)) {
-                    $arrData = $objFormParam->getHashArray();
-                    $json = $this->lfGetNewsDetailForJson($arrData, $objNews);
+
+                    $json = $this->lfGetNewsDetailForJson($objFormParam);
                     echo $json;
                     SC_Response_Ex::actionExit();
@@ -101,6 +96,6 @@
                 break;
             default:
-                $this->arrNews = $objNews->getList();
-                $this->newsCount = $objNews->getCount();
+                $this->newsCount = $this->lfGetNewsCount();
+                $this->arrNews = $this->lfGetNews(SC_Query_Ex::getSingletonInstance());
                 break;
         }
@@ -113,6 +108,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -124,6 +118,5 @@
      * @return void
      */
-    function lfInitNewsParam(&$objFormParam)
-    {
+    function lfInitNewsParam(&$objFormParam) {
         $objFormParam->addParam('現在ページ', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
         $objFormParam->addParam('表示件数', 'disp_number', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
@@ -136,7 +129,7 @@
      * @return array $arrNewsList 新着情報の配列を返す
      */
-    function lfGetNews($dispNumber, $pageNo, SC_Helper_News_Ex $objNews)
-    {
-        $arrNewsList = $objNews->getList($dispNumber, $pageNo);
+    function lfGetNews(&$objQuery) {
+        $objQuery->setOrder('rank DESC ');
+        $arrNewsList = $objQuery->select('* , cast(news_date as date) as news_date_disp', 'dtb_news' ,'del_flg = 0');
 
         // モバイルサイトのセッション保持 (#797)
@@ -159,17 +152,22 @@
      * (ページと表示件数を指定)
      *
-     * @param array $arrData フォーム入力値
-     * @param object $objNews
+     * @param array $objFormParam フォームパラメータークラス
      * @return String $json 新着情報のJSONを返す
      */
-    function lfGetNewsForJson($arrData, SC_Helper_News_Ex $objNews)
-    {
+    function lfGetNewsForJson(&$objFormParam) {
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $arrData = $objFormParam->getHashArray();
 
         $dispNumber = $arrData['disp_number'];
         $pageNo = $arrData['pageno'];
-        $arrNewsList = $this->lfGetNews($dispNumber, $pageNo, $objNews);
+        if (!empty($dispNumber) && !empty($pageNo)) {
+            $objQuery->setLimitOffset($dispNumber, (($pageNo - 1) * $dispNumber));
+        }
+
+        $arrNewsList = $this->lfGetNews($objQuery);
 
         //新着情報の最大ページ数をセット
-        $newsCount = $objNews->getCount();
+        $newsCount = $this->lfGetNewsCount();
         $arrNewsList['news_page_count'] = ceil($newsCount / 3);
 
@@ -183,15 +181,32 @@
      * (news_idを指定)
      *
-     * @param array $arrData フォーム入力値
-     * @param object $objNews
+     * @param array $objFormParam フォームパラメータークラス
      * @return String $json 新着情報1件分のJSONを返す
      */
-    function lfGetNewsDetailForJson($arrData, SC_Helper_News_Ex $objNews)
-    {
-
-        $arrNewsList = $objNews->get($arrData['news_id']);
+    function lfGetNewsDetailForJson(&$objFormParam) {
+
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+        $arrData = $objFormParam->getHashArray();
+        $newsId = $arrData['news_id'];
+        $arrNewsList = $objQuery->select(' * , cast(news_date as date) as news_date_disp ',' dtb_news '," del_flg = '0' AND news_id = ? ", array($newsId));
+
         $json =  SC_Utils_Ex::jsonEncode($arrNewsList);    //JSON形式
 
         return $json;
+    }
+
+    /**
+     * 新着情報の件数を取得する
+     *
+     * @return Integer $count 新着情報の件数を返す
+     */
+    function lfGetNewsCount() {
+
+        $count = 0;
+
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+        $count = $objQuery->count('dtb_news', "del_flg = '0'");
+
+        return $count;
     }
 
@@ -202,6 +217,5 @@
      * @return string JSON 形式のエラーメッセージ
      */
-    function lfGetErrors($arrErr)
-    {
+    function lfGetErrors($arrErr) {
         $messages = '';
         foreach ($arrErr as $val) {
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 22602)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php	(revision 22796)
@@ -32,10 +32,8 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Category extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Category extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
-    public $arrParentID;
 
     /**
@@ -44,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -54,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -65,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // モバイル判定
@@ -90,6 +85,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -101,6 +95,5 @@
      * @return array $arrCategoryId 選択中のカテゴリID
      */
-    function lfGetSelectedCategoryId($arrRequest)
-    {
+    function lfGetSelectedCategoryId($arrRequest) {
             // 商品ID取得
         $product_id = '';
@@ -129,17 +122,45 @@
      * @return array $arrRet カテゴリツリーの配列を返す
      */
-    function lfGetCatTree($arrParentCategoryId, $count_check = false)
-    {
-        $objCategory = new SC_Helper_Category_Ex($count_check);
-        $arrTree = $objCategory->getTree();
-
-        $this->arrParentID = array();
+    function lfGetCatTree($arrParentCategoryId, $count_check = false) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objDb = new SC_Helper_DB_Ex();
+        $col = '*';
+        $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id';
+        // 登録商品数のチェック
+        if ($count_check) {
+            $where = 'del_flg = 0 AND product_count > 0';
+        } else {
+            $where = 'del_flg = 0';
+        }
+        $objQuery->setOption('ORDER BY rank DESC');
+        $arrRet = $objQuery->select($col, $from, $where);
         foreach ($arrParentCategoryId as $category_id) {
-            $arrParentID = $objCategory->getTreeTrail($category_id);
-            $this->arrParentID = array_merge($this->arrParentID, $arrParentID); 
+            $arrParentID = $objDb->sfGetParents(
+                'dtb_category',
+                'parent_category_id',
+                'category_id',
+                $category_id
+            );
+            $arrBrothersID = SC_Utils_Ex::sfGetBrothersArray(
+                $arrRet,
+                'parent_category_id',
+                'category_id',
+                $arrParentID
+            );
+            $arrChildrenID = SC_Utils_Ex::sfGetUnderChildrenArray(
+                $arrRet,
+                'parent_category_id',
+                'category_id',
+                $category_id
+            );
             $this->root_parent_id[] = $arrParentID[0];
-        }
-
-        return $arrTree;
+            $arrDispID = array_merge($arrBrothersID, $arrChildrenID);
+            foreach ($arrRet as &$arrCategory) {
+                if (in_array($arrCategory['category_id'], $arrDispID)) {
+                    $arrCategory['display'] = 1;
+                }
+            }
+        }
+        return $arrRet;
     }
 
@@ -150,6 +171,5 @@
      * @return array $arrMainCat メインカテゴリの配列を返す
      */
-    function lfGetMainCat($count_check = false)
-    {
+    function lfGetMainCat($count_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
Index: /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc extends LC_Page_Ex 
-{
+class LC_Page_FrontParts_Bloc extends LC_Page_Ex {
 
     /**
@@ -40,6 +39,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         // 開始時刻を設定する。
         $this->timeStart = microtime(true);
@@ -66,6 +64,5 @@
      * @return void
      */
-    function setTplMainpage($bloc_file)
-    {
+    function setTplMainpage($bloc_file) {
         if (SC_Utils_Ex::isAbsoluteRealPath($bloc_file)) {
             $this->tpl_mainpage = $bloc_file;
Index: /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginHeader extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_LoginHeader extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
     }
@@ -74,6 +70,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id:LC_Page_FrontParts_LoginCheck.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_LoginCheck extends LC_Page_Ex 
-{
+class LC_Page_FrontParts_LoginCheck extends LC_Page_Ex {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -67,6 +64,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // 会員管理クラス
@@ -213,6 +209,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -224,6 +219,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('メールアドレス', 'login_email', MTEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -241,6 +235,5 @@
      * @see LC_PageError
      */
-    function lfGetErrorMessage($error)
-    {
+    function lfGetErrorMessage($error) {
         switch ($error) {
             case TEMP_LOGIN_ERROR:
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 22607)
+++ /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Products_List extends LC_Page_Ex 
-{
+class LC_Page_Products_List extends LC_Page_Ex {
 
     // {{{ properties
@@ -69,6 +68,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -85,6 +83,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -97,6 +94,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objProduct = new SC_Product_Ex();
@@ -147,5 +143,7 @@
         }
 
-        $this->tpl_rnd = SC_Utils_Ex::sfGetRandomString(3);
+        $this->tpl_rnd          = SC_Utils_Ex::sfGetRandomString(3);
+
+
     }
 
@@ -155,6 +153,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -165,6 +162,5 @@
      * @return integer カテゴリID
      */
-    function lfGetCategoryId($category_id)
-    {
+    function lfGetCategoryId($category_id) {
 
         // 指定なしの場合、0 を返す
@@ -190,6 +186,5 @@
 
     /* 商品一覧の表示 */
-    function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct)
-    {
+    function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct) {
 
         $arrOrderVal = array();
@@ -229,5 +224,5 @@
                     ,product_id DESC
 __EOS__;
-                $objQuery->setOrder($order);
+                    $objQuery->setOrder($order);
                 break;
         }
@@ -249,6 +244,5 @@
 
     /* 入力内容のチェック */
-    function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2)
-    {
+    function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2) {
 
         // 入力データを渡す。
@@ -274,6 +268,5 @@
      * @return void
      */
-    function lfGetDisplayNum($display_number)
-    {
+    function lfGetDisplayNum($display_number) {
         // 表示件数
         return (SC_Utils_Ex::sfIsInt($display_number))
@@ -287,6 +280,5 @@
      * @return str
      */
-    function lfGetPageTitle($mode, $category_id = 0)
-    {
+    function lfGetPageTitle($mode, $category_id = 0) {
         if ($mode == 'search') {
             return '検索結果';
@@ -294,7 +286,6 @@
             return '全商品';
         } else {
-            $objCategory = new SC_Helper_Category_Ex();
-            $arrCat = $objCategory->get($category_id);
-            return $arrCat['category_name'];
+            $arrCat = SC_Helper_DB_Ex::sfGetCat($category_id);
+            return $arrCat['name'];
         }
     }
@@ -305,6 +296,5 @@
      * @return array
      */
-    function lfGetSearchConditionDisp($arrSearchData)
-    {
+    function lfGetSearchConditionDisp($arrSearchData) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $arrSearch  = array('category' => '指定なし', 'maker' => '指定なし', 'name' => '指定なし');
@@ -316,7 +306,5 @@
         // メーカー検索条件
         if (strlen($arrSearchData['maker_id']) > 0) {
-            $objMaker = new SC_Helper_Maker_Ex();
-            $maker = $objMaker->get($arrSearchData['maker_id']);
-            $arrSearch['maker']     = $maker['name'];
+            $arrSearch['maker']     = $objQuery->get('name', 'dtb_maker', 'maker_id = ?', array($arrSearchData['maker_id']));
         }
 
@@ -333,6 +321,5 @@
      * @return int
      */
-    function lfGetProductAllNum($searchCondition)
-    {
+    function lfGetProductAllNum($searchCondition) {
         // 検索結果対象となる商品の数を取得
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
@@ -347,6 +334,5 @@
      * @return array
      */
-    function lfGetSearchCondition($arrSearchData)
-    {
+    function lfGetSearchCondition($arrSearchData) {
         $searchCondition = array(
             'where'             => '',
@@ -391,11 +377,11 @@
         }
 
+        $searchCondition['where_for_count'] = $searchCondition['where'];
+
         // 在庫無し商品の非表示
         if (NOSTOCK_HIDDEN) {
             $searchCondition['where'] .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = alldtl.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
-        }
-
-        // XXX 一時期内容が異なっていたことがあるので別要素にも格納している。
-        $searchCondition['where_for_count'] = $searchCondition['where'];
+            $searchCondition['where_for_count'] .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = alldtl.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
+        }
 
         return $searchCondition;
@@ -407,6 +393,5 @@
      * @return str
      */
-    function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id)
-    {
+    function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id) {
         $js_fnOnLoad = '';
         foreach ($arrProducts as $key => $value) {
@@ -429,6 +414,5 @@
      * @return void
      */
-    function lfAddCart($arrForm, $referer)
-    {
+    function lfAddCart($arrForm, $referer) {
         $product_class_id = $arrForm['product_class_id'];
         $objCartSess = new SC_CartSession_Ex();
@@ -444,6 +428,5 @@
      * @return Array $arrProducts 商品一覧情報
      */
-    function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage)
-    {
+    function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage) {
 
         foreach ($arrProducts['productStatus'] as $product_id => $arrValues) {
@@ -465,10 +448,10 @@
     /**
      *
-     * @return void
-     */
-    function doJson()
-    {
+     * @param type $objProduct 
+     * @return void
+     */
+    function doJson(&$objProduct) {
         $this->arrProducts = $this->setStatusDataTo($this->arrProducts, $this->arrSTATUS, $this->arrSTATUS_IMAGE);
-        SC_Product_Ex::setPriceTaxTo($this->arrProducts);
+        $this->arrProducts = $objProduct->setPriceTaxTo($this->arrProducts);
 
         // 一覧メイン画像の指定が無い商品のための処理
@@ -486,6 +469,5 @@
      * @return void
      */
-    function doDefault(&$objProduct)
-    {
+    function doDefault(&$objProduct) {
         //商品一覧の表示処理
         $strnavi            = $this->objNavi->strnavi;
@@ -536,10 +518,6 @@
                 $this->lfAddCart($this->arrForm, $_SERVER['HTTP_REFERER']);
 
-                // 開いているカテゴリーツリーを維持するためのパラメーター
-                $arrQueryString = array(
-                    'category_id' => $this->arrForm['category_id'],
-                );
-
-                SC_Response_Ex::sendRedirect(CART_URLPATH, $arrQueryString);
+
+                SC_Response_Ex::sendRedirect(CART_URLPATH);
                 SC_Response_Ex::actionExit();
             }
@@ -552,6 +530,5 @@
         }
 
-        $this->tpl_javascript   .= 'function fnOnLoad()
-        {' . $js_fnOnLoad . '}';
+        $this->tpl_javascript   .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
         $this->tpl_onload       .= 'fnOnLoad(); ';
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id:LC_Page_Products_Review.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Products_Review extends LC_Page_Ex 
-{
+class LC_Page_Products_Review extends LC_Page_Ex {
 
     // {{{ properties
@@ -54,6 +53,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -69,6 +67,5 @@
      * Page のプロセス.
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -81,6 +78,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
@@ -141,6 +137,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -152,6 +147,5 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('レビューID', 'review_id', INT_LEN, 'aKV');
         $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK','EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -170,6 +164,5 @@
      * @return array エラーメッセージの配列
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $arrErr = $objFormParam->checkError();
 
@@ -199,6 +192,5 @@
      * @return string $product_name 商品名
      */
-    function lfGetProductName($product_id)
-    {
+    function lfGetProductName($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -207,6 +199,5 @@
 
     //登録実行
-    function lfRegistRecommendData(&$objFormParam)
-    {
+    function lfRegistRecommendData(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRegist = $objFormParam->getDbArray();
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 22608)
+++ /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php	(revision 22796)
@@ -35,6 +35,5 @@
  * @version $Id:LC_Page_Products_Detail.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Products_Detail extends LC_Page_Ex 
-{
+class LC_Page_Products_Detail extends LC_Page_Ex {
 
     /** 商品ステータス */
@@ -67,6 +66,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
@@ -82,6 +80,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -94,6 +91,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         // 会員クラス
         $objCustomer = new SC_Customer_Ex();
@@ -140,6 +136,5 @@
 
         $this->tpl_javascript .= 'classCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories[$product_id]) . ';';
-        $this->tpl_javascript .= 'function lnOnLoad()
-        {' . $this->js_lnOnload . '}';
+        $this->tpl_javascript .= 'function lnOnLoad(){' . $this->js_lnOnload . '}';
         $this->tpl_onload .= 'lnOnLoad();';
 
@@ -242,12 +237,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* プロダクトIDの正当性チェック */
-    function lfCheckProductId($admin_mode,$product_id)
-    {
+    function lfCheckProductId($admin_mode,$product_id) {
         // 管理機能からの確認の場合は、非公開の商品も表示する。
         if (isset($admin_mode) && $admin_mode == 'on') {
@@ -270,6 +263,5 @@
 
     /* ファイル情報の初期化 */
-    function lfInitFile($objUpFile)
-    {
+    function lfInitFile($objUpFile) {
         $objUpFile->addFile('詳細-メイン画像', 'main_image', array('jpg'), IMAGE_SIZE);
         for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) {
@@ -280,6 +272,5 @@
 
     /* 規格選択セレクトボックスの作成 */
-    function lfMakeSelect()
-    {
+    function lfMakeSelect() {
         return 'fnSetClassCategories('
             . 'document.form1, '
@@ -289,6 +280,5 @@
 
     /* 規格選択セレクトボックスの作成(モバイル) */
-    function lfMakeSelectMobile(&$objPage, $product_id,$request_classcategory_id1)
-    {
+    function lfMakeSelectMobile(&$objPage, $product_id,$request_classcategory_id1) {
 
         $classcat_find1 = false;
@@ -353,6 +343,5 @@
 
     /* パラメーター情報の初期化 */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('規格1', 'classcategory_id1', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('規格2', 'classcategory_id2', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -371,6 +360,5 @@
 
     /* 商品規格情報の取得 */
-    function lfGetProductsClass($product_id)
-    {
+    function lfGetProductsClass($product_id) {
         $objProduct = new SC_Product_Ex();
         return $objProduct->getProductsClassFullByProductId($product_id);
@@ -378,6 +366,5 @@
 
     /* 登録済み関連商品の読み込み */
-    function lfPreGetRecommendProducts($product_id)
-    {
+    function lfPreGetRecommendProducts($product_id) {
         $objProduct = new SC_Product_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -403,6 +390,5 @@
 
     /* 入力内容のチェック */
-    function lfCheckError($mode,&$objFormParam,$tpl_classcat_find1 = null ,$tpl_classcat_find2 = null)
-    {
+    function lfCheckError($mode,&$objFormParam,$tpl_classcat_find1 = null ,$tpl_classcat_find2 = null) {
 
         switch ($mode) {
@@ -436,6 +422,5 @@
 
     //商品ごとのレビュー情報を取得する
-    function lfGetReviewData($id)
-    {
+    function lfGetReviewData($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //商品ごとのレビュー情報を取得する
@@ -454,6 +439,5 @@
      * @return $subImageFlag
      */
-    function lfSetFile($objUpFile,$arrProduct,&$arrFile)
-    {
+    function lfSetFile($objUpFile,$arrProduct,&$arrFile) {
         // DBからのデータを引き継ぐ
         $objUpFile->setDBFileList($arrProduct);
@@ -475,6 +459,5 @@
      * @return void
      */
-    function lfRegistFavoriteProduct($favorite_product_id,$customer_id)
-    {
+    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')) {
@@ -506,6 +489,5 @@
      * @return void 
      */
-    function doCart()
-    {
+    function doCart() {
         $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,
                                             $this->tpl_classcat_find1,
@@ -517,10 +499,6 @@
             $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity'));
 
-            // 開いているカテゴリーツリーを維持するためのパラメーター
-            $arrQueryString = array(
-                'product_id' => $this->objFormParam->getValue('product_id'),
-            );
-
-            SC_Response_Ex::sendRedirect(CART_URLPATH, $arrQueryString);
+
+            SC_Response_Ex::sendRedirect(CART_URLPATH);
             SC_Response_Ex::actionExit();
         }
@@ -533,6 +511,5 @@
      * @return void
      */
-    function doAddFavorite(&$objCustomer)
-    {
+    function doAddFavorite(&$objCustomer) {
         // ログイン中のユーザが商品をお気に入りにいれる処理
         if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0) {
@@ -556,6 +533,5 @@
      * @return void
      */
-    function doAddFavoriteSphone($objCustomer)
-    {
+    function doAddFavoriteSphone($objCustomer) {
         // ログイン中のユーザが商品をお気に入りにいれる処理(スマートフォン用)
         if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0) {
@@ -581,6 +557,5 @@
      * @return void 
      */
-    function doDefault()
-    {
+    function doDefault() {
         // カート「戻るボタン」用に保持
         $netURL = new Net_URL();
@@ -592,6 +567,5 @@
      * @return void
      */
-    function doMobileSelect()
-    {
+    function doMobileSelect() {
         // 規格1が設定されている場合
         if ($this->tpl_classcat_find1) {
@@ -609,6 +583,5 @@
      * @return type 
      */
-    function doMobileSelect2()
-    {
+    function doMobileSelect2() {
         $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,$this->tpl_classcat_find1,$this->tpl_classcat_find2);
 
@@ -635,6 +608,5 @@
      * @return void
      */
-    function doMobileSelectItem()
-    {
+    function doMobileSelectItem() {
         $objProduct = new SC_Product_Ex();
 
@@ -678,6 +650,5 @@
      * @return void 
      */
-    function doMobileCart()
-    {
+    function doMobileCart() {
         // この段階でエラーが出る場合は、数量の入力エラーのはず
         if (count($this->arrErr)) {
@@ -691,6 +662,5 @@
      * @return void 
      */
-    function doMobileDefault()
-    {
+    function doMobileDefault() {
         $this->tpl_mainpage = 'products/detail.tpl';
     }
Index: /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Products_Search extends LC_Page_Ex 
-{
+class LC_Page_Products_Search extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
@@ -76,6 +72,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Products_CategoryList extends LC_Page_Ex 
-{
+class LC_Page_Products_CategoryList extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // カテゴリIDの正当性チェック
@@ -85,12 +81,10 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* カテゴリIDの正当性チェック */
-    function lfCheckCategoryId($category_id)
-    {
+    function lfCheckCategoryId($category_id) {
         if ($category_id && !SC_Helper_DB_Ex::sfIsRecord('dtb_category', 'category_id', (array)$category_id, 'del_flg = 0')) {
             return 0;
@@ -108,6 +102,5 @@
      * @return void
      */
-    function lfGetCategories($category_id, $count_check = false, &$objPage)
-    {
+    function lfGetCategories($category_id, $count_check = false, &$objPage) {
         // カテゴリの正しいIDを取得する。
         $category_id = $this->lfCheckCategoryId($category_id);
@@ -163,6 +156,5 @@
      * @return object
      */
-    function lfInitParam($arrRequest)
-    {
+    function lfInitParam($arrRequest) {
         $objFormParam = new SC_FormParam_Ex();
         $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
Index: /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Products_ReviewComplete extends LC_Page_Ex 
-{
+class LC_Page_Products_ReviewComplete extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->setTemplate('products/review_complete.tpl');
@@ -78,6 +74,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_ResizeImage extends LC_Page_Ex 
-{
+class LC_Page_ResizeImage extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -64,6 +61,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
@@ -94,11 +90,9 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('画像ファイル名', 'image', STEXT_LEN, 'a',  array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('画像の幅', 'width', STEXT_LEN, 'n',  array('NUM_CHECK'));
@@ -111,6 +105,5 @@
      * @return boolean 正常な形式:true 不正な形式:false
      */
-    function lfCheckFileName()
-    {
+    function lfCheckFileName() {
         //$pattern = '|^[0-9]+_[0-9a-z]+\.[a-z]{3}$|';
         $pattern = '|\./|';
@@ -132,6 +125,5 @@
      * @return void
      */
-    function lfOutputImage($file, $width, $height)
-    {
+    function lfOutputImage($file, $width, $height) {
         $objThumb = new gdthumb();
         $objThumb->Main($file, $width, $height, '', true);
Index: /branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php	(revision 22581)
+++ /branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_RSS extends LC_Page_Ex 
-{
+class LC_Page_RSS extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'rss/index.tpl';
@@ -56,11 +54,11 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
 
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $objView = new SC_SiteView_Ex(false);
 
         //新着情報を取得
-        $arrNews = $this->lfGetNews();
+        $arrNews = $this->lfGetNews($objQuery);
 
         //キャッシュしない(念のため)
@@ -92,6 +90,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -100,13 +97,22 @@
      * 新着情報を取得する
      *
+     * @param SC_Query $objQuery DB操作クラス
      * @return array $arrNews 取得結果を配列で返す
      */
-    function lfGetNews()
-    {
-        $objNews = new SC_Helper_News_Ex();
-        $arrNews = $objNews->getList();
-
-        $objDb = new SC_Helper_DB_Ex();
-        $arrInfo = $objDb->sfGetBasisData(FALSE, 'shop_name, email04');
+    function lfGetNews(&$objQuery) {
+        $col = '';
+        $col .= 'news_id ';        // 新着情報ID
+        $col .= ',news_title ';    // 新着情報タイトル
+        $col .= ',news_comment ';  // 新着情報本文
+        $col .= ',news_date ';     // 日付
+        $col .= ',news_url ';      // 新着情報URL
+        $col .= ',news_select ';   // 新着情報の区分(1:URL、2:本文)
+        $col .= ',(SELECT shop_name FROM dtb_baseinfo limit 1) AS shop_name  ';    // 店名
+        $col .= ',(SELECT email04 FROM dtb_baseinfo limit 1) AS email ';           // 代表Emailアドレス
+        $from = 'dtb_news';
+        $where = "del_flg = '0'";
+        $order = 'rank DESC';
+        $objQuery->setOrder($order);
+        $arrNews = $objQuery->select($col,$from,$where);
 
         // RSS用に変換
@@ -115,6 +121,4 @@
 
             $row =& $arrNews[$key];
-            $row['shop_name'] = $arrInfo['shop_name'];
-            $row['email'] = $arrInfo['email04'];
             // 日付
             $row['news_date'] = date('r', strtotime($row['news_date']));
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 22567)
+++ /branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Rss_Products extends LC_Page_Ex 
-{
+class LC_Page_Rss_Products extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'rss/products.tpl';
@@ -56,6 +54,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
     }
@@ -66,6 +63,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objView = new SC_SiteView_Ex();
@@ -128,6 +124,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -140,6 +135,5 @@
      * @return array $arrProduct 商品情報の配列を返す
      */
-    function lfGetProductsDetailData($mode, $product_id)
-    {
+    function lfGetProductsDetailData($mode, $product_id) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         //商品詳細を取得
@@ -192,6 +186,5 @@
      * @return array $arrProduct 商品情報の配列を返す
      */
-    function lfGetProductsListData()
-    {
+    function lfGetProductsListData() {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         //商品一覧を取得
@@ -205,6 +198,5 @@
      * @return array $arrProduct 商品情報の配列を返す
      */
-    function lfGetProductsAllData()
-    {
+    function lfGetProductsAllData() {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         //商品情報を取得
@@ -251,6 +243,5 @@
      * @return array $arrProduct 取得結果を配列で返す
      */
-    function lfGetProductsDetail(&$objQuery, $product_id = 'all')
-    {
+    function lfGetProductsDetail(&$objQuery, $product_id = 'all') {
         $objProduct = new SC_Product_Ex();
 
@@ -293,6 +284,5 @@
      * @return array $arrProduct 取得結果を配列で返す
      */
-    function lfGetProductsAllclass(&$objQuery)
-    {
+    function lfGetProductsAllclass(&$objQuery) {
         // --- 商品一覧の取得
         $objQuery->setWhere('del_flg = 0 AND status = 1');
Index: /branches/version-2_12-dev/data/class/pages/LC_Page_Index.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/LC_Page_Index.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/LC_Page_Index.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Index extends LC_Page_Ex 
-{
+class LC_Page_Index extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $this->tpl_title = '';
         $objCustomer = new SC_Customer_Ex();
@@ -77,6 +73,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Api extends LC_Page_Ex 
-{
+class LC_Page_Api extends LC_Page_Ex {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
@@ -79,6 +75,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Api_Xml extends LC_Page_Ex 
-{
+class LC_Page_Api_Xml extends LC_Page_Ex {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
@@ -79,6 +75,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Api_Php extends LC_Page_Ex 
-{
+class LC_Page_Api_Php extends LC_Page_Ex {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
@@ -79,6 +75,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php	(revision 22796)
@@ -33,6 +33,5 @@
  * @version $Id$
  */
-class LC_Page_Api_Json extends LC_Page_Ex 
-{
+class LC_Page_Api_Json extends LC_Page_Ex {
 
     // }}}
@@ -44,6 +43,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -54,6 +52,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
@@ -65,6 +62,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
@@ -79,6 +75,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_Order extends LC_Page_Ex 
-{
+class LC_Page_Order extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_page_category = 'order';
@@ -57,6 +55,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -69,6 +66,5 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -83,6 +79,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php
===================================================================
--- /branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 // 棒グラフ生成クラス
-class SC_Graph_Bar extends SC_Graph_Line_Ex
-{
+class SC_Graph_Bar extends SC_Graph_Line_Ex{
     // コンストラクタ
     function __construct(
@@ -33,6 +32,5 @@
 
     // グラフの描画
-    function drawGraph()
-    {
+    function drawGraph() {
         $this->drawYLine();
         $this->drawXLine(true);
@@ -53,6 +51,5 @@
 
     // 棒グラフの描画
-    function drawBar($line_no)
-    {
+    function drawBar($line_no) {
         $arrPointList = $this->arrPointList[$line_no];
         // データ数を数える
@@ -83,6 +80,5 @@
 
     // ラベルを描画する
-    function drawLabel($line_no)
-    {
+    function drawLabel($line_no) {
         $arrData = $this->arrDataList[$line_no];
         $arrPointList = $this->arrPointList[$line_no];
Index: /branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php
===================================================================
--- /branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 // 折れ線グラフ生成クラス
-class SC_Graph_Line extends SC_Graph_Base_Ex
-{
+class SC_Graph_Line extends SC_Graph_Base_Ex{
     var $area_width;
     var $area_height;
@@ -56,12 +55,10 @@
 
     // X軸ラベルの角度セット
-    function setXLabelAngle($Angle)
-    {
+    function setXLabelAngle($Angle) {
         $this->XLabelAngle = $Angle;
     }
 
     // Y軸タイトル
-    function drawYTitle()
-    {
+    function drawYTitle() {
         // Y軸にタイトルを入れる
         if ($this->YTitle != '') {
@@ -74,6 +71,5 @@
 
     // X軸タイトル
-    function drawXTitle()
-    {
+    function drawXTitle() {
         // Y軸にタイトルを入れる
         if ($this->XTitle != '') {
@@ -86,6 +82,5 @@
 
     // Y軸の描画
-    function drawYLine()
-    {
+    function drawYLine() {
         imageline($this->image, $this->left, $this->top, $this->left, $this->top + $this->area_height, $this->flame_color);
         // 目盛り幅を求める(中間点は自動)
@@ -112,6 +107,5 @@
 
     // X軸の描画
-    function drawXLine($bar = false)
-    {
+    function drawXLine($bar = false) {
         imageline($this->image, $this->left, $this->top + $this->area_height, $this->left + $this->area_width, $this->top + $this->area_height, $this->flame_color);
         $arrPointList = $this->arrPointList[0];
@@ -156,12 +150,10 @@
 
     // グリッド表示
-    function setYGridOn($ygrid_on)
-    {
+    function setYGridOn($ygrid_on) {
         $this->ygrid_on = $ygrid_on;
     }
 
     // ポイントの描画
-    function setMark($line_no, $left, $top, $size = LINE_MARK_SIZE)
-    {
+    function setMark($line_no, $left, $top, $size = LINE_MARK_SIZE) {
         // 偶数に変換しておく
         $size += $size % 2;
@@ -178,6 +170,5 @@
 
     // Y軸目盛りに値を入れる
-    function setYScale()
-    {
+    function setYScale() {
         // 1目盛りの値
         $number = intval($this->graph_max / LINE_Y_SCALE);
@@ -195,6 +186,5 @@
 
     //
-    function setMax($arrData)
-    {
+    function setMax($arrData) {
         // データの最大値を取得する。
         $data_max = max($arrData);
@@ -212,6 +202,5 @@
 
     // グラフの描画
-    function drawGraph()
-    {
+    function drawGraph() {
         // グラフ背景を描画
         $this->drawYLine();
@@ -238,6 +227,5 @@
 
     // ラインを描画する
-    function drawLine($line_no)
-    {
+    function drawLine($line_no) {
         $arrPointList = $this->arrPointList[$line_no];
 
@@ -255,6 +243,5 @@
 
     // マークを描画する
-    function drawMark($line_no)
-    {
+    function drawMark($line_no) {
         $arrPointList = $this->arrPointList[$line_no];
         $count = count($arrPointList);
@@ -267,6 +254,5 @@
 
     // ラベルを描画する
-    function drawLabel($line_no)
-    {
+    function drawLabel($line_no) {
         $arrData = $this->arrDataList[$line_no];
         $arrPointList = $this->arrPointList[$line_no];
@@ -283,6 +269,5 @@
 
     // データをセットする
-    function setData($arrData)
-    {
+    function setData($arrData) {
         $this->arrDataList[$this->line_max] = array_values((array)$arrData);
         $this->setMax($this->arrDataList[$this->line_max]);
@@ -305,18 +290,15 @@
 
     // X軸ラベルをセットする
-    function setXLabel($arrXLabel)
-    {
+    function setXLabel($arrXLabel) {
         $this->arrXLabel = array_values((array)$arrXLabel);
     }
 
     // X軸タイトルをセットする
-    function setXTitle($title)
-    {
+    function setXTitle($title) {
         $this->XTitle = $title;
     }
 
     // Y軸タイトルをセットする
-    function setYTitle($title)
-    {
+    function setYTitle($title) {
         $this->YTitle = $title;
     }
Index: /branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php
===================================================================
--- /branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php	(revision 22796)
@@ -131,6 +131,5 @@
  * @version $Id$
  */
-class SC_Graph_Base 
-{
+class SC_Graph_Base {
 
     // {{{ properties
@@ -183,6 +182,5 @@
 
     // コンストラクタ
-    function __construct($bgw, $bgh, $left, $top)
-    {
+    function __construct($bgw, $bgh, $left, $top) {
         $this->init();
         // 画像作成
@@ -213,6 +211,5 @@
 
     // リサンプル(画像を滑らかに縮小する)
-    function resampled()
-    {
+    function resampled() {
         $new_width = $this->bgw * 0.8;
         $new_height = $this->bgh * 0.8;
@@ -224,6 +221,5 @@
 
     // オブジェクトカラーの設定
-    function setColorList($arrRGB)
-    {
+    function setColorList($arrRGB) {
         $this->arrRGB = $arrRGB;
         $count = count($this->arrRGB);
@@ -239,12 +235,10 @@
 
     // 影のありなし
-    function setShadeOn($shade_on)
-    {
+    function setShadeOn($shade_on) {
         $this->shade_on = $shade_on;
     }
 
     // 画像を出力する
-    function outputGraph($header = true, $filename = '')
-    {
+    function outputGraph($header = true, $filename = '') {
         if ($header) {
             header('Content-type: image/png');
@@ -261,6 +255,5 @@
 
     // 描画時のテキスト幅を求める
-    function getTextWidth($text, $font_size)
-    {
+    function getTextWidth($text, $font_size) {
         $text_len = strlen($text);
         $ret = $font_size * $text_len * TEXT_RATE;
@@ -275,6 +268,5 @@
 
     // テキストを出力する
-    function setText($font_size, $left, $top, $text, $color = NULL, $angle = 0, $labelbg = false)
-    {
+    function setText($font_size, $left, $top, $text, $color = NULL, $angle = 0, $labelbg = false) {
         // 時計回りに角度を変更
         $angle = -$angle;
@@ -308,6 +300,5 @@
 
     // タイトルを出力する
-    function drawTitle($text, $font_size = TITLE_FONT_SIZE)
-    {
+    function drawTitle($text, $font_size = TITLE_FONT_SIZE) {
         // 出力位置の算出
         $text_width = $this->getTextWidth($text, $font_size);
@@ -318,6 +309,5 @@
 
     // ログを出力する
-    function debugPrint($text)
-    {
+    function debugPrint($text) {
         $text = mb_convert_encoding($text, 'UTF-8', CHAR_CODE);
         if (!isset($this->text_top)) {
@@ -330,6 +320,5 @@
 
     // カラーラベルを描画
-    function drawLegend($legend_max = '', $clabelbg = true)
-    {
+    function drawLegend($legend_max = '', $clabelbg = true) {
         // 凡例が登録されていなければ中止
         if (count($this->arrLegend) <= 0) {
@@ -380,6 +369,5 @@
 
     // カラーラベル背景の描画
-    function drawClabelBG($left, $top, $right, $bottom)
-    {
+    function drawClabelBG($left, $top, $right, $bottom) {
         // 影の描画
         if ($this->shade_on) {
@@ -392,6 +380,5 @@
 
     // 凡例をセットする
-    function setLegend($arrLegend)
-    {
+    function setLegend($arrLegend) {
         $this->arrLegend = array_values((array)$arrLegend);
     }
@@ -408,6 +395,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         // 凡例背景
         $this->ARR_LEGENDBG_COLOR = array(245,245,245);
@@ -451,6 +437,5 @@
      * @return array 円の中心点と直径から弧の終端座標の配列
      */
-    function lfGetArcPos($cx, $cy, $cw, $ch, $e)
-    {
+    function lfGetArcPos($cx, $cy, $cw, $ch, $e) {
         // 三角関数用の角度を求める
         $s = 90 - $e;
@@ -463,6 +448,5 @@
 
     /** 画像にテキストを描画する */
-    function lfImageText($dst_image, $text, $font_size, $left, $top, $font, $arrRGB)
-    {
+    function lfImageText($dst_image, $text, $font_size, $left, $top, $font, $arrRGB) {
         $color = ImageColorAllocate($dst_image, $arrRGB[0], $arrRGB[1], $arrRGB[2]);
         $text = mb_convert_encoding($text, 'UTF-8', CHAR_CODE);
@@ -474,6 +458,5 @@
 
     /** 表示色の取得 */
-    function lfGetImageColor($image, $array)
-    {
+    function lfGetImageColor($image, $array) {
         if (count($array) != 3) {
             return NULL;
@@ -484,6 +467,5 @@
 
     /** 影用表示色の取得 */
-    function lfGetImageDarkColor($image, $array)
-    {
+    function lfGetImageDarkColor($image, $array) {
         if (count($array) != 3) {
             return NULL;
Index: /branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php
===================================================================
--- /branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php	(revision 22585)
+++ /branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 // 円グラフ生成クラス
-class SC_Graph_Pie extends SC_Graph_Base_Ex
-{
+class SC_Graph_Pie extends SC_Graph_Base_Ex{
     var $cw;
     var $ch;
@@ -34,6 +33,5 @@
 
     // コンストラクタ
-    function __construct($bgw = BG_WIDTH, $bgh = BG_HEIGHT, $left = PIE_LEFT, $top = PIE_TOP)
-    {
+    function __construct($bgw = BG_WIDTH, $bgh = BG_HEIGHT, $left = PIE_LEFT, $top = PIE_TOP) {
         parent::__construct($bgw, $bgh, $left, $top);
         // サイズ設定
@@ -44,6 +42,5 @@
 
     // データを360°値に変換する
-    function getCircleData($array)
-    {
+    function getCircleData($array) {
         $total = '';
         $new_total = '';
@@ -76,6 +73,5 @@
 
     // 円の位置設定を行う
-    function setPosition($cx, $cy)
-    {
+    function setPosition($cx, $cy) {
         $this->cx = $cx;
         $this->cy = $cy;
@@ -83,6 +79,5 @@
 
     // 円のサイズ設定を行う
-    function setSize($cw, $ch, $cz = 0)
-    {
+    function setSize($cw, $ch, $cz = 0) {
         $this->cw = $cw;
         $this->ch = $ch;
@@ -91,6 +86,5 @@
 
     // 影の描画
-    function drawShade()
-    {
+    function drawShade() {
         $move = 1;
         for ($i = ($this->cy + $this->cz); $i <= ($this->cy + $this->cz + ($this->cz * PIE_SHADE_IMPACT)); $i++) {
@@ -101,12 +95,10 @@
 
     // データをセットする
-    function setData($arrData)
-    {
+    function setData($arrData) {
         $this->arrData = array_values($arrData);
     }
 
     // 円グラフを描画する
-    function drawGraph()
-    {
+    function drawGraph() {
         $x = $this->cx;
         $y = $this->cy;
@@ -117,7 +109,8 @@
         // データの角度を取得する
         $arrRad = $this->getCircleData($this->arrData);
+        $rd_max = count($arrRad);
 
         // データが存在しない場合
-        if (empty($arrRad)) {
+        if ($rd_max <= 0) {
             return;
         }
@@ -135,8 +128,8 @@
         for ($i = ($y + $z - 1); $i >= $y; $i--) {
             $start = 0;
-            foreach ($arrRad as $rad) {
+            for ($j = 0; $j < $rd_max; $j++) {
                 // 角度が0度以上の場合のみ側面を描画する。
-                if ($rad > 0) {
-                    $end = $start + $rad;
+                if ($arrRad[$j] > 0) {
+                    $end = $start + $arrRad[$j];
                     if ($start == 0 && $end == 360) {
                         // -90~270で指定すると円が描画できないので0~360に指定
@@ -155,17 +148,25 @@
         // 上面の描画
         $start = 0;
-        foreach ($arrRad as $key => $rad) {
-            $end = $start + $rad;
-            // 開始・終了が同一値だと、(imagefilledarc 関数における) 0°から360°として動作するようなので、スキップする。
-            // XXX 値ラベルは別ロジックなので、実質問題を生じないと考えている。
-            if ($start == $end) {
-                continue 1;
-            }
-            // -90°は12時の位置から開始するように補正するもの。
-            // 塗りつぶし
-            imagefilledarc($this->image, $x, $y, $w, $h, $start - 90, $end - 90, $this->arrColor[($key % $c_max)], $style);
-            // FIXME 360°描画の場合、(imagefilledarc 関数における) 0°から360°として動作する。本来-90°から360°として動作すべき。
-            //       なお、360°と0°の組み合わせを考慮すると線が無いのも問題があるので、この処理をスキップする対応は不適当である。
-            // 縁取り線
+        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);
+            } else {
+                // -90°は12時の位置から開始するように補正している。
+                imagefilledarc($this->image, $x, $y, $w, $h, $start - 90, $end - 90, $this->arrColor[($i % $c_max)], IMG_ARC_PIE);
+            }
+            $start = $end;
+        }
+
+        // 上面の縁取り
+        $start = 0;
+        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);
+            }
+            // -90°は12時の位置から開始するように補正している。
             imagefilledarc($this->image, $x, $y, $w, $h, $start - 90, $end - 90, $this->flame_color, IMG_ARC_EDGED|IMG_ARC_NOFILL);
             $start = $end;
@@ -176,6 +177,6 @@
         imageline($this->image, $x - ($w / 2), $y, $x - ($w / 2), $y + $z, $this->flame_color);
         $start = 0;
-        foreach ($arrRad as $rad) {
-            $end = $start + $rad;
+        for ($i = 0; $i < $rd_max; $i++) {
+            $end = $start + $arrRad[$i];
             // 前面のみ
             if ($end > 90 && $end < 270) {
@@ -197,15 +198,15 @@
 
     // 円グラフのラベルを描画する
-    function drawLabel($arrRad)
-    {
-        $start = 0;
-        foreach ($arrRad as $key => $rad) {
-            $center = $start + ($rad / 2);
-            $end = $start + $rad;
+    function drawLabel($arrRad) {
+        $rd_max = count($arrRad);
+        $start = 0;
+        for ($i = 0; $i < $rd_max; $i++) {
+            $center = $start + ($arrRad[$i] / 2);
+            $end = $start + $arrRad[$i];
             list($sx, $sy) = $this->lfGetArcPos($this->cx, $this->cy, ($this->cw / 1.5), ($this->ch / 1.5), $center);
             list($ex, $ey) = $this->lfGetArcPos($this->cx, $this->cy, ($this->cw * 1.5), ($this->ch * 1.5), $center);
             // 指示線の描画
             imageline($this->image, $sx, $sy, $ex + 2, $ey - PIE_LABEL_UP, $this->flame_color);
-            $this->setText(FONT_SIZE, $ex - 10, $ey - PIE_LABEL_UP - FONT_SIZE, $this->arrLabel[$key], NULL, 0, true);
+            $this->setText(FONT_SIZE, $ex - 10, $ey - PIE_LABEL_UP - FONT_SIZE, $this->arrLabel[$i], NULL, 0, true);
             $start = $end;
         }
Index: /branches/version-2_12-dev/data/class/SC_Initial.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Initial.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Initial.php	(revision 22796)
@@ -28,6 +28,5 @@
  * @version $Id$
  */
-class SC_Initial 
-{
+class SC_Initial {
 
     // {{{ cunstructor
@@ -36,6 +35,5 @@
      * コンストラクタ.
      */
-    function __construct()
-    {
+    function __construct() {
 
         /** EC-CUBEのバージョン */
@@ -52,6 +50,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->requireInitialConfig();
         $this->defineDSN();                 // requireInitialConfig メソッドより後で実行
@@ -73,6 +70,5 @@
      * @return void
      */
-    function requireInitialConfig()
-    {
+    function requireInitialConfig() {
 
         define('CONFIG_REALFILE', realpath(dirname(__FILE__)) . '/../config/config.php');
@@ -89,6 +85,5 @@
      * @deprecated 下位互換用
      */
-    function defineDSN()
-    {
+    function defineDSN() {
         if (defined('DB_TYPE') && defined('DB_USER') && defined('DB_PASSWORD')
             && defined('DB_SERVER') && defined('DB_PORT') && defined('DB_NAME')
@@ -104,6 +99,5 @@
      * @deprecated
      */
-    function setErrorReporting()
-    {
+    function setErrorReporting() {
         error_reporting(E_ALL & ~E_NOTICE);
         // PHP 5.3.0対応
@@ -121,6 +115,5 @@
      * @return void
      */
-    function phpconfigInit()
-    {
+    function phpconfigInit() {
         ini_set('html_errors', '1');
         ini_set('mbstring.http_input', CHAR_CODE);
@@ -157,6 +150,5 @@
      * @return void
      */
-    function defineDirectoryIndex()
-    {
+    function defineDirectoryIndex() {
 
         // DirectoryIndex の実ファイル名
@@ -189,6 +181,5 @@
      * @return void
      */
-    function defineParameter()
-    {
+    function defineParameter() {
 
         $errorMessage
@@ -233,6 +224,5 @@
      * @return void
      */
-    function complementParameter()
-    {
+    function complementParameter() {
     }
 
@@ -245,6 +235,5 @@
      * @return void
      */
-    function createCacheDir()
-    {
+    function createCacheDir() {
         if (defined('HTML_REALDIR')) {
             umask(0);
@@ -273,6 +262,5 @@
      * @return void
      */
-    function defineConstants()
-    {
+    function defineConstants() {
         // LC_Page_Error用
         /** 指定商品ページがない */
@@ -441,6 +429,5 @@
      * @return void
      */
-    function stripslashesDeepGpc()
-    {
+    function stripslashesDeepGpc() {
         // Strip magic quotes from request data.
         if (get_magic_quotes_gpc()
@@ -472,6 +459,5 @@
      * @return void
      */
-    function resetSuperglobalsRequest()
-    {
+    function resetSuperglobalsRequest() {
         $_REQUEST = array_merge($_GET, $_POST);
     }
@@ -484,6 +470,5 @@
      * @return void
      */
-    function defineIfNotDefined($name, $value = null)
-    {
+    function defineIfNotDefined($name, $value = null) {
         if (!defined($name)) {
             define($name, $value);
@@ -496,6 +481,5 @@
      * @return void
      */
-    function setTimezone()
-    {
+    function setTimezone() {
         date_default_timezone_set('Asia/Tokyo');
     }
Index: /branches/version-2_12-dev/data/class/SC_CartSession.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_CartSession.php	(revision 22707)
+++ /branches/version-2_12-dev/data/class/SC_CartSession.php	(revision 22796)
@@ -28,6 +28,5 @@
  * @version $Id$
  */
-class SC_CartSession 
-{
+class SC_CartSession {
     /** ユニークIDを指定する. */
     var $key_tmp;
@@ -37,6 +36,5 @@
 
     /* コンストラクタ */
-    function __construct($cartKey = 'cart')
-    {
+    function __construct($cartKey = 'cart') {
         if (!isset($_SESSION[$cartKey])) {
             $_SESSION[$cartKey] = array();
@@ -46,6 +44,5 @@
 
     // 商品購入処理中のロック
-    function saveCurrentCart($key_tmp, $productTypeId)
-    {
+    function saveCurrentCart($key_tmp, $productTypeId) {
         $this->key_tmp = 'savecart_' . $key_tmp;
         // すでに情報がなければ現状のカート情報を記録しておく
@@ -62,6 +59,5 @@
 
     // 商品購入中の変更があったかをチェックする。
-    function getCancelPurchase($productTypeId)
-    {
+    function getCancelPurchase($productTypeId) {
         $ret = isset($this->cartSession[$productTypeId]['cancel_purchase'])
             ? $this->cartSession[$productTypeId]['cancel_purchase'] : '';
@@ -71,6 +67,5 @@
 
     // 購入処理中に商品に変更がなかったかを判定
-    function checkChangeCart($productTypeId)
-    {
+    function checkChangeCart($productTypeId) {
         $change = false;
         $max = $this->getMax($productTypeId);
@@ -100,6 +95,5 @@
 
     // 次に割り当てるカートのIDを取得する
-    function getNextCartID($productTypeId)
-    {
+    function getNextCartID($productTypeId) {
         $count = array();
         foreach ($this->cartSession[$productTypeId] as $key => $value) {
@@ -117,6 +111,5 @@
      * @deprecated SC_CartSession::getCartList() を使用してください
      */
-    function getProductTotal($id, $productTypeId)
-    {
+    function getProductTotal($id, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
@@ -136,6 +129,5 @@
 
     // 値のセット
-    function setProductValue($id, $key, $val, $productTypeId)
-    {
+    function setProductValue($id, $key, $val, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
@@ -149,6 +141,5 @@
 
     // カート内商品の最大要素番号を取得する。
-    function getMax($productTypeId)
-    {
+    function getMax($productTypeId) {
         $max = 0;
         if (count($this->cartSession[$productTypeId]) > 0) {
@@ -165,6 +156,5 @@
 
     // カート内商品数量の合計
-    function getTotalQuantity($productTypeId)
-    {
+    function getTotalQuantity($productTypeId) {
         $total = 0;
         $max = $this->getMax($productTypeId);
@@ -176,6 +166,5 @@
 
     // 全商品の合計価格
-    function getAllProductsTotal($productTypeId)
-    {
+    function getAllProductsTotal($productTypeId) {
         // 税込み合計
         $total = 0;
@@ -201,6 +190,5 @@
 
     // 全商品の合計税金
-    function getAllProductsTax($productTypeId)
-    {
+    function getAllProductsTax($productTypeId) {
         // 税合計
         $total = 0;
@@ -216,6 +204,5 @@
 
     // 全商品の合計ポイント
-    function getAllProductsPoint($productTypeId)
-    {
+    function getAllProductsPoint($productTypeId) {
         // ポイント合計
         $total = 0;
@@ -242,6 +229,5 @@
 
     // カートへの商品追加
-    function addProduct($product_class_id, $quantity)
-    {
+    function addProduct($product_class_id, $quantity) {
         $objProduct = new SC_Product_Ex();
         $arrProduct = $objProduct->getProductsClass($product_class_id);
@@ -267,6 +253,5 @@
 
     // 前頁のURLを記録しておく
-    function setPrevURL($url, $excludePaths = array())
-    {
+    function setPrevURL($url, $excludePaths = array()) {
         // 前頁として記録しないページを指定する。
         $arrExclude = array(
@@ -289,12 +274,10 @@
 
     // 前頁のURLを取得する
-    function getPrevURL()
-    {
+    function getPrevURL() {
         return isset($_SESSION['prev_url']) ? $_SESSION['prev_url'] : '';
     }
 
     // キーが一致した商品の削除
-    function delProductKey($keyname, $val, $productTypeId)
-    {
+    function delProductKey($keyname, $val, $productTypeId) {
         $max = count($this->cartSession[$productTypeId]);
         for ($i = 0; $i < $max; $i++) {
@@ -305,11 +288,9 @@
     }
 
-    function setValue($key, $val, $productTypeId)
-    {
+    function setValue($key, $val, $productTypeId) {
         $this->cartSession[$productTypeId][$key] = $val;
     }
 
-    function getValue($key, $productTypeId)
-    {
+    function getValue($key, $productTypeId) {
         return $this->cartSession[$productTypeId][$key];
     }
@@ -319,6 +300,5 @@
      * productsClass項目から、不必要な項目を削除する。
      */
-    function adjustSessionProductsClass(&$arrProductsClass)
-    {
+    function adjustSessionProductsClass(&$arrProductsClass) {
         $arrNecessaryItems = array(
             'product_id'          => true,
@@ -353,6 +333,5 @@
      * @return array カート内商品一覧の配列
      */
-    function getCartList($productTypeId)
-    {
+    function getCartList($productTypeId) {
         $objProduct = new SC_Product_Ex();
         $max = $this->getMax($productTypeId);
@@ -394,6 +373,5 @@
      * @return array すべてのカートの内容
      */
-    function getAllCartList()
-    {
+    function getAllCartList() {
         $results = array();
         $cartKeys = $this->getKeys();
@@ -411,4 +389,11 @@
 
     /**
+     * @deprected getAllProductClassID を使用して下さい
+     */
+    function getAllProductID($productTypeId) {
+        trigger_error('正しく動作しないメソッドが呼び出されました。', E_USER_ERROR);
+    }
+
+    /**
      * カート内にある商品規格IDを全て取得する.
      *
@@ -416,6 +401,5 @@
      * @return array 商品規格ID の配列
      */
-    function getAllProductClassID($productTypeId)
-    {
+    function getAllProductClassID($productTypeId) {
         $max = $this->getMax($productTypeId);
         $productClassIDs = array();
@@ -434,6 +418,5 @@
      * @return void
      */
-    function delAllProducts($productTypeId)
-    {
+    function delAllProducts($productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
@@ -443,6 +426,5 @@
 
     // 商品の削除
-    function delProduct($cart_no, $productTypeId)
-    {
+    function delProduct($cart_no, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
@@ -454,6 +436,5 @@
 
     // 数量の増加
-    function upQuantity($cart_no, $productTypeId)
-    {
+    function upQuantity($cart_no, $productTypeId) {
         $quantity = $this->getQuantity($cart_no, $productTypeId);
         if (strlen($quantity + 1) <= INT_LEN) {
@@ -463,6 +444,5 @@
 
     // 数量の減少
-    function downQuantity($cart_no, $productTypeId)
-    {
+    function downQuantity($cart_no, $productTypeId) {
         $quantity = $this->getQuantity($cart_no, $productTypeId);
         if ($quantity > 1) {
@@ -478,6 +458,5 @@
      * @return integer 該当商品規格の数量
      */
-    function getQuantity($cart_no, $productTypeId)
-    {
+    function getQuantity($cart_no, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
@@ -496,6 +475,5 @@
      * @retrun void
      */
-    function setQuantity($quantity, $cart_no, $productTypeId)
-    {
+    function setQuantity($quantity, $cart_no, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
@@ -513,6 +491,5 @@
      * @return integer 商品規格ID
      */
-    function getProductClassId($cart_no, $productTypeId)
-    {
+    function getProductClassId($cart_no, $productTypeId) {
         for ($i = 0; $i < count($this->cartSession[$productTypeId]); $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) {
@@ -536,9 +513,6 @@
      * @return string エラーが発生した場合はエラーメッセージ
      */
-    function checkProducts($productTypeId)
-    {
+    function checkProducts($productTypeId) {
         $objProduct = new SC_Product_Ex();
-        $objDelivery = new SC_Helper_Delivery_Ex();
-        $arrDeliv = $objDelivery->getList($productTypeId);
         $tpl_message = '';
 
@@ -558,4 +532,5 @@
                  * 配送業者のチェック
                  */
+                $arrDeliv = SC_Helper_Purchase_Ex::getDeliv($productTypeId);
                 if (SC_Utils_Ex::isBlank($arrDeliv)) {
                     $tpl_message .= '※「' . $product['name'] . '」はまだ配送の準備ができておりません。';
@@ -592,6 +567,5 @@
      * @return boolean 送料無料の場合 true
      */
-    function isDelivFree($productTypeId)
-    {
+    function isDelivFree($productTypeId) {
         $objDb = new SC_Helper_DB_Ex();
 
@@ -652,8 +626,4 @@
         $results['deliv_fee'] = 0;
 
-        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
-        $results['order_tax_rate'] = $arrInfo['tax'];
-        $results['order_tax_rule'] = $arrInfo['tax_rule'];
-
         // 商品ごとの送料を加算
         if (OPTION_PRODUCT_DELIV_FEE == 1) {
@@ -668,5 +638,5 @@
             && !SC_Utils_Ex::isBlank($deliv_pref)
             && !SC_Utils_Ex::isBlank($deliv_id)) {
-            $results['deliv_fee'] += SC_Helper_Delivery_Ex::getDelivFee($deliv_pref, $deliv_id);
+            $results['deliv_fee'] += $this->sfGetDelivFee($deliv_pref, $deliv_id);
         }
 
@@ -707,6 +677,5 @@
      * @return array 商品種別IDの配列
      */
-    function getKeys()
-    {
+    function getKeys() {
         $keys = array_keys($this->cartSession);
         // 数量が 0 の商品種別は削除する
@@ -726,6 +695,5 @@
      * @return void
      */
-    function registerKey($key)
-    {
+    function registerKey($key) {
         $_SESSION['cartKey'] = $key;
     }
@@ -736,6 +704,5 @@
      * @return void
      */
-    function unsetKey()
-    {
+    function unsetKey() {
         unset($_SESSION['cartKey']);
     }
@@ -746,6 +713,5 @@
      * @return integer 商品種別ID
      */
-    function getKey()
-    {
+    function getKey() {
         return $_SESSION['cartKey'];
     }
@@ -756,6 +722,5 @@
      * @return boolean カートが複数商品種別の場合 true
      */
-    function isMultiple()
-    {
+    function isMultiple() {
         return count($this->getKeys()) > 1;
     }
@@ -767,7 +732,35 @@
      * @return boolean 指定の商品種別がカートに含まれる場合 true
      */
-    function hasProductType($product_type_id)
-    {
+    function hasProductType($product_type_id) {
         return in_array($product_type_id, $this->getKeys());
     }
+
+    /**
+     * 都道府県から配送料金を取得する.
+     *
+     * @param integer|array $pref_id 都道府県ID 又は都道府県IDの配列
+     * @param integer $deliv_id 配送業者ID
+     * @return string 指定の都道府県, 配送業者の配送料金
+     */
+    function sfGetDelivFee($pref_id, $deliv_id = 0) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        if (!is_array($pref_id)) {
+            $pref_id = array($pref_id);
+        }
+        $sql = <<< __EOS__
+            SELECT T1.fee AS fee
+            FROM dtb_delivfee T1
+                JOIN dtb_deliv T2
+                    ON T1.deliv_id = T2.deliv_id
+            WHERE T1.pref = ?
+                AND T1.deliv_id = ?
+                AND T2.del_flg = 0
+__EOS__;
+        $result = 0;
+        foreach ($pref_id as $pref) {
+            $result += $objQuery->getOne($sql, array($pref, $deliv_id));
+        }
+        return $result;
+    }
+
 }
Index: /branches/version-2_12-dev/data/class/SC_CustomerList.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_CustomerList.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_CustomerList.php	(revision 22796)
@@ -25,11 +25,9 @@
  *  [概要] 会員検索用クラス
  */
-class SC_CustomerList extends SC_SelectSql_Ex 
-{
+class SC_CustomerList extends SC_SelectSql_Ex {
 
     var $arrColumnCSV;
 
-    function __construct($array, $mode = '')
-    {
+    function __construct($array, $mode = '') {
         parent::__construct($array);
 
@@ -329,12 +327,10 @@
 
     // 検索用SQL
-    function getList()
-    {
+    function getList() {
         $this->select = 'SELECT customer_id,name01,name02,kana01,kana02,sex,email,email_mobile,tel01,tel02,tel03,pref,status,update_date,mailmaga_flg FROM dtb_customer ';
-        return $this->getSql(2);
-    }
-
-    function getListMailMagazine($is_mobile = false)
-    {
+        return $this->getSql(0);
+    }
+
+    function getListMailMagazine($is_mobile = false) {
 
         $colomn = $this->getMailMagazineColumn($is_mobile);
@@ -348,6 +344,5 @@
 
     // 検索総数カウント用SQL
-    function getListCount()
-    {
+    function getListCount() {
         $this->select = 'SELECT COUNT(customer_id) FROM dtb_customer ';
         return $this->getSql(1);
@@ -355,6 +350,5 @@
 
     // CSVダウンロード用SQL
-    function getListCSV($arrColumnCSV)
-    {
+    function getListCSV($arrColumnCSV) {
         $this->arrColumnCSV = $arrColumnCSV;
         $i = 0;
@@ -369,6 +363,5 @@
     }
 
-    function getWhere()
-    {
+    function getWhere() {
         return array($this->where, $this->arrVal);
     }
Index: /branches/version-2_12-dev/data/class/SC_SelectSql.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_SelectSql.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_SelectSql.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 /* ---- SQL文を作るクラス ---- */
-class SC_SelectSql 
-{
+class SC_SelectSql {
 
     var $sql;
@@ -36,6 +35,5 @@
 
     //--　コンストラクタ。
-    function __construct($array = '')
-    {
+    function __construct($array = '') {
         if (is_array($array)) {
             $this->arrSql = $array;
@@ -44,6 +42,5 @@
 
     //-- SQL分生成
-    function getSql($mode = '')
-    {
+    function getSql($mode = '') {
         $this->sql = $this->select .' '. $this->where .' '. $this->group .' ';
 
@@ -56,6 +53,5 @@
 
         // 検索用
-    function addSearchStr($val)
-    {
+    function addSearchStr($val) {
         $return = '%' .$val. '%';
         return $return;
@@ -63,6 +59,5 @@
 
     //-- 範囲検索（○　~　○　まで）
-    function selectRange($from, $to, $column)
-    {
+    function selectRange($from, $to, $column) {
 
         // ある単位のみ検索($from = $to)
@@ -87,6 +82,5 @@
 
     //--　期間検索（○年○月○日か~○年○月○日まで）
-    function selectTermRange($from_year, $from_month, $from_day, $to_year, $to_month, $to_day, $column)
-    {
+    function selectTermRange($from_year, $from_month, $from_day, $to_year, $to_month, $to_day, $column) {
         $return = array();
 
@@ -127,6 +121,5 @@
 
     // checkboxなどで同一カラム内で単一、もしくは複数選択肢が有る場合　例: AND ( sex = xxx OR sex = xxx OR sex = xxx) AND ...
-    function setItemTerm($arr, $ItemStr)
-    {
+    function setItemTerm($arr, $ItemStr) {
         $return = array();
         foreach ($arr as $data) {
@@ -153,6 +146,5 @@
 
     //　NULL値が必要な場合
-    function setItemTermWithNull($arr, $ItemStr)
-    {
+    function setItemTermWithNull($arr, $ItemStr) {
         $return = array();
         $item = " {$ItemStr} IS NULL ";
@@ -172,6 +164,5 @@
     }
     // NULLもしくは''で検索する場合
-    function setItemTermWithNullAndSpace($arr, $ItemStr)
-    {
+    function setItemTermWithNullAndSpace($arr, $ItemStr) {
         $return = array();
         $count = count($arr);
@@ -198,6 +189,5 @@
 
     */
-    function setWhereByOR($arrWhere)
-    {
+    function setWhereByOR($arrWhere) {
 
         $count = count($arrWhere);
@@ -221,6 +211,5 @@
     }
 
-    function setWhere($where)
-    {
+    function setWhere($where) {
         if ($where != '') {
             if ($this->where) {
@@ -235,6 +224,5 @@
     }
 
-    function setOrder($order)
-    {
+    function setOrder($order) {
 
             $this->order =  'ORDER BY ' . $order;
@@ -242,6 +230,5 @@
     }
 
-    function setGroup($group)
-    {
+    function setGroup($group) {
 
         $this->group =  'GROUP BY ' . $group;
@@ -249,6 +236,5 @@
     }
 
-    function clearSql()
-    {
+    function clearSql() {
         $this->select = '';
         $this->where = '';
@@ -257,6 +243,5 @@
     }
 
-    function setSelect($sql)
-    {
+    function setSelect($sql) {
         $this->select = $sql;
     }
Index: /branches/version-2_12-dev/data/class/SC_Customer.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Customer.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Customer.php	(revision 22796)
@@ -25,12 +25,10 @@
  *  [概要] 会員管理クラス
  */
-class SC_Customer 
-{
+class SC_Customer {
 
     /** 会員情報 */
     var $customer_data;
 
-    function getCustomerDataFromEmailPass($pass, $email, $mobile = false)
-    {
+    function getCustomerDataFromEmailPass($pass, $email, $mobile = false) {
         // 小文字に変換
         $email = strtolower($email);
@@ -65,6 +63,5 @@
      *                 は false を返す。
      */
-    function checkMobilePhoneId()
-    {
+    function checkMobilePhoneId() {
         //docomo用にデータを取り出す。
         if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') {
@@ -91,6 +88,5 @@
      *                 それ以外の場合は false を返す。
      */
-    function getCustomerDataFromMobilePhoneIdPass($pass)
-    {
+    function getCustomerDataFromMobilePhoneIdPass($pass) {
         //docomo用にデータを取り出す。
         if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') {
@@ -122,6 +118,5 @@
      * @return void
      */
-    function updateMobilePhoneId()
-    {
+    function updateMobilePhoneId() {
         if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) {
             return;
@@ -141,6 +136,5 @@
 
     // パスワードを確認せずにログイン
-    function setLogin($email)
-    {
+    function setLogin($email) {
         // 本登録された会員のみ
         $sql = 'SELECT * FROM dtb_customer WHERE (email = ? OR email_mobile = ?) AND del_flg = 0 AND status = 2';
@@ -153,6 +147,5 @@
 
     // セッション情報を最新の情報に更新する
-    function updateSession()
-    {
+    function updateSession() {
         $sql = 'SELECT * FROM dtb_customer WHERE customer_id = ? AND del_flg = 0';
         $customer_id = $this->getValue('customer_id');
@@ -164,6 +157,5 @@
 
     // ログイン情報をセッションに登録し、ログに書き込む
-    function startSession()
-    {
+    function startSession() {
         $_SESSION['customer'] = $this->customer_data;
         // セッション情報の保存
@@ -172,6 +164,5 @@
 
     // ログアウト　$_SESSION['customer']を解放し、ログに書き込む
-    function EndSession()
-    {
+    function EndSession() {
         // セッション情報破棄の前にcustomer_idを保存
         $customer_id = $_SESSION['customer']['customer_id'];
@@ -193,6 +184,5 @@
 
     // ログインに成功しているか判定する。
-    function isLoginSuccess($dont_check_email_mobile = false)
-    {
+    function isLoginSuccess($dont_check_email_mobile = false) {
         // ログイン時のメールアドレスとDBのメールアドレスが一致している場合
         if (isset($_SESSION['customer']['customer_id'])
@@ -215,6 +205,5 @@
 
     // パラメーターの取得
-    function getValue($keyname)
-    {
+    function getValue($keyname) {
         // ポイントはリアルタイム表示
         if ($keyname == 'point') {
@@ -229,12 +218,10 @@
 
     // パラメーターのセット
-    function setValue($keyname, $val)
-    {
+    function setValue($keyname, $val) {
         $_SESSION['customer'][$keyname] = $val;
     }
 
     // パラメーターがNULLかどうかの判定
-    function hasValue($keyname)
-    {
+    function hasValue($keyname) {
         if (isset($_SESSION['customer'][$keyname])) {
             return !SC_Utils_Ex::isBlank($_SESSION['customer'][$keyname]);
@@ -244,6 +231,5 @@
 
     // 誕生日月であるかどうかの判定
-    function isBirthMonth()
-    {
+    function isBirthMonth() {
         if (isset($_SESSION['customer']['birth'])) {
             $arrRet = preg_split('|[- :/]|', $_SESSION['customer']['birth']);
@@ -266,6 +252,5 @@
      * @return string $_SERVER['REMOTE_HOST'] 又は $_SERVER['REMOTE_ADDR']の文字列
      */
-    function getRemoteHost()
-    {
+    function getRemoteHost() {
 
         if (!empty($_SERVER['REMOTE_HOST'])) {
@@ -279,6 +264,5 @@
 
     //受注関連の会員情報を更新
-    function updateOrderSummary($customer_id)
-    {
+    function updateOrderSummary($customer_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrOrderSummary =  $objQuery->getRow('SUM( payment_total) as buy_total, COUNT(order_id) as buy_times,MAX( create_date) as last_buy_date, MIN(create_date) as first_buy_date','dtb_order','customer_id = ? AND del_flg = 0 AND status <> ?',array($customer_id,ORDER_CANCEL));
@@ -298,6 +282,5 @@
      * @return boolean ログインに成功した場合 true; 失敗した場合 false
      */
-    function doLogin($login_email, $login_pass)
-    {
+    function doLogin($login_email, $login_pass) {
         switch (SC_Display_Ex::detectDevice()) {
             case DEVICE_TYPE_MOBILE:
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 22592)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id$
  */
-class SC_Helper_Mobile 
-{
+class SC_Helper_Mobile {
 
     /** 基本MimeType */
@@ -82,6 +81,5 @@
      * @return void
      */
-    function lfMobileCheckCompatibility()
-    {
+    function lfMobileCheckCompatibility() {
         if (!SC_MobileUserAgent_Ex::isSupported()) {
             header('Location: ' . ROOT_URLPATH . 'unsupported/' . DIR_INDEX_PATH);
@@ -96,6 +94,5 @@
      * @return void
      */
-    function lfMobileConvertInputValue(&$value)
-    {
+    function lfMobileConvertInputValue(&$value) {
         if (is_array($value)) {
             foreach ($value as $key => $val) {
@@ -116,6 +113,5 @@
      * @return void
      */
-    function lfMobileInitInput()
-    {
+    function lfMobileInitInput() {
         array_walk($_GET, array($this, 'lfMobileConvertInputValue'));
         array_walk($_POST, array($this, 'lfMobileConvertInputValue'));
@@ -129,7 +125,6 @@
      *                     取得できなかった場合は null を返す。
      */
-    function lfMobileGetExtSessionId()
-    {
-        if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
+    function lfMobileGetExtSessionId() {
+        if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches = array())) {
             return null;
         }
@@ -157,6 +152,5 @@
      *                      取得できなかった場合は false を返す。
      */
-    function lfMobileGetSessionId()
-    {
+    function lfMobileGetSessionId() {
         // パラメーターからセッションIDを取得する。
         $sessionId = @$_POST[session_name()];
@@ -187,6 +181,5 @@
      * @return boolean セッションデータが有効な場合は true、無効な場合は false を返す。
      */
-    function lfMobileValidateSession()
-    {
+    function lfMobileValidateSession() {
         // 配列 mobile が登録されているかどうかをチェックする。
         if (!is_array(@$_SESSION['mobile'])) {
@@ -228,6 +221,5 @@
      * @return void
      */
-    function lfMobileInitOutput()
-    {
+    function lfMobileInitOutput() {
         // 出力用のエンコーディングを Shift JIS に固定する。
         mb_http_output('SJIS-win');
@@ -251,6 +243,5 @@
      * @return void
      */
-    function sfMobileInit()
-    {
+    function sfMobileInit() {
         $this->lfMobileInitInput();
 
@@ -267,6 +258,5 @@
      * @return String
      */
-    function gfAddSessionId($url = null)
-    {
+    function gfAddSessionId($url = null) {
         $objURL = new Net_URL($url);
         $objURL->addQueryString(session_name(), session_id());
@@ -280,6 +270,5 @@
      * @param array セッション ID を追加した配列
      */
-    function sessionIdArray($array = array())
-    {
+    function sessionIdArray($array = array()) {
         return array_merge($array, array(session_name() => session_id()));
     }
@@ -290,6 +279,5 @@
      * @return string 生成したトークンを返す。
      */
-    function lfGenerateKaraMailToken()
-    {
+    function lfGenerateKaraMailToken() {
         $token_chars = '0123456789abcdefghijklmnopqrstuvwxyz';
         $token_chars_length = strlen($token_chars);
@@ -312,6 +300,5 @@
      * @return string|false トークンを返す。エラーが発生した場合はfalseを返す。
      */
-    function gfPrepareKaraMail($next_url, $session_id = null)
-    {
+    function gfPrepareKaraMail($next_url, $session_id = null) {
         if (!isset($session_id)) {
             $session_id = session_id();
@@ -359,6 +346,5 @@
      * @return boolean 成功した場合はtrue、失敗した場合はfalseを返す。
      */
-    function gfRegisterKaraMail($token, $email)
-    {
+    function gfRegisterKaraMail($token, $email) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -390,6 +376,5 @@
      * @return string|false URLを返す。エラーが発生した場合はfalseを返す。
      */
-    function gfFinishKaraMail($token)
-    {
+    function gfFinishKaraMail($token) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -429,6 +414,5 @@
      * @return void
      */
-    function sfMobileSetExtSessionId($param_key, $param_value, $url)
-    {
+    function sfMobileSetExtSessionId($param_key, $param_value, $url) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -453,6 +437,5 @@
      * @return boolean 携帯のメールアドレスの場合はtrue、それ以外の場合はfalseを返す。
      */
-    function gfIsMobileMailAddress($address)
-    {
+    function gfIsMobileMailAddress($address) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrMobileMailDomains = $masterData->getMasterData('mtb_mobile_domain');
@@ -474,6 +457,5 @@
      * @return string MIMEタイプ
      */
-    function getMimeType($filename)
-    {
+    function getMimeType($filename) {
         //ファイルの拡張子からコンテンツタイプを決定する
         $file_extension = strtolower(substr(strrchr($filename,'.'),1));
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 22567)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id$
  */
-class SC_Helper_FileManager 
-{
+class SC_Helper_FileManager {
 
     /**
@@ -38,6 +37,5 @@
      * @return void
      */
-    function sfGetFileList($dir)
-    {
+    function sfGetFileList($dir) {
         $arrFileList = array();
         $arrDirList = array();
@@ -93,6 +91,5 @@
      * @return void
      */
-    function sfGetDirSize($dir)
-    {
+    function sfGetDirSize($dir) {
         $bytes = 0;
         if (file_exists($dir)) {
@@ -132,6 +129,5 @@
      * @return array ツリー生成用の配列
      */
-    function sfGetFileTree($dir, $tree_status)
-    {
+    function sfGetFileTree($dir, $tree_status) {
 
         $cnt = 0;
@@ -174,6 +170,5 @@
      * @return array ツリー生成用の配列
      */
-    function sfGetFileTreeSub($dir, $default_rank, &$cnt, &$arrTree, $tree_status)
-    {
+    function sfGetFileTreeSub($dir, $default_rank, &$cnt, &$arrTree, $tree_status) {
 
         if (file_exists($dir)) {
@@ -222,6 +217,5 @@
      * @return bool ファイルが存在する場合 true
      */
-    function sfDirChildExists($dir)
-    {
+    function sfDirChildExists($dir) {
         if (file_exists($dir)) {
             if (is_dir($dir)) {
@@ -249,6 +243,5 @@
      * @return bool 前回開かれた状態の場合 true
      */
-    function lfIsFileOpen($dir, $tree_status)
-    {
+    function lfIsFileOpen($dir, $tree_status) {
         $arrTreeStatus = explode('|', $tree_status);
         if (in_array($dir, $arrTreeStatus)) {
@@ -265,6 +258,5 @@
      * @return void
      */
-    function sfDownloadFile($file)
-    {
+    function sfDownloadFile($file) {
         // ファイルの場合はダウンロードさせる
         Header('Content-disposition: attachment; filename='.basename($file));
@@ -282,6 +274,5 @@
      * @return bool ファイル作成に成功した場合 true
      */
-    function sfCreateFile($file, $mode = '')
-    {
+    function sfCreateFile($file, $mode = '') {
         // 行末の/を取り除く
         if ($mode != '') {
@@ -300,6 +291,5 @@
      * @return string ファイルの内容
      */
-    function sfReadFile($filename)
-    {
+    function sfReadFile($filename) {
         $str = '';
         // バイナリモードでオープン
@@ -321,6 +311,5 @@
      * @return boolean ファイルの書き込みに成功した場合 true
      */
-    function sfWriteFile($filename, $value)
-    {
+    function sfWriteFile($filename, $value) {
         if (!is_dir(dirname($filename))) {
             SC_Utils_Ex::recursiveMkdir(dirname($filename), 0777);
@@ -343,6 +332,5 @@
      * @return boolean 成功した場合 true; 失敗した場合 false
      */
-    function downloadArchiveFiles($dir, $template_code)
-    {
+    function downloadArchiveFiles($dir, $template_code) {
         // ダウンロードされるファイル名
         $dlFileName = 'tpl_package_' . $template_code . '_' . date('YmdHis') . '.tar.gz';
@@ -382,6 +370,5 @@
      * @return boolean Archive_Tar::extractModify()のエラー
      */
-    function unpackFile($path)
-    {
+    function unpackFile($path) {
         // 圧縮フラグTRUEはgzip解凍をおこなう
         $tar = new Archive_Tar($path, true);
@@ -411,6 +398,5 @@
      * @return void
      */
-    function deleteFile($path, $del_myself = true)
-    {
+    function deleteFile($path, $del_myself = true) {
         $flg = false;
         // 対象が存在するかを検証.
Index: /branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php	(revision 22610)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id:SC_Helper_PageLayout.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_PageLayout 
-{
+class SC_Helper_PageLayout {
 
     // }}}
@@ -48,6 +47,5 @@
      * @return void
      */
-    function sfGetPageLayout(&$objPage, $preview = false, $url = '', $device_type_id = DEVICE_TYPE_PC)
-    {
+    function sfGetPageLayout(&$objPage, $preview = false, $url = '', $device_type_id = DEVICE_TYPE_PC) {
 
         // URLを元にページ情報を取得
@@ -89,5 +87,5 @@
                         . 'tpl_path: ' . $arrBloc['tpl_path'] . "\n"
                         . 'php_path: ' . $arrBloc['php_path'];
-                    trigger_error($error, E_USER_WARNING);
+                    GC_Utils_Ex::gfPrintLog($error);
                 }
             }
@@ -111,6 +109,5 @@
      * @return array ページ属性の配列
      */
-    function getPageProperties($device_type_id = DEVICE_TYPE_PC, $page_id = null, $where = '', $arrParams = array())
-    {
+    function getPageProperties($device_type_id = DEVICE_TYPE_PC, $page_id = null, $where = '', $arrParams = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
@@ -136,8 +133,10 @@
      * @return array ブロック情報の配列
      */
-    function getBlocs($device_type_id = DEVICE_TYPE_PC, $where = '', $arrParams = array(), $has_realpath = true)
-    {
-        $objBloc = new SC_Helper_Bloc_Ex($device_type_id);
-        $arrBlocs = $objBloc->getWhere($where, $arrParams);
+    function getBlocs($device_type_id = DEVICE_TYPE_PC, $where = '', $arrParams = array(), $has_realpath = true) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
+        $arrParams = array_merge(array($device_type_id), $arrParams);
+        $objQuery->setOrder('bloc_id');
+        $arrBlocs = $objQuery->select('*', 'dtb_bloc', $where, $arrParams);
         if ($has_realpath) {
             $this->setBlocPathTo($device_type_id, $arrBlocs);
@@ -155,6 +154,5 @@
      * @return array 配置情報を含めたブロックの配列
      */
-    function getBlocPositions($device_type_id, $page_id, $has_realpath = true)
-    {
+    function getBlocPositions($device_type_id, $page_id, $has_realpath = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = <<< __EOF__
@@ -170,16 +168,4 @@
             $this->setBlocPathTo($device_type_id, $arrBlocs);
         }
-        
-        //全ページ設定と各ページのブロックの重複を削除
-        foreach ($arrBlocs as $index => $arrBloc) {
-            if($arrBloc['anywhere'] == 1){
-                $arrUniqBlocIds[] = $arrBloc['bloc_id'];
-            }
-        }
-        foreach ($arrBlocs as $bloc_index => $arrBlocData) {
-            if(in_array($arrBlocData['bloc_id'], $arrUniqBlocIds) && $arrBlocData['anywhere'] == 0){
-                unset($arrBlocs[$bloc_index]);
-            }
-        }
         return $arrBlocs;
     }
@@ -195,6 +181,5 @@
      * @return integer 削除数
      */
-    function lfDelPageData($page_id, $device_type_id = DEVICE_TYPE_PC)
-    {
+    function lfDelPageData($page_id, $device_type_id = DEVICE_TYPE_PC) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // page_id が空でない場合にはdeleteを実行
@@ -218,6 +203,5 @@
      * @return void // TODO boolean にするべき?
      */
-    function lfDelFile($filename, $device_type_id)
-    {
+    function lfDelFile($filename, $device_type_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -251,6 +235,5 @@
      * @return 編集可能ページの場合 true
      */
-    function isEditablePage($device_type_id, $page_id)
-    {
+    function isEditablePage($device_type_id, $page_id) {
         if ($page_id == 0) {
             return false;
@@ -271,6 +254,5 @@
      * @return string テンプレートのパス
      */
-    function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false)
-    {
+    function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false) {
         $templateName = '';
         switch ($device_type_id) {
@@ -309,6 +291,5 @@
      * @return string 端末に応じた DocumentRoot から user_data までのパス
      */
-    function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false)
-    {
+    function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false) {
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
@@ -342,6 +323,5 @@
      * @return void
      */
-    function setBlocPathTo($device_type_id = DEVICE_TYPE_PC, &$arrBlocs = array())
-    {
+    function setBlocPathTo($device_type_id = DEVICE_TYPE_PC, &$arrBlocs = array()) {
         foreach ($arrBlocs as $key => $value) {
             $arrBloc =& $arrBlocs[$key];
@@ -359,6 +339,5 @@
      * @return integer $col_num カラム数
      */
-    function getColumnNum($arrPageLayout)
-    {
+    function getColumnNum($arrPageLayout) {
         // メインは確定
         $col_num = 1;
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 22568)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class SC_Helper_Purchase 
-{
+class SC_Helper_Purchase {
 
     var $arrShippingKey = array(
@@ -61,6 +60,5 @@
      * @return void
      */
-    function completeOrder($orderStatus = ORDER_NEW)
-    {
+    function completeOrder($orderStatus = ORDER_NEW) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objSiteSession = new SC_SiteSession_Ex();
@@ -117,6 +115,5 @@
      * @return void
      */
-    function cancelOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false)
-    {
+    function cancelOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $in_transaction = $objQuery->inTransaction();
@@ -160,6 +157,5 @@
      * @return string 受注一時ID
      */
-    function rollbackOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false)
-    {
+    function rollbackOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $in_transaction = $objQuery->inTransaction();
@@ -203,6 +199,5 @@
      * @return void
      */
-    function verifyChangeCart($uniqId, &$objCartSession)
-    {
+    function verifyChangeCart($uniqId, &$objCartSession) {
         $cartKey = $objCartSession->getKey();
 
@@ -239,6 +234,5 @@
      * @return array 受注一時情報の配列
      */
-    function getOrderTemp($uniqId)
-    {
+    function getOrderTemp($uniqId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->getRow('*', 'dtb_order_temp', 'order_temp_id = ?', array($uniqId));
@@ -251,6 +245,5 @@
      * @return array 受注一時情報の配列
      */
-    function getOrderTempByOrderId($order_id)
-    {
+    function getOrderTempByOrderId($order_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->getRow('*', 'dtb_order_temp', 'order_id = ?', array($order_id));
@@ -265,8 +258,7 @@
      * @param array $params 登録する受注情報の配列
      * @param SC_Customer $objCustomer SC_Customer インスタンス
-     * @return void
-     */
-    function saveOrderTemp($uniqId, $params, &$objCustomer = NULL)
-    {
+     * @return array void
+     */
+    function saveOrderTemp($uniqId, $params, &$objCustomer = NULL) {
         if (SC_Utils_Ex::isBlank($uniqId)) {
             return;
@@ -303,6 +295,5 @@
      * @param bool $has_shipment_item 配送商品を保有している配送先のみ返す。
      */
-    function getShippingTemp($has_shipment_item = false)
-    {
+    function getShippingTemp($has_shipment_item = false) {
         if ($has_shipment_item) {
             $arrReturn = array();
@@ -323,6 +314,5 @@
      * @return void
      */
-    function clearShipmentItemTemp($shipping_id = null)
-    {
+    function clearShipmentItemTemp($shipping_id = null) {
         if (is_null($shipping_id)) {
             foreach ($_SESSION['shipping'] as $key => $value) {
@@ -344,6 +334,5 @@
      * @return void
      */
-    function setShipmentItemTemp($shipping_id, $product_class_id, $quantity)
-    {
+    function setShipmentItemTemp($shipping_id, $product_class_id, $quantity) {
         // 配列が長くなるので, リファレンスを使用する
         $arrItems =& $_SESSION['shipping'][$shipping_id]['shipment_item'][$product_class_id];
@@ -375,6 +364,5 @@
      * 配送先都道府県の配列を返す.
      */
-    function getShippingPref($is_multiple)
-    {
+    function getShippingPref($is_multiple) {
         $results = array();
         foreach (SC_Helper_Purchase_Ex::getShippingTemp($is_multiple) as $val) {
@@ -389,6 +377,5 @@
      * @return boolean 複数配送指定の購入の場合 true
      */
-    function isMultiple()
-    {
+    function isMultiple() {
         return count(SC_Helper_Purchase_Ex::getShippingTemp(true)) >= 2;
     }
@@ -402,6 +389,5 @@
      * @return void
      */
-    function saveShippingTemp($arrSrc, $shipping_id = 0)
-    {
+    function saveShippingTemp($arrSrc, $shipping_id = 0) {
         // 配送商品は引き継がない
         unset($arrSrc['shipment_item']);
@@ -421,6 +407,5 @@
      * @return void
      */
-    function unsetShippingTemp()
-    {
+    function unsetShippingTemp() {
         SC_Helper_Purchase_Ex::unsetAllShippingTemp(true);
     }
@@ -432,6 +417,5 @@
      * @return void
      */
-    static function unsetAllShippingTemp($multiple_temp = false)
-    {
+    static function unsetAllShippingTemp($multiple_temp = false) {
         unset($_SESSION['shipping']);
         if ($multiple_temp) {
@@ -446,6 +430,5 @@
      * @return void
      */
-    static function unsetOneShippingTemp($shipping_id)
-    {
+    static function unsetOneShippingTemp($shipping_id) {
         unset($_SESSION['shipping'][$shipping_id]);
     }
@@ -509,6 +492,5 @@
      * @return void
      */
-    function copyFromOrder(&$dest, $src, $prefix = 'shipping', $src_prefix = 'order', $arrKey = null)
-    {
+    function copyFromOrder(&$dest, $src, $prefix = 'shipping', $src_prefix = 'order', $arrKey = null) {
         if (is_null($arrKey)) {
             $arrKey = $this->arrShippingKey;
@@ -533,6 +515,5 @@
      * @return void
      */
-    function extractShipping($arrSrc)
-    {
+    function extractShipping($arrSrc) {
         $arrKey = array();
         foreach ($this->arrShippingKey as $key) {
@@ -543,8 +524,68 @@
 
     /**
+     * 購入金額に応じた支払方法を取得する.
+     *
+     * @param integer $total 購入金額
+     * @param integer $deliv_id 配送業者ID
+     * @return array 購入金額に応じた支払方法の配列
+     */
+    function getPaymentsByPrice($total, $deliv_id) {
+
+        $arrPaymentIds = $this->getPayments($deliv_id);
+        if (SC_Utils_Ex::isBlank($arrPaymentIds)) {
+            return array();
+        }
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // 削除されていない支払方法を取得
+        $where = 'del_flg = 0 AND payment_id IN (' . SC_Utils_Ex::repeatStrWithSeparator('?', count($arrPaymentIds)) . ')';
+        $objQuery->setOrder('rank DESC');
+        $payments = $objQuery->select('payment_id, payment_method, rule_max, upper_rule, note, payment_image, charge', 'dtb_payment', $where, $arrPaymentIds);
+        $arrPayment = array();
+        foreach ($payments as $data) {
+            // 下限と上限が設定されている
+            if (strlen($data['rule_max']) != 0 && strlen($data['upper_rule']) != 0) {
+                if ($data['rule_max'] <= $total && $data['upper_rule'] >= $total) {
+                    $arrPayment[] = $data;
+                }
+            }
+            // 下限のみ設定されている
+            elseif (strlen($data['rule_max']) != 0) {
+                if ($data['rule_max'] <= $total) {
+                    $arrPayment[] = $data;
+                }
+            }
+            // 上限のみ設定されている
+            elseif (strlen($data['upper_rule']) != 0) {
+                if ($data['upper_rule'] >= $total) {
+                    $arrPayment[] = $data;
+                }
+            }
+            // いずれも設定なし
+            else {
+                $arrPayment[] = $data;
+            }
+        }
+        return $arrPayment;
+    }
+
+    /**
+     * 支払方法の詳細を取得する.
+     *
+     * @param integer $payment_id お支払い方法
+     * @return array 支払方法詳細の配列
+     */
+    function getPaymentsByPaymentsId($payment_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $where = 'payment_id = ? AND del_flg = 0';
+        $arrValues = array($payment_id);
+        return $objQuery->getRow('*', 'dtb_payment', $where, $arrValues);
+    }
+
+    /**
      * お届け日一覧を取得する.
      */
-    function getDelivDate(&$objCartSess, $productTypeId)
-    {
+    function getDelivDate(&$objCartSess, $productTypeId) {
         $cartList = $objCartSess->getCartList($productTypeId);
         $delivDateIds = array();
@@ -604,6 +645,5 @@
      * お届け可能日のスタート値から, お届け日の配列を取得する.
      */
-    function getDateArray($start_day, $end_day)
-    {
+    function getDateArray($start_day, $end_day) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrWDAY = $masterData->getMasterData('mtb_wday');
@@ -627,4 +667,50 @@
 
     /**
+     * 配送業者IDからお届け時間の配列を取得する.
+     *
+     * @param integer $deliv_id 配送業者ID
+     * @return array お届け時間の配列
+     */
+    function getDelivTime($deliv_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('time_id');
+        $results = $objQuery->select('time_id, deliv_time',
+                                     'dtb_delivtime',
+                                     'deliv_id = ?', array($deliv_id));
+        $arrDelivTime = array();
+        foreach ($results as $val) {
+            $arrDelivTime[$val['time_id']] = $val['deliv_time'];
+        }
+        return $arrDelivTime;
+    }
+
+    /**
+     * 商品種別ID から配送業者を取得する.
+     *
+     * @param integer $product_type_id 商品種別ID
+     * @return array 配送業者の配列
+     */
+    function getDeliv($product_type_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank DESC');
+        return $objQuery->select('*', 'dtb_deliv', 'product_type_id = ? AND del_flg = 0',
+                                 array($product_type_id));
+    }
+
+    /**
+     * 配送業者ID から, 有効な支払方法IDを取得する.
+     *
+     * @param integer $deliv_id 配送業者ID
+     * @return array 有効な支払方法IDの配列
+     */
+    function getPayments($deliv_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank');
+        return $objQuery->getCol('payment_id', 'dtb_payment_options',
+                                 'deliv_id = ?',
+                                 array($deliv_id), MDB2_FETCHMODE_ORDERED);
+    }
+
+    /**
      * 配送情報の登録を行う.
      *
@@ -638,6 +724,5 @@
      * @return void
      */
-    function registerShipping($order_id, $arrParams, $convert_shipping_date = true)
-    {
+    function registerShipping($order_id, $arrParams, $convert_shipping_date = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_shipping';
@@ -677,6 +762,5 @@
      * @return void
      */
-    function registerShipmentItem($order_id, $shipping_id, $arrParams)
-    {
+    function registerShipmentItem($order_id, $shipping_id, $arrParams) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_shipment_item';
@@ -734,6 +818,5 @@
      * @param integer 受注ID
      */
-    function registerOrderComplete($orderParams, &$objCartSession, $cartKey)
-    {
+    function registerOrderComplete($orderParams, &$objCartSession, $cartKey) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -774,6 +857,4 @@
             $arrDetail[$i]['price'] = $item['price'];
             $arrDetail[$i]['quantity'] = $item['quantity'];
-            $arrDetail[$i]['tax_rate'] = $orderParams['order_tax_rate'];
-            $arrDetail[$i]['tax_rule'] = $orderParams['order_tax_rule'];
 
             // 在庫の減少処理
@@ -805,6 +886,5 @@
      * @return integer 受注ID
      */
-    function registerOrder($order_id, $arrParams)
-    {
+    function registerOrder($order_id, $arrParams) {
         $table = 'dtb_order';
         $where = 'order_id = ?';
@@ -860,6 +940,5 @@
      * @return void
      */
-    function registerOrderDetail($order_id, $arrParams)
-    {
+    function registerOrderDetail($order_id, $arrParams) {
         $table = 'dtb_order_detail';
         $where = 'order_id = ?';
@@ -882,6 +961,5 @@
      * @return array 受注情報の配列
      */
-    function getOrder($order_id, $customer_id = null)
-    {
+    function getOrder($order_id, $customer_id = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'order_id = ?';
@@ -901,6 +979,5 @@
      * @return array 受注詳細の配列
      */
-    function getOrderDetail($order_id, $has_order_status = true)
-    {
+    function getOrderDetail($order_id, $has_order_status = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $dbFactory  = SC_DB_DBFactory_Ex::getInstance();
@@ -916,6 +993,4 @@
             T2.quantity,
             T2.point_rate,
-            T2.tax_rate,
-            T2.tax_rule,
 __EOS__;
         if ($has_order_status) {
@@ -959,6 +1034,5 @@
      * @return void
      */
-    function setDownloadableFlgTo(&$arrOrderDetail)
-    {
+    function setDownloadableFlgTo(&$arrOrderDetail) {
         foreach ($arrOrderDetail as $key => $value) {
             // 販売価格が 0 円
@@ -983,6 +1057,5 @@
      * @return array 配送情報の配列
      */
-    function getShippings($order_id, $has_items = true)
-    {
+    function getShippings($order_id, $has_items = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrResults = array();
@@ -1014,6 +1087,5 @@
      * @return array 商品規格IDをキーにした配送商品の配列
      */
-    function getShipmentItems($order_id, $shipping_id, $has_detail = true)
-    {
+    function getShipmentItems($order_id, $shipping_id, $has_detail = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objProduct = new SC_Product_Ex();
@@ -1047,6 +1119,5 @@
      * @return void
      */
-    function sendOrderMail($orderId)
-    {
+    function sendOrderMail($orderId) {
         $mailHelper = new SC_Helper_Mail_Ex();
         $template_id =
@@ -1067,6 +1138,5 @@
      * @return void
      */
-    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array())
-    {
+    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrOrderOld = $objQuery->getRow('status, add_point, use_point, customer_id', 'dtb_order', 'order_id = ?', array($orderId));
@@ -1176,6 +1246,5 @@
      * @static
      */
-    function sfUpdateOrderNameCol($order_id, $temp_table = false)
-    {
+    function sfUpdateOrderNameCol($order_id, $temp_table = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -1215,6 +1284,5 @@
      * @return boolean 使用するか(会員テーブルから減算するか)
      */
-    function isUsePoint($status)
-    {
+    function isUsePoint($status) {
         if ($status == null) {
             return false;
@@ -1236,6 +1304,5 @@
      * @return boolean 加算するか
      */
-    function isAddPoint($status)
-    {
+    function isAddPoint($status) {
         switch ($status) {
             case ORDER_NEW:         // 新規注文
@@ -1273,6 +1340,5 @@
      * @param integer $cartKey 登録を行うカート情報のキー
      */
-    function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey)
-    {
+    function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey) {
         // カートの内容を削除する.
         $objCartSession->delAllProducts($cartKey);
@@ -1291,6 +1357,5 @@
      * @return void
      */
-    function setShipmentItemTempForSole(&$objCartSession, $shipping_id = 0)
-    {
+    function setShipmentItemTempForSole(&$objCartSession, $shipping_id = 0) {
         $objCartSess = new SC_CartSession_Ex();
 
@@ -1309,6 +1374,5 @@
      * @return integer
      */
-    public function getNextOrderID()
-    {
+    public function getNextOrderID() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->nextVal('dtb_order_order_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 22567)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php	(revision 22796)
@@ -13,6 +13,5 @@
    * @version $Id$
    */
-class SC_Helper_CSV 
-{
+class SC_Helper_CSV {
 
     // {{{ properties
@@ -30,6 +29,5 @@
      * デフォルトコンストラクタ.
      */
-    function __construct()
-    {
+    function __construct() {
         $this->init();
     }
@@ -44,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->arrSubnavi = array(
             1 => 'product',
@@ -73,6 +70,5 @@
      * @return mixed $is_download = true時 成功失敗フラグ(boolean) 、$is_downalod = false時 string
      */
-    function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false)
-    {
+    function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false) {
         // CSV出力タイトル行の作成
         $arrOutput = SC_Utils_Ex::sfSwapArray($this->sfGetCsvOutput($csv_id, 'status = ' . CSV_COLUMN_STATUS_FLG_ENABLE));
@@ -104,7 +100,4 @@
             $sql = 'SELECT ' . $cols . ' FROM dtb_category ' . $where;
         }
-        // 「getSqlを使っているcsv_id=1」以外で「order指定」がある場合は末尾に付与
-        // 全csv_idでgetSqlを使用して生成するよう統一する場合は当メソッドの呼び元も要修正
-        $sql = ($csv_id != '1' && strlen($order) >= 1) ? $sql.' order by '.$order : $sql;
         // 固有処理ここまで
         return $this->sfDownloadCsvFromSql($sql, $arrVal, $this->arrSubnavi[$csv_id], $arrOutput['disp_name'], $is_download);
@@ -120,6 +113,5 @@
      * @return array CSV 項目の配列
      */
-    function sfGetCsvOutput($csv_id = '', $where = '', $arrVal = array(), $order = 'rank, no')
-    {
+    function sfGetCsvOutput($csv_id = '', $where = '', $arrVal = array(), $order = 'rank, no') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -147,6 +139,5 @@
      * @return boolean true:インポート可能、false:インポート不可
      */
-    function sfIsImportCSVFrame(&$arrCSVFrame)
-    {
+    function sfIsImportCSVFrame(&$arrCSVFrame) {
         $result = true;
         foreach ($arrCSVFrame as $val) {
@@ -169,6 +160,5 @@
      * @return boolean true:更新可能、false:新規追加のみ不可
      */
-    function sfIsUpdateCSVFrame(&$arrCSVFrame)
-    {
+    function sfIsUpdateCSVFrame(&$arrCSVFrame) {
         $result = true;
         foreach ($arrCSVFrame as $val) {
@@ -189,6 +179,5 @@
      * @return integer CSV のカウント数
      */
-    function sfGetCSVRecordCount($fp)
-    {
+    function sfGetCSVRecordCount($fp) {
         $count = 0;
         while (!feof($fp)) {
@@ -210,6 +199,5 @@
      * @return boolean true (true:固定 false:中断)
      */
-    function cbOutputCSV($data)
-    {
+    function cbOutputCSV($data) {
         $line = $this->sfArrayToCSV($data);
         $line = mb_convert_encoding($line, 'SJIS-Win');
@@ -230,6 +218,5 @@
      * @return mixed $is_download = true時 成功失敗フラグ(boolean) 、$is_downalod = false時 string
      */
-    function sfDownloadCsvFromSql($sql, $arrVal = array(), $file_head = 'csv', $arrHeader = array(), $is_download = false)
-    {
+    function sfDownloadCsvFromSql($sql, $arrVal = array(), $file_head = 'csv', $arrHeader = array(), $is_download = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -275,6 +262,5 @@
      * @return string 結果行
      */
-    function sfArrayToCsv($fields, $delimiter = ',', $enclosure = '"', $arrayDelimiter = '|')
-    {
+    function sfArrayToCsv($fields, $delimiter = ',', $enclosure = '"', $arrayDelimiter = '|') {
         if (strlen($delimiter) != 1) {
             trigger_error('delimiter must be a single character', E_USER_WARNING);
@@ -313,6 +299,5 @@
      * @return void
      */
-    function lfDownloadCsv($arrData, $prefix = '')
-    {
+    function lfDownloadCsv($arrData, $prefix = '') {
 
         if ($prefix == '') {
@@ -344,6 +329,5 @@
      * @return void
      */
-    function lfDownloadCSVFile($filepath, $prefix = '')
-    {
+    function lfDownloadCSVFile($filepath, $prefix = '') {
         $file_name = $prefix . date('YmdHis') . '.csv';
 
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 22567)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php	(revision 22796)
@@ -28,6 +28,5 @@
  * @version $Id$
  */
-class SC_Helper_Transform 
-{
+class SC_Helper_Transform {
     protected $objDOM;
     protected $arrSmartyTagsOrg;
@@ -50,6 +49,5 @@
      * @return void
      */
-    public function __construct($source)
-    {
+    public function __construct($source) {
         $this->objDOM = new DOMDocument();
         $this->objDOM->strictErrorChecking = false;
@@ -134,6 +132,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function select($selector, $index = NULL, $require = true, $err_msg = NULL)
-    {
+    public function select($selector, $index = NULL, $require = true, $err_msg = NULL) {
         $this->arrSelectElements = array();
         $this->search_depth = 0;
@@ -175,6 +172,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function find($selector, $index = NULL, $require = true, $err_msg = NULL)
-    {
+    public function find($selector, $index = NULL, $require = true, $err_msg = NULL) {
         $arrParentElements = $this->arrSelectElements[$this->search_depth];
         $this->search_depth++;
@@ -216,6 +212,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function end($back_num = 1)
-    {
+    public function end($back_num = 1) {
         if ($this->search_depth >= $back_num) {
             $this->search_depth -= $back_num;
@@ -234,6 +229,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function insertBefore($html_snip)
-    {
+    public function insertBefore($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('insertBefore', $objElement[0], $html_snip);
@@ -249,6 +243,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function insertAfter($html_snip)
-    {
+    public function insertAfter($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('insertAfter', $objElement[0], $html_snip);
@@ -264,6 +257,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function appendFirst($html_snip)
-    {
+    public function appendFirst($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('appendFirst', $objElement[0], $html_snip);
@@ -279,6 +271,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function appendChild($html_snip)
-    {
+    public function appendChild($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('appendChild', $objElement[0], $html_snip);
@@ -294,6 +285,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function replaceElement($html_snip)
-    {
+    public function replaceElement($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
             $this->lfSetTransform('replaceElement', $objElement[0], $html_snip);
@@ -308,6 +298,5 @@
      * @return SC_Helper_Transformオブジェクト
      */
-    public function removeElement()
-    {
+    public function removeElement() {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
             $this->lfSetTransform('replaceElement', $objElement[0], '');
@@ -322,6 +311,5 @@
      * @return string トランスフォーム済みHTML。まったくトランスフォームが行われなかった場合は元のHTMLを返す。。
      */
-    public function getHTML()
-    {
+    public function getHTML() {
         if (count($this->arrErr)) {
             // エラーメッセージ組み立て
@@ -370,6 +358,5 @@
      * @return string 代わりの文字列
      */
-    protected function lfCaptureSmartyTags2Comment(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Comment(array $arrMatches) {
         $substitute_tag = sprintf('<!--###%08d###-->', $this->smarty_tags_idx);
         $this->arrSmartyTagsOrg[$this->smarty_tags_idx] = $arrMatches[0];
@@ -388,6 +375,5 @@
      * @return string 代わりの文字列
      */
-    protected function lfCaptureHeadTags2Comment(array $arrMatches)
-    {
+    protected function lfCaptureHeadTags2Comment(array $arrMatches) {
         $substitute_tag = sprintf('<!--###%08d###-->', $this->smarty_tags_idx);
         $this->arrSmartyTagsOrg[$this->smarty_tags_idx] = $arrMatches[2];
@@ -412,6 +398,5 @@
      * @return string 代わりの文字列
      */
-    protected function lfCaptureSmartyTagsInTag(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTagsInTag(array $arrMatches) {
         // Smartyタグ内のクォートを処理しやすいよう、いったんダミーのタグに
         $html = preg_replace_callback('/<\!--{.+?\}-->/s', array($this, 'lfCaptureSmartyTags2Temptag'), $arrMatches[0]);
@@ -430,6 +415,5 @@
      * @return string 代わりの文字列
      */
-    protected function lfCaptureSmartyTags2Temptag(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Temptag(array $arrMatches) {
         $substitute_tag = sprintf('###TEMP%08d###', $this->smarty_tags_idx);
         $this->arrSmartyTagsOrg[$this->smarty_tags_idx] = $arrMatches[0];
@@ -448,6 +432,5 @@
      * @return string 代わりの文字列
      */
-    protected function lfCaptureSmartyTagsInQuote(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTagsInQuote(array $arrMatches) {
         $html = preg_replace_callback(
             '/###TEMP(\d{8})###/s',
@@ -467,6 +450,5 @@
      * @return string 代わりの文字列
      */
-    protected function lfCaptureSmartyTags2Value(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Value(array $arrMatches) {
         $tag_idx = (int)$arrMatches[1];
         $substitute_tag = sprintf('###%08d###', $tag_idx);
@@ -484,6 +466,5 @@
      * @return string 代わりの文字列
      */
-    protected function lfCaptureSmartyTags2Attr(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Attr(array $arrMatches) {
         $tag_idx = (int)$arrMatches[1];
         $substitute_tag = sprintf('rel%08d="######"', $tag_idx);
@@ -499,6 +480,5 @@
      * @return void
      */
-    protected function lfScanChild(DOMNode $objDOMElement, $parent_selector = '')
-    {
+    protected function lfScanChild(DOMNode $objDOMElement, $parent_selector = '') {
         $objNodeList = $objDOMElement->childNodes;
         if (is_null($objNodeList)) return;
@@ -536,6 +516,5 @@
      * @return string 正規表現文字列
      */
-    protected function lfSelector2Regex($selector, $parent_index = NULL)
-    {
+    protected function lfSelector2Regex($selector, $parent_index = NULL){
         // jQueryライクなセレクタを正規表現に
         $selector = preg_replace('/ *> */', ' >', $selector);   // 子セレクタをツリー検索用に 「A >B」の記法にする
@@ -572,6 +551,5 @@
      * @return void
      */
-    protected function lfAddElement($elementNo, array &$arrElement)
-    {
+    protected function lfAddElement($elementNo, array &$arrElement) {
         if (is_array($this->arrSelectElements[$this->search_depth]) && array_key_exists($arrElement[0], $this->arrSelectElements[$this->search_depth])) {
             //nop
@@ -591,6 +569,5 @@
      * @return boolean
      */
-    protected function lfSetTransform($mode, $target_key, $html_snip)
-    {
+    protected function lfSetTransform($mode, $target_key, $html_snip) {
 
         $substitute_tag = sprintf('<!--###%08d###-->', $this->smarty_tags_idx);
@@ -658,6 +635,5 @@
      * @return void
      */
-    protected function lfSetError($selector, $type, $err_msg = NULL)
-    {
+    protected function lfSetError($selector, $type, $err_msg = NULL) {
         $this->arrErr[] = array(
             'selector'    => $selector,
Index: /branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php	(revision 22568)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php	(revision 22796)
@@ -35,14 +35,9 @@
      * 
      * @param integer $payment_id 支払方法ID
-     * @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
      * @return array
      */
-    public function get($payment_id, $has_deleted = false)
-    {
+    public function get($payment_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'payment_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
         $arrRet = $objQuery->select('*', 'dtb_payment', $where, array($payment_id));
         return $arrRet[0];
@@ -52,57 +47,14 @@
      * 支払方法一覧の取得.
      *
-     * @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
      * @return array
      */
-    public function getList($has_deleted = false)
-    {
+    public function getList() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'payment_id, payment_method, payment_image, charge, rule_max, upper_rule, note, fix, charge_flg';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
+        $col = 'payment_id, payment_method, charge, rule_max, upper_rule, note, fix, charge_flg';
+        $where = 'del_flg = 0';
         $table = 'dtb_payment';
         $objQuery->setOrder('rank DESC');
         $arrRet = $objQuery->select($col, $table, $where);
         return $arrRet;
-    }
-
-    /**
-     * 購入金額に応じた支払方法を取得する.
-     *
-     * @param integer $total 購入金額
-     * @return array 購入金額に応じた支払方法の配列
-     */
-    function getByPrice($total)
-    {
-        // 削除されていない支払方法を取得
-        $payments = $this->getList();
-        $arrPayment = array();
-        foreach ($payments as $data) {
-            // 下限と上限が設定されている
-            if (strlen($data['rule_max']) != 0 && strlen($data['upper_rule']) != 0) {
-                if ($data['rule_max'] <= $total && $data['upper_rule'] >= $total) {
-                    $arrPayment[] = $data;
-                }
-            }
-            // 下限のみ設定されている
-            elseif (strlen($data['rule_max']) != 0) {
-                if ($data['rule_max'] <= $total) {
-                    $arrPayment[] = $data;
-                }
-            }
-            // 上限のみ設定されている
-            elseif (strlen($data['upper_rule']) != 0) {
-                if ($data['upper_rule'] >= $total) {
-                    $arrPayment[] = $data;
-                }
-            }
-            // いずれも設定なし
-            else {
-                $arrPayment[] = $data;
-            }
-        }
-        return $arrPayment;
     }
 
@@ -113,10 +65,8 @@
      * @return void
      */
-    public function save($sqlval)
-    {
+    public function save($sqlval) {
+        $payment_id = $sqlval['payment_id'];
+
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $payment_id = $sqlval['payment_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         // 新規登録
         if ($payment_id == '') {
@@ -129,5 +79,4 @@
         } else {
             unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
             $where = 'payment_id = ?';
             $objQuery->update('dtb_payment', $sqlval, $where, array($payment_id));
@@ -141,6 +90,5 @@
      * @return void
      */
-    public function delete($payment_id)
-    {
+    public function delete($payment_id) {
         $objDb = new SC_Helper_DB_Ex();
         // ランク付きレコードの削除
@@ -154,6 +102,5 @@
      * @return void
      */
-    public function rankUp($payment_id)
-    {
+    public function rankUp($payment_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankUp('dtb_payment', 'payment_id', $payment_id);
@@ -166,6 +113,5 @@
      * @return void
      */
-    public function rankDown($payment_id)
-    {
+    public function rankDown($payment_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankDown('dtb_payment', 'payment_id', $payment_id);
@@ -180,19 +126,8 @@
      * @return boolean 決済モジュールを使用する支払い方法の場合 true
      */
-    public static function useModule($payment_id)
-    {
+    public static function useModule($payment_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $memo03 = $objQuery->get('memo03', 'dtb_payment', 'payment_id = ?', array($payment_id));
         return !SC_Utils_Ex::isBlank($memo03);
     }
-
-    /**
-     * 支払方法IDをキー, 名前を値とする配列を取得.
-     * 
-     * @return array
-     */
-    public static function getIDValueList()
-    {
-        return SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
-    }
 }
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 22567)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php	(revision 22796)
@@ -28,6 +28,5 @@
  * @version $Id$
  */
-class SC_Helper_Plugin 
-{
+class SC_Helper_Plugin {
     // プラグインのインスタンスの配列.
     var $arrPluginInstances = array();
@@ -45,6 +44,5 @@
      * @return void
      */
-    function load($plugin_activate_flg = true)
-    {
+    function load($plugin_activate_flg = true) {
 
         if (!defined('CONFIG_REALFILE') || !file_exists(CONFIG_REALFILE)) return; // インストール前
@@ -80,6 +78,5 @@
      * @return object SC_Helper_Pluginオブジェクト
      */
-    static function getSingletonInstance($plugin_activate_flg = true)
-    {
+    static function getSingletonInstance($plugin_activate_flg = true) {
         if (!isset($GLOBALS['_SC_Helper_Plugin_instance'])) {
             // プラグインのローダーがDB接続を必要とするため、
@@ -103,6 +100,5 @@
      * @return void
      */
-    function doAction($hook_point, $arrArgs = array())
-    {
+    function doAction($hook_point, $arrArgs = array()) {
         if (is_array($arrArgs) === false) {
             array(&$arrArgs);
@@ -158,6 +154,5 @@
      * @param string $priority 実行順
      */
-    function registerSuperHookPoint($objPlugin, $hook_point, $function_name, $priority)
-    {
+    function registerSuperHookPoint($objPlugin, $hook_point, $function_name, $priority) {
         // スーパープラグイン関数を定義しているかを検証.
         if (method_exists($objPlugin, $function_name) === true) {
@@ -173,6 +168,5 @@
      * @param string $priority 実行順
      */
-    function registerLocalHookPoint($objPlugin, $priority)
-    {
+    function registerLocalHookPoint($objPlugin, $priority) {
         // ローカルプラグイン関数を定義しているかを検証.
         if (method_exists($objPlugin, 'register') === true) {
@@ -191,6 +185,5 @@
      * @return boolean 成功すればtrue
      */
-    function addAction($hook_point, $function, $priority = 0)
-    {
+    function addAction($hook_point, $function, $priority = 0) {
         if (!is_callable($function)) {
             // TODO エラー処理;　コール可能な形式ではありません
@@ -209,6 +202,5 @@
      * @return string コールバック関数を一意に識別するID
      */
-    function makeActionUniqueId($hook_point, $function, $priority)
-    {
+    function makeActionUniqueId($hook_point, $function, $priority) {
         static $filter_id_count = 0;
 
@@ -249,6 +241,5 @@
      * @return array $arrBlocsサイトルートからメディアディレクトリへの相対パス
      */
-    function getEnableBlocs($arrBlocs)
-    {
+    function getEnableBlocs($arrBlocs) {
         foreach ($arrBlocs as $key => $value) {
             // 有効なpluginのブロック以外.
@@ -270,6 +261,5 @@
      * @return void
      */
-    function setHeadNavi($url)
-    {
+    function setHeadNavi($url) {
         $this->arrHeadNaviBlocsByPlugin[$url] = TARGET_ID_HEAD;
     }
@@ -281,6 +271,5 @@
      * @return void
      */
-    function setHeadNaviBlocs(&$arrBlocs)
-    {
+    function setHeadNaviBlocs(&$arrBlocs) {
         foreach ($this->arrHeadNaviBlocsByPlugin as $key => $value) {
             $arrBlocs[] = array(
@@ -299,6 +288,5 @@
      * @return void
      */
-    public static function hook($hook_point, $arrArgs = array(), $plugin_activate_flg = PLUGIN_ACTIVATE_FLAG)
-    {
+    public static function hook($hook_point, $arrArgs = array(), $plugin_activate_flg = PLUGIN_ACTIVATE_FLAG) {
         $objPlugin = SC_Helper_Plugin::getSingletonInstance($plugin_activate_flg);
         $objPlugin->doAction($hook_point, $arrArgs);
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 22569)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php	(revision 22796)
@@ -30,23 +30,19 @@
  * @version $Id$
  */
-class SC_Helper_Customer 
-{
+class SC_Helper_Customer {
 
     /**
      * 会員情報の登録・編集処理を行う.
      *
-     * @param array $arrData 登録するデータの配列（SC_FormParamのgetDbArrayの戻り値）
+     * @param array $array 登録するデータの配列（SC_FormParamのgetDbArrayの戻り値）
      * @param array $customer_id nullの場合はinsert, 存在する場合はupdate
      * @access public
      * @return integer 登録編集したユーザーのcustomer_id
      */
-    function sfEditCustomerData($arrData, $customer_id = null)
-    {
+    function sfEditCustomerData($array, $customer_id = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
 
-        $old_version_flag = false;
-
-        $arrData['update_date'] = 'CURRENT_TIMESTAMP';    // 更新日
+        $array['update_date'] = 'CURRENT_TIMESTAMP';    // 更新日
 
         // salt値の生成(insert時)または取得(update時)。
@@ -55,15 +51,13 @@
 
             // 旧バージョン(2.11未満)からの移行を考慮
-            if (strlen($salt) === 0) {
-                $old_version_flag = true;
-            }
+            if (empty($salt)) $old_version_flag = true;
         } else {
             $salt = SC_Utils_Ex::sfGetRandomString(10);
-            $arrData['salt'] = $salt;
+            $array['salt'] = $salt;
         }
         //-- パスワードの更新がある場合は暗号化
-        if ($arrData['password'] == DEFAULT_PASSWORD or $arrData['password'] == '') {
+        if ($array['password'] == DEFAULT_PASSWORD or $array['password'] == '') {
             //更新しない
-            unset($arrData['password']);
+            unset($array['password']);
         } else {
             // 旧バージョン(2.11未満)からの移行を考慮
@@ -71,13 +65,13 @@
                 $is_password_updated = true;
                 $salt = SC_Utils_Ex::sfGetRandomString(10);
-                $arrData['salt'] = $salt;
-            }
-
-            $arrData['password'] = SC_Utils_Ex::sfGetHashString($arrData['password'], $salt);
+                $array['salt'] = $salt;
+            }
+
+            $array['password'] = SC_Utils_Ex::sfGetHashString($array['password'], $salt);
         }
         //-- 秘密の質問の更新がある場合は暗号化
-        if ($arrData['reminder_answer'] == DEFAULT_PASSWORD or $arrData['reminder_answer'] == '') {
+        if ($array['reminder_answer'] == DEFAULT_PASSWORD or $array['reminder_answer'] == '') {
             //更新しない
-            unset($arrData['reminder_answer']);
+            unset($array['reminder_answer']);
 
             // 旧バージョン(2.11未満)からの移行を考慮
@@ -85,5 +79,5 @@
                 // パスワードが更新される場合は、平文になっている秘密の質問を暗号化する
                 $reminder_answer = $objQuery->get('reminder_answer', 'dtb_customer', 'customer_id = ? ', array($customer_id));
-                $arrData['reminder_answer'] = SC_Utils_Ex::sfGetHashString($reminder_answer, $salt);
+                $array['reminder_answer'] = SC_Utils_Ex::sfGetHashString($reminder_answer, $salt);
             }
         } else {
@@ -91,7 +85,7 @@
             if ($old_version_flag && !$is_password_updated) {
                 // パスワードが更新されない場合は、平文のままにする
-                unset($arrData['salt']);
+                unset($array['salt']);
             } else {
-                $arrData['reminder_answer'] = SC_Utils_Ex::sfGetHashString($arrData['reminder_answer'], $salt);
+                $array['reminder_answer'] = SC_Utils_Ex::sfGetHashString($array['reminder_answer'], $salt);
             }
         }
@@ -100,5 +94,5 @@
         if (is_numeric($customer_id)) {
             // 編集
-            $objQuery->update('dtb_customer', $arrData, 'customer_id = ? ', array($customer_id));
+            $objQuery->update('dtb_customer', $array, 'customer_id = ? ', array($customer_id));
         } else {
             // 新規登録
@@ -106,14 +100,13 @@
             // 会員ID
             $customer_id = $objQuery->nextVal('dtb_customer_customer_id');
-            $arrData['customer_id'] = $customer_id;
+            $array['customer_id'] = $customer_id;
             // 作成日
-            if (is_null($arrData['create_date'])) {
-                $arrData['create_date'] = 'CURRENT_TIMESTAMP';
-            }
-            $objQuery->insert('dtb_customer', $arrData);
+            if (is_null($array['create_date'])) {
+                $array['create_date'] = 'CURRENT_TIMESTAMP';
+            }
+            $objQuery->insert('dtb_customer', $array);
         }
 
         $objQuery->commit();
-
         return $customer_id;
     }
@@ -127,8 +120,6 @@
      * @return array 最終ポイントの配列
      */
-    function sfGetCustomerPoint($order_id, $use_point, $add_point)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
+    function sfGetCustomerPoint($order_id, $use_point, $add_point) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('customer_id', 'dtb_order', 'order_id = ?', array($order_id));
         $customer_id = $arrRet[0]['customer_id'];
@@ -146,5 +137,4 @@
             $point = '';
         }
-
         return array($point, $total_point);
     }
@@ -158,6 +148,5 @@
      * @return integer  0:登録可能     1:登録済み   2:再登録制限期間内削除ユーザー  3:自分のアドレス
      */
-    function sfCheckRegisterUserFromEmail($email)
-    {
+    function sfCheckRegisterUserFromEmail($email) {
         $objCustomer = new SC_Customer_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -207,6 +196,5 @@
      * @return boolean メールアドレスが重複する場合 true
      */
-    function sfCustomerEmailDuplicationCheck($customer_id, $email)
-    {
+    function sfCustomerEmailDuplicationCheck($customer_id, $email) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -218,5 +206,4 @@
             || strlen($arrResults['email_mobile']) >= 1 &&  $email === $arrResults['email_mobile']
         ;
-
         return $return;
     }
@@ -230,6 +217,5 @@
      * @return array 会員情報の配列を返す
      */
-    function sfGetCustomerData($customer_id, $mask_flg = true)
-    {
+    function sfGetCustomerData($customer_id, $mask_flg = true) {
         $objQuery       =& SC_Query_Ex::getSingletonInstance();
 
@@ -253,5 +239,4 @@
             $arrForm['reminder_answer']   = DEFAULT_PASSWORD;
         }
-
         return $arrForm;
     }
@@ -268,8 +253,6 @@
      * @return array 対象会員データ
      */
-    function sfGetCustomerDataFromId($customer_id, $add_where = '', $arrAddVal = array())
-    {
+    function sfGetCustomerDataFromId($customer_id, $add_where = '', $arrAddVal = array()) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
-
         if ($add_where == '') {
             $where = 'customer_id = ?';
@@ -283,5 +266,4 @@
             $arrData = $objQuery->getRow('*', 'dtb_customer', $where, $arrAddVal);
         }
-
         return $arrData;
     }
@@ -293,6 +275,5 @@
      * @return string 会員登録キーの文字列
      */
-    function sfGetUniqSecretKey()
-    {
+    function sfGetUniqSecretKey() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -301,5 +282,4 @@
             $exists = $objQuery->exists('dtb_customer', 'secret_key = ?', array($uniqid));
         } while ($exists);
-
         return $uniqid;
     }
@@ -313,8 +293,6 @@
      * @return integer 会員ID
      */
-    function sfGetCustomerId($uniqid, $check_status = false)
-    {
+    function sfGetCustomerId($uniqid, $check_status = false) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
-
         $where      = 'secret_key = ?';
 
@@ -334,6 +312,5 @@
      * @return void
      */
-    function sfCustomerEntryParam(&$objFormParam, $isAdmin = false)
-    {
+    function sfCustomerEntryParam(&$objFormParam, $isAdmin = false) {
         SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
         SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, $isAdmin);
@@ -359,6 +336,5 @@
      * @return void
      */
-    function sfCustomerMypageParam(&$objFormParam)
-    {
+    function sfCustomerMypageParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
         SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, false, true);
@@ -379,6 +355,5 @@
      * @return void
      */
-    function sfCustomerCommonParam(&$objFormParam)
-    {
+    function sfCustomerCommonParam(&$objFormParam) {
         $objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
@@ -406,7 +381,6 @@
      * @return void
      */
-    function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false)
-    {
-        $objFormParam->addParam('パスワード', 'password', PASSWORD_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
+    function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false) {
+        $objFormParam->addParam('パスワード', 'password', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('パスワード確認用の質問の答え', 'reminder_answer', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('パスワード確認用の質問', 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -420,5 +394,5 @@
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) {
             $objFormParam->addParam('メールアドレス', 'email', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK'));
-            $objFormParam->addParam('パスワード(確認)', 'password02', PASSWORD_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK' ,'ALNUM_CHECK'), '', false);
+            $objFormParam->addParam('パスワード(確認)', 'password02', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK' ,'ALNUM_CHECK'), '', false);
             if (!$isAdmin) {
                 $objFormParam->addParam('メールアドレス(確認)', 'email02', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK','SPTAB_CHECK' , 'EMAIL_CHAR_CHECK'), '', false);
@@ -437,6 +411,5 @@
      * @return array エラーの配列
      */
-    function sfCustomerEntryErrorCheck(&$objFormParam)
-    {
+    function sfCustomerEntryErrorCheck(&$objFormParam) {
         $objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam);
         $objErr = SC_Helper_Customer_Ex::sfCustomerRegisterErrorCheck($objErr);
@@ -467,6 +440,5 @@
      * @return array エラーの配列
      */
-    function sfCustomerMypageErrorCheck(&$objFormParam, $isAdmin = false)
-    {
+    function sfCustomerMypageErrorCheck(&$objFormParam, $isAdmin = false) {
 
         $objFormParam->toLower('email_mobile');
@@ -485,5 +457,4 @@
             unset($objErr->arrErr['reminder_answer']);
         }
-
         return $objErr->arrErr;
     }
@@ -496,6 +467,5 @@
      * @return array エラー情報の配列
      */
-    function sfCustomerCommonErrorCheck(&$objFormParam)
-    {
+    function sfCustomerCommonErrorCheck(&$objFormParam) {
         $objFormParam->convParam();
         $objFormParam->toLower('email');
@@ -521,11 +491,10 @@
      * @return SC_CheckError $objErr エラー情報
      */
-    function sfCustomerRegisterErrorCheck(&$objErr, $isAdmin = false)
-    {
+    function sfCustomerRegisterErrorCheck(&$objErr, $isAdmin = false) {
         $objErr->doFunc(array('生年月日', 'year', 'month', 'day'), array('CHECK_BIRTHDAY'));
-        $objErr->doFunc(array('パスワード', 'password', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN) ,array('NUM_RANGE_CHECK'));
 
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) {
             if (!$isAdmin) {
+                $objErr->doFunc(array('パスワード', 'password', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN) ,array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
                 $objErr->doFunc(array('メールアドレス', 'メールアドレス(確認)', 'email', 'email02') ,array('EQUAL_CHECK'));
             }
@@ -538,5 +507,4 @@
             $objErr->doFunc(array('携帯メールアドレス', 'email_mobile'), array('CHECK_REGIST_CUSTOMER_EMAIL', 'MOBILE_EMAIL_CHECK'));
         }
-
         return $objErr;
     }
@@ -549,6 +517,5 @@
      * @return void
      */
-    function sfSetSearchParam(&$objFormParam)
-    {
+    function sfSetSearchParam(&$objFormParam) {
         $objFormParam->addParam('会員ID', 'search_customer_id', ID_MAX_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('お名前', 'search_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -599,12 +566,9 @@
      * @return array エラー配列
      */
-    function sfCheckErrorSearchParam(&$objFormParam)
-    {
+    function sfCheckErrorSearchParam(&$objFormParam) {
         // パラメーターの基本チェック
         $arrErr = $objFormParam->checkError();
-        // エラーチェック対象のパラメータ取得
-        $array = $objFormParam->getHashArray();
         // 拡張エラーチェック初期化
-        $objErr = new SC_CheckError_Ex($array);
+        $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         // 拡張エラーチェック
         $objErr->doFunc(array('誕生日(開始日)', 'search_b_start_year', 'search_b_start_month', 'search_b_start_day'), array('CHECK_DATE'));
@@ -622,5 +586,5 @@
         if (SC_Utils_Ex::sfIsInt($array['search_buy_total_from'])
             && SC_Utils_Ex::sfIsInt($array['search_buy_total_to'])
-            && $array['search_buy_total_from'] > $array['search_buy_total_to']
+            && $array['search_buy_total_from'] > $array['buy_total_to']
         ) {
             $objErr->arrErr['search_buy_total_from'] .= '※ 購入金額の指定範囲が不正です。';
@@ -636,5 +600,4 @@
             $arrErr = array_merge($arrErr, $objErr->arrErr);
         }
-
         return $arrErr;
     }
@@ -647,9 +610,7 @@
      * @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
      */
-    function sfGetSearchData($arrParam, $limitMode = '')
-    {
+    function sfGetSearchData($arrParam, $limitMode = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
-
         $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_max']);
         $disp_pageno = $arrParam['search_pageno'];
@@ -682,33 +643,9 @@
      * @return boolean 仮会員の場合 true
      */
-    public function checkTempCustomer($login_email)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
+    public function checkTempCustomer($login_email) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'email = ? AND status = 1 AND del_flg = 0';
         $exists = $objQuery->exists('dtb_customer', $where, array($login_email));
-
         return $exists;
     }
-
-    /**
-     * 会員を削除する処理
-     *
-     * @param integer $customer_id 会員ID
-     * @return boolean true:成功 false:失敗
-     */
-    public static function delete($customer_id)
-    {
-        $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, 'del_flg = 0');
-        if (SC_Utils_Ex::isBlank($arrData)) {
-            //対象となるデータが見つからない。
-            return false;
-        }
-        // XXXX: 仮会員は物理削除となっていたが論理削除に変更。
-        $arrVal = array(
-            'del_flg' => '1',
-        );
-        SC_Helper_Customer_Ex::sfEditCustomerData($arrVal, $customer_id);
-        return true;
-    }
 }
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 22567)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php	(revision 22796)
@@ -6,6 +6,5 @@
 $GLOBALS[SJIS_widths] = $SJIS_widths;
 
-class SC_Helper_FPDI extends PDF_Japanese 
-{
+class SC_Helper_FPDI extends PDF_Japanese {
     /**
      * PDF_Japanese の明朝フォントに加えゴシックフォントを追加定義
@@ -13,6 +12,5 @@
      * @return void
      */
-    function AddSJISFont()
-    {
+    function AddSJISFont() {
         parent::AddSJISFont();
         $cw = $GLOBALS['SJIS_widths'];
@@ -27,6 +25,5 @@
      * PDF_Japanese#SJISMultiCell をベースにカスタマイズ。
      */
-    function SJISMultiCellForFancyTable($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
-    {
+    function SJISMultiCellForFancyTable($w, $h, $txt, $border = 0, $align = 'L', $fill = 0) {
         $y = $this->y;
 
@@ -148,6 +145,5 @@
      * FIXME: 後の列の高さが大きい場合、表示が乱れる。
      */
-    function FancyTable($header, $data, $w)
-    {
+    function FancyTable($header, $data, $w) {
         // Colors, line width and bold font
         $this->SetFillColor(216, 216, 216);
@@ -190,17 +186,14 @@
     }
 
-    function Text($x, $y, $txt)
-    {
+    function Text($x, $y, $txt) {
         parent::Text($x, $y, $this->lfConvSjis($txt));
     }
 
-    function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
-    {
+    function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='') {
         parent::Cell($w, $h, $this->lfConvSjis($txt), $border, $ln, $align, $fill, $link);
     }
 
     // 文字コードSJIS変換 -> japanese.phpで使用出来る文字コードはSJIS-winのみ
-    function lfConvSjis($conv_str)
-    {
+    function lfConvSjis($conv_str) {
         return mb_convert_encoding($conv_str, 'SJIS-win', CHAR_CODE);
     }
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 22584)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id$
  */
-class SC_Helper_Mail 
-{
+class SC_Helper_Mail {
 
     /** メールテンプレートのパス */
@@ -45,6 +44,5 @@
      * コンストラクタ.
      */
-    function __construct()
-    {
+    function __construct() {
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrMAILTPLPATH =  $masterData->getMasterData('mtb_mail_tpl_path');
@@ -57,6 +55,5 @@
      * @param LC_Page $objPage
      */
-    function setPage(LC_Page $objPage)
-    {
+    function setPage(LC_Page $objPage) {
         $this->objPage = $objPage;
     }
@@ -67,19 +64,18 @@
      * @return LC_Page
      */
-    function getPage()
-    {
+    function getPage() {
         return $this->objPage;
     }
 
     /* DBに登録されたテンプレートメールの送信 */
-    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '')
-    {
-
+    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '') {
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         // メールテンプレート情報の取得
-        $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-        $mailtemplate = $objMailtemplate->get($template_id);
-        $objPage->tpl_header = $mailtemplate['header'];
-        $objPage->tpl_footer = $mailtemplate['footer'];
-        $tmp_subject = $mailtemplate['subject'];
+        $where = 'template_id = ?';
+        $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id));
+        $objPage->tpl_header = $arrRet[0]['header'];
+        $objPage->tpl_footer = $arrRet[0]['footer'];
+        $tmp_subject = $arrRet[0]['subject'];
 
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
@@ -105,6 +101,5 @@
 
     /* 受注完了メール送信 */
-    function sfSendOrderMail($order_id, $template_id, $subject = '', $header = '', $footer = '', $send = true)
-    {
+    function sfSendOrderMail($order_id, $template_id, $subject = '', $header = '', $footer = '', $send = true) {
 
         $arrTplVar = new stdClass();
@@ -116,9 +111,9 @@
         if ($subject == '' && $header == '' && $footer == '') {
             // メールテンプレート情報の取得
-            $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-            $mailtemplate = $objMailtemplate->get($template_id);
-            $arrTplVar->tpl_header = $mailtemplate['header'];
-            $arrTplVar->tpl_footer = $mailtemplate['footer'];
-            $tmp_subject = $mailtemplate['subject'];
+            $where = 'template_id = ?';
+            $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id));
+            $arrTplVar->tpl_header = $arrRet[0]['header'];
+            $arrTplVar->tpl_footer = $arrRet[0]['footer'];
+            $tmp_subject = $arrRet[0]['subject'];
         } else {
             $arrTplVar->tpl_header = $header;
@@ -218,6 +213,5 @@
 
     // テンプレートを使用したメールの送信
-    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage)
-    {
+    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage) {
         $objMailView = new SC_SiteView_Ex();
         $objMailView->setPage($this->getPage());
@@ -240,6 +234,5 @@
 
     // 通常のメール送信
-    function sfSendMail($to, $tmp_subject, $body)
-    {
+    function sfSendMail($to, $tmp_subject, $body) {
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         // メール送信処理
@@ -255,6 +248,5 @@
 
     //件名にテンプレートを用いる
-    function sfMakeSubject($subject, &$objMailView)
-    {
+    function sfMakeSubject($subject, &$objMailView) {
         if (empty($objMailView)) {
             $objMailView = new SC_SiteView_Ex();
@@ -275,6 +267,5 @@
 
     // メール配信履歴への登録
-    function sfSaveMailHistory($order_id, $template_id, $subject, $body)
-    {
+    function sfSaveMailHistory($order_id, $template_id, $subject, $body) {
         $sqlval = array();
         $sqlval['subject'] = $subject;
@@ -296,6 +287,5 @@
 
     /* 会員登録があるかどうかのチェック(仮会員を含まない) */
-    function sfCheckCustomerMailMaga($email)
-    {
+    function sfCheckCustomerMailMaga($email) {
         $col = 'email, mailmaga_flg, customer_id';
         $from = 'dtb_customer';
@@ -318,6 +308,5 @@
      * @return boolean true:成功 false:失敗
      */
-    function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false)
-    {
+    function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false) {
         // 会員データの取得
         if (SC_Utils_Ex::sfIsInt($customer_id)) {
@@ -382,6 +371,5 @@
      * @todo   表示順も引数で変更できるように
      */
-    function sfGetMailmagaTemplate($template_id = null)
-    {
+    function sfGetMailmagaTemplate($template_id = null) {
         // 初期化
         $where = '';
@@ -409,6 +397,5 @@
      * @return　array 送信履歴情報を格納した配列
      */
-    function sfGetSendHistory($send_id = null)
-    {
+    function sfGetSendHistory($send_id = null) {
         // 初期化
         $where = '';
@@ -438,6 +425,5 @@
      * @return　void
      */
-    function sfSendMailmagazine($send_id)
-    {
+    function sfSendMailmagazine($send_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
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 22567)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php	(revision 22796)
@@ -13,6 +13,5 @@
  * @version $Id$
  */
-class SC_Helper_Session 
-{
+class SC_Helper_Session {
 
     var $objDb;
@@ -26,6 +25,5 @@
      * 各関数をセッションハンドラに保存する
      */
-    function __construct()
-    {
+    function __construct() {
         $this->objDb = new SC_Helper_DB_Ex();
         session_set_save_handler(array(&$this, 'sfSessOpen'),
@@ -51,6 +49,5 @@
      * @return bool セッションが正常に開始された場合 true
      */
-    function sfSessOpen($save_path, $session_name)
-    {
+    function sfSessOpen($save_path, $session_name) {
         return true;
     }
@@ -61,6 +58,5 @@
      * @return bool セッションが正常に終了した場合 true
      */
-    function sfSessClose()
-    {
+    function sfSessClose() {
         return true;
     }
@@ -72,6 +68,5 @@
      * @return string セッションデータの値
      */
-    function sfSessRead($id)
-    {
+    function sfSessRead($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('sess_data', 'dtb_session', 'sess_id = ?', array($id));
@@ -90,6 +85,5 @@
      * @return bool セッションの書き込みに成功した場合 true
      */
-    function sfSessWrite($id, $sess_data)
-    {
+    function sfSessWrite($id, $sess_data) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $exists = $objQuery->exists('dtb_session', 'sess_id = ?', array($id));
@@ -121,6 +115,5 @@
      * @return bool セッションを正常に破棄した場合 true
      */
-    function sfSessDestroy($id)
-    {
+    function sfSessDestroy($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->delete('dtb_session', 'sess_id = ?', array($id));
@@ -135,6 +128,5 @@
      * @param integer $maxlifetime セッションの有効期限(使用しない)
      */
-    function sfSessGc($maxlifetime)
-    {
+    function sfSessGc($maxlifetime) {
         // MAX_LIFETIME以上更新されていないセッションを削除する。
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -162,6 +154,5 @@
      * @return string トランザクショントークンの文字列
      */
-    function getToken()
-    {
+    function getToken() {
         if (empty($_SESSION[TRANSACTION_ID_NAME])) {
             $_SESSION[TRANSACTION_ID_NAME] = SC_Helper_Session_Ex::createToken();
@@ -176,6 +167,5 @@
      * @return string トランザクショントークン用の文字列
      */
-    function createToken()
-    {
+    function createToken() {
         return sha1(uniqid(rand(), true));
     }
@@ -199,6 +189,5 @@
      * @return boolean トランザクショントークンが有効な場合 true
      */
-    function isValidToken($is_unset = false)
-    {
+    function isValidToken($is_unset = false) {
         // token の妥当性チェック
         $ret = $_REQUEST[TRANSACTION_ID_NAME] === $_SESSION[TRANSACTION_ID_NAME];
@@ -215,6 +204,5 @@
      * @return void
      */
-    function destroyToken()
-    {
+    function destroyToken() {
         unset($_SESSION[TRANSACTION_ID_NAME]);
     }
@@ -227,6 +215,5 @@
      * @return void
      */
-    function adminAuthorization()
-    {
+    function adminAuthorization() {
         $masterData = new SC_DB_MasterData_Ex();
         $arrExcludes = $masterData->getMasterData('mtb_auth_excludes');
Index: /branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php	(revision 22796)
@@ -37,6 +37,5 @@
      * @return array()
      */
-    function registAddress($sqlval)
-    {
+    function save($sqlval) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $customer_id = $sqlval['customer_id'];
@@ -78,6 +77,5 @@
      * @return array()
      */
-    function getAddress($other_deliv_id)
-    {
+    function get($other_deliv_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $address = $objQuery->select('*', 'dtb_other_deliv', 'other_deliv_id = ?', array($other_deliv_id));
@@ -92,6 +90,5 @@
      * @return array
      */
-    function getList($customer_id, $startno = '')
-    {
+    function getList($customer_id, $startno = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setOrder('other_deliv_id DESC');
@@ -109,6 +106,5 @@
      * @return void
      */
-    function deleteAddress($other_deliv_id)
-    {
+    function delete($other_deliv_id) {
         $where      = 'other_deliv_id = ?';
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
@@ -122,6 +118,5 @@
      * @return void
      */
-    function setFormParam(&$objFormParam)
-    {
+    function setFormParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
         $objFormParam->addParam('', 'other_deliv_id');
@@ -134,6 +129,5 @@
      * @return void
      */
-    function errorCheck(&$objFormParam)
-    {
+    function errorCheck(&$objFormParam) {
         $objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam);
         return $objErr->arrErr;
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 22595)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id:SC_Helper_DB.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_DB 
-{
+class SC_Helper_DB {
 
     // {{{ properties
@@ -65,6 +64,5 @@
      *               引数 $add == false でカラムが存在しない場合 false
      */
-    function sfColumnExists($table_name, $col_name, $col_type = '', $dsn = '', $add = false)
-    {
+    function sfColumnExists($table_name, $col_name, $col_type = '', $dsn = '', $add = false) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
@@ -104,6 +102,5 @@
      *               $add == false で, データが存在しない場合 false
      */
-    function sfDataExists($table_name, $where, $arrWhereVal, $dsn = '', $sql = '', $add = false)
-    {
+    function sfDataExists($table_name, $where, $arrWhereVal, $dsn = '', $sql = '', $add = false) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
@@ -134,6 +131,5 @@
      * @return array 店舗基本情報の配列
      */
-    function sfGetBasisData($force = false, $col = '')
-    {
+    function sfGetBasisData($force = false, $col = '') {
         static $data = array();
 
@@ -157,71 +153,4 @@
 
     /**
-     * 基本情報のキャッシュデータを取得する
-     *
-     * @param boolean $generate キャッシュファイルが無い時、DBのデータを基にキャッシュを生成するか
-     * @return array 店舗基本情報の配列
-     */
-    function sfGetBasisDataCache($generate = false)
-    {
-        // テーブル名
-        $name = 'dtb_baseinfo';
-        // キャッシュファイルパス
-        $filepath = MASTER_DATA_REALDIR . $name . '.serial';
-        // ファイル存在確認
-        if (!file_exists($filepath) && $generate) {
-            // 存在していなければキャッシュ生成
-            $this->sfCreateBasisDataCache();
-        }
-        // 戻り値初期化
-        $cacheData = array();
-        // キャッシュファイルが存在すれば読み込む
-        if (file_exists($filepath)) {
-            // キャッシュデータファイルを読み込みアンシリアライズした配列を取得
-            $cacheData = unserialize(file_get_contents($filepath));
-        }
-        // return
-        return $cacheData;
-    }
-
-    /**
-     * 基本情報のキャッシュデータファイルを生成する
-     * データはsfGetBasisDataより取得。
-     * 
-     * このメソッドが直接呼ばれるのは、
-     *「基本情報管理＞SHOPマスター」の更新完了後。
-     * sfGetBasisDataCacheでは、
-     * キャッシュデータファイルが無い場合に呼ばれます。
-     *
-     * @return bool キャッシュデータファイル生成結果
-     */
-    function sfCreateBasisDataCache()
-    {
-        // テーブル名
-        $name = 'dtb_baseinfo';
-        // キャッシュファイルパス
-        $filepath = MASTER_DATA_REALDIR . $name . '.serial';
-        // データ取得
-        $arrData = $this->sfGetBasisData(true);
-        // シリアライズ
-        $data = serialize($arrData);
-        // ファイルを書き出しモードで開く
-        $handle = fopen($filepath, 'w');
-        if (!$handle) {
-            // ファイル生成失敗
-            return false;
-        }
-        // ファイルの内容を書き出す.
-        $res = fwrite($handle, $data);
-        // ファイルを閉じる
-        fclose($handle);
-        if ( $res === false) {
-            // ファイル生成失敗
-            return false;
-        }
-        // ファイル生成成功
-        return true;
-    }
-
-    /**
      * 基本情報の登録数を取得する
      *
@@ -229,6 +158,5 @@
      * @deprecated
      */
-    function sfGetBasisCount()
-    {
+    function sfGetBasisCount() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -241,6 +169,5 @@
      * @return boolean 有無
      */
-    function sfGetBasisExists()
-    {
+    function sfGetBasisExists() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -249,6 +176,5 @@
 
     /* 選択中のアイテムのルートカテゴリIDを取得する */
-    function sfGetRootId()
-    {
+    function sfGetRootId() {
 
         if (!$this->g_root_on) {
@@ -286,6 +212,5 @@
      * @return array オーダー前ポイントの配列
      */
-    function sfGetRollbackPoint($order_id, $use_point, $add_point, $order_status)
-    {
+    function sfGetRollbackPoint($order_id, $use_point, $add_point, $order_status) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('customer_id', 'dtb_order', 'order_id = ?', array($order_id));
@@ -319,6 +244,5 @@
      * @return array カテゴリツリーの配列
      */
-    function sfGetCatTree($parent_category_id, $count_check = false)
-    {
+    function sfGetCatTree($parent_category_id, $count_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '';
@@ -343,5 +267,5 @@
         $arrRet = $objQuery->select($col, $from, $where);
 
-        $arrParentID = SC_Utils_Ex::getTreeTrail($parent_category_id, 'category_id', 'parent_category_id', $arrRet);
+        $arrParentID = SC_Helper_DB_Ex::sfGetParents('dtb_category', 'parent_category_id', 'category_id', $parent_category_id);
 
         foreach ($arrRet as $key => $array) {
@@ -366,6 +290,5 @@
      * @see sfGetCatTree()
      */
-    function findTree(&$arrTree, $parent, &$result)
-    {
+    function findTree(&$arrTree, $parent, &$result) {
         if ($result[count($result) - 1]['parent_category_id'] === 0) {
             return;
@@ -391,6 +314,5 @@
      * @return array カテゴリツリーの配列
      */
-    function sfGetMultiCatTree($product_id, $count_check = false)
-    {
+    function sfGetMultiCatTree($product_id, $count_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '';
@@ -440,6 +362,5 @@
      * @return string 親カテゴリを連結した文字列
      */
-    function sfGetCatCombName($category_id)
-    {
+    function sfGetCatCombName($category_id) {
         // 商品が属するカテゴリIDを縦に取得
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -461,4 +382,20 @@
 
     /**
+     * 指定したカテゴリIDのカテゴリを取得する.
+     *
+     * @param integer $category_id カテゴリID
+     * @return array 指定したカテゴリIDのカテゴリ
+     */
+    function sfGetCat($category_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // カテゴリを取得する
+        $arrVal = array($category_id);
+        $res = $objQuery->select('category_id AS id, category_name AS name', 'dtb_category', 'category_id = ?', $arrVal);
+
+        return $res[0];
+    }
+
+    /**
      * 指定したカテゴリIDの大カテゴリを取得する.
      *
@@ -466,6 +403,5 @@
      * @return array 指定したカテゴリIDの大カテゴリ
      */
-    function sfGetFirstCat($category_id)
-    {
+    function sfGetFirstCat($category_id) {
         // 商品が属するカテゴリIDを縦に取得
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -492,6 +428,5 @@
      * @return array カテゴリツリーの配列
      */
-    function sfGetCategoryList($addwhere = '', $products_check = false, $head = CATEGORY_HEAD)
-    {
+    function sfGetCategoryList($addwhere = '', $products_check = false, $head = CATEGORY_HEAD) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'del_flg = 0';
@@ -532,6 +467,5 @@
      * @return array カテゴリツリーの配列
      */
-    function sfGetLevelCatList($parent_zero = true)
-    {
+    function sfGetLevelCatList($parent_zero = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -582,6 +516,5 @@
      *
      */
-    function sfGetCategoryId($product_id, $category_id = 0, $closed = false)
-    {
+    function sfGetCategoryId($product_id, $category_id = 0, $closed = false) {
         if ($closed) {
             $status = '';
@@ -610,6 +543,5 @@
      * @return void
      */
-    function addProductBeforCategories($category_id, $product_id)
-    {
+    function addProductBeforCategories($category_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -632,6 +564,5 @@
      * @return void
      */
-    function addProductAfterCategories($category_id, $product_id)
-    {
+    function addProductAfterCategories($category_id, $product_id) {
         $sqlval = array('category_id' => $category_id,
                         'product_id' => $product_id);
@@ -665,6 +596,5 @@
      * @return void
      */
-    function removeProductByCategories($category_id, $product_id)
-    {
+    function removeProductByCategories($category_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->delete('dtb_product_categories',
@@ -679,6 +609,5 @@
      * @return void
      */
-    function updateProductCategories($arrCategory_id, $product_id)
-    {
+    function updateProductCategories($arrCategory_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -713,6 +642,5 @@
      * @return void
      */
-    function sfCountCategory($objQuery = NULL, $is_force_all_count = false)
-    {
+    function sfCountCategory($objQuery = NULL, $is_force_all_count = false) {
         $objProduct = new SC_Product_Ex();
 
@@ -891,6 +819,5 @@
      * @param array 子ID の配列
      */
-    function sfGetChildsID($table, $pid_name, $id_name, $id)
-    {
+    function sfGetChildsID($table, $pid_name, $id_name, $id) {
         $arrRet = $this->sfGetChildrenArray($table, $pid_name, $id_name, $id);
         return $arrRet;
@@ -906,6 +833,5 @@
      * @return array 子IDの配列
      */
-    function sfGetChildrenArray($table, $pid_name, $id_name, $id)
-    {
+    function sfGetChildrenArray($table, $pid_name, $id_name, $id) {
         $arrChildren = array();
         $arrRet = array($id);
@@ -928,6 +854,5 @@
      * @return array 子IDの配列
      */
-    function sfGetChildrenArraySub($table, $pid_name, $id_name, $arrPID)
-    {
+    function sfGetChildrenArraySub($table, $pid_name, $id_name, $arrPID) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -949,6 +874,5 @@
      * @return array 親IDの配列
      */
-    function sfGetParents($table, $pid_name, $id_name, $id)
-    {
+    function sfGetParents($table, $pid_name, $id_name, $id) {
         $arrRet = SC_Helper_DB_Ex::sfGetParentsArray($table, $pid_name, $id_name, $id);
         return $arrRet;
@@ -964,6 +888,5 @@
      * @return array 親IDの配列
      */
-    function sfGetParentsArray($table, $pid_name, $id_name, $id)
-    {
+    function sfGetParentsArray($table, $pid_name, $id_name, $id) {
         $arrParents = array();
         $ret = $id;
@@ -980,6 +903,5 @@
 
     /* 子ID所属する親IDを取得する */
-    function sfGetParentsArraySub($table, $pid_name, $id_name, $child)
-    {
+    function sfGetParentsArraySub($table, $pid_name, $id_name, $child) {
         if (SC_Utils_Ex::isBlank($child)) {
             return false;
@@ -999,6 +921,5 @@
      * @return array 商品を検索する場合の配列
      */
-    function sfGetCatWhere($category_id)
-    {
+    function sfGetCatWhere($category_id) {
         // 子カテゴリIDの取得
         $arrRet = SC_Helper_DB_Ex::sfGetChildrenArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
@@ -1019,6 +940,5 @@
      * @return array SELECT ボックス用リストの配列
      */
-    function sfGetIDValueList($table, $keyname, $valname, $where = '', $arrVal = array())
-    {
+    function sfGetIDValueList($table, $keyname, $valname, $where = '', $arrVal = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = "$keyname, $valname";
@@ -1045,6 +965,5 @@
      * @return void
      */
-    function sfRankUp($table, $colname, $id, $andwhere = '')
-    {
+    function sfRankUp($table, $colname, $id, $andwhere = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
@@ -1097,6 +1016,5 @@
      * @return void
      */
-    function sfRankDown($table, $colname, $id, $andwhere = '')
-    {
+    function sfRankDown($table, $colname, $id, $andwhere = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
@@ -1149,6 +1067,5 @@
      * @return void
      */
-    function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = '')
-    {
+    function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
@@ -1277,6 +1194,5 @@
      * @return array 特定のカラムの配列
      */
-    function sfGetParentsCol($objQuery, $table, $id_name, $col_name, $arrId)
-    {
+    function sfGetParentsCol($objQuery, $table, $id_name, $col_name, $arrId) {
         $col = $col_name;
         $len = count($arrId);
@@ -1310,6 +1226,5 @@
      * @return void
      */
-    function sfMoveCatRank($objQuery, $table, $id_name, $cat_name, $old_catid, $new_catid, $id)
-    {
+    function sfMoveCatRank($objQuery, $table, $id_name, $cat_name, $old_catid, $new_catid, $id) {
         if ($old_catid == $new_catid) {
             return;
@@ -1350,6 +1265,5 @@
      * @return bool レコードが存在する場合 true
      */
-    function sfIsRecord($table, $col, $arrVal, $addwhere = '')
-    {
+    function sfIsRecord($table, $col, $arrVal, $addwhere = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrCol = preg_split('/[, ]/', $col);
@@ -1384,6 +1298,5 @@
      * @return void
      */
-    function sfCountMaker($objQuery)
-    {
+    function sfCountMaker($objQuery) {
         $sql = '';
 
@@ -1409,6 +1322,5 @@
      *
      */
-    function sfGetMakerId($product_id, $maker_id = 0, $closed = false)
-    {
+    function sfGetMakerId($product_id, $maker_id = 0, $closed = false) {
         if ($closed) {
             $status = '';
@@ -1444,6 +1356,5 @@
      * @return array カテゴリツリーの配列
      */
-    function sfGetMakerList($addwhere = '', $products_check = false)
-    {
+    function sfGetMakerList($addwhere = '', $products_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'del_flg = 0';
@@ -1482,6 +1393,5 @@
      * @return integer 税金額
      */
-    function sfTax($price)
-    {
+    function sfTax($price) {
         // 店舗基本情報を取得
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
@@ -1497,12 +1407,9 @@
      * @return integer 税金付与した金額
      */
-    function sfCalcIncTax($price, $tax = null, $tax_rule = null)
-    {
+    function sfCalcIncTax($price, $tax = null, $tax_rule = null) {
         // 店舗基本情報を取得
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
-        $tax      = $tax      === null ? $CONF['tax']      : $tax;
-        $tax_rule = $tax_rule === null ? $CONF['tax_rule'] : $tax_rule;
-
-        return SC_Utils_Ex::sfCalcIncTax($price, $tax, $tax_rule);
+
+        return SC_Utils_Ex::sfCalcIncTax($price, $CONF['tax'], $CONF['tax_rule']);
     }
 
@@ -1514,6 +1421,5 @@
      * @return integer 加算ポイント
      */
-    function sfGetAddPoint($totalpoint, $use_point)
-    {
+    function sfGetAddPoint($totalpoint, $use_point) {
         // 店舗基本情報を取得
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
@@ -1530,6 +1436,5 @@
      * @return void
      */
-    function sfExecSqlByFile($sqlFilePath)
-    {
+    function sfExecSqlByFile($sqlFilePath) {
         if (file_exists($sqlFilePath)) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -1552,6 +1457,5 @@
      * @return bool 商品規格が存在する場合:true, それ以外:false
      */
-    function sfHasProductClass($product_id)
-    {
+    function sfHasProductClass($product_id) {
         if (!SC_Utils_Ex::sfIsInt($product_id)) return false;
 
@@ -1562,49 +1466,3 @@
         return $exists;
     }
-
-    /**
-     * 店舗基本情報を登録する
-     *
-     * @param array $arrData 登録するデータ
-     * @return void
-     */
-    static function registerBasisData($arrData)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $arrData = $objQuery->extractOnlyColsOf('dtb_baseinfo', $arrData);
-
-        if (isset($arrData['regular_holiday_ids']) && is_array($arrData['regular_holiday_ids'])) {
-            // 定休日をパイプ区切りの文字列に変換
-            $arrData['regular_holiday_ids'] = implode('|', $arrData['regular_holiday_ids']);
-        }
-
-        $arrData['update_date'] = 'CURRENT_TIMESTAMP';
-
-        // UPDATEの実行
-        $ret = $objQuery->update('dtb_baseinfo', $arrData);
-        GC_Utils_Ex::gfPrintLog('dtb_baseinfo に UPDATE を実行しました。');
-
-        // UPDATE できなかった場合、INSERT
-        if ($ret == 0) {
-            $arrData['id'] = 1;
-            $ret = $objQuery->insert('dtb_baseinfo', $arrData);
-            GC_Utils_Ex::gfPrintLog('dtb_baseinfo に INSERT を実行しました。');
-        }
-    }
-
-    /**
-     * レコード件数を計算.
-     * 
-     * @param string $table
-     * @param string $where
-     * @param array $arrval
-     * @return integer レコード件数
-     */
-    public function countRecords($table, $where = '', $arrval = array())
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'COUNT(*)';
-        return $objQuery->get($col, $table, $where, $arrval);
-    }
 }
Index: /branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php	(revision 22592)
+++ /branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php	(revision 22796)
@@ -30,6 +30,5 @@
  * @version $Id$
  */
-class SC_Helper_HandleError 
-{
+class SC_Helper_HandleError {
 
     /**
@@ -38,6 +37,5 @@
      * @return void
      */
-    static function load()
-    {
+    static function load() {
         // E_DEPRECATED 定数 (for PHP < 5.3)
         // TODO バージョン互換処理に統合したい。
@@ -85,6 +83,5 @@
      *                      E_WARNING, E_USER_WARNING が発生した場合、true を返す
      */
-    static function handle_warning($errno, $errstr, $errfile, $errline)
-    {
+    static function handle_warning($errno, $errstr, $errfile, $errline) {
         // error_reporting 設定に含まれていないエラーコードは処理しない
         if (!(error_reporting() & $errno)) {
@@ -129,7 +126,6 @@
      *                     エラーが捕捉されない場合は, 出力バッファリングの内容を返す
      */
-    static function &_fatal_error_handler(&$buffer)
-    {
-        if (preg_match('/<b>(Fatal error)<\/b>: +(.+) in <b>(.+)<\/b> on line <b>(\d+)<\/b><br \/>/i', $buffer, $matches)) {
+    static function &_fatal_error_handler(&$buffer) {
+        if (preg_match('/<b>(Fatal error)<\/b>: +(.+) in <b>(.+)<\/b> on line <b>(\d+)<\/b><br \/>/i', $buffer, $matches = array())) {
             $message = "$matches[1]: $matches[2] on [$matches[3]($matches[4])]";
             GC_Utils_Ex::gfPrintLog($message, ERROR_LOG_REALFILE, true);
@@ -154,6 +150,5 @@
      * @return void
      */
-    static function handle_error()
-    {
+    static function handle_error() {
         // 最後のエラーを確実に捉えるため、先頭で呼び出す。
         $arrError = error_get_last();
@@ -192,6 +187,5 @@
      * @return void
      */
-    static function displaySystemError($errstr = null)
-    {
+    static function displaySystemError($errstr = null) {
         ob_clean();
 
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Kiyaku.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Kiyaku.php	(revision 22570)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * 会員規約を管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Kiyaku
-{
-    /**
-     * 会員規約の情報を取得.
-     * 
-     * @param integer $kiyaku_id 会員規約ID
-     * @param boolean $has_deleted 削除された会員規約も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function get($kiyaku_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'kiyaku_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_kiyaku', $where, array($kiyaku_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * 会員規約一覧の取得.
-     *
-     * @param boolean $has_deleted 削除された会員規約も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'kiyaku_id, kiyaku_title, kiyaku_text';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_kiyaku';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * 会員規約の登録.
-     * 
-     * @param array $sqlval
-     * @return multiple 登録成功:会員規約ID, 失敗:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $kiyaku_id = $sqlval['kiyaku_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // 新規登録
-        if ($kiyaku_id == '') {
-            // INSERTの実行
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_kiyaku') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['kiyaku_id'] = $objQuery->nextVal('dtb_kiyaku_kiyaku_id');
-            $ret = $objQuery->insert('dtb_kiyaku', $sqlval);
-        // 既存編集
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'kiyaku_id = ?';
-            $ret = $objQuery->update('dtb_kiyaku', $sqlval, $where, array($kiyaku_id));
-        }
-        return ($ret) ? $sqlval['kiyaku_id'] : FALSE;
-    }
-
-    /**
-     * 会員規約の削除.
-     * 
-     * @param integer $kiyaku_id 会員規約ID
-     * @return void
-     */
-    public function delete($kiyaku_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // ランク付きレコードの削除
-        $objDb->sfDeleteRankRecord('dtb_kiyaku', 'kiyaku_id', $kiyaku_id);
-    }
-
-    /**
-     * 会員規約の表示順をひとつ上げる.
-     * 
-     * @param integer $kiyaku_id 会員規約ID
-     * @return void
-     */
-    public function rankUp($kiyaku_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_kiyaku', 'kiyaku_id', $kiyaku_id);
-    }
-
-    /**
-     * 会員規約の表示順をひとつ下げる.
-     * 
-     * @param integer $kiyaku_id 会員規約ID
-     * @return void
-     */
-    public function rankDown($kiyaku_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_kiyaku', 'kiyaku_id', $kiyaku_id);
-    }
-
-    /**
-     * 同じタイトルの規約が存在するか確認.
-     * 
-     * @param string $title 規約タイトル
-     * @param integer $kiyaku_id 会員規約ID
-     * @return boolean 同名のタイトルが存在:TRUE
-     */
-    public function isTitleExist($title, $kiyaku_id = NULL)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        
-        $where  = 'del_flg = 0 AND kiyaku_title = ?';
-        $arrVal = array($title);
-        
-        if(!SC_Utils_Ex::isBlank($kiyaku_id)) {
-            $where   .= ' AND kiyaku_id <> ?';
-            $arrVal[] = $kiyaku_id;
-        }
-        
-        $arrRet = $objQuery->select('kiyaku_id, kiyaku_title', 'dtb_kiyaku', $where, $arrVal);
-
-        return !SC_Utils_Ex::isBlank($arrRet);
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Maker.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Maker.php	(revision 22578)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * メーカーを管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Maker
-{
-    /**
-     * メーカーの情報を取得.
-     * 
-     * @param integer $maker_id メーカーID
-     * @param boolean $has_deleted 削除されたメーカーも含む場合 true; 初期値 false
-     * @return array
-     */
-    public function get($maker_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'maker_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_maker', $where, array($maker_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * 名前からメーカーの情報を取得.
-     * 
-     * @param integer $name メーカー名
-     * @param boolean $has_deleted 削除されたメーカーも含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getByName($name, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'name = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_maker', $where, array($name));
-        return $arrRet[0];
-    }
-
-    /**
-     * メーカー一覧の取得.
-     *
-     * @param boolean $has_deleted 削除されたメーカーも含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'maker_id, name';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_maker';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * メーカーの登録.
-     * 
-     * @param array $sqlval
-     * @return multiple 登録成功:メーカーID, 失敗:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $maker_id = $sqlval['maker_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // 新規登録
-        if ($maker_id == '') {
-            // INSERTの実行
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_maker') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['maker_id'] = $objQuery->nextVal('dtb_maker_maker_id');
-            $ret = $objQuery->insert('dtb_maker', $sqlval);
-        // 既存編集
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'maker_id = ?';
-            $ret = $objQuery->update('dtb_maker', $sqlval, $where, array($maker_id));
-        }
-        return ($ret) ? $sqlval['maker_id'] : FALSE;
-    }
-
-    /**
-     * メーカーの削除.
-     * 
-     * @param integer $maker_id メーカーID
-     * @return void
-     */
-    public function delete($maker_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // ランク付きレコードの削除
-        $objDb->sfDeleteRankRecord('dtb_maker', 'maker_id', $maker_id, '', true);
-    }
-
-    /**
-     * メーカーの表示順をひとつ上げる.
-     * 
-     * @param integer $maker_id メーカーID
-     * @return void
-     */
-    public function rankUp($maker_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_maker', 'maker_id', $maker_id);
-    }
-
-    /**
-     * メーカーの表示順をひとつ下げる.
-     * 
-     * @param integer $maker_id メーカーID
-     * @return void
-     */
-    public function rankDown($maker_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_maker', 'maker_id', $maker_id);
-    }
-
-    /**
-     * メーカーIDをキー, 名前を値とする配列を取得.
-     * 
-     * @return array
-     */
-    public static function getIDValueList()
-    {
-        return SC_Helper_DB_Ex::sfGetIDValueList('dtb_maker', 'maker_id', 'name');
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Recommend.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Recommend.php	(revision 22582)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * おすすめ商品を管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Recommend
-{
-    /**
-     * おすすめ商品の情報を取得.
-     * 
-     * @param integer $best_id おすすめ商品ID
-     * @param boolean $has_deleted 削除されたおすすめ商品も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function get($best_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'best_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_best_products', $where, array($best_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * おすすめ商品の情報をランクから取得.
-     * 
-     * @param integer $rank ランク
-     * @param boolean $has_deleted 削除されたおすすめ商品も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getByRank($rank, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'rank = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_best_products', $where, array($rank));
-        return $arrRet[0];
-    }
-
-    /**
-     * おすすめ商品一覧の取得.
-     *
-     * @param integer $dispNumber 表示件数
-     * @param integer $pageNumber ページ番号
-     * @param boolean $has_deleted 削除されたおすすめ商品も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getList($dispNumber = 0, $pageNumber = 0, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_best_products';
-        $objQuery->setOrder('rank');
-        if ($dispNumber > 0) {
-            if ($pageNumber > 0) {
-                $objQuery->setLimitOffset($dispNumber, (($pageNumber - 1) * $dispNumber));
-            } else {
-                $objQuery->setLimit($dispNumber);
-            }
-        }
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * おすすめ商品の登録.
-     * 
-     * @param array $sqlval
-     * @return multiple 登録成功:おすすめ商品ID, 失敗:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $best_id = $sqlval['best_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // 新規登録
-        if ($best_id == '') {
-            // INSERTの実行
-            if (!$sqlval['rank']) {
-                $sqlval['rank'] = $objQuery->max('rank', 'dtb_best_products') + 1;
-            }
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id');
-            $ret = $objQuery->insert('dtb_best_products', $sqlval);
-        // 既存編集
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'best_id = ?';
-            $ret = $objQuery->update('dtb_best_products', $sqlval, $where, array($best_id));
-        }
-        return ($ret) ? $sqlval['best_id'] : FALSE;
-    }
-
-    /**
-     * おすすめ商品の削除.
-     * 
-     * @param integer $best_id おすすめ商品ID
-     * @return void
-     */
-    public function delete($best_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // ランク付きレコードの削除
-        $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $best_id, TRUE);
-    }
-
-    /**
-     * 商品IDの配列からおすすめ商品を削除.
-     * 
-     * @param array $productIDs 商品ID
-     * @return void
-     */
-    public function deleteByProductIDs($productIDs)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $arrList = $this->getList();
-        foreach ($arrList as $recommend) {
-            if (in_array($recommend['product_id'], $productIDs)) {
-                $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $recommend['best_id'], TRUE);
-            }
-        }
-    }
-
-    /**
-     * おすすめ商品の表示順をひとつ上げる.
-     * 
-     * @param integer $best_id おすすめ商品ID
-     * @return void
-     */
-    public function rankUp($best_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        //おすすめはデータベースの登録が昇順なので、Modeを逆にする。
-        $objDb->sfRankDown('dtb_best_products', 'best_id', $best_id);
-    }
-
-    /**
-     * おすすめ商品の表示順をひとつ下げる.
-     * 
-     * @param integer $best_id おすすめ商品ID
-     * @return void
-     */
-    public function rankDown($best_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        //おすすめはデータベースの登録が昇順なので、Modeを逆にする。
-        $objDb->sfRankUp('dtb_best_products', 'best_id', $best_id);
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_News.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_News.php	(revision 22581)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * ニュースを管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_News
-{
-    /**
-     * ニュースの情報を取得.
-     * 
-     * @param integer $news_id ニュースID
-     * @param boolean $has_deleted 削除されたニュースも含む場合 true; 初期値 false
-     * @return array
-     */
-    public function get($news_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*, cast(news_date as date) as cast_news_date';
-        $where = 'news_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_news', $where, array($news_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * ニュース一覧の取得.
-     *
-     * @param integer $dispNumber 表示件数
-     * @param integer $pageNumber ページ番号
-     * @param boolean $has_deleted 削除されたニュースも含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getList($dispNumber = 0, $pageNumber = 0, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*, cast(news_date as date) as cast_news_date';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_news';
-        $objQuery->setOrder('rank DESC');
-        if ($dispNumber > 0) {
-            if ($pageNumber > 0) {
-                $objQuery->setLimitOffset($dispNumber, (($pageNumber - 1) * $dispNumber));
-            } else {
-                $objQuery->setLimit($dispNumber);
-            }
-        }
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * ニュースの登録.
-     * 
-     * @param array $sqlval
-     * @return multiple 登録成功:ニュースID, 失敗:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $news_id = $sqlval['news_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // 新規登録
-        if ($news_id == '') {
-            // INSERTの実行
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_news') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['news_id'] = $objQuery->nextVal('dtb_news_news_id');
-            $ret = $objQuery->insert('dtb_news', $sqlval);
-        // 既存編集
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'news_id = ?';
-            $ret = $objQuery->update('dtb_news', $sqlval, $where, array($news_id));
-        }
-        return ($ret) ? $sqlval['news_id'] : FALSE;
-    }
-
-    /**
-     * ニュースの削除.
-     * 
-     * @param integer $news_id ニュースID
-     * @return void
-     */
-    public function delete($news_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // ランク付きレコードの削除
-        $objDb->sfDeleteRankRecord('dtb_news', 'news_id', $news_id);
-    }
-
-    /**
-     * ニュースの表示順をひとつ上げる.
-     * 
-     * @param integer $news_id ニュースID
-     * @return void
-     */
-    public function rankUp($news_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_news', 'news_id', $news_id);
-    }
-
-    /**
-     * ニュースの表示順をひとつ下げる.
-     * 
-     * @param integer $news_id ニュースID
-     * @return void
-     */
-    public function rankDown($news_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_news', 'news_id', $news_id);
-    }
-
-    /**
-     * ニュースの表示順を指定する.
-     * 
-     * @param integer $news_id ニュースID
-     * @param integer $rank 移動先の表示順
-     * @return void
-     */
-    public function moveRank($news_id, $rank)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfMoveRank('dtb_news', 'news_id', $news_id, $rank);
-    }
-
-    /**
-     * ニュース記事数を計算.
-     * 
-     * @param boolean $has_deleted 削除されたニュースも含む場合 true; 初期値 false
-     * @return integer ニュース記事数
-     */
-    public function getCount($has_deleted = false)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        if (!$has_deleted) {
-            $where = 'del_flg = 0';
-        } else {
-            $where = '';
-        }
-        return $objDb->countRecords('dtb_news', $where);
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Category.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Category.php	(revision 22603)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * カテゴリーを管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Category
-{
-    private $count_check;
-
-    /**
-     * コンストラクター
-     * 
-     * @param boolean $count_check 登録商品数をチェックする場合はtrue
-     */
-    function __construct($count_check = FALSE)
-    {
-        $this->count_check = $count_check;
-    }
-
-    /**
-     * カテゴリーの情報を取得.
-     * 
-     * @param integer $category_id カテゴリーID
-     * @return array
-     */
-    public function get($category_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id';
-        $where = 'dtb_category.category_id = ? AND del_flg = 0';
-        // 登録商品数のチェック
-        if ($this->count_check) {
-            $where .= ' AND product_count > 0';
-        }
-        $arrRet = $objQuery->getRow($col, $from, $where, array($category_id));
-        return $arrRet;
-    }
-
-    /**
-     * カテゴリー一覧の取得.
-     * 
-     * @param boolean $cid_to_key 配列のキーをカテゴリーIDにする場合はtrue
-     * @return array カテゴリー一覧の配列
-     */
-    public function getList($cid_to_key = FALSE)
-    {
-        static $arrCategory = array(), $cidIsKey = array();
-
-        if (!isset($arrCategory[$this->count_check])) {
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $col = '*';
-            $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id';
-            // 登録商品数のチェック
-            if ($this->count_check) {
-                $where = 'del_flg = 0 AND product_count > 0';
-            } else {
-                $where = 'del_flg = 0';
-            }
-            $objQuery->setOption('ORDER BY rank DESC');
-            $arrTmp = $objQuery->select($col, $from, $where);
-
-            $arrCategory[$this->count_check] = $arrTmp;
-        }
-
-        if ($cid_to_key) {
-            if (!isset($cidIsKey[$this->count_check])) {
-                // 配列のキーをカテゴリーIDに
-                $cidIsKey[$this->count_check] = SC_Utils_Ex::makeArrayIDToKey('category_id', $arrCategory[$this->count_check]);
-            }
-            return $cidIsKey[$this->count_check];
-        }
-
-        return $arrCategory[$this->count_check];
-    }
-
-    /**
-     * カテゴリーツリーの取得.
-     * 
-     * @return type
-     */
-    public function getTree()
-    {
-        static $arrTree = array();
-        if (!isset($arrTree[$this->count_check])) {
-            $arrList = $this->getList();
-            $arrTree[$this->count_check] = SC_Utils_Ex::buildTree('category_id', 'parent_category_id', LEVEL_MAX, $arrList);
-        }
-        return $arrTree[$this->count_check];
-    }
-
-    /**
-     * 親カテゴリーIDの配列を取得.
-     * 
-     * @param integer $category_id 起点のカテゴリーID
-     * @param boolean $id_only IDだけの配列を返す場合はtrue
-     * @return array
-     */
-    public function getTreeTrail($category_id, $id_only = TRUE)
-    {
-        $arrCategory = $this->getList(TRUE);
-        $arrTrailID = SC_Utils_Ex::getTreeTrail($category_id, 'category_id', 'parent_category_id', $arrCategory, TRUE, 0, $id_only);
-        return $arrTrailID;
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Mailtemplate.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Mailtemplate.php	(revision 22584)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * メールテンプレートを管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Mailtemplate
-{
-    /**
-     * メールテンプレートの情報を取得.
-     * 
-     * @param integer $template_id メールテンプレートID
-     * @param boolean $has_deleted 削除されたメールテンプレートも含む場合 true; 初期値 false
-     * @return array
-     */
-    public function get($template_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'template_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_mailtemplate', $where, array($template_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * メールテンプレート一覧の取得.
-     *
-     * @param boolean $has_deleted 削除されたメールテンプレートも含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_mailtemplate';
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * メールテンプレートの登録.
-     * 
-     * @param array $sqlval
-     * @return multiple 登録成功:メールテンプレートID, 失敗:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $template_id = $sqlval['template_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // 存在確認
-        $where = 'template_id = ?';
-        $exist = $objQuery->exists('dtb_mailtemplate', $where, array($template_id));
-        // 新規登録
-        if (!$exist) {
-            // INSERTの実行
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            if (!$sqlval['template_id']) {
-                $sqlval['template_id'] = $objQuery->nextVal('dtb_mailtemplate_template_id');
-            }
-            $ret = $objQuery->insert('dtb_mailtemplate', $sqlval);
-        // 既存編集
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $ret = $objQuery->update('dtb_mailtemplate', $sqlval, $where, array($template_id));
-        }
-        return ($ret) ? $sqlval['template_id'] : FALSE;
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Bloc.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Bloc.php	(revision 22610)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * ブロックを管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Bloc
-{
-    private $device_type_id = NULL;
-
-    function __construct($devide_type_id = DEVICE_TYPE_PC)
-    {
-        $this->device_type_id = $devide_type_id;
-    }
-
-    /**
-     * ブロックの情報を取得.
-     * 
-     * @param integer $bloc_id ブロックID
-     * @return array
-     */
-    public function get($bloc_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'bloc_id = ? AND device_type_id = ?';
-        $arrRet = $objQuery->getRow($col, 'dtb_bloc', $where, array($bloc_id, $this->device_type_id));
-        if (SC_Utils_Ex::isAbsoluteRealPath($arrRet['tpl_path'])) {
-            $tpl_path = $arrRet['tpl_path'];
-        } else {
-            $tpl_path = SC_Helper_PageLayout_Ex::getTemplatePath($this->device_type_id) . BLOC_DIR . $arrRet['tpl_path'];
-        }
-        if (file_exists($tpl_path)) {
-            $arrRet['bloc_html'] = file_get_contents($tpl_path);
-        }
-        return $arrRet;
-    }
-
-    /**
-     * ブロック一覧の取得.
-     *
-     * @return array
-     */
-    public function getList()
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'device_type_id = ?';
-        $table = 'dtb_bloc';
-        $arrRet = $objQuery->select($col, $table, $where, array($this->device_type_id));
-        return $arrRet;
-    }
-
-    /**
-     * where句で条件を指定してブロック一覧を取得.
-     * 
-     * @param string $where
-     * @param array $sqlval
-     */
-    public function getWhere($where = '', $sqlval = array())
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
-        array_unshift($sqlval, $this->device_type_id);
-        $table = 'dtb_bloc';
-        $arrRet = $objQuery->select($col, $table, $where, $sqlval);
-        return $arrRet;
-    }
-
-    /**
-     * ブロックの登録.
-     * 
-     * @param array $sqlval
-     * @return multiple 登録成功:ブロックID, 失敗:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
-
-        // blod_id が空の場合は新規登録
-        $is_new = SC_Utils_Ex::isBlank($sqlval['bloc_id']);
-        $bloc_dir = SC_Helper_PageLayout_Ex::getTemplatePath($sqlval['device_type_id']) . BLOC_DIR;
-        // 既存データの重複チェック
-        if (!$is_new) {
-            $arrExists = $this->get($sqlval['bloc_id']);
-
-            // 既存のファイルが存在する場合は削除しておく
-            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
-            if (file_exists($exists_file)) {
-                unlink($exists_file);
-            }
-        }
-
-        $table = 'dtb_bloc';
-        $arrValues = $objQuery->extractOnlyColsOf($table, $sqlval);
-        $arrValues['tpl_path'] = $sqlval['filename'] . '.tpl';
-        $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
-
-        // 新規登録
-        if ($is_new || SC_Utils_Ex::isBlank($arrExists)) {
-            $objQuery->setOrder('');
-            $arrValues['bloc_id'] = 1 + $objQuery->max('bloc_id', $table, 'device_type_id = ?',
-                                                       array($arrValues['device_type_id']));
-            $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
-            $objQuery->insert($table, $arrValues);
-        }
-        // 更新
-        else {
-            $objQuery->update($table, $arrValues, 'bloc_id = ? AND device_type_id = ?',
-                              array($arrValues['bloc_id'], $arrValues['device_type_id']));
-        }
-
-        $bloc_path = $bloc_dir . $arrValues['tpl_path'];
-        if (!SC_Helper_FileManager_Ex::sfWriteFile($bloc_path, $sqlval['bloc_html'])) {
-            $objQuery->rollback();
-            return false;
-        }
-
-        $objQuery->commit();
-        return $arrValues['bloc_id'];
-    }
-
-    /**
-     * ブロックの削除.
-     * 
-     * @param integer $bloc_id
-     * @return boolean
-     */
-    public function delete($bloc_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
-
-        $arrExists = $this->getWhere('bloc_id = ? AND deletable_flg = 1', array($bloc_id));
-        $is_error = false;
-        if (!SC_Utils_Ex::isBlank($arrExists)) {
-            $objQuery->delete('dtb_bloc', 'bloc_id = ? AND device_type_id = ?',
-                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
-            $objQuery->delete('dtb_blocposition', 'bloc_id = ? AND device_type_id = ?',
-                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
-
-            $bloc_dir = SC_Helper_PageLayout_Ex::getTemplatePath($this->device_type_id) . BLOC_DIR;
-            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
-
-            // ファイルの削除
-            if (file_exists($exists_file)) {
-                if (!unlink($exists_file)) {
-                    $is_error = true;
-                }
-            }
-        } else {
-            $is_error = true;
-        }
-
-        if ($is_error) {
-            $objQuery->rollback();
-            return false;
-        }
-        $objQuery->commit();
-        return true;
-    }
-
-    /**
-     * 端末種別IDのメンバー変数を取得.
-     * 
-     * @return integer 端末種別ID
-     */
-    public function getDeviceTypeID()
-    {
-        return $this->device_type_id; 
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Delivery.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Delivery.php	(revision 22567)
+++ 	(revision )
@@ -1,351 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * 配送方法を管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Delivery {
-
-    /**
-     * 配送方法の情報を取得.
-     * 
-     * @param integer $deliv_id 配送方法ID
-     * @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function get($deliv_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        // 配送業者一覧の取得
-        $col = '*';
-        $where = 'deliv_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $table = 'dtb_deliv';
-        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
-        $arrDeliv = $arrRet[0];
-        if (!$arrDeliv) {
-            return $arrDeliv;
-        }
-
-        // お届け時間の取得
-        $arrDeliv['deliv_time'] = $this->getDelivTime($deliv_id);
-
-        // 配送料金の取得
-        $arrDeliv['deliv_fee'] = $this->getDelivFeeList($deliv_id);
-
-        // 支払方法
-        $arrDeliv['payment_ids'] = $this->getPayments($deliv_id);
-
-        return $arrDeliv;
-    }
-
-    /**
-     * 配送方法一覧の取得.
-     *
-     * @param integer $product_type_id 商品種別ID
-     * @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getList($product_type_id = null, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = '';
-        $arrVal = array();
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        if (!is_null($product_type_id)) {
-            if (!$has_deleted) {
-                $where .= ' AND ';
-            }
-            $where .= 'product_type_id = ?';
-            $arrVal[] = $product_type_id;
-        }
-        $table = 'dtb_deliv';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where, $arrVal);
-        return $arrRet;
-    }
-
-    /**
-     * 配送方法の登録.
-     * 
-     * @param array $sqlval
-     * @return integer $deliv_id
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
-
-        // お届け時間
-        $sqlval_deliv_time = $sqlval['deliv_time'];
-        unset($sqlval['deliv_time']);
-        // 配送料
-        if (INPUT_DELIV_FEE) {
-            $sqlval_deliv_fee = $sqlval['deliv_fee'];
-        }
-        unset($sqlval['deliv_fee']);
-        // 支払い方法
-        $sqlval_payment_ids = $sqlval['payment_ids'];
-        unset($sqlval['payment_ids']);
-
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-
-        // deliv_id が決まっていた場合
-        if ($sqlval['deliv_id'] != '') {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $deliv_id = $sqlval['deliv_id'];
-            $where = 'deliv_id = ?';
-            $objQuery->update('dtb_deliv', $sqlval, $where, array($deliv_id));
-
-            // お届け時間の登録
-            $table = 'dtb_delivtime';
-            $where = 'deliv_id = ? AND time_id = ?';
-            for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
-                $arrWhereVal = array($deliv_id, $cnt);
-                // 既存データの有無を確認
-                $curData = $objQuery->select('*', $table, $where, $arrWhereVal);
-
-                if (isset($sqlval_deliv_time[$cnt])) {
-                    $deliv_time = array();
-                    $deliv_time['deliv_time'] = $sqlval_deliv_time[$cnt];
-
-                    // 入力が空ではなく、DBに情報があれば更新
-                    if (count($curData)) {
-                        $objQuery->update($table, $deliv_time, $where, $arrWhereVal);
-                    }
-                    // DBに情報がなければ登録
-                    else {
-                        $deliv_time['deliv_id'] = $deliv_id;
-                        $deliv_time['time_id'] = $cnt;
-                        $objQuery->insert($table, $deliv_time);
-                    }
-                }
-                // 入力が空で、DBに情報がある場合は削除
-                elseif (count($curData)) {
-                    $objQuery->delete($table, $where, $arrWhereVal);
-                }
-            }
-
-            // 配送料の登録
-            if (INPUT_DELIV_FEE) {
-                foreach ($sqlval_deliv_fee as $deliv_fee) {
-                    $objQuery->update('dtb_delivfee', array('fee' => $deliv_fee['fee']), 'deliv_id = ? AND fee_id = ?', array($deliv_id, $deliv_fee['fee_id']));
-                }
-            }
-        } else {
-            // 登録する配送業者IDの取得
-            $deliv_id = $objQuery->nextVal('dtb_deliv_deliv_id');
-            $sqlval['deliv_id'] = $deliv_id;
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_deliv') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            // INSERTの実行
-            $objQuery->insert('dtb_deliv', $sqlval);
-
-            // お届け時間の設定
-            foreach ($sqlval_deliv_time as $cnt => $deliv_time) {
-                $deliv_time['deliv_id'] = $deliv_id;
-                $deliv_time['time_id'] = $cnt;
-                // INSERTの実行
-                $objQuery->insert('dtb_delivtime', $deliv_time);
-            }
-
-            if (INPUT_DELIV_FEE) {
-                // 配送料金の設定
-                foreach ($sqlval_deliv_fee as $deliv_fee) {
-                    $deliv_fee['deliv_id'] = $deliv_id;
-                    // INSERTの実行
-                    $objQuery->insert('dtb_delivfee', $deliv_fee);
-                }
-            }
-        }
-
-        // 支払い方法
-        $objQuery->delete('dtb_payment_options', 'deliv_id = ?', array($deliv_id));
-        $i = 1;
-        foreach ($sqlval_payment_ids as $payment_id) {
-            $sqlval_payment_id = array();
-            $sqlval_payment_id['deliv_id'] = $deliv_id;
-            $sqlval_payment_id['payment_id'] = $payment_id;
-            $sqlval_payment_id['rank'] = $i;
-            $objQuery->insert('dtb_payment_options', $sqlval_payment_id);
-            $i++;
-        }
-
-        $objQuery->commit();
-
-        return $deliv_id;
-    }
-
-    /**
-     * 配送方法の削除.
-     * 
-     * @param integer $deliv_id 配送方法ID
-     * @return void
-     */
-    public function delete($deliv_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // ランク付きレコードの削除
-        $objDb->sfDeleteRankRecord('dtb_deliv', 'deliv_id', $deliv_id);
-    }
-
-    /**
-     * 配送方法の表示順をひとつ上げる.
-     * 
-     * @param integer $deliv_id 配送方法ID
-     * @return void
-     */
-    public function rankUp($deliv_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_deliv', 'deliv_id', $deliv_id);
-    }
-
-    /**
-     * 配送方法の表示順をひとつ下げる.
-     * 
-     * @param integer $deliv_id 配送方法ID
-     * @return void
-     */
-    public function rankDown($deliv_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_deliv', 'deliv_id', $deliv_id);
-    }
-
-    /**
-     * 同じ内容の配送方法が存在するか確認.
-     * 
-     * @param array $arrDeliv
-     * @return boolean
-     */
-    public function checkExist($arrDeliv)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        if ($arrDeliv['deliv_id'] == '') {
-            $ret = $objDb->sfIsRecord('dtb_deliv', 'service_name', array($arrDeliv['service_name']));
-        } else {
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $ret = (($objQuery->count('dtb_deliv', 'deliv_id != ? AND service_name = ? ', array($arrDeliv['deliv_id'], $arrDeliv['service_name'])) > 0) ? true : false);
-        }
-        return $ret;
-    }
-
-    /**
-     * 配送方法IDをキー, 名前を値とする配列を取得.
-     * 
-     * @param string $type 値のタイプ
-     * @return array
-     */
-    public static function getIDValueList($type = 'name')
-    {
-        return SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', $type);
-    }
-
-    /**
-     * 配送業者IDからお届け時間の配列を取得する.
-     *
-     * @param integer $deliv_id 配送業者ID
-     * @return array お届け時間の配列
-     */
-    public static function getDelivTime($deliv_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->setOrder('time_id');
-        $results = $objQuery->select('time_id, deliv_time', 'dtb_delivtime', 'deliv_id = ?', array($deliv_id));
-        $arrDelivTime = array();
-        foreach ($results as $val) {
-            $arrDelivTime[$val['time_id']] = $val['deliv_time'];
-        }
-        return $arrDelivTime;
-    }
-
-    /**
-     * 配送業者ID から, 有効な支払方法IDを取得する.
-     *
-     * @param integer $deliv_id 配送業者ID
-     * @return array 有効な支払方法IDの配列
-     */
-    public static function getPayments($deliv_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->setOrder('rank');
-        return $objQuery->getCol('payment_id', 'dtb_payment_options', 'deliv_id = ?', array($deliv_id), MDB2_FETCHMODE_ORDERED);
-    }
-
-    /**
-     * 都道府県から配送料金を取得する.
-     *
-     * @param integer|array $pref_id 都道府県ID 又は都道府県IDの配列
-     * @param integer $deliv_id 配送業者ID
-     * @return string 指定の都道府県, 配送業者の配送料金
-     */
-    public static function getDelivFee($pref_id, $deliv_id = 0)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        if (!is_array($pref_id)) {
-            $pref_id = array($pref_id);
-        }
-        $sql = <<< __EOS__
-            SELECT T1.fee AS fee
-            FROM dtb_delivfee T1
-                JOIN dtb_deliv T2
-                    ON T1.deliv_id = T2.deliv_id
-            WHERE T1.pref = ?
-                AND T1.deliv_id = ?
-                AND T2.del_flg = 0
-__EOS__;
-        $result = 0;
-        foreach ($pref_id as $pref) {
-            $result += $objQuery->getOne($sql, array($pref, $deliv_id));
-        }
-        return $result;
-    }
-
-    /**
-     * 配送業者ID から, 配送料金の一覧を取得する.
-     *
-     * @param integer $deliv_id 配送業者ID
-     * @return array 配送料金の配列
-     */
-    public static function getDelivFeeList($deliv_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->setOrder('pref');
-        $col = 'fee_id, fee, pref';
-        $where = 'deliv_id = ?';
-        $table = 'dtb_delivfee';
-        return $objQuery->select($col, $table, $where, array($deliv_id));
-    }
-}
Index: anches/version-2_12-dev/data/class/helper/SC_Helper_Holiday.php
===================================================================
--- /branches/version-2_12-dev/data/class/helper/SC_Helper_Holiday.php	(revision 22575)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * 休日を管理するヘルパークラス.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Holiday
-{
-    /**
-     * 休日の情報を取得.
-     * 
-     * @param integer $holiday_id 休日ID
-     * @param boolean $has_deleted 削除された休日も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function get($holiday_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'holiday_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_holiday', $where, array($holiday_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * 休日一覧の取得.
-     *
-     * @param boolean $has_deleted 削除された休日も含む場合 true; 初期値 false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'holiday_id, title, month, day';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_holiday';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * 休日の登録.
-     * 
-     * @param array $sqlval
-     * @return multiple 登録成功:休日ID, 失敗:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $holiday_id = $sqlval['holiday_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // 新規登録
-        if ($holiday_id == '') {
-            // INSERTの実行
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_holiday') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['holiday_id'] = $objQuery->nextVal('dtb_holiday_holiday_id');
-            $ret = $objQuery->insert('dtb_holiday', $sqlval);
-        // 既存編集
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'holiday_id = ?';
-            $ret = $objQuery->update('dtb_holiday', $sqlval, $where, array($holiday_id));
-        }
-        return ($ret) ? $sqlval['holiday_id'] : FALSE;
-    }
-
-    /**
-     * 休日の削除.
-     * 
-     * @param integer $holiday_id 休日ID
-     * @return void
-     */
-    public function delete($holiday_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // ランク付きレコードの削除
-        $objDb->sfDeleteRankRecord('dtb_holiday', 'holiday_id', $holiday_id, '', true);
-    }
-
-    /**
-     * 休日の表示順をひとつ上げる.
-     * 
-     * @param integer $holiday_id 休日ID
-     * @return void
-     */
-    public function rankUp($holiday_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_holiday', 'holiday_id', $holiday_id);
-    }
-
-    /**
-     * 休日の表示順をひとつ下げる.
-     * 
-     * @param integer $holiday_id 休日ID
-     * @return void
-     */
-    public function rankDown($holiday_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_holiday', 'holiday_id', $holiday_id);
-    }
-
-    /**
-     * 同じ日付の休日が存在するか確認.
-     * 
-     * @param integer $month
-     * @param integer $day
-     * @param integer $holiday_id
-     * @return boolean 同日付の休日が存在:true
-     */
-    public function isDateExist($month, $day, $holiday_id = NULL)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'del_flg = 0 AND month = ? AND day = ?';
-        $arrVal = array($month, $day);
-        if (!SC_Utils_Ex::isBlank($holiday_id)) {
-            $where .= ' AND holiday_id <> ?';
-            $arrVal[] = $holiday_id;
-        }
-        $arrRet = $objQuery->select('holiday_id, title', 'dtb_holiday', $where, $arrVal);
-
-        return !SC_Utils_Ex::isBlank($arrRet);
-    }
-}
Index: /branches/version-2_12-dev/data/class/SC_Query.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Query.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Query.php	(revision 22796)
@@ -30,6 +30,5 @@
  * @version $Id$
  */
-class SC_Query 
-{
+class SC_Query {
 
     var $option = '';
@@ -50,6 +49,5 @@
      * @param boolean $new 新規に接続を行うかどうか
      */
-    function __construct($dsn = '', $force_run = false, $new = false)
-    {
+    function __construct($dsn = '', $force_run = false, $new = false) {
 
         if ($dsn == '') {
@@ -101,6 +99,5 @@
      * @return SC_Query シングルトンの SC_Query インスタンス
      */
-    static function getSingletonInstance($dsn = '', $force_run = false, $new = false)
-    {
+    static function getSingletonInstance($dsn = '', $force_run = false, $new = false) {
         $objThis = SC_Query_Ex::getPoolInstance($dsn);
         if (is_null($objThis)) {
@@ -122,6 +119,5 @@
      * @return boolean
      */
-    function isError()
-    {
+    function isError() {
         if (PEAR::isError($this->conn)) {
             return true;
@@ -138,6 +134,5 @@
      * @return integer 件数
      */
-    function count($table, $where = '', $arrWhereVal = array())
-    {
+    function count($table, $where = '', $arrWhereVal = array()) {
         return $this->get('COUNT(*)', $table, $where, $arrWhereVal);
     }
@@ -151,6 +146,5 @@
      * @return boolean 有無
      */
-    function exists($table, $where = '', $arrWhereVal = array())
-    {
+    function exists($table, $where = '', $arrWhereVal = array()) {
         $sql_inner = $this->getSql('*', $table, $where, $arrWhereVal);
         $sql = "SELECT CASE WHEN EXISTS($sql_inner) THEN 1 ELSE 0 END";
@@ -169,6 +163,5 @@
      * @return array|null
      */
-    function select($cols, $from = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function select($cols, $from = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
         $sqlse = $this->getSql($cols, $from, $where, $arrWhereVal);
         return $this->getAll($sqlse, $arrWhereVal, $fetchmode);
@@ -181,6 +174,5 @@
      * @return string SQL文
      */
-    function getLastQuery($disp = true)
-    {
+    function getLastQuery($disp = true) {
         $sql = $this->conn->last_query;
         if ($disp) {
@@ -196,6 +188,5 @@
      *         失敗した場合は PEAR::Error オブジェクト
      */
-    function commit()
-    {
+    function commit() {
         return $this->conn->commit();
     }
@@ -207,6 +198,5 @@
      *         失敗した場合は PEAR::Error オブジェクト
      */
-    function begin()
-    {
+    function begin() {
         return $this->conn->beginTransaction();
     }
@@ -218,6 +208,5 @@
      *         失敗した場合は PEAR::Error オブジェクト
      */
-    function rollback()
-    {
+    function rollback() {
         return $this->conn->rollback();
     }
@@ -228,6 +217,5 @@
      * @return boolean トランザクションが開始されている場合 true
      */
-    function inTransaction()
-    {
+    function inTransaction() {
         return $this->conn->inTransaction();
     }
@@ -240,6 +228,5 @@
      * FIXME MDB2::exec() の実装であるべき
      */
-    function exec($str, $arrVal = array())
-    {
+    function exec($str, $arrVal = array()) {
         return $this->query($str, $arrVal);
     }
@@ -254,6 +241,5 @@
      * @return boolean 結果
      */
-    function doCallbackAll($cbFunc, $sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function doCallbackAll($cbFunc, $sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
 
         $sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -287,6 +273,5 @@
      * @return array データを含む2次元配列。失敗した場合に 0 または DB_Error オブジェクトを返します。
      */
-    function getAll($sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function getAll($sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
 
         $sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -321,6 +306,5 @@
      * @return string 構築済みの SELECT 文
      */
-    function getSql($cols, $from = '', $where = '', &$arrWhereVal = null)
-    {
+    function getSql($cols, $from = '', $where = '', &$arrWhereVal = null) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
 
@@ -358,6 +342,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function setOption($str)
-    {
+    function setOption($str) {
         $this->option = $str;
         return $this;
@@ -373,6 +356,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function setLimitOffset($limit, $offset = 0)
-    {
+    function setLimitOffset($limit, $offset = 0) {
         if (is_numeric($limit) && is_numeric($offset)) {
             $this->conn->setLimit($limit, $offset);
@@ -389,6 +371,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function setGroupBy($str)
-    {
+    function setGroupBy($str) {
         if (strlen($str) == 0) {
             $this->groupby = '';
@@ -407,6 +388,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function andWhere($str)
-    {
+    function andWhere($str) {
         if ($this->where != '') {
             $this->where .= ' AND ' . $str;
@@ -425,6 +405,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function orWhere($str)
-    {
+    function orWhere($str) {
         if ($this->where != '') {
             $this->where .= ' OR ' . $str;
@@ -444,6 +423,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function setWhere($where = '', $arrWhereVal = array())
-    {
+    function setWhere($where = '', $arrWhereVal = array()) {
         $this->where = $where;
         $this->arrWhereVal = $arrWhereVal;
@@ -459,6 +437,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function setOrder($str)
-    {
+    function setOrder($str) {
         if (strlen($str) == 0) {
             $this->order = '';
@@ -477,6 +454,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function setLimit($limit)
-    {
+    function setLimit($limit) {
         if (is_numeric($limit)) {
             $this->conn->setLimit($limit);
@@ -493,6 +469,5 @@
      * @return SC_Query 自分自身のインスタンス
      */
-    function setOffset($offset)
-    {
+    function setOffset($offset) {
         if (is_numeric($offset)) {
             $this->conn->setLimit($this->conn->limit, $offset);
@@ -512,6 +487,5 @@
      * @return integer|DB_Error|boolean 挿入件数またはエラー(DB_Error, false)
      */
-    function insert($table, $arrVal, $arrSql = array(), $arrSqlVal = array(), $from = '', $arrFromVal = array())
-    {
+    function insert($table, $arrVal, $arrSql = array(), $arrSqlVal = array(), $from = '', $arrFromVal = array()) {
         $strcol = '';
         $strval = '';
@@ -570,6 +544,5 @@
      * @return
      */
-    function update($table, $arrVal, $where = '', $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array())
-    {
+    function update($table, $arrVal, $where = '', $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array()) {
         $arrCol = array();
         $arrValForQuery = array();
@@ -626,6 +599,5 @@
      * @return integer MAX文の実行結果
      */
-    function max($col, $table, $where = '', $arrWhereVal = array())
-    {
+    function max($col, $table, $where = '', $arrWhereVal = array()) {
         $ret = $this->get("MAX($col)", $table, $where, $arrWhereVal);
         return $ret;
@@ -641,6 +613,5 @@
      * @return integer MIN文の実行結果
      */
-    function min($col, $table, $where = '', $arrWhereVal = array())
-    {
+    function min($col, $table, $where = '', $arrWhereVal = array()) {
         $ret = $this->get("MIN($col)", $table, $where, $arrWhereVal);
         return $ret;
@@ -656,6 +627,5 @@
      * @return mixed SQL の実行結果
      */
-    function get($col, $table = '', $where = '', $arrWhereVal = array())
-    {
+    function get($col, $table = '', $where = '', $arrWhereVal = array()) {
         $sqlse = $this->getSql($col, $table, $where, $arrWhereVal);
         // SQL文の実行
@@ -671,6 +641,5 @@
      * @return mixed SQL の実行結果
      */
-    function getOne($sql, $arrVal = array())
-    {
+    function getOne($sql, $arrVal = array()) {
 
         $sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -705,6 +674,5 @@
      * @return array array('カラム名' => '値', ...)の連想配列
      */
-    function getRow($col, $table = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function getRow($col, $table = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
 
         $sql = $this->getSql($col, $table, $where, $arrWhereVal);
@@ -739,6 +707,5 @@
      * @return array SQL の実行結果の配列
      */
-    function getCol($col, $table = '', $where = '', $arrWhereVal = array())
-    {
+    function getCol($col, $table = '', $where = '', $arrWhereVal = array()) {
         $sql = $this->getSql($col, $table, $where, $arrWhereVal);
         $sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -771,6 +738,5 @@
      * @return
      */
-    function delete($table, $where = '', $arrWhereVal = array())
-    {
+    function delete($table, $where = '', $arrWhereVal = array()) {
         if (strlen($where) <= 0) {
             $sqlde = "DELETE FROM $table";
@@ -788,6 +754,5 @@
      * @param integer 次のシーケンス値
      */
-    function nextVal($seq_name)
-    {
+    function nextVal($seq_name) {
         return $this->conn->nextID($seq_name);
     }
@@ -799,6 +764,5 @@
      * @return integer 現在のシーケンス値
      */
-    function currVal($seq_name)
-    {
+    function currVal($seq_name) {
         return $this->conn->currID($seq_name);
     }
@@ -811,6 +775,5 @@
      * @return MDB2_OK
      */
-    function setVal($seq_name, $start)
-    {
+    function setVal($seq_name, $start) {
         $objManager =& $this->conn->loadModule('Manager');
 
@@ -840,6 +803,5 @@
      * @return array SQL の実行結果の配列
      */
-    function query($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT)
-    {
+    function query($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT) {
 
         $n = $this->dbFactory->sfChangeMySQL($n);
@@ -866,6 +828,5 @@
      * @return array シーケンス名の配列
      */
-    function listSequences()
-    {
+    function listSequences() {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->listSequences();
@@ -877,6 +838,5 @@
      * @return array テーブル名の配列
      */
-    function listTables()
-    {
+    function listTables() {
         return $this->dbFactory->listTables($this);
     }
@@ -888,6 +848,5 @@
      * @return array 指定のテーブルのカラム名の配列
      */
-    function listTableFields($table)
-    {
+    function listTableFields($table) {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->listTableFields($table);
@@ -900,6 +859,5 @@
      * @return array 指定のテーブルのインデックス一覧
      */
-    function listTableIndexes($table)
-    {
+    function listTableIndexes($table) {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->listTableIndexes($table);
@@ -914,6 +872,5 @@
      *               MySQLのtext型フィールドを指定する場合は $definition['length'] = 'text_field(NNN)' が必要
      */
-    function createIndex($table, $name, $definition)
-    {
+    function createIndex($table, $name, $definition) {
         $definition = $this->dbFactory->sfGetCreateIndexDefinition($table, $name, $definition);
         $objManager =& $this->conn->loadModule('Manager');
@@ -927,6 +884,5 @@
      * @param string $name インデックス名
      */
-    function dropIndex($table, $name)
-    {
+    function dropIndex($table, $name) {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->dropIndex($table, $name);
@@ -939,6 +895,5 @@
      * @return array テーブル情報の配列
      */
-    function getTableInfo($table)
-    {
+    function getTableInfo($table) {
         $objManager =& $this->conn->loadModule('Reverse');
         return $objManager->tableInfo($table, NULL);
@@ -956,6 +911,5 @@
      * @return string クォートされた文字列
      */
-    function quote($val)
-    {
+    function quote($val) {
         return $this->conn->quote($val);
     }
@@ -968,6 +922,5 @@
      * @return array テーブルに存在する列のみ抽出した連想配列
      */
-    function extractOnlyColsOf($table, $arrParams)
-    {
+    function extractOnlyColsOf($table, $arrParams) {
         $arrCols = $this->listTableFields($table);
         $arrResults = array();
@@ -989,6 +942,5 @@
      * @return MDB2_Statement_Common プリペアドステートメントインスタンス
      */
-    function prepare($sql, $types = null, $result_types = MDB2_PREPARE_RESULT)
-    {
+    function prepare($sql, $types = null, $result_types = MDB2_PREPARE_RESULT) {
         $sth =& $this->conn->prepare($sql, $types, $result_types);
         if (PEAR::isError($sth)) {
@@ -1007,6 +959,5 @@
      * @return MDB2_Result 結果セットのインスタンス
      */
-    function execute(&$sth, $arrVal = array())
-    {
+    function execute(&$sth, $arrVal = array()) {
 
         $arrStartInfo =& $this->lfStartDbTraceLog($sth, $arrVal);
@@ -1034,6 +985,5 @@
      * @return string トレースしたエラー文字列
      */
-    function traceError($error, $sql = '', $arrVal = false)
-    {
+    function traceError($error, $sql = '', $arrVal = false) {
         $err = "SQL: [$sql]\n";
         if ($arrVal !== false) {
@@ -1052,6 +1002,5 @@
      * エラー処理
      */
-    function error($msg)
-    {
+    function error($msg) {
         $msg = "DB処理でエラーが発生しました。\n" . $msg;
         if (!$this->force_run) {
@@ -1072,6 +1021,5 @@
      * @return array 実行結果の配列
      */
-    function getQueryDefsFields($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT)
-    {
+    function getQueryDefsFields($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT) {
 
         $n = $this->dbFactory->sfChangeMySQL($n);
@@ -1100,6 +1048,5 @@
      * @return void
      */
-    private function lfStartDbTraceLog(&$objSth, &$arrVal)
-    {
+    private function lfStartDbTraceLog(&$objSth, &$arrVal) {
         if (!defined('SQL_QUERY_LOG_MODE') || SQL_QUERY_LOG_MODE === 0) {
             return;
@@ -1136,6 +1083,5 @@
      * @return void
      */
-    private function lfEndDbTraceLog(&$arrStartInfo, &$objSth, &$arrVal)
-    {
+    private function lfEndDbTraceLog(&$arrStartInfo, &$objSth, &$arrVal) {
         if (!defined('SQL_QUERY_LOG_MODE') || SQL_QUERY_LOG_MODE === 0) {
             return;
@@ -1168,6 +1114,5 @@
      * @return SC_Query プールしたインスタンス
      */
-    static function setPoolInstance(&$objThis, $dsn = '')
-    {
+    static function setPoolInstance(&$objThis, $dsn = '') {
         $key_str = serialize($dsn);
         return SC_Query_Ex::$arrPoolInstance[$key_str] = $objThis;
@@ -1180,6 +1125,5 @@
      * @return SC_Query|null
      */
-    static function getPoolInstance($dsn = '')
-    {
+    static function getPoolInstance($dsn = '') {
         $key_str = serialize($dsn);
         if (isset(SC_Query_Ex::$arrPoolInstance[$key_str])) {
Index: /branches/version-2_12-dev/data/class/SC_SmartphoneView.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_SmartphoneView.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_SmartphoneView.php	(revision 22796)
@@ -22,13 +22,10 @@
  */
 
-class SC_SmartphoneView extends SC_SiteView_Ex 
-{
-    function __construct($setPrevURL = true)
-    {
+class SC_SmartphoneView extends SC_SiteView_Ex {
+    function __construct($setPrevURL = true) {
         parent::__construct($setPrevURL);
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
Index: /branches/version-2_12-dev/data/class/SC_Product.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Product.php	(revision 22593)
+++ /branches/version-2_12-dev/data/class/SC_Product.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id$
  */
-class SC_Product 
-{
+class SC_Product {
 
     /** 規格名一覧 */
@@ -61,6 +60,5 @@
      * @return void
      */
-    function setProductsOrder($col, $table = 'dtb_products', $order = 'ASC')
-    {
+    function setProductsOrder($col, $table = 'dtb_products', $order = 'ASC') {
         $this->arrOrderData = array('col' => $col, 'table' => $table, 'order' => $order);
     }
@@ -75,8 +73,8 @@
      * @return array 商品IDの配列
      */
-    function findProductIdsOrder(&$objQuery, $arrVal = array())
-    {
-        $table = 'dtb_products AS alldtl';
-
+    function findProductIdsOrder(&$objQuery, $arrVal = array()) {
+        $table = <<< __EOS__
+            dtb_products AS alldtl
+__EOS__;
         $objQuery->setGroupBy('alldtl.product_id');
         if (is_array($this->arrOrderData) and $objQuery->order == '') {
@@ -96,7 +94,10 @@
             $objQuery->setOrder($order);
         }
-        $arrReturn = $objQuery->getCol('alldtl.product_id', $table, '', $arrVal);
-
-        return $arrReturn;
+        $results = $objQuery->select('alldtl.product_id', $table, '', $arrVal, MDB2_FETCHMODE_ORDERED);
+        $resultValues = array();
+        foreach ($results as $val) {
+            $resultValues[] = $val[0];
+        }
+        return $resultValues;
     }
 
@@ -110,8 +111,8 @@
      * @return array 対象商品ID数
      */
-    function findProductCount(&$objQuery, $arrVal = array())
-    {
-        $table = 'dtb_products AS alldtl';
-
+    function findProductCount(&$objQuery, $arrVal = array()) {
+        $table = <<< __EOS__
+            dtb_products AS alldtl
+__EOS__;
         return $objQuery->count($table, '', $arrVal);
     }
@@ -127,6 +128,5 @@
      * @return array 商品一覧の配列
      */
-    function lists(&$objQuery)
-    {
+    function lists(&$objQuery) {
         $col = <<< __EOS__
              product_id
@@ -154,5 +154,4 @@
 __EOS__;
         $res = $objQuery->select($col, $this->alldtlSQL());
-
         return $res;
     }
@@ -170,6 +169,5 @@
      * @return array 商品一覧の配列 (キー: 商品ID)
      */
-    function getListByProductIds(&$objQuery, $arrProductId = array())
-    {
+    function getListByProductIds(&$objQuery, $arrProductId = array()) {
         if (empty($arrProductId)) {
             return array();
@@ -183,5 +181,10 @@
 
         // 配列のキーを商品IDに
-        $arrProducts = SC_Utils_Ex::makeArrayIDToKey('product_id', $arrProducts);
+        $arrTmp = array();
+        foreach ($arrProducts as $arrProduct) {
+            $arrTmp[$arrProduct['product_id']] = $arrProduct;
+        }
+        $arrProducts =& $arrTmp;
+        unset($arrTmp);
 
         // SC_Query::setOrder() の指定がない場合、$arrProductId で指定された商品IDの順に配列要素を並び替え
@@ -207,6 +210,5 @@
      * @return array 商品詳細情報の配列
      */
-    function getDetail($productId)
-    {
+    function getDetail($productId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrProduct = $objQuery->getRow('*', $this->alldtlSQL('product_id = ?'),
@@ -227,9 +229,7 @@
      * @return array 商品詳細情報と商品規格の配列
      */
-    function getDetailAndProductsClass($productClassId)
-    {
+    function getDetailAndProductsClass($productClassId) {
         $result = $this->getProductsClass($productClassId);
         $result = array_merge($result, $this->getDetail($result['product_id']));
-
         return $result;
     }
@@ -245,6 +245,5 @@
      * @return void
      */
-    function setProductsClassByProductIds($arrProductId, $has_deleted = false)
-    {
+    function setProductsClassByProductIds($arrProductId, $has_deleted = false) {
 
         foreach ($arrProductId as $productId) {
@@ -348,6 +347,5 @@
      * @return array 商品規格の配列
      */
-    function getProductsClassByQuery(&$objQuery, $params)
-    {
+    function getProductsClassByQuery(&$objQuery, $params) {
         // 末端の規格を取得
         $col = <<< __EOS__
@@ -402,10 +400,8 @@
      * @return array 商品規格の配列
      */
-    function getProductsClass($productClassId)
-    {
+    function getProductsClass($productClassId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setWhere('product_class_id = ? AND T1.del_flg = 0');
         $arrRes = $this->getProductsClassByQuery($objQuery, $productClassId);
-
         return (array)$arrRes[0];
     }
@@ -418,6 +414,5 @@
      * @return array 商品規格の配列
      */
-    function getProductsClassByProductIds($productIds = array(), $has_deleted = false)
-    {
+    function getProductsClassByProductIds($productIds = array(), $has_deleted = false) {
         if (empty($productIds)) {
             return array();
@@ -429,5 +424,4 @@
         }
         $objQuery->setWhere($where);
-
         return $this->getProductsClassByQuery($objQuery, $productIds);
     }
@@ -440,8 +434,6 @@
      * @return array すべての組み合わせの商品規格の配列
      */
-    function getProductsClassFullByProductId($productId, $has_deleted = false)
-    {
+    function getProductsClassFullByProductId($productId, $has_deleted = false) {
         $arrRet = $this->getProductsClassByProductIds(array($productId), $has_deleted);
-
         return $arrRet;
     }
@@ -453,6 +445,5 @@
      * @return array 商品IDをキーにした商品ステータスIDの配列
      */
-    function getProductStatus($productIds)
-    {
+    function getProductStatus($productIds) {
         if (empty($productIds)) {
             return array();
@@ -467,5 +458,4 @@
             $results[$status['product_id']][] = $status['product_status_id'];
         }
-
         return $results;
     }
@@ -479,6 +469,5 @@
      * @param array $productStatusIds ON にする商品ステータスIDの配列
      */
-    function setProductStatus($productId, $productStatusIds)
-    {
+    function setProductStatus($productId, $productStatusIds) {
 
         $val['product_id'] = $productId;
@@ -506,6 +495,5 @@
      * @see getDetailAndProductsClass()
      */
-    function getBuyLimit($p)
-    {
+    function getBuyLimit($p) {
         $limit = null;
         if ($p['stock_unlimited'] != '1' && is_numeric($p['sale_limit'])) {
@@ -516,5 +504,4 @@
             $limit = $p['stock'];
         }
-
         return $limit;
     }
@@ -532,6 +519,5 @@
      * @return boolean 在庫の減少に成功した場合 true; 失敗した場合 false
      */
-    function reduceStock($productClassId, $quantity)
-    {
+    function reduceStock($productClassId, $quantity) {
 
         if ($quantity == 0) {
@@ -559,32 +545,23 @@
      *
      * @param array $arrProducts 商品情報の配列
-     * @return array 旧バージョン互換用のデータ
-     */
-    static function setPriceTaxTo(&$arrProducts)
-    {
-        foreach ($arrProducts as &$arrProduct) {
-            $arrProduct['price01_min_format'] = number_format($arrProduct['price01_min']);
-            $arrProduct['price01_max_format'] = number_format($arrProduct['price01_max']);
-            $arrProduct['price02_min_format'] = number_format($arrProduct['price02_min']);
-            $arrProduct['price02_max_format'] = number_format($arrProduct['price02_max']);
-
-            SC_Product_Ex::setIncTaxToProduct($arrProduct);
-
-            $arrProduct['price01_min_inctax_format'] = number_format($arrProduct['price01_min_inctax']);
-            $arrProduct['price01_max_inctax_format'] = number_format($arrProduct['price01_max_inctax']);
-            $arrProduct['price02_min_inctax_format'] = number_format($arrProduct['price02_min_inctax']);
-            $arrProduct['price02_max_inctax_format'] = number_format($arrProduct['price02_max_inctax']);
-
-            // @deprecated 2.12.4
-            // 旧バージョン互換用
-            // 本来は、税額の代入で使用すべきキー名。
-            $arrProduct['price01_min_tax_format'] =& $arrProduct['price01_min_inctax_format'];
-            $arrProduct['price01_max_tax_format'] =& $arrProduct['price01_max_inctax_format'];
-            $arrProduct['price02_min_tax_format'] =& $arrProduct['price02_min_inctax_format'];
-            $arrProduct['price02_max_tax_format'] =& $arrProduct['price02_max_inctax_format'];
-        }
-        // @deprecated 2.12.4
-        // 旧バージョン互換用
-        // 現在は参照渡しで戻せる
+     * @return array 税込金額を設定した商品情報の配列
+     */
+    function setPriceTaxTo($arrProducts) {
+        foreach ($arrProducts as $key => $value) {
+            $arrProducts[$key]['price01_min_format'] = number_format($arrProducts[$key]['price01_min']);
+            $arrProducts[$key]['price01_max_format'] = number_format($arrProducts[$key]['price01_max']);
+            $arrProducts[$key]['price02_min_format'] = number_format($arrProducts[$key]['price02_min']);
+            $arrProducts[$key]['price02_max_format'] = number_format($arrProducts[$key]['price02_max']);
+
+            $arrProducts[$key]['price01_min_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price01_min']);
+            $arrProducts[$key]['price01_max_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price01_max']);
+            $arrProducts[$key]['price02_min_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price02_min']);
+            $arrProducts[$key]['price02_max_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price02_max']);
+
+            $arrProducts[$key]['price01_min_tax_format'] = number_format($arrProducts[$key]['price01_min_tax']);
+            $arrProducts[$key]['price01_max_tax_format'] = number_format($arrProducts[$key]['price01_max_tax']);
+            $arrProducts[$key]['price02_min_tax_format'] = number_format($arrProducts[$key]['price02_min_tax']);
+            $arrProducts[$key]['price02_max_tax_format'] = number_format($arrProducts[$key]['price02_max_tax']);
+        }
         return $arrProducts;
     }
@@ -596,6 +573,5 @@
      * @return void
      */
-    static function setIncTaxToProducts(&$arrProducts)
-    {
+    static function setIncTaxToProducts(&$arrProducts) {
         foreach ($arrProducts as &$arrProduct) {
             SC_Product_Ex::setIncTaxToProduct($arrProduct);
@@ -609,10 +585,9 @@
      * @return void
      */
-    static function setIncTaxToProduct(&$arrProduct)
-    {
-        $arrProduct['price01_min_inctax'] = isset($arrProduct['price01_min']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price01_min']) : null;
-        $arrProduct['price01_max_inctax'] = isset($arrProduct['price01_max']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price01_max']) : null;
-        $arrProduct['price02_min_inctax'] = isset($arrProduct['price02_min']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price02_min']) : null;
-        $arrProduct['price02_max_inctax'] = isset($arrProduct['price02_max']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price02_max']) : null;
+    static function setIncTaxToProduct(&$arrProduct) {
+        $arrProduct['price01_min_inctax'] = isset($arrProduct['price01_min']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price01_min']) : null;
+        $arrProduct['price01_max_inctax'] = isset($arrProduct['price01_max']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price01_max']) : null;
+        $arrProduct['price02_min_inctax'] = isset($arrProduct['price02_min']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price02_min']) : null;
+        $arrProduct['price02_max_inctax'] = isset($arrProduct['price02_max']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price02_max']) : null;
     }
 
@@ -623,6 +598,5 @@
      * @return string 商品詳細の SQL
      */
-    function alldtlSQL($where_products_class = '')
-    {
+    function alldtlSQL($where_products_class = '') {
         if (!SC_Utils_Ex::isBlank($where_products_class)) {
             $where_products_class = 'AND (' . $where_products_class . ')';
@@ -719,5 +693,4 @@
             ) AS alldtl
 __EOS__;
-
         return $sql;
     }
@@ -731,6 +704,5 @@
      * @return string 商品規格詳細の SQL
      */
-    function prdclsSQL($where = '')
-    {
+    function prdclsSQL($where = '') {
         $where_clause = '';
         if (!SC_Utils_Ex::isBlank($where)) {
@@ -770,5 +742,4 @@
         ) as prdcls
 __EOS__;
-
         return $sql;
     }
Index: /branches/version-2_12-dev/data/class/SC_Session.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Session.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_Session.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 /* セッション管理クラス */
-class SC_Session 
-{
+class SC_Session {
 
     /** ログインユーザ名 */
@@ -45,6 +44,5 @@
 
     /* コンストラクタ */
-    function __construct()
-    {
+    function __construct() {
         // セッション情報の保存
         if (isset($_SESSION['cert'])) {
@@ -67,6 +65,5 @@
     }
     /* 認証成功の判定 */
-    function IsSuccess()
-    {
+    function IsSuccess() {
         if ($this->cert == CERT_STRING) {
             $masterData = new SC_DB_MasterData_Ex();
@@ -86,24 +83,20 @@
 
     /* セッションの書き込み */
-    function SetSession($key, $val)
-    {
+    function SetSession($key, $val) {
         $_SESSION[$key] = $val;
     }
 
     /* セッションの読み込み */
-    function GetSession($key)
-    {
+    function GetSession($key) {
         return $_SESSION[$key];
     }
 
     /* セッションIDの取得 */
-    function GetSID()
-    {
+    function GetSID() {
         return $this->sid;
     }
 
     /** ユニークIDの取得 **/
-    function getUniqId()
-    {
+    function getUniqId() {
         // ユニークIDがセットされていない場合はセットする。
         if (empty($_SESSION['uniqid'])) {
@@ -114,6 +107,5 @@
 
     /** ユニークIDのセット **/
-    function setUniqId()
-    {
+    function setUniqId() {
         // 予測されないようにランダム文字列を付与する。
         $this->SetSession('uniqid', SC_Utils_Ex::sfGetUniqRandomId());
@@ -121,6 +113,5 @@
 
     // 関連セッションのみ破棄する。
-    function logout()
-    {
+    function logout() {
         unset($_SESSION['cert']);
         unset($_SESSION['login_id']);
Index: /branches/version-2_12-dev/data/class/SC_AdminView.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_AdminView.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_AdminView.php	(revision 22796)
@@ -22,13 +22,10 @@
  */
 
-class SC_AdminView extends SC_View_Ex
-{
-    function __construct()
-    {
+class SC_AdminView extends SC_View_Ex {
+    function __construct() {
         parent::__construct();
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
Index: /branches/version-2_12-dev/data/class/SC_UploadFile.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_UploadFile.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_UploadFile.php	(revision 22796)
@@ -23,6 +23,5 @@
 
 /* アップロードファイル管理クラス */
-class SC_UploadFile 
-{
+class SC_UploadFile {
     var $temp_dir;
     var $save_dir;
@@ -59,6 +58,5 @@
 
     // ファイル管理クラス
-    function __construct($temp_dir, $save_dir)
-    {
+    function __construct($temp_dir, $save_dir) {
         $this->temp_dir = rtrim($temp_dir, '/') . '/';
         $this->save_dir = rtrim($save_dir, '/') . '/';
@@ -67,6 +65,5 @@
 
     // ファイル情報追加
-    function addFile($disp_name, $keyname, $arrExt, $size, $necessary=false, $width=0, $height=0, $image=true)
-    {
+    function addFile($disp_name, $keyname, $arrExt, $size, $necessary=false, $width=0, $height=0, $image=true) {
         $this->disp_name[] = $disp_name;
         $this->keyname[] = $keyname;
@@ -79,6 +76,5 @@
     }
     // サムネイル画像の作成
-    function makeThumb($src_file, $width, $height, $dst_file)
-    {
+    function makeThumb($src_file, $width, $height, $dst_file) {
         $objThumb = new gdthumb();
         $ret = $objThumb->Main($src_file, $width, $height, $dst_file);
@@ -94,6 +90,5 @@
 
     // アップロードされたファイルを保存する。
-    function makeTempFile($keyname, $rename = IMAGE_RENAME)
-    {
+    function makeTempFile($keyname, $rename = IMAGE_RENAME) {
         $objErr = new SC_CheckError_Ex();
         $cnt = 0;
@@ -142,6 +137,5 @@
 
     // アップロードされたダウンロードファイルを保存する。
-    function makeTempDownFile($keyname='down_file')
-    {
+    function makeTempDownFile($keyname='down_file') {
         $objErr = new SC_CheckError_Ex();
         $cnt = 0;
@@ -174,6 +168,5 @@
 
     // 画像を削除する。
-    function deleteFile($keyname)
-    {
+    function deleteFile($keyname) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
@@ -192,6 +185,5 @@
 
     // 画像を削除する。
-    function deleteKikakuFile($keyname)
-    {
+    function deleteKikakuFile($keyname) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
@@ -210,6 +202,5 @@
 
     // 一時ファイルパスを取得する。
-    function getTempFilePath($keyname)
-    {
+    function getTempFilePath($keyname) {
         $cnt = 0;
         $filepath = '';
@@ -226,6 +217,5 @@
 
     // 一時ファイルを保存ディレクトリに移す
-    function moveTempFile()
-    {
+    function moveTempFile() {
         $objImage = new SC_Image_Ex($this->temp_dir);
 
@@ -248,6 +238,5 @@
 
     // ダウンロード一時ファイルを保存ディレクトリに移す
-    function moveTempDownFile()
-    {
+    function moveTempDownFile() {
         $objImage = new SC_Image_Ex($this->temp_dir);
         for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
@@ -266,6 +255,5 @@
 
     // HIDDEN用のファイル名配列を返す
-    function getHiddenFileList()
-    {
+    function getHiddenFileList() {
         $cnt = 0;
         $arrRet = array();
@@ -283,6 +271,5 @@
 
     // HIDDENで送られてきたファイル名を取得する
-    function setHiddenFileList($arrPOST)
-    {
+    function setHiddenFileList($arrPOST) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -299,6 +286,5 @@
     }
 
-    function setHiddenKikakuFileList($arrPOST)
-    {
+    function setHiddenKikakuFileList($arrPOST) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -316,6 +302,5 @@
 
     // フォームに渡す用のファイル情報配列を返す
-    function getFormFileList($temp_url, $save_url, $real_size = false)
-    {
+    function getFormFileList($temp_url, $save_url, $real_size = false) {
         $arrRet = array();
         $cnt = 0;
@@ -356,6 +341,5 @@
 
     // フォームに渡す用のダウンロードファイル情報を返す
-    function getFormDownFile()
-    {
+    function getFormDownFile() {
         $arrRet = '';
         for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
@@ -368,6 +352,5 @@
         return $arrRet;
     }
-    function getFormKikakuDownFile()
-    {
+    function getFormKikakuDownFile() {
         $arrRet = array();
         $cnt = 0;
@@ -384,6 +367,5 @@
 
     // DB保存用のファイル名配列を返す
-    function getDBFileList()
-    {
+    function getDBFileList() {
         $cnt = 0;
         $dbFileList = array();
@@ -400,6 +382,5 @@
 
     // DBで保存されたファイル名配列をセットする
-    function setDBFileList($arrVal)
-    {
+    function setDBFileList($arrVal) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -412,6 +393,5 @@
 
     // DBで保存されたダウンロードファイル名をセットする
-    function setDBDownFile($arrVal)
-    {
+    function setDBDownFile($arrVal) {
         if (isset($arrVal['down_realfilename']) && $arrVal['down_realfilename'] != '') {
             $this->save_file[0] = $arrVal['down_realfilename'];
@@ -420,6 +400,5 @@
 
     // DBで保存されたダウンロードファイル名をセットする(setDBDownFileと統合予定)
-    function setPostFileList($arrPost)
-    {
+    function setPostFileList($arrPost) {
         for ($cnt = 0;$cnt < count($this->keyname); $cnt++) {
             if (isset($arrPost['temp_down_realfilename:' . ($cnt+1)])) {
@@ -430,6 +409,5 @@
 
     // 画像をセットする
-    function setDBImageList($arrVal)
-    {
+    function setDBImageList($arrVal) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -442,6 +420,5 @@
 
     // DB上のファイルの内削除要求があったファイルを削除する。
-    function deleteDBFile($arrVal)
-    {
+    function deleteDBFile($arrVal) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
@@ -457,6 +434,5 @@
 
     // DB上のダウンロードファイルの内削除要求があったファイルを削除する。
-    function deleteDBDownFile($arrVal)
-    {
+    function deleteDBDownFile($arrVal) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
@@ -469,6 +445,5 @@
 
     // 必須判定
-    function checkExists($keyname = '')
-    {
+    function checkExists($keyname = '') {
         $cnt = 0;
         $arrRet = array();
@@ -492,6 +467,5 @@
 
     // 拡大率を指定して画像保存
-    function saveResizeImage($keyname, $to_w, $to_h)
-    {
+    function saveResizeImage($keyname, $to_w, $to_h) {
         $path = '';
 
@@ -514,6 +488,5 @@
      * @return string
      */
-    function lfGetTmpImageName($rename, $keyname = '', $uploadfile = '')
-    {
+    function lfGetTmpImageName($rename, $keyname = '', $uploadfile = '') {
 
         if ($rename === true) {
Index: /branches/version-2_12-dev/data/class/SC_FormParam.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_FormParam.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_FormParam.php	(revision 22796)
@@ -30,6 +30,5 @@
  * @author LOCKON CO.,LTD.
  */
-class SC_FormParam 
-{
+class SC_FormParam {
 
     /**
@@ -63,6 +62,5 @@
      * コンストラクタ
      */
-    function __construct()
-    {
+    function __construct() {
         $this->check_dir = IMAGE_SAVE_REALDIR;
 
@@ -84,6 +82,5 @@
      * @deprecated 2.12.0 #1702
      */
-    function initParam()
-    {
+    function initParam() {
         $this->disp_name = array();
         $this->keyname = array();
@@ -96,6 +93,5 @@
 
     // パラメーターの追加
-    function addParam($disp_name, $keyname, $length = '', $convert = '', $arrCheck = array(), $default = '', $input_db = true)
-    {
+    function addParam($disp_name, $keyname, $length = '', $convert = '', $arrCheck = array(), $default = '', $input_db = true) {
         $this->disp_name[] = $disp_name;
         $this->keyname[] = $keyname;
@@ -111,6 +107,5 @@
     // $arrVal  :$arrVal['keyname']・・の配列を一致したキーのインスタンスに格納する
     // $seq     :trueの場合、$arrVal[0]~の配列を登録順にインスタンスに格納する
-    function setParam($arrVal, $seq = false)
-    {
+    function setParam($arrVal, $seq = false) {
         if (!is_array($arrVal)) return;
         if (!$seq) {
@@ -126,6 +121,5 @@
 
     // 画面表示用タイトル生成
-    function setHtmlDispNameArray()
-    {
+    function setHtmlDispNameArray() {
         foreach ($this->keyname as $index => $key) {
             $find = false;
@@ -151,12 +145,10 @@
 
     // 画面表示用タイトル取得
-    function getHtmlDispNameArray()
-    {
+    function getHtmlDispNameArray() {
         return $this->html_disp_name;
     }
 
     // 複数列パラメーターの取得
-    function setParamList($arrVal2d, $keyname)
-    {
+    function setParamList($arrVal2d, $keyname) {
         // DBの件数を取得する。
         $no = 1;
@@ -168,6 +160,5 @@
     }
 
-    function setDBDate($db_date, $year_key = 'year', $month_key = 'month', $day_key = 'day')
-    {
+    function setDBDate($db_date, $year_key = 'year', $month_key = 'month', $day_key = 'day') {
         if (empty($db_date)) {
             return;
@@ -180,6 +171,5 @@
 
     // キーに対応した値をセットする。
-    function setValue($key, $value)
-    {
+    function setValue($key, $value) {
         if (!in_array($key, $this->keyname)) {
             // TODO 警告発生
@@ -189,6 +179,5 @@
     }
 
-    function toLower($key)
-    {
+    function toLower($key) {
         if (isset($this->arrValue[$key])) {
             $this->arrValue[$key] = strtolower($this->arrValue[$key]);
@@ -197,6 +186,5 @@
 
     // エラーチェック
-    function checkError($br = true)
-    {
+    function checkError($br = true) {
         $arrErr = array();
 
@@ -230,5 +218,4 @@
                     case 'SELECT_CHECK':
                     case 'FILE_NAME_CHECK_BY_NOUPLOAD':
-                    case 'NUM_POINT_CHECK':
                         $this->recursionCheck($this->disp_name[$index], $func,
                             $value, $arrErr, $key, $this->length[$index]);
@@ -315,6 +302,5 @@
      * @see mb_convert_kana
      */
-    function convParam()
-    {
+    function convParam() {
         foreach ($this->keyname as $index => $key) {
             if (isset($this->arrValue[$key])) {
@@ -330,6 +316,5 @@
      * @param string $convert mb_convert_kana の変換オプション
      */
-    function recursionConvParam(&$value, $convert)
-    {
+    function recursionConvParam(&$value, $convert) {
         if (is_array($value)) {
             foreach ($value as $key => $val) {
@@ -349,6 +334,5 @@
      * @return array 連想配列
      */
-    function getHashArray($arrKey = array())
-    {
+    function getHashArray($arrKey = array()) {
         $arrRet = array();
         foreach ($this->keyname as $keyname) {
@@ -361,6 +345,5 @@
 
     // DB格納用配列の作成
-    function getDbArray()
-    {
+    function getDbArray() {
         $dbArray = array();
         foreach ($this->keyname as $index => $key) {
@@ -378,6 +361,5 @@
      * @return array 縦横を入れ替えた配列
      */
-    function getSwapArray($arrKey = array())
-    {
+    function getSwapArray($arrKey = array()) {
         $arrTmp = $this->getHashArray($arrKey);
         return SC_Utils_Ex::sfSwapArray($arrTmp);
@@ -385,12 +367,10 @@
 
     // 項目名一覧の取得
-    function getTitleArray()
-    {
+    function getTitleArray() {
         return $this->disp_name;
     }
 
     // 項目数を返す
-    function getCount()
-    {
+    function getCount() {
         $count = count($this->keyname);
         return $count;
@@ -398,6 +378,5 @@
 
     // フォームに渡す用のパラメーターを返す
-    function getFormParamList()
-    {
+    function getFormParamList() {
         $formParamList = array();
         foreach ($this->keyname as $index => $key) {
@@ -419,12 +398,10 @@
      * @return array キー名の一覧
      */
-    function getKeyList()
-    {
+    function getKeyList() {
         return $this->keyname;
     }
 
     // キー名と一致した値を返す
-    function getValue($keyname, $default = '')
-    {
+    function getValue($keyname, $default = '') {
         $ret = null;
         foreach ($this->keyname as $key) {
@@ -452,6 +429,5 @@
      * @deprecated
      */
-    function splitParamCheckBoxes($keyname)
-    {
+    function splitParamCheckBoxes($keyname) {
         foreach ($this->keyname as $key) {
             if ($key == $keyname) {
@@ -469,6 +445,5 @@
      * @return void
      */
-    function trimParam($has_wide_space = true)
-    {
+    function trimParam($has_wide_space = true) {
         foreach ($this->arrValue as &$value) {
             $this->recursionTrim($value, $has_wide_space);
@@ -483,10 +458,9 @@
      * @return void
      */
-    function recursionTrim(&$value, $has_wide_space = true)
-    {
+    function recursionTrim(&$value, $has_wide_space = true) {
         $pattern = '/^[ 　\r\n\t]*(.*?)[ 　\r\n\t]*$/u';
         if (is_array($value)) {
             foreach ($value as $key => $val) {
-                $this->recursionTrim($value[$key], $has_wide_space);
+                $this->recursionTrim($value[$key], $convert);
             }
         } else {
@@ -508,6 +482,5 @@
      * @return array 検索結果引き継ぎ用の連想配列.
      */
-    function getSearchArray($prefix = 'search_')
-    {
+    function getSearchArray($prefix = 'search_') {
         $arrResults = array();
         foreach ($this->keyname as $key) {
@@ -525,6 +498,5 @@
      * @deprecated 2.12.0 必要ならば getFormParamList メソッドに引数を追加するなどで実現可能
      */
-    function getFormDispArray()
-    {
+    function getFormDispArray() {
         $formDispArray = array();
         foreach ($this->keyname as $index => $key) {
@@ -546,6 +518,5 @@
      * カスタマイズおよびプラグインで使用されるのを想定
      */
-    function removeParam($keyname)
-    {
+    function removeParam($keyname) {
         $index = array_search($keyname, $this->keyname);
 
@@ -590,6 +561,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 22567)
+++ /branches/version-2_12-dev/data/class/SC_MobileUserAgent.php	(revision 22796)
@@ -28,6 +28,5 @@
  * すべてのメソッドはクラスメソッド。
  */
-class SC_MobileUserAgent 
-{
+class SC_MobileUserAgent {
     /**
      * 携帯端末のキャリアを表す文字列を取得する。
@@ -38,6 +37,5 @@
      *                      携帯端末ではない場合は false を返す。
      */
-    function getCarrier()
-    {
+    function getCarrier() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
         if (Net_UserAgent_Mobile::isError($objAgent)) {
@@ -69,6 +67,5 @@
      * @return string|false 取得したIDを返す。取得できなかった場合は false を返す。
      */
-    function getId()
-    {
+    function getId() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
         if (Net_UserAgent_Mobile::isError($objAgent)) {
@@ -88,6 +85,5 @@
      * @return string 携帯端末のモデルを表す文字列を返す。
      */
-    function getModel()
-    {
+    function getModel() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
         if (Net_UserAgent_Mobile::isError($objAgent)) {
@@ -112,6 +108,5 @@
      * @return boolean サポートしている場合は true、それ以外の場合は false を返す。
      */
-    function isSupported()
-    {
+    function isSupported() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
 
@@ -143,6 +138,5 @@
      * @return boolean サポートしている場合は true、それ以外の場合は false を返す。 
      */
-    function isMobile()
-    { 
+    function isMobile() { 
         $objAgent =& Net_UserAgent_Mobile::singleton(); 
         if (Net_UserAgent_Mobile::isError($objAgent)) { 
Index: /branches/version-2_12-dev/data/class/SC_ClassAutoloader.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_ClassAutoloader.php	(revision 22567)
+++ /branches/version-2_12-dev/data/class/SC_ClassAutoloader.php	(revision 22796)
@@ -29,6 +29,5 @@
  * @version $Id$
  */
-class SC_ClassAutoloader 
-{
+class SC_ClassAutoloader {
     /**
      * クラスのオートローディング本体
@@ -37,6 +36,5 @@
      * @return void
      */
-    public static function autoload($class)
-    {
+    public static function autoload($class) {
         $arrClassNamePart = explode('_', $class);
         $is_ex = end($arrClassNamePart) === 'Ex';
Index: /branches/version-2_12-dev/data/class/SC_CheckError.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_CheckError.php	(revision 22609)
+++ /branches/version-2_12-dev/data/class/SC_CheckError.php	(revision 22796)
@@ -27,12 +27,10 @@
  *----------------------------------------------------------------------
  */
-class SC_CheckError 
-{
+class SC_CheckError {
     var $arrErr = array();
     var $arrParam;
 
     // チェック対象の値が含まれる配列をセットする。
-    function __construct($array = '')
-    {
+    function __construct($array = '') {
         if ($array != '') {
             $this->arrParam = $array;
@@ -43,6 +41,5 @@
     }
 
-    function doFunc($value, $arrFunc)
-    {
+    function doFunc($value, $arrFunc) {
         foreach ($arrFunc as $key) {
             $this->$key($value);
@@ -56,6 +53,5 @@
      * @return void
      */
-    function HTML_TAG_CHECK($value)
-    {
+    function HTML_TAG_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -63,10 +59,6 @@
         $this->createParam($value);
         // HTMLに含まれているタグを抽出する
-        $arrTagIncludedHtml = array();
-        preg_match_all('/<\/?([a-z]+)/i', $this->arrParam[$value[1]], $arrTagIncludedHtml);
-        // 抽出結果を小文字に変換
-        foreach ($arrTagIncludedHtml[1] as $key => $matchedTag) {
-            $arrTagIncludedHtml[1][$key] = strtolower($matchedTag);
-        }
+        preg_match_all('/<\/?([a-z]+)/i', $this->arrParam[$value[1]], $arrTagIncludedHtml = array());
+
         $arrDiffTag = array_diff($arrTagIncludedHtml[1], $value[2]);
 
@@ -89,6 +81,5 @@
      * @return void
      */
-    function EXIST_CHECK($value)
-    {
+    function EXIST_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -109,6 +100,5 @@
      * @return void
      */
-    function EXIST_CHECK_REVERSE($value)
-    {
+    function EXIST_CHECK_REVERSE($value) {
         if (isset($this->arrErr[$value[0]])) {
             return;
@@ -127,6 +117,5 @@
      * @return void
      */
-    function SPTAB_CHECK($value)
-    {
+    function SPTAB_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -145,6 +134,5 @@
      * @return void
      */
-    function NO_SPTAB($value)
-    {
+    function NO_SPTAB($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -157,6 +145,5 @@
 
     /* ゼロで開始されている数値の判定 */
-    function ZERO_START($value)
-    {
+    function ZERO_START($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -175,6 +162,5 @@
      * @return void
      */
-    function SELECT_CHECK($value)
-    {
+    function SELECT_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -193,6 +179,5 @@
      * @return void
      */
-    function EQUAL_CHECK($value)
-    {
+    function EQUAL_CHECK($value) {
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
             return;
@@ -212,6 +197,5 @@
      * @return void
      */
-    function DIFFERENT_CHECK($value)
-    {
+    function DIFFERENT_CHECK($value) {
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
             return;
@@ -231,6 +215,5 @@
      * @return void
      */
-    function GREATER_CHECK($value)
-    {
+    function GREATER_CHECK($value) {
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
             return;
@@ -250,6 +233,5 @@
      * @return void
      */
-    function MAX_LENGTH_CHECK($value)
-    {
+    function MAX_LENGTH_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -269,6 +251,5 @@
      * @return void
      */
-    function MIN_LENGTH_CHECK($value)
-    {
+    function MIN_LENGTH_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -288,6 +269,5 @@
      * @return void
      */
-    function MAX_CHECK($value)
-    {
+    function MAX_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -307,6 +287,5 @@
      * @return void
      */
-    function MIN_CHECK($value)
-    {
+    function MIN_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -325,6 +304,5 @@
      * @return void
      */
-    function NUM_CHECK($value)
-    {
+    function NUM_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -343,6 +321,5 @@
      * @return void
      */
-    function NUM_POINT_CHECK($value)
-    {
+    function NUM_POINT_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -354,6 +331,5 @@
     }
 
-    function ALPHA_CHECK($value)
-    {
+    function ALPHA_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -378,6 +354,5 @@
      * @return void
      */
-    function TEL_CHECK($value)
-    {
+    function TEL_CHECK($value) {
         $telItemLen = isset($value[4]) ? $value[4] : TEL_ITEM_LEN;
         $telLen = isset($value[5]) ? $value[5] : TEL_LEN;
@@ -420,6 +395,5 @@
         value[1]    : 判定対象要素名
     */
-    function FULL_EXIST_CHECK($value)
-    {
+    function FULL_EXIST_CHECK($value) {
         $max = count($value);
         $this->createParam($value);
@@ -449,6 +423,5 @@
         value[1]    : 判定対象要素名
     */
-    function ALL_EXIST_CHECK($value)
-    {
+    function ALL_EXIST_CHECK($value) {
         $max = count($value);
 
@@ -481,6 +454,5 @@
         value[1]    : 判定対象要素名
     */
-    function ONE_EXIST_CHECK($value)
-    {
+    function ONE_EXIST_CHECK($value) {
         $max = count($value);
         $this->createParam($value);
@@ -510,6 +482,5 @@
         value[1]    : 判定対象要素名
     */
-    function TOP_EXIST_CHECK($value)
-    {
+    function TOP_EXIST_CHECK($value) {
         $max = count($value);
         $this->createParam($value);
@@ -544,6 +515,5 @@
     // 入力文字がカナ以外ならエラーを返す
     // value[0] = 項目名 value[1] = 判定対象文字列
-    function KANA_CHECK($value)
-    {
+    function KANA_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -558,6 +528,5 @@
     // 入力文字がカナ以外ならエラーを返す
     // value[0] = 項目名 value[1] = 判定対象文字列
-    function KANABLANK_CHECK($value)
-    {
+    function KANABLANK_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -572,6 +541,5 @@
     // 入力文字が英数字以外ならエラーを返す
     // value[0] = 項目名 value[1] = 判定対象文字列
-    function ALNUM_CHECK($value)
-    {
+    function ALNUM_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -586,6 +554,5 @@
     // 入力文字が英数記号以外ならエラーを返す
     // value[0] = 項目名 value[1] = 判定対象文字列
-    function GRAPH_CHECK($value)
-    {
+    function GRAPH_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -600,6 +567,5 @@
     // 入力値で0が許されない場合エラーを返す
     // value[0] = 項目名 value[1] = 判定対象
-    function ZERO_CHECK($value)
-    {
+    function ZERO_CHECK($value) {
         $this->createParam($value);
         if ($this->arrParam[$value[1]] == '0') {
@@ -611,6 +577,5 @@
     // 入力文字の桁数判定　→　最小桁数＜入力文字列＜最大桁数
     // value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 最小桁数 value[3] = 最大桁数
-    function NUM_RANGE_CHECK($value)
-    {
+    function NUM_RANGE_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -627,6 +592,5 @@
     // 入力文字の桁数判定　→　入力文字列 = 桁数　以外はNGの場合
     // value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 桁数
-    function NUM_COUNT_CHECK($value)
-    {
+    function NUM_COUNT_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -647,6 +611,5 @@
      * @return void
      */
-    function EMAIL_CHECK($value)
-    {
+    function EMAIL_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -697,6 +660,5 @@
     //　メールアドレスに使用する文字を正規表現で判定する
     //  value[0] = 項目名 value[1] = 判定対象メールアドレス
-    function EMAIL_CHAR_CHECK($value)
-    {
+    function EMAIL_CHAR_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -711,6 +673,5 @@
     //　URLを正規表現で判定する。デフォルトでhttp://があってもOK
     //  value[0] = 項目名 value[1] = 判定対象URL
-    function URL_CHECK($value)
-    {
+    function URL_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -723,6 +684,5 @@
     /*　IPアドレスの判定　*/
     //  value[0] = 項目名 value[1] = 判定対象IPアドレス文字列
-    function IP_CHECK($value)
-    {
+    function IP_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -747,6 +707,5 @@
     // 受け取りがない場合エラーを返す
     // value[0] = 項目名 value[1] = 判定対象 value[2]=array(拡張子)
-    function FILE_EXT_CHECK($value)
-    {
+    function FILE_EXT_CHECK($value) {
         if (isset($this->arrErr[$value[1]]) || count($value[2]) == 0) {
             return;
@@ -774,6 +733,5 @@
     // 受け取りがない場合エラーを返す
     // value[0] = 項目名 value[1] = 判定対象  value[2] = 指定ディレクトリ
-    function FIND_FILE($value)
-    {
+    function FIND_FILE($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -798,6 +756,5 @@
     // 受け取りがない場合エラーを返す
     // value[0] = 項目名 value[1] = 判定対象  value[2] = 指定サイズ(KB)
-    function FILE_EXIST_CHECK($value)
-    {
+    function FILE_EXIST_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -812,6 +769,5 @@
     // 受け取りがない場合エラーを返す
     // value[0] = 項目名 value[1] = 判定対象  value[2] = 指定サイズ(KB)
-    function FILE_SIZE_CHECK($value)
-    {
+    function FILE_SIZE_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -831,6 +787,5 @@
     // 入力文字が英数字,'_','-'以外ならエラーを返す
     // value[0] = 項目名 value[1] = 判定対象文字列
-    function FILE_NAME_CHECK($value)
-    {
+    function FILE_NAME_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -845,6 +800,5 @@
     // 入力文字が英数字,'_','-'以外ならエラーを返す
     // value[0] = 項目名 value[1] = 判定対象文字列
-    function FILE_NAME_CHECK_BY_NOUPLOAD($value)
-    {
+    function FILE_NAME_CHECK_BY_NOUPLOAD($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -861,6 +815,5 @@
     // value[2] = MM
     // value[3] = DD
-    function CHECK_DATE($value)
-    {
+    function CHECK_DATE($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -885,6 +838,5 @@
     // value[4] = HH
     // value[5] = mm
-    function CHECK_DATE2($value)
-    {
+    function CHECK_DATE2($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -906,6 +858,5 @@
     // value[1] = YYYY
     // value[2] = MM
-    function CHECK_DATE3($value)
-    {
+    function CHECK_DATE3($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -928,6 +879,5 @@
     // value[2] = MM
     // value[3] = DD
-    function CHECK_BIRTHDAY($value)
-    {
+    function CHECK_BIRTHDAY($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -974,6 +924,5 @@
     // value[6] = end_month
     // value[7] = end_day
-    function CHECK_SET_TERM($value)
-    {
+    function CHECK_SET_TERM($value) {
 
         // 期間指定
@@ -1025,6 +974,5 @@
 
     /*-----------------------------------------------------------------*/
-    function CHECK_SET_TERM2($value)
-    {
+    function CHECK_SET_TERM2($value) {
 
         // 期間指定
@@ -1069,6 +1017,5 @@
     // value[4] = end_year
     // value[5] = end_month
-    function CHECK_SET_TERM3($value)
-    {
+    function CHECK_SET_TERM3($value) {
 
         // 期間指定
@@ -1095,6 +1042,5 @@
 
     //ディレクトリ存在チェック
-    function DIR_CHECK($value)
-    {
+    function DIR_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -1107,6 +1053,5 @@
 
     // ドメインチェック
-    function DOMAIN_CHECK($value)
-    {
+    function DOMAIN_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -1120,6 +1065,5 @@
     //　メールアドレスを正規表現で判定する
     // value[0] = 項目名 value[1] = 判定対象メールアドレス
-    function MOBILE_EMAIL_CHECK($value)
-    {
+    function MOBILE_EMAIL_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -1140,6 +1084,5 @@
      * @return void
      */
-    function CHECK_REGIST_CUSTOMER_EMAIL($value)
-    {
+    function CHECK_REGIST_CUSTOMER_EMAIL($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
@@ -1167,6 +1110,5 @@
      * @example $objErr->doFunc(array('URL', 'contents', $arrReviewDenyURL), array('PROHIBITED_STR_CHECK'));
      */
-    function PROHIBITED_STR_CHECK($value)
-    {
+    function PROHIBITED_STR_CHECK($value) {
         if (isset($this->arrErr[$value[1]]) || empty($this->arrParam[$value[1]])) {
             return;
@@ -1177,5 +1119,5 @@
 
         $pattern = '/' . join('|', $prohibitedStr) . '/i';
-        if (preg_match_all($pattern, $targetStr, $matches)) {
+        if (preg_match_all($pattern, $targetStr, $matches = array())) {
             $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は入力できません。<br />';
         }
@@ -1189,6 +1131,5 @@
      * @return void
      */
-    function EVAL_CHECK($value)
-    {
+    function EVAL_CHECK($value) {
         if (isset($this->arrErr[$value[0]])) {
             return;
@@ -1211,6 +1152,5 @@
      * @return bool パラメーターとして適切な文字列か
      */
-    function evalCheck($value)
-    {
+    function evalCheck($value) {
         return @eval('return is_scalar(' . $value . ');');
     }
@@ -1223,6 +1163,5 @@
      * @return void
      */
-    function createParam($value)
-    {
+    function createParam($value) {
         foreach ($value as $key) {
             if (is_string($key) || is_int($key)) {
@@ -1239,6 +1178,5 @@
      * @return boolean 値が10進数の数値表現のみの場合 true
      */
-    function numelicCheck($string)
-    {
+    function numelicCheck($string) {
         /*
          * XXX 10進数の数値表現か否かを調べたいだけだが,
Index: anches/version-2_12-dev/data/class/SC_Cache.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_Cache.php	(revision 22587)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-require DATA_REALDIR . 'module/Cache/Lite.php';
-
-/**
- * Cache controll using PEAR::Cache_Lite.
- */
-class SC_Cache
-{
-
-    /**
-     * Instance of PEAR::Cache_Lite class.
-     * @var object 
-     */
-    static $_instance = NULL;
-
-    /**
-     * Default cache lifetime. 
-     */
-    const LIFETIME = MAX_LIFETIME;
-
-    /**
-     * Directory to save cache files.
-     */
-    const CACHEDIR = MASTER_DATA_REALDIR;
-
-    /**
-     * Create Cache_Lite object and set it to static variable.
-     * 
-     * @return void
-     */
-    public static function forge()
-    {
-        $options = array(
-            'cacheDir' => SC_Cache_Ex::CACHEDIR,
-            'lifeTime' => SC_Cache_Ex::LIFETIME,
-            'automaticSerialization' => TRUE
-        );
-        SC_Cache_Ex::$_instance = new Cache_Lite($options);
-    }
-
-    /**
-     * Get Cache_Lite object.
-     *
-     * @return void
-     */
-    public static function getInstance()
-    {
-        is_null(SC_Cache_Ex::$_instance) and SC_Cache_Ex::forge();
-        return SC_Cache_Ex::$_instance;
-    }
-
-    /**
-     * Get data from cache.
-     *
-     * @param   string  $id         cache id
-     * @param   string  $group      name of the cache group
-     * @param   int     $lifeTime   custom lifetime
-     * @return  mixed   data of cache (else : false)
-     */
-    public static function get($id, $group = 'default', $lifeTime = NULL)
-    {
-        $processor = SC_Cache_Ex::getInstance();
-
-        // set custom lifetime.
-        !is_null($lifeTime) and $processor->setOption('lifeTime', $lifeTime);
-
-        $cache = $processor->get($id, $group);
-
-        // set back to default lifetime.
-        !is_null($lifeTime) and $processor->setOption('lifeTime', SC_Cache_Ex::$_lifetime);
-
-        return $cache;
-    }
-
-    /**
-     * Save data into cache.
-     *
-     * @param   mixed   $data   data of cache
-     * @param   string  $id     cache id
-     * @param   string  $group  name of the cache group
-     * @return  void
-     */
-    public static function save($data, $id, $group = 'default')
-    {
-        $processor = SC_Cache_Ex::getInstance();
-
-        $processor->save($data, $id, $group);
-    }
-
-    /**
-     * Clean cache.
-     *
-     * @param string $group name of the cache group
-     * @return void
-     */
-    public static function clean($group = FALSE)
-    {
-        $processor = SC_Cache_Ex::getInstance();
-
-        $processor->clean($group);
-    }
-}
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 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php	(revision 22796)
@@ -39,6 +39,5 @@
  * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_checkboxes_ex($params, &$smarty)
-{
+function smarty_function_html_checkboxes_ex($params, &$smarty) {
     require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
 
@@ -128,6 +127,5 @@
 }
 
-function smarty_function_html_checkboxes_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags)
-{
+function smarty_function_html_checkboxes_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags) {
     $_output = '';
 
Index: /branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php
===================================================================
--- /branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php	(revision 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php	(revision 22796)
@@ -9,6 +9,5 @@
  * @return string 出力
  */
-function smarty_modifier_numeric_emoji($value)
-{
+function smarty_modifier_numeric_emoji($value) {
     // 数字絵文字 (0～9) の絵文字番号
     static $numeric_emoji_index = array('134', '125', '126', '127', '128', '129', '130', '131', '132', '133');
Index: /branches/version-2_12-dev/data/smarty_extends/modifier.h.php
===================================================================
--- /branches/version-2_12-dev/data/smarty_extends/modifier.h.php	(revision 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/modifier.h.php	(revision 22796)
@@ -19,6 +19,5 @@
  * @return string
  */
-function smarty_modifier_h($string)
-{
+function smarty_modifier_h($string) {
     return htmlspecialchars($string, ENT_QUOTES);
 }
Index: /branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php
===================================================================
--- /branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php	(revision 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php	(revision 22796)
@@ -39,6 +39,5 @@
  * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_radios_ex($params, &$smarty)
-{
+function smarty_function_html_radios_ex($params, &$smarty) {
     require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
 
@@ -130,6 +129,5 @@
 }
 
-function smarty_function_html_radios_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags)
-{
+function smarty_function_html_radios_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags) {
     $_output = '';
 
Index: /branches/version-2_12-dev/data/smarty_extends/block.marquee.php
===================================================================
--- /branches/version-2_12-dev/data/smarty_extends/block.marquee.php	(revision 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/block.marquee.php	(revision 22796)
@@ -8,6 +8,5 @@
  * @return string 出力
  */
-function smarty_block_marquee($params, $content, &$smarty, &$repeat)
-{
+function smarty_block_marquee($params, $content, &$smarty, &$repeat) {
     // {/marquee}の場合のみ出力する。
     if ($repeat || !isset($content)) {
Index: /branches/version-2_12-dev/data/smarty_extends/function.from_to.php
===================================================================
--- /branches/version-2_12-dev/data/smarty_extends/function.from_to.php	(revision 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/function.from_to.php	(revision 22796)
@@ -31,6 +31,5 @@
  * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_from_to($params, &$smarty)
-{
+function smarty_function_from_to($params, &$smarty) {
     require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
 
Index: /branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php
===================================================================
--- /branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php	(revision 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php	(revision 22796)
@@ -19,6 +19,5 @@
  * @return string
  */
-function smarty_modifier_nl2br_html($string)
-{
+function smarty_modifier_nl2br_html($string) {
     $lines = preg_split('/(\\r\\n|\\r|\\n)/', $string);
     $keys = array_keys($lines);
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 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php	(revision 22796)
@@ -6,6 +6,5 @@
  * @return string $value マッチした場合は変換後の文字列、しない場合は入力された文字列をそのまま返す。
  */
-function smarty_modifier_script_escape($value)
-{
+function smarty_modifier_script_escape($value) {
 
     if (is_array($value)) return $value;
Index: /branches/version-2_12-dev/data/smarty_extends/modifier.u.php
===================================================================
--- /branches/version-2_12-dev/data/smarty_extends/modifier.u.php	(revision 22567)
+++ /branches/version-2_12-dev/data/smarty_extends/modifier.u.php	(revision 22796)
@@ -19,6 +19,5 @@
  * @return string
  */
-function smarty_modifier_u($string)
-{
+function smarty_modifier_u($string) {
     return htmlspecialchars(rawurlencode($string), ENT_QUOTES);
 }
Index: /branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 22458)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 22796)
@@ -173,97 +173,100 @@
         <!--{* ログイン済みの会員のみ *}-->
 
-        <!--{* ▼お届け先 *}-->
+        <!--お届け先ここから-->
+        <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け先を表示しない） *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
         <!--{foreach item=shippingItem from=$arrShipping name=shippingItem}-->
-            <h3>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-            <!--{if $is_multiple}-->
-                <table summary="ご注文内容確認">
-                    <col width="10%" />
-                    <col width="60%" />
-                    <col width="20%" />
-                    <col width="10%" />
+        <h3>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
+        <!--{if $is_multiple}-->
+            <table summary="ご注文内容確認">
+                <col width="10%" />
+                <col width="60%" />
+                <col width="20%" />
+                <col width="10%" />
+                <tr>
+                    <th scope="col">商品写真</th>
+                    <th scope="col">商品名</th>
+                    <th scope="col">単価</th>
+                    <th scope="col">数量</th>
+                    <!--{* XXX 購入小計と誤差が出るためコメントアウト
+                    <th scope="col">小計</th>
+                    *}-->
+                </tr>
+                <!--{foreach item=item from=$shippingItem.shipment_item}-->
                     <tr>
-                        <th scope="col">商品写真</th>
-                        <th scope="col">商品名</th>
-                        <th scope="col">単価</th>
-                        <th scope="col">数量</th>
+                        <td class="alignC">
+                            <a
+                                <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
+                                <!--{/if}-->
+                            >
+                                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
+                        </td>
+                        <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
+                            <!--{if $item.productsClass.classcategory_name1 != ""}-->
+                                <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br />
+                            <!--{/if}-->
+                            <!--{if $item.productsClass.classcategory_name2 != ""}-->
+                                <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}-->
+                            <!--{/if}-->
+                        </td>
+                        <td class="alignR">
+                            <!--{$item.price|sfCalcIncTax|number_format}-->円
+                        </td>
+                        <td class="alignC"><!--{$item.quantity}--></td>
                         <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                        <th scope="col">小計</th>
+                        <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
                         *}-->
                     </tr>
-                    <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                        <tr>
-                            <td class="alignC">
-                                <a
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
-                                    <!--{/if}-->
-                                >
-                                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
-                            </td>
-                            <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
-                                <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                    <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br />
-                                <!--{/if}-->
-                                <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                    <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}-->
-                                <!--{/if}-->
-                            </td>
-                            <td class="alignR">
-                                <!--{$item.price|sfCalcIncTax|number_format}-->円
-                            </td>
-                            <td class="alignC"><!--{$item.quantity}--></td>
-                            <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                            <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
-                            *}-->
-                        </tr>
-                    <!--{/foreach}-->
-                </table>
+                <!--{/foreach}-->
+            </table>
+        <!--{/if}-->
+
+        <table summary="お届け先確認" class="delivname">
+            <col width="30%" />
+            <col width="70%" />
+            <tbody>
+                <tr>
+                    <th scope="row">お名前</th>
+                    <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">お名前(フリガナ)</th>
+                    <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">郵便番号</th>
+                    <td>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">住所</th>
+                    <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">電話番号</th>
+                    <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">FAX番号</th>
+                    <td>
+                        <!--{if $shippingItem.shipping_fax01 > 0}-->
+                            <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
+                        <!--{/if}-->
+                    </td>
+                </tr>
+            <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                <tr>
+                    <th scope="row">お届け日</th>
+                    <td><!--{$shippingItem.shipping_date|default:"指定なし"|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">お届け時間</th>
+                    <td><!--{$shippingItem.shipping_time|default:"指定なし"|h}--></td>
+                </tr>
             <!--{/if}-->
-
-            <table summary="お届け先確認" class="delivname">
-                <col width="30%" />
-                <col width="70%" />
-                <tbody>
-                    <tr>
-                        <th scope="row">お名前</th>
-                        <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">お名前(フリガナ)</th>
-                        <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">郵便番号</th>
-                        <td>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">住所</th>
-                        <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">電話番号</th>
-                        <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">FAX番号</th>
-                        <td>
-                            <!--{if $shippingItem.shipping_fax01 > 0}-->
-                                <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
-                            <!--{/if}-->
-                        </td>
-                    </tr>
-                    <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                        <tr>
-                            <th scope="row">お届け日</th>
-                            <td><!--{$shippingItem.shipping_date|default:"指定なし"|h}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">お届け時間</th>
-                            <td><!--{$shippingItem.shipping_time|default:"指定なし"|h}--></td>
-                        </tr>
-                    <!--{/if}-->
-                </tbody>
-            </table>
+            </tbody>
+        </table>
         <!--{/foreach}-->
-        <!--{* ▲お届け先 *}-->
+        <!--{/if}-->
+        <!--お届け先ここまで-->
 
         <h3>配送方法・お支払方法・その他お問い合わせ</h3>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl	(revision 22608)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl	(revision 22796)
@@ -21,11 +21,11 @@
  *}-->
 
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.js"></script>
+<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.css" media="screen" />
 <script type="text/javascript">//<![CDATA[
     $(document).ready(function() {
         $('a.expansion').facebox({
-            loadingImage : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/loading.gif',
-            closeImage   : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/closelabel.png'
+            loadingImage : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/loading.gif',
+            closeImage   : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/closelabel.png'
         });
     });
@@ -36,158 +36,167 @@
         <h2 class="title"><!--{$tpl_title|h}--></h2>
 
-        <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
-            <!--★ポイント案内★-->
-            <!--{if $smarty.const.USE_POINT !== false}-->
-                <div class="point_announce">
-                    <!--{if $tpl_login}-->
-                        <span class="user_name"><!--{$tpl_name|h}--> 様</span>の、現在の所持ポイントは「<span class="point"><!--{$tpl_user_point|number_format|default:0|h}--> pt</span>」です。<br />
-                    <!--{else}-->
-                        ポイント制度をご利用になられる場合は、会員登録後ログインしてくださいますようお願い致します。<br />
+    <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
+        <!--★ポイント案内★-->
+        <!--{if $smarty.const.USE_POINT !== false}-->
+            <div class="point_announce">
+                <!--{if $tpl_login}-->
+                    <span class="user_name"><!--{$tpl_name|h}--> 様</span>の、現在の所持ポイントは「<span class="point"><!--{$tpl_user_point|number_format|default:0}--> pt</span>」です。<br />
+                <!--{else}-->
+                    ポイント制度をご利用になられる場合は、会員登録後ログインしてくださいますようお願い致します。<br />
+                <!--{/if}-->
+                ポイントは商品購入時に<span class="price">1pt＝<!--{$smarty.const.POINT_VALUE}-->円</span>として使用することができます。<br />
+            </div>
+        <!--{/if}-->
+    <!--{/if}-->
+
+    <p class="totalmoney_area">
+        <!--{* カゴの中に商品がある場合にのみ表示 *}-->
+        <!--{if count($cartKeys) > 1}-->
+            <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]}--><!--{if !$smarty.foreach.cartKey.last}-->、<!--{/if}--><!--{/foreach}-->は同時購入できません。<br />
+                        お手数ですが、個別に購入手続きをお願い致します。
+            </span>
+        <!--{/if}-->
+
+        <!--{if strlen($tpl_error) != 0}-->
+            <p class="attention"><!--{$tpl_error|h}--></p>
+        <!--{/if}-->
+
+        <!--{if strlen($tpl_message) != 0}-->
+            <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
+        <!--{/if}-->
+    </p>
+
+    <!--{if count($cartItems) > 0}-->
+    <!--{foreach from=$cartKeys item=key}-->
+    <div class="form_area">
+        <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="?">
+            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+            <input type="hidden" name="mode" value="confirm" />
+            <input type="hidden" name="cart_no" value="" />
+            <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+            <input type="hidden" name="category_id" value="<!--{$tpl_category_id|h}-->" />
+            <!--{if count($cartKeys) > 1}-->
+            <h3><!--{$arrProductType[$key]}--></h3>
+                <p>
+                    <!--{$arrProductType[$key]}-->の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。
+                    <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $arrInfo.free_rule > 0}-->
+                            <!--{if !$arrData[$key].is_deliv_free}-->
+                                あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です！！
+                            <!--{else}-->
+
+                                現在、「<span class="attention">送料無料</span>」です！！
+                            <!--{/if}-->
+                        <!--{/if}-->
                     <!--{/if}-->
-                    ポイントは商品購入時に<span class="price">1pt＝<!--{$smarty.const.POINT_VALUE|h}-->円</span>として使用することができます。<br />
-                </div>
+                </p>
+            <!--{else}-->
+                <p>
+                    お買い上げ商品の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。
+                    <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $arrInfo.free_rule > 0}-->
+                            <!--{if !$arrData[$key].is_deliv_free}-->
+                                あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です！！
+                            <!--{else}-->
+                                現在、「<span class="attention">送料無料</span>」です！！
+                            <!--{/if}-->
+                        <!--{/if}-->
+                    <!--{/if}-->
+                </p>
             <!--{/if}-->
-        <!--{/if}-->
-
-        <p class="totalmoney_area">
-            <!--{* カゴの中に商品がある場合にのみ表示 *}-->
-            <!--{if count($cartKeys) > 1}-->
-                <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]|h}--><!--{if !$smarty.foreach.cartKey.last}-->、<!--{/if}--><!--{/foreach}-->は同時購入できません。<br />
-                    お手数ですが、個別に購入手続きをお願い致します。
-                </span>
-            <!--{/if}-->
-
-            <!--{if strlen($tpl_error) != 0}-->
-                <p class="attention"><!--{$tpl_error|h}--></p>
-            <!--{/if}-->
-
-            <!--{if strlen($tpl_message) != 0}-->
-                <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
-            <!--{/if}-->
-        </p>
-
-        <!--{if count($cartItems) > 0}-->
-            <!--{foreach from=$cartKeys item=key}-->
-                <div class="form_area">
-                    <form name="form<!--{$key|h}-->" id="form<!--{$key|h}-->" method="post" action="?">
-                        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME|h}-->" value="<!--{$transactionid|h}-->" />
-                        <input type="hidden" name="mode" value="confirm" />
-                        <input type="hidden" name="cart_no" value="" />
-                        <input type="hidden" name="cartKey" value="<!--{$key|h}-->" />
-                        <input type="hidden" name="category_id" value="<!--{$tpl_category_id|h}-->" />
-                        <input type="hidden" name="product_id" value="<!--{$tpl_product_id|h}-->" />
-                        <!--{if count($cartKeys) > 1}-->
-                            <h3><!--{$arrProductType[$key]|h}--></h3>
-                            <!--{assign var=purchasing_goods_name value=$arrProductType[$key]}-->
-                        <!--{else}-->
-                            <!--{assign var=purchasing_goods_name value="カゴの中の商品"}-->
-                        <!--{/if}-->
-                        <p>
-                            <!--{$purchasing_goods_name|h}-->の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format|h}-->円</span>」です。
-                            <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                                <!--{if $arrInfo.free_rule > 0}-->
-                                    <!--{if !$arrData[$key].is_deliv_free}-->
-                                        あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format|h}-->円</span>」で送料無料です！！
-                                    <!--{else}-->
-                                        現在、「<span class="attention">送料無料</span>」です！！
-                                    <!--{/if}-->
+
+            <table summary="商品情報">
+                <col width="10%" />
+                <col width="15%" />
+                <col width="30%" />
+                <col width="15%" />
+                <col width="15%" />
+                <col width="15%" />
+                <tr>
+                    <th class="alignC">削除</th>
+                    <th class="alignC">商品写真</th>
+                    <th class="alignC">商品名</th>
+                    <th class="alignC">単価</th>
+                    <th class="alignC">数量</th>
+                    <th class="alignC">小計</th>
+                </tr>
+                <!--{foreach from=$cartItems[$key] item=item}-->
+                    <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                        <td class="alignC"><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->', 'delete', 'cart_no', '<!--{$item.cart_no}-->'); return false;">削除</a>
+                        </td>
+                        <td class="alignC">
+                        <a class="expansion" target="_blank"
+                                <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->"
                                 <!--{/if}-->
-                            <!--{/if}-->
-                        </p>
-
-                        <table summary="商品情報">
-                            <col width="10%" />
-                            <col width="15%" />
-                            <col width="30%" />
-                            <col width="15%" />
-                            <col width="15%" />
-                            <col width="15%" />
-                            <tr>
-                                <th class="alignC">削除</th>
-                                <th class="alignC">商品写真</th>
-                                <th class="alignC">商品名</th>
-                                <th class="alignC">単価</th>
-                                <th class="alignC">数量</th>
-                                <th class="alignC">小計</th>
-                            </tr>
-                            <!--{foreach from=$cartItems[$key] item=item}-->
-                                <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR|h}-->;<!--{/if}-->">
-                                    <td class="alignC"><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->', 'delete', 'cart_no', '<!--{$item.cart_no|h}-->'); return false;">削除</a>
-                                    </td>
-                                    <td class="alignC">
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}-->
-                                        <a class="expansion" target="_blank" href="<!--{$smarty.const.IMAGE_SAVE_URLPATH|h}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->">
-                                    <!--{/if}-->
-                                    <img src="<!--{$smarty.const.ROOT_URLPATH|h}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" />
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}-->
-                                        </a>
-                                    <!--{/if}-->
-                                    </td>
-                                    <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong>
-                                        <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                            <div><!--{$item.productsClass.class_name1|h}-->：<!--{$item.productsClass.classcategory_name1|h}--></div>
-                                        <!--{/if}-->
-                                        <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                            <div><!--{$item.productsClass.class_name2|h}-->：<!--{$item.productsClass.classcategory_name2|h}--></div>
-                                        <!--{/if}-->
-                                    </td>
-                                    <td class="alignR">
-                                        <!--{$item.price|sfCalcIncTax|number_format|h}-->円
-                                    </td>
-                                    <td class="alignC"><!--{$item.quantity|h}-->
-                                        <ul id="quantity_level">
-                                            <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->','up','cart_no','<!--{$item.cart_no|h}-->'); return false"><img src="<!--{$TPL_URLPATH|h}-->img/button/btn_plus.jpg" width="16" height="16" alt="＋" /></a></li>
-                                            <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->','down','cart_no','<!--{$item.cart_no|h}-->'); return false"><img src="<!--{$TPL_URLPATH|h}-->img/button/btn_minus.jpg" width="16" height="16" alt="-" /></a></li>
-                                        </ul>
-                                    </td>
-                                    <td class="alignR"><!--{$item.total_inctax|number_format|h}-->円</td>
-                                </tr>
-                            <!--{/foreach}-->
-                            <tr>
-                                <th colspan="5" class="alignR">小計</th>
-                                <td class="alignR"><!--{$tpl_total_inctax[$key]|number_format|h}-->円</td>
-                            </tr>
-                            <tr>
-                                <th colspan="5" class="alignR">合計</th>
-                                <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format|h}-->円</span></td>
-                            </tr>
-                            <!--{if $smarty.const.USE_POINT !== false}-->
-                                <!--{if $arrData[$key].birth_point > 0}-->
-                                    <tr>
-                                        <th colspan="5" class="alignR">お誕生月ポイント</th>
-                                        <td class="alignR"><!--{$arrData[$key].birth_point|number_format|h}-->pt</td>
-                                    </tr>
-                                <!--{/if}-->
-                                <tr>
-                                    <th colspan="5" class="alignR">今回加算ポイント</th>
-                                    <td class="alignR"><!--{$arrData[$key].add_point|number_format|h}-->pt</td>
-                                </tr>
-                            <!--{/if}-->
-                        </table>
+                                >
+                                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" />
+                            </a>
+                        </td>
+                        <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
+                            <!--{if $item.productsClass.classcategory_name1 != ""}-->
+                                <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br />
+                            <!--{/if}-->
+                            <!--{if $item.productsClass.classcategory_name2 != ""}-->
+                                <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}-->
+                            <!--{/if}-->
+                        </td>
+                        <td class="alignR">
+                            <!--{$item.price|sfCalcIncTax|number_format}-->円
+                        </td>
+                        <td class="alignC"><!--{$item.quantity}-->
+                            <ul id="quantity_level">
+                                <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','up','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.jpg" width="16" height="16" alt="＋" /></a></li>
+                                <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','down','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.jpg" width="16" height="16" alt="-" /></a></li>
+                            </ul>
+                        </td>
+                        <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
+                    </tr>
+                <!--{/foreach}-->
+                <tr>
+                    <th colspan="5" class="alignR">小計</th>
+                    <td class="alignR"><!--{$tpl_total_inctax[$key]|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th colspan="5" class="alignR">合計</th>
+                    <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format}-->円</span></td>
+                </tr>
+                <!--{if $smarty.const.USE_POINT !== false}-->
+                    <!--{if $arrData[$key].birth_point > 0}-->
+                        <tr>
+                            <th colspan="5" class="alignR">お誕生月ポイント</th>
+                            <td class="alignR"><!--{$arrData[$key].birth_point|number_format}-->pt</td>
+                        </tr>
+                    <!--{/if}-->
+                    <tr>
+                        <th colspan="5" class="alignR">今回加算ポイント</th>
+                        <td class="alignR"><!--{$arrData[$key].add_point|number_format}-->pt</td>
+                    </tr>
+                <!--{/if}-->
+            </table>
+                <!--{if strlen($tpl_error) == 0}-->
+                    <p class="alignC">上記内容でよろしければ「購入手続きへ」ボタンをクリックしてください。</p>
+                <!--{/if}-->
+            <div class="btn_area">
+                <ul>
+                    <li>
+                        <!--{if $tpl_prev_url != ""}-->
+                            <a href="<!--{$tpl_prev_url|h}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg','back<!--{$key}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg','back<!--{$key}-->');">
+                                <img src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" name="back<!--{$key}-->" /></a>
+                        <!--{/if}-->
+                    </li>
+                    <li>
                         <!--{if strlen($tpl_error) == 0}-->
-                            <p class="alignC">上記内容でよろしければ「購入手続きへ」ボタンをクリックしてください。</p>
-                        <!--{/if}-->
-                        <div class="btn_area">
-                            <ul>
-                                <li>
-                                    <!--{if $tpl_prev_url != ""}-->
-                                        <a href="<!--{$tpl_prev_url|h}-->" onmouseover="chgImg('<!--{$TPL_URLPATH|h}-->img/button/btn_back_on.jpg','back<!--{$key|h}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH|h}-->img/button/btn_back.jpg','back<!--{$key|h}-->');">
-                                            <img src="<!--{$TPL_URLPATH|h}-->img/button/btn_back.jpg" alt="戻る" name="back<!--{$key|h}-->" /></a>
-                                    <!--{/if}-->
-                                </li>
-                                <li>
-                                    <!--{if strlen($tpl_error) == 0}-->
-                                        <input type="hidden" name="cartKey" value="<!--{$key|h}-->" />
-                                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH|h}-->img/button/btn_buystep_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH|h}-->img/button/btn_buystep.jpg',this)" src="<!--{$TPL_URLPATH|h}-->img/button/btn_buystep.jpg" alt="購入手続きへ" name="confirm" />
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                        </div>
-                    </form>
-                </div>
-            <!--{/foreach}-->
-        <!--{else}-->
-            <p class="empty"><span class="attention">※ 現在カート内に商品はございません。</span></p>
-        <!--{/if}-->
+                            <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+                            <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_buystep_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_buystep.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_buystep.jpg" alt="購入手続きへ" name="confirm" />
+                        <!--{/if}-->
+                    </li>
+                </ul>
+            </div>
+        </form>
+        </div>
+    <!--{/foreach}-->
+    <!--{else}-->
+        <p class="empty"><span class="attention">※ 現在カート内に商品はございません。</span></p>
+    <!--{/if}-->
     </div>
 </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl	(revision 22376)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl	(revision 22796)
@@ -38,9 +38,9 @@
             <col width="70%" />
             <tr>
-                <th>お名前</th>
+                <th>お名前<span class="attention">※</span></th>
                 <td><!--{$arrForm.name01.value|h}-->　<!--{$arrForm.name02.value|h}--></td>
             </tr>
             <tr>
-                <th>お名前(フリガナ)</th>
+                <th>お名前(フリガナ)<span class="attention">※</span></th>
                 <td><!--{$arrForm.kana01.value|h}-->　<!--{$arrForm.kana02.value|h}--></td>
             </tr>
@@ -66,9 +66,9 @@
             </tr>
             <tr>
-                <th>メールアドレス</th>
+                <th>メールアドレス<span class="attention">※</span></th>
                 <td><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></td>
             </tr>
             <tr>
-                <th>お問い合わせ内容</th>
+                <th>お問い合わせ内容<span class="attention">※</span></th>
                 <td><!--{$arrForm.contents.value|h|nl2br}--></td>
             </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 22218)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 22796)
@@ -52,11 +52,10 @@
 商品コード: <!--{$arrOrderDetail[cnt].product_code}-->
 商品名: <!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
-単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrOrderDetail[cnt].tax_rate:$arrOrderDetail[cnt].tax_rule|number_format}-->
+単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax|number_format}-->
 数量：<!--{$arrOrderDetail[cnt].quantity}-->
 
 <!--{/section}-->
 -------------------------------------------------
-小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）<!--{/if}-->
-
+小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> (うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）
 値引き ￥ <!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|number_format|default:0}-->
 送　料 ￥ <!--{$arrOrder.deliv_fee|number_format|default:0}-->
@@ -85,5 +84,5 @@
 商品コード: <!--{$item.product_code}-->
 商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥ <!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
+単価：￥ <!--{$item.price|sfCalcIncTax|number_format}-->
 数量：<!--{$item.quantity}-->
 
Index: /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	(revision 22548)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	(revision 22796)
@@ -24,5 +24,5 @@
     <div class="block_outer clearfix">
         <div id="recommend_area">
-            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.png" alt="*" class="title_icon" /></h2>
+            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.jpg" alt="*" class="title_icon" /></h2>
             <div class="block_body clearfix">
                 <!--{foreach from=$arrBestProducts item=arrProduct name="recommend_products"}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	(revision 22583)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	(revision 22796)
@@ -23,9 +23,9 @@
 <div class="block_outer">
     <div id="news_area">
-    <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_news.png" alt="新着情報" /><span class="rss"><a href="<!--{$smarty.const.ROOT_URLPATH}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_rss.jpg" alt="RSS" /></a></span></h2>
+    <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_news.jpg" alt="新着情報" /><span class="rss"><a href="<!--{$smarty.const.ROOT_URLPATH}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_rss.jpg" alt="RSS" /></a></span></h2>
         <div class="block_body">
             <div class="news_contents">
             <!--{section name=data loop=$arrNews}-->
-            <!--{assign var="date_array" value="-"|explode:$arrNews[data].cast_news_date}-->
+            <!--{assign var="date_array" value="-"|explode:$arrNews[data].news_date_disp}-->
             <dl class="newslist">
                 <dt><!--{$date_array[0]}-->年<!--{$date_array[1]}-->月<!--{$date_array[2]}-->日</dt>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 22602)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 22796)
@@ -26,10 +26,50 @@
     });
 //]]></script>
-
 <div class="block_outer">
     <div id="category_area">
         <div class="block_body">
             <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_category.gif" alt="商品カテゴリ" /></h2>
-            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$arrTree treeID="categorytreelist" display=1}-->
+            <!--{strip}-->
+                <ul id="categorytree">
+                    <!--{assign var=preLev value=1}-->
+                    <!--{assign var=firstdone value=0}-->
+                    <!--{section name=cnt loop=$arrTree}-->
+                        <!--{* 表示フラグがTRUEなら表示 *}-->
+                        <!--{if $arrTree[cnt].display == 1}-->
+                            <!--{assign var=level value=`$arrTree[cnt].level`}-->
+                            <!--{assign var=levdiff value=`$level-$preLev`}-->
+                                <!--{if $levdiff > 0}-->
+                                    <ul>
+                                <!--{elseif $levdiff == 0 && $firstdone == 1}-->
+                                    </li>
+                                <!--{elseif $levdiff < 0}-->
+                                    <!--{section name=d loop=`$levdiff*-1`}-->
+                                            </li>
+                                        </ul>
+                                    <!--{/section}-->
+                                    </li>
+                                <!--{/if}-->
+                            <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
+                                <p>
+                                    <a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+                                </p>
+                            <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
+                            <!--{assign var=preLev value=`$level`}-->
+                        <!--{/if}-->
+                        <!--{* セクションの最後に閉じタグを追加 *}-->
+                        <!--{if $smarty.section.cnt.last}-->
+                            <!--{if $preLev-1 > 0}-->
+                                <!--{section name=d loop=`$preLev-1`}-->
+                                    </li>
+                                </ul>
+                                <!--{/section}-->
+                                </li>
+                            <!--{else}-->
+                                </li>
+                            <!--{/if}-->
+                        <!--{/if}-->
+                    <!--{/section}-->
+                </ul>
+            <!--{/strip}-->
         </div>
     </div>
Index: anches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl	(revision 22602)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}--><!--{if in_array($child.category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
-        <p><a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></p>
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 22376)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 22796)
@@ -42,5 +42,5 @@
         </tr>
         <tr>
-            <th>投稿者名</th>
+            <th>投稿者名<span class="attention">※</span></th>
             <td><!--{$arrForm.reviewer_name|h}--></td>
         </tr>
@@ -54,13 +54,13 @@
         </tr>
         <tr>
-            <th>おすすめレベル</th>
+            <th>おすすめレベル<span class="attention">※</span></th>
             <td><span class="recommend_level"><!--{$arrRECOMMEND[$arrForm.recommend_level]}--></span></td>
         </tr>
         <tr>
-            <th>タイトル</th>
+            <th>タイトル<span class="attention">※</span></th>
             <td><!--{$arrForm.title|h}--></td>
         </tr>
         <tr>
-            <th>コメント</th>
+            <th>コメント<span class="attention">※</span></th>
             <td><!--{$arrForm.comment|h|nl2br}--></td>
         </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl	(revision 22548)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl	(revision 22796)
@@ -116,5 +116,5 @@
                                 <!--{$arrProduct.price01_min_inctax|number_format}-->～<!--{$arrProduct.price01_max_inctax|number_format}-->
                             <!--{/if}-->
-                        <!--{/strip}--></span><span id="price01_dynamic"></span>
+                        </span><span id="price01_dynamic"></span><!--{/strip}-->
                         円
                     </dd>
@@ -132,5 +132,5 @@
                             <!--{$arrProduct.price02_min_inctax|number_format}-->～<!--{$arrProduct.price02_max_inctax|number_format}-->
                         <!--{/if}-->
-                    <!--{/strip}--></span><span id="price02_dynamic"></span>
+                    </span><span id="price02_dynamic"></span><!--{/strip}-->
                     円
                 </dd>
@@ -150,5 +150,5 @@
                             <!--{/if}-->
                         <!--{/if}-->
-                    <!--{/strip}--></span><span id="point_dynamic"></span>
+                    </span><span id="point_dynamic"></span><!--{/strip}-->
                     Pt
                 </div>
@@ -192,97 +192,97 @@
 
             <div class="cart_area clearfix">
-                <input type="hidden" name="mode" value="cart" />
-                <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
-                <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
-                <input type="hidden" name="favorite_product_id" value="" />
-
-                <!--{if $tpl_stock_find}-->
-                    <!--{if $tpl_classcat_find1}-->
-                        <div class="classlist">
-                            <!--▼規格1-->
-                            <ul class="clearfix">
-                                <li><!--{$tpl_class_name1|h}-->：</li>
-                                <li>
-                                    <select name="classcategory_id1" style="<!--{$arrErr.classcategory_id1|sfGetErrorColor}-->">
-                                    <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
-                                    </select>
-                                    <!--{if $arrErr.classcategory_id1 != ""}-->
-                                    <br /><span class="attention">※ <!--{$tpl_class_name1}-->を入力して下さい。</span>
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                            <!--▲規格1-->
-                            <!--{if $tpl_classcat_find2}-->
-                            <!--▼規格2-->
-                            <ul class="clearfix">
-                                <li><!--{$tpl_class_name2|h}-->：</li>
-                                <li>
-                                    <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
-                                    </select>
-                                    <!--{if $arrErr.classcategory_id2 != ""}-->
-                                    <br /><span class="attention">※ <!--{$tpl_class_name2}-->を入力して下さい。</span>
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                            <!--▲規格2-->
+            <input type="hidden" name="mode" value="cart" />
+            <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
+            <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
+            <input type="hidden" name="favorite_product_id" value="" />
+
+            <!--{if $tpl_stock_find}-->
+                <!--{if $tpl_classcat_find1}-->
+                    <div class="classlist">
+                        <!--▼規格1-->
+                        <ul class="clearfix">
+                            <li><!--{$tpl_class_name1|h}-->：</li>
+                            <li>
+                                <select name="classcategory_id1" style="<!--{$arrErr.classcategory_id1|sfGetErrorColor}-->">
+                                <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
+                                </select>
+                                <!--{if $arrErr.classcategory_id1 != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name1}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </li>
+                        </ul>
+                        <!--▲規格1-->
+                        <!--{if $tpl_classcat_find2}-->
+                        <!--▼規格2-->
+                        <ul class="clearfix">
+                            <li><!--{$tpl_class_name2|h}-->：</li>
+                            <li>
+                                <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
+                                </select>
+                                <!--{if $arrErr.classcategory_id2 != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name2}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </li>
+                        </ul>
+                        <!--▲規格2-->
+                        <!--{/if}-->
+                    </div>
+                <!--{/if}-->
+
+                <!--★数量★-->
+                <dl class="quantity">
+                    <dt>数量：</dt>
+                    <dd><input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
+                        <!--{if $arrErr.quantity != ""}-->
+                            <br /><span class="attention"><!--{$arrErr.quantity}--></span>
+                        <!--{/if}-->
+                    </dd>
+                </dl>
+
+                <div class="cartin">
+                    <div class="cartin_btn">
+                        <div id="cartbtn_default">
+                            <!--★カゴに入れる★-->
+                            <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
+                                <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="カゴに入れる" name="cart" id="cart" /></a>
+                        </div>
+                    </div>
+                </div>
+                <div class="attention" id="cartbtn_dynamic"></div>
+            <!--{else}-->
+                <div class="attention">申し訳ございませんが、只今品切れ中です。</div>
+            <!--{/if}-->
+
+            <!--★お気に入り登録★-->
+            <!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1 && $tpl_login === true}-->
+                <div class="favorite_btn">
+                    <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
+                    <!--{if $arrErr[$add_favorite]}-->
+                        <div class="attention"><!--{$arrErr[$add_favorite]}--></div>
+                    <!--{/if}-->
+                    <!--{if !$is_favorite}-->
+                        <a href="javascript:fnChangeAction('?product_id=<!--{$arrProduct.product_id|h}-->'); fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id|h}-->');" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg','add_favorite_product');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg','add_favorite_product');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg" alt="お気に入りに追加" name="add_favorite_product" id="add_favorite_product" /></a>
+                    <!--{else}-->
+                        <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="お気に入り登録済" name="add_favorite_product" id="add_favorite_product" />
+                        <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.tipsy.js"></script>
+                        <script type="text/javascript">
+                            var favoriteButton = $("#add_favorite_product");
+                            favoriteButton.tipsy({gravity: $.fn.tipsy.autoNS, fallback: "お気に入りに登録済み", fade: true });
+
+                            <!--{if $just_added_favorite == true}-->
+                            favoriteButton.load(function(){$(this).tipsy("show")});
+                            $(function(){
+                                var tid = setTimeout('favoriteButton.tipsy("hide")',5000);
+                            });
                             <!--{/if}-->
-                        </div>
+                        </script>
                     <!--{/if}-->
-
-                    <!--★数量★-->
-                    <dl class="quantity">
-                        <dt>数量：</dt>
-                        <dd><input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
-                            <!--{if $arrErr.quantity != ""}-->
-                                <br /><span class="attention"><!--{$arrErr.quantity}--></span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-
-                    <div class="cartin">
-                        <div class="cartin_btn">
-                            <div id="cartbtn_default">
-                                <!--★カゴに入れる★-->
-                                <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
-                                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="カゴに入れる" name="cart" id="cart" /></a>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="attention" id="cartbtn_dynamic"></div>
-                <!--{else}-->
-                    <div class="attention">申し訳ございませんが、只今品切れ中です。</div>
-                <!--{/if}-->
-
-                <!--★お気に入り登録★-->
-                <!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1 && $tpl_login === true}-->
-                    <div class="favorite_btn">
-                        <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
-                        <!--{if $arrErr[$add_favorite]}-->
-                            <div class="attention"><!--{$arrErr[$add_favorite]}--></div>
-                        <!--{/if}-->
-                        <!--{if !$is_favorite}-->
-                            <a href="javascript:fnChangeAction('?product_id=<!--{$arrProduct.product_id|h}-->'); fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id|h}-->');" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg','add_favorite_product');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg','add_favorite_product');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg" alt="お気に入りに追加" name="add_favorite_product" id="add_favorite_product" /></a>
-                        <!--{else}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="お気に入り登録済" name="add_favorite_product" id="add_favorite_product" />
-                            <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.tipsy.js"></script>
-                            <script type="text/javascript">
-                                var favoriteButton = $("#add_favorite_product");
-                                favoriteButton.tipsy({gravity: $.fn.tipsy.autoNS, fallback: "お気に入りに登録済み", fade: true });
-
-                                <!--{if $just_added_favorite == true}-->
-                                favoriteButton.load(function(){$(this).tipsy("show")});
-                                $(function(){
-                                    var tid = setTimeout('favoriteButton.tipsy("hide")',5000);
-                                });
-                                <!--{/if}-->
-                            </script>
-                        <!--{/if}-->
-                    </div>
-                <!--{/if}-->
-            </div>
+                </div>
+            <!--{/if}-->
         </div>
-        <!--▲買い物かご-->
     </div>
-    </form>
+    <!--▲買い物かご-->
+</div>
+</form>
 
     <!--詳細ここまで-->
@@ -305,6 +305,5 @@
                         <!--{/if}-->
                         <img src="<!--{$arrFile[$ikey].filepath}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile[$ikey].width}-->" height="<!--{$arrFile[$ikey].height}-->" />
-                        <!--{if $arrProduct[$lkey]|strlen >= 1}-->
-                            </a>
+                        <!--{if $arrProduct[$lkey]|strlen >= 1}--></a>
                             <span class="mini">
                                 <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank">
@@ -324,5 +323,5 @@
     <!--この商品に対するお客様の声-->
     <div id="customervoice_area">
-        <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_voice.png" alt="この商品に対するお客様の声" /></h2>
+        <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_voice.jpg" alt="この商品に対するお客様の声" /></h2>
 
         <div class="review_bloc clearfix">
@@ -357,5 +356,5 @@
     <!--{if $arrRecommend}-->
         <div id="whobought_area">
-            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_recommend.png" alt="その他のオススメ商品" /></h2>
+            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_recommend.jpg" alt="その他のオススメ商品" /></h2>
             <!--{foreach from=$arrRecommend item=arrItem name="arrRecommend"}-->
                 <div class="product_item">
Index: /branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl	(revision 22607)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl	(revision 22796)
@@ -197,5 +197,4 @@
                 <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
                 <input type="hidden" name="product_class_id" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
-                <input type="hidden" name="category_id" value="<!--{$arrSearchData.category_id|h}-->" />
 
                 <div class="cart_area clearfix">
Index: /branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl	(revision 22363)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl	(revision 22796)
@@ -21,5 +21,5 @@
  *}-->
 
-<body class="<!--{$tpl_page_class_name|h}-->">
+<body>
 <!--{$GLOBAL_ERR}-->
 <noscript>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl	(revision 22363)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl	(revision 22796)
@@ -22,5 +22,5 @@
  *}-->
 
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" class="<!--{$tpl_page_class_name|h}-->">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />
Index: /branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl	(revision 22796)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl	(revision 22796)
@@ -0,0 +1,41 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *}-->
+
+<!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="住所検索" disable_wincol=1}-->
+
+<div id="zipsearchcolumn">
+    <h2>住所検索</h2>
+    <div id="zipsearch_area">
+        <form name="form1" id="form1" method="post" action="?">
+            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+            <input type="hidden" name="state" value="<!--{$tpl_state}-->" />
+            <input type="hidden" name="city" value="<!--{$tpl_city}-->" />
+            <input type="hidden" name="town" value="<!--{$tpl_town}-->" />
+            <div id="completebox">
+                <p><!--{$tpl_message}--></p>
+            </div>
+        </form>
+    </div>
+    <div class="btn"><a href="javascript:window.close()" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close_on.gif','b_close');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close.gif','b_close');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_close.gif" alt="閉じる" border="0" name="b_close" /></a></div>
+</div>
+
+<!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_footer.tpl"}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 22573)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 22796)
@@ -33,12 +33,9 @@
                 <span class="st">注文番号：&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
                 <span class="st">お支払い方法：&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
-                <!--{if $is_price_change == true}-->    
-                    <div class="attention" Align="right">※金額が変更されている商品があるため、再注文時はご注意ください。</div>
-                <!--{/if}-->
             </p>
             <form action="order.php" method="post">
                 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                 <p class="btn">
-                    <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->" />
+                    <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->">
                     <input type="image" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re_on.jpg', this);" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg', this);" src="<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg" alt="この購入内容で再注文する" name="submit" value="この購入内容で再注文する" />
                 </p>
@@ -87,16 +84,9 @@
                     <!--{/if}-->
                     </td>
-                    <!--{assign var=order_price   value=`$orderDetail.price`}-->
-                    <!--{assign var=product_price value=`$orderDetail.product_price`}-->
+                    <!--{assign var=price value=`$orderDetail.price`}-->
                     <!--{assign var=quantity value=`$orderDetail.quantity`}-->
-                    <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-                    <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円
-                    <!--{if $order_price != $product_price}-->
-                        <div class="attention">【現在価格】</div><span class="attention"><!--{$product_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円</span>
-                    <!--{/if}-->
-                    </td>
+                    <td class="alignR"><!--{$price|sfCalcIncTax|number_format|h}-->円</td>
                     <td class="alignR"><!--{$quantity|h}--></td>
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+                    <td class="alignR"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</td>
                 </tr>
             <!--{/foreach}-->
@@ -180,5 +170,5 @@
                             </td>
                             <td class="alignR">
-                                <!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->円
+                                <!--{$item.price|sfCalcIncTax|number_format}-->円
                             </td>
                             <td class="alignC"><!--{$item.quantity}--></td>
@@ -191,7 +181,6 @@
             <!--{/if}-->
             <table summary="お届け先" class="delivname">
-                <col width="30%" />
-                <col width="70%" />
-                <tbody>
+                    <col width="30%" />
+                    <col width="70%" />
                     <tr>
                         <th class="alignL">お名前</th>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	(revision 22606)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	(revision 22796)
@@ -43,13 +43,12 @@
 ■ご注文商品明細
 <!--{section name=cnt loop=$arrOrderDetail}-->
-商品コード：<!--{$arrOrderDetail[cnt].product_code}-->
-商品名：<!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
-単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrOrderDetail[cnt].tax_rate:$arrOrderDetail[cnt].tax_rule|number_format}-->
+商品コード: <!--{$arrOrderDetail[cnt].product_code}-->
+商品名: <!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
+単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax|number_format}-->
 数量：<!--{$arrOrderDetail[cnt].quantity}-->
 
 <!--{/section}-->
 
-小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）<!--{/if}-->
-
+小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> (うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）
 値引き ￥ <!--{$arrOrder.use_point+$arrOrder.discount|number_format|default:0}-->
 送　料 ￥ <!--{$arrOrder.deliv_fee|number_format|default:0}-->
@@ -69,10 +68,10 @@
 　電話番号：<!--{$shipping.shipping_tel01}-->-<!--{$shipping.shipping_tel02}-->-<!--{$shipping.shipping_tel03}-->
 　お届け日：<!--{$shipping.shipping_date|date_format:"%Y/%m/%d"|default:"指定なし"}-->
-　お届け時間：<!--{$shipping.shipping_time|default:"指定なし"}-->
+お届け時間：<!--{$shipping.shipping_time|default:"指定なし"}-->
 
 <!--{foreach item=item name=item from=$shipping.shipment_item}-->
-商品コード：<!--{$item.product_code}-->
-商品名：<!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥ <!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
+商品コード: <!--{$item.product_code}-->
+商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
+単価：￥ <!--{$item.price|sfCalcIncTax|number_format}-->
 数量：<!--{$item.quantity}-->
 
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 22369)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 22796)
@@ -103,15 +103,4 @@
         <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
 
-        ●FAX<br>
-        <!--{assign var=key1 value="`$prefix`fax01"}-->
-        <!--{assign var=key2 value="`$prefix`fax02"}-->
-        <!--{assign var=key3 value="`$prefix`fax03"}-->
-        <!--{if $arrErr[fax01] || $arrErr[fax02] || $arrErr[fax03]}-->
-            <font color="#FF0000"><!--{$arrErr[fax01]}--><!--{$arrErr[fax02]}--><!--{$arrErr[fax03]}--></font><br>
-        <!--{/if}-->
-        <input type="text" size="<!--{$size}-->" name="fax01" value="<!--{$arrForm.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
-        <input type="text" size="<!--{$size}-->" name="fax02" value="<!--{$arrForm.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
-        <input type="text" size="<!--{$size}-->" name="fax03" value="<!--{$arrForm.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" /><br>
-        
         ●メールアドレス<font color="#FF0000"> *</font><br>
         <font color="#FF0000"><!--{$arrErr.email}--></font>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl	(revision 22545)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl	(revision 22796)
@@ -34,6 +34,6 @@
         <input type="text" name="quantity" size="3" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength=<!--{$smarty.const.INT_LEN}--> istyle="4"><br>
         <input type="hidden" name="mode" value="cart">
-        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
-        <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value|h}-->">
+        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
+        <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value}-->">
         <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
         <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->">
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl	(revision 22545)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl	(revision 22796)
@@ -37,5 +37,5 @@
         </select><br>
         <input type="hidden" name="mode" value="selectItem">
-        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
+        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
         <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
         <center><input type="submit" name="submit" value="次へ"></center>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl	(revision 22549)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl	(revision 22796)
@@ -115,14 +115,4 @@
     <br>
 
-    <!--★メーカー★-->
-    <!--{if $arrProduct.maker_name|strlen >= 1}-->
-        メーカー：<!--{$arrProduct.maker_name|h}--><br>
-    <!--{/if}-->
-
-    <!--★メーカーURL★-->
-    <!--{if $arrProduct.comment1|strlen >= 1}-->
-        メーカーURL：<a href="<!--{$arrProduct.comment1|h}-->"><!--{$arrProduct.comment1|h}--></a><br>
-    <!--{/if}-->
-
     <!--★関連カテゴリ★-->
     関連カテゴリ：<br>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 22601)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 22796)
@@ -27,4 +27,10 @@
     注文番号：<!--{$tpl_arrOrderData.order_id}--><br>
     お支払い方法：<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+    <!--{if $tpl_arrOrderData.deliv_time_id != ""}--><br>
+        お届け時間：<!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
+    <!--{/if}-->
+    <!--{if $tpl_arrOrderData.deliv_date != ""}--><br>
+        お届け日：<!--{$tpl_arrOrderData.deliv_date|h}-->
+    <!--{/if}-->
 
     <form action="order.php" method="post">
@@ -62,9 +68,7 @@
         <!--{assign var=price value=`$orderDetail.price`}-->
         <!--{assign var=quantity value=`$orderDetail.quantity`}-->
-        <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-        <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
-        <!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円<br>
+        <!--{$price|sfCalcIncTax|number_format|h}-->円<br>
         数量：<!--{$quantity|h}--><br>
-        小計：<!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円<br>
+        小計：<!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円<br>
     <!--{/foreach}-->
     <hr>
@@ -105,5 +109,5 @@
                     <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--><br>
                 <!--{/if}-->
-                単価：<!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->円<br>
+                単価：<!--{$item.price|sfCalcIncTax|number_format}-->円<br>
                 数量：<!--{$item.quantity}--><br>
                 <br>
@@ -123,8 +127,4 @@
             <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}--><br>
         <!--{/if}-->
-        ●お届け日<br>
-        <!--{$shippingItem.shipping_date|default:'指定なし'|h}-->&nbsp;<br>
-        ●お届け時間<br>
-        <!--{$shippingItem.shipping_time|default:'指定なし'|h}-->&nbsp;<br>
         <br>
     <!--{/foreach}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 22458)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 22796)
@@ -69,5 +69,6 @@
         <!--{/if}-->
 
-        <!--{if $arrShipping}-->
+        <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け先を表示しない） *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
             【お届け先】<br>
             <!--{foreach item=shippingItem from=$arrShipping name=shippingItem}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 22796)
@@ -103,5 +103,5 @@
                 <td>
                     <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
-                    〒 <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                    〒 <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" maxlength="3" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" maxlength="4" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
                     <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;">住所入力</a>
                 </td>
@@ -241,6 +241,6 @@
 
         <input type="hidden" name="order_id" value="" />
-        <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
-        <input type="hidden" name="edit_customer_id" value="<!--{$edit_customer_id}-->" />
+        <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->">
+        <input type="hidden" name="edit_customer_id" value="<!--{$edit_customer_id}-->" >
 
         <h2>購入履歴一覧</h2>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 22796)
@@ -104,5 +104,5 @@
             <td><!--{$arrCustomer[cnt].name01|h}--><!--{$arrCustomer[cnt].name02|h}-->(<!--{$arrCustomer[cnt].kana01|h}--><!--{$arrCustomer[cnt].kana02|h}-->)</td>
             <td><!--{$arrCustomer[cnt].tel01|h}-->-<!--{$arrCustomer[cnt].tel02|h}-->-<!--{$arrCustomer[cnt].tel03|h}--></td>
-            <td align="center"><a href="" onclick="return func_submit(<!--{$arrCustomer[cnt].customer_id|h}-->)">決定</a></td>
+            <td align="center"><a href="" onClick="return func_submit(<!--{$arrCustomer[cnt].customer_id|h}-->)">決定</a></td>
         </tr>
         <!--▲会員<!--{$smarty.section.cnt.iteration}-->-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 22796)
@@ -137,5 +137,5 @@
                 <td class="center" rowspan="2"><!--{if $row.status eq 1}-->仮<!--{else}-->本<!--{/if}--></td>
                 <td><!--{$row.customer_id|h}--></td>
-                <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br />(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
+                <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br>(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
                 <td class="center" rowspan="2"><!--{$arrSex[$row.sex]|h}--></td>
                 <td><!--{$row.tel01|h}-->-<!--{$row.tel02|h}-->-<!--{$row.tel03|h}--></td>
@@ -145,5 +145,5 @@
             <tr>
                 <td><!--{assign var=pref value=$row.pref}--><!--{$arrPref[$pref]}--></td>
-                <td><!--{mailto address=$row.email encode="javascript"}--><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|h}-->');">仮登録メール再送</a><!--{/if}--></td>
+                <td><!--{mailto address=$row.email encode="javascript"}--></a><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|h}-->');">仮登録メール再送</a><!--{/if}--></td>
             </tr>
         <!--{/foreach}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 22796)
@@ -141,5 +141,4 @@
         <!--{/if}-->
         <!--{/section}-->
-        </tr>
     </table>
     <!--{/if}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 22796)
@@ -87,5 +87,5 @@
                 <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','header','cnt_header'); return false;"><span>文字数カウント</span></a>
                 今までに入力したのは
-                <input type="text" name="cnt_header" size="4" class="box4" readonly="readonly" style="text-align:right" />
+                <input type="text" name="cnt_header" size="4" class="box4" readonly = true style="text-align:right" />
                 文字です。
             </div>
@@ -107,5 +107,5 @@
                 <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','footer','cnt_footer'); return false;"><span>文字数カウント</span></a>
                 今までに入力したのは
-                <input type="text" name="cnt_footer" size="4" class="box4" readonly="readonly" style="text-align:right" />
+                <input type="text" name="cnt_footer" size="4" class="box4" readonly = true style="text-align:right" />
                 文字です。
             </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 22495)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 22796)
@@ -129,5 +129,5 @@
                 <!--{assign var=key value="law_email"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
+                <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
             </td>
         </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 22796)
@@ -25,5 +25,5 @@
 <form name="form1" id="form1" method="post" action="?" onSubmit="return window.confirm('登録しても宜しいですか');">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="mode" value="confirm">
 <input type="hidden" name="device_type_id" value="" />
 <input type="hidden" name="page_id" value="" />
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 22477)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 22796)
@@ -111,5 +111,5 @@
 <form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
 <!--{* ▼登録テーブルここから *}-->
 <div id="basis" class="contents-main">
@@ -323,5 +323,5 @@
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
         </ul>
     </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 22796)
@@ -29,5 +29,5 @@
     <form name="form1" id="form1" method="get" action="?" onsubmit="return false;">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-        <input type="hidden" name="mode" value="" />
+        <input type="hidden" name="mode" value="">
         <p>保存されている郵便番号CSVの更新日時: <!--{$tpl_csv_datetime|h}--></p>
         <p>郵便番号CSVには <!--{$tpl_line|h}--> 行のデータがあります。</p>
@@ -53,5 +53,5 @@
             <h2>DB手動登録</h2>
             <p>指定した行数から郵便番号を登録します。タイムアウトした場合、直前まで登録されます。</p>
-            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', ''); return false;"><span class="btn-next">手動登録</span></a>　開始行: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8" /><span class="attention"><!--{$arrErr.startRowNum}--></span></p>
+            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', ''); return false;"><span class="btn-next">手動登録</span></a>　開始行: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8"><span class="attention"><!--{$arrErr.startRowNum}--></span></p>
         </div>
 
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 22575)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 22796)
@@ -34,5 +34,5 @@
             <td>
                 <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
-                <input type="text" name="title" value="<!--{$arrForm.title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+                <input type="text" name="title" value="<!--{$arrForm.title|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
                 <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
             </td>
@@ -48,9 +48,9 @@
                 <select name="month" style="<!--{$arrErr.month|sfGetErrorColor}-->">
                     <option value="">--</option>
-                    <!--{html_options options=$arrMonth selected=$arrForm.month.value}-->
+                    <!--{html_options options=$arrMonth selected=$arrForm.month}-->
                 </select>月
                 <select name="day" style="<!--{$arrErr.day|sfGetErrorColor}-->">
                     <option value="">--</option>
-                    <!--{html_options options=$arrDay selected=$arrForm.day.value}-->
+                    <!--{html_options options=$arrDay selected=$arrForm.day}-->
                 </select>日
                 <br />
@@ -100,8 +100,8 @@
             <td class="center">
                 <!--{if $smarty.section.cnt.iteration != 1}-->
-                <a href="?" onclick="fnModeSubmit('up', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">上へ</a>
+                <a href="?" onclick="fnModeSubmit('up', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />上へ</a>
                 <!--{/if}-->
                 <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
-                <a href="?" onclick="fnModeSubmit('down', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">下へ</a>
+                <a href="?" onclick="fnModeSubmit('down', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />下へ</a>
                 <!--{/if}-->
             </td>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 22294)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 22796)
@@ -34,5 +34,5 @@
                 <span class="attention"><!--{$arrErr.kiyaku_title}--></span>
                 <span class="attention"><!--{$arrErr.name}--></span>
-                <input type="text" name="kiyaku_title" value="<!--{$arrForm.kiyaku_title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="<!--{if $arrErr.kiyaku_title != "" || $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60"/>
+                <input type="text" name="kiyaku_title" value="<!--{$arrForm.kiyaku_title|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="<!--{if $arrErr.kiyaku_title != "" || $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60"/>
                 <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
             </td>
@@ -42,5 +42,5 @@
             <td>
             <span class="attention"><!--{$arrErr.kiyaku_text}--></span>
-            <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{"\n"}--><!--{$arrForm.kiyaku_text.value|h}--></textarea>
+            <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{"\n"}--><!--{$arrForm.kiyaku_text|h}--></textarea>
             <span class="attention"> (上限<!--{$smarty.const.MLTEXT_LEN}-->文字)</span>
             </td>
@@ -70,5 +70,5 @@
                 <td align="center">
                     <!--{if $tpl_kiyaku_id != $arrKiyaku[cnt].kiyaku_id}-->
-                    <a href="?" onclick="fnModeSubmit('pre_edit', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">編集</a>
+                    <a href="?" onclick="fnSetFormSubmit('form1', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">編集</a>
                     <!--{else}-->
                     編集中
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl	(revision 22796)
@@ -126,6 +126,6 @@
         <!--{assign var=key1 value="search_buy_times_from"}-->
         <!--{assign var=key2 value="search_buy_times_to"}-->
-    <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span><br />
+    <!--{if $arrErr.buy_times_from || $arrErr.buy_times_to}-->
+        <span class="attention"><!--{$arrErr.buy_times_from}--><!--{$arrErr.buy_times_to}--></span><br />
     <!--{/if}-->
     <input type="text" name="<!--{$key1}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key1].value|h}-->" size="6" class="box6" <!--{if $arrErr[$key1] || $arrErr[$key2]}--><!--{sfSetErrorStyle}--><!--{/if}--> /> 回 ～
@@ -221,5 +221,5 @@
         <!--{assign var=key value="search_buy_product_code"}-->
         <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" >
     </td>
 </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 22597)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 22796)
@@ -43,10 +43,37 @@
     <!--{* ▼画面左 *}-->
     <div id="products-rank-left">
-        <ul>
-            <li>
-                <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />&nbsp;ホーム</a>
-                <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/product_rank_tree_fork.tpl" children=$arrTree treeID="f0" display=1}-->
-            </li>
-        </ul>
+        <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">&nbsp;ホーム</a><br />
+        <!--{section name=cnt loop=$arrTree}-->
+            <!--{assign var=level value="`$arrTree[cnt].level`}-->
+
+            <!--{* 上の階層表示の時にdivを閉じる *}-->
+            <!--{assign var=close_cnt value="`$before_level-$level+1`}-->
+            <!--{if $close_cnt > 0}-->
+                <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{* スペース繰り返し *}-->
+            <!--{section name=n loop=$level}-->　　<!--{/section}-->
+
+            <!--{* カテゴリ名表示 *}-->
+            <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false">
+            <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ">
+            <!--{else}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
+            <!--{/if}-->
+            <!--{$disp_name|sfCutString:10:false|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+            <br />
+            <!--{if $arrTree[cnt].display == true}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->">
+            <!--{else}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+            <!--{/if}-->
+            <!--{if $smarty.section.cnt.last}-->
+                <!--{section name=n loop=$level}--></div><!--{/section}-->
+            <!--{/if}-->
+            <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+        <!--{/section}-->
     </div>
     <!--{* ▲画面左 *}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 22796)
@@ -48,6 +48,5 @@
             <td>
                 <!--{if $arrErr.csv_file}--><span class="attention"><!--{$arrErr.csv_file}--></span><!--{/if}-->
-                <input type="file" name="csv_file" size="60" class="box60" /><span class="attention"> (1行目タイトル行)
-                (最大アップロードサイズ:<!--{$max_upload_csv_size}-->)</span>
+                <input type="file" name="csv_file" size="60" class="box60" /><span class="attention"> (1行目タイトル行)</span>
             </td>
         </tr>
@@ -56,5 +55,5 @@
             <td>
                 <!--{foreach name=title key=key item=item from=$arrTitle}-->
-                <!--{$smarty.foreach.title.iteration}-->項目：<!--{$item}--><br />
+                <!--{$smarty.foreach.title.iteration}-->項目：<!--{$item}--><br>
                 <!--{/foreach}-->
             </td>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 22796)
@@ -97,5 +97,5 @@
             </tr>
             <tr>
-                <th>ダウンロード商品用<br />ファイル</th>
+                <th>ダウンロード商品用<BR />ファイル</th>
                 <td>
                     <!--{if $arrForm.down_realfilename != ""}-->
@@ -271,5 +271,5 @@
                     <th>関連商品(<!--{$smarty.section.cnt.iteration}-->)<br />
                         <!--{if $arrRecommend[$recommend_no].product_id|strlen >= 1}-->
-                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
+                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->">
                         <!--{/if}-->
                     </th>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 22796)
@@ -23,5 +23,5 @@
 *}-->
 
-<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data"">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="csv_upload" />
@@ -48,5 +48,5 @@
                     <span class="attention"><!--{$arrErr.csv_file}--></span>
                 <!--{/if}-->
-                <input type="file" name="csv_file" size="40" /><span class="attention">(1行目タイトル行)(最大アップロードサイズ:<!--{$max_upload_csv_size}-->)</span>
+                <input type="file" name="csv_file" size="40" /><span class="attention">(1行目タイトル行)</span>
             </td>
         </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 22578)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 22796)
@@ -35,5 +35,5 @@
                     <!--{if $arrErr.maker_id}--><span class="attention"><!--{$arrErr.maker_id}--></span><br /><!--{/if}-->
                     <!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><!--{/if}-->
-                    <input type="text" name="name" value="<!--{$arrForm.name.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+                    <input type="text" name="name" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
                     <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
                 </td>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 22303)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 22796)
@@ -76,5 +76,5 @@
                 </td>
                 <td align="center">
-                    <a href="?" onclick="if(window.confirm('分類名を削除すると、その分類を利用している商品規格が無効になります。\n整合性の問題を把握し、バックアップを行ってから削除することを推奨致します。')){ fnModeSubmit('delete','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); } return false;">削除</a>
+                    <a href="?" onclick="fnModeSubmit('delete','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); return false;">削除</a>
                 </td>
                 <td align="center">
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 22796)
@@ -194,7 +194,7 @@
         <col width="8%" />
         <tr>
-            <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br />登録</label></th>
-            <th>規格1<br />(<!--{$arrClass[$class_id1]|default:"未選択"|h}-->)</th>
-            <th>規格2<br />(<!--{$arrClass[$class_id2]|default:"未選択"|h}-->)</th>
+            <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br>登録</label></th>
+            <th>規格1<br>(<!--{$arrClass[$class_id1]|default:"未選択"|h}-->)</th>
+            <th>規格2<br>(<!--{$arrClass[$class_id2]|default:"未選択"|h}-->)</th>
             <th>商品コード</th>
             <th>在庫数<span class="attention">*</span></th>
@@ -202,6 +202,6 @@
             <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
             <th>商品種別<span class="attention">*</span></th>
-            <th>ダウンロード<br />ファイル名<span class="red"><br />上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
-            <th>ダウンロード商品用<br />ファイル</th>
+            <th>ダウンロード<br>ファイル名<span class="red"><br>上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
+            <th>ダウンロード商品用<br>ファイル</th>
         </tr>
         <!--{section name=cnt loop=$arrForm.total.value}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 22796)
@@ -38,5 +38,5 @@
             <th>商品名</th>
             <td><!--{$arrForm.name|h}-->
-            <input type="hidden" name="name" value="<!--{$arrForm.name|h}-->" />
+            <input type="hidden" name="name" value="<!--{$arrForm.name|h}-->">
             </td>
         </tr>
@@ -44,5 +44,5 @@
             <th>投稿日</th>
             <td><!--{$arrForm.create_date|sfDispDBDate}-->
-            <input type="hidden" name="create_date" value="<!--{$arrForm.create_date|h}-->" />
+            <input type="hidden" name="create_date" value="<!--{$arrForm.create_date|h}-->">
             </td>
         </tr>
@@ -51,5 +51,5 @@
             <td>
                 <!--{if $arrErr.status}--><span class="attention"><!--{$arrErr.status}--></span><!--{/if}-->
-                <input type="radio" name="status" value="2" <!--{if $arrForm.status eq 2}-->checked="checked"<!--{/if}--> />非表示<!--{if $arrForm.status eq 2 && !$tpl_status_change}--><!--{else}--><input type="radio" name="status" value="1" <!--{if $arrForm.status eq 1}-->checked="checked"<!--{/if}--> />表示<!--{/if}-->
+                <input type="radio" name="status" value="2" <!--{if $arrForm.status eq 2}-->checked<!--{/if}-->>非表示<!--{if $arrForm.status eq 2 && !$tpl_status_change}--><!--{else}--><input type="radio" name="status" value="1" <!--{if $arrForm.status eq 1}-->checked<!--{/if}-->>表示<!--{/if}-->
             </td>
         </tr>
@@ -58,5 +58,5 @@
             <td>
                 <!--{if $arrErr.reviewer_name}--><span class="attention"><!--{$arrErr.reviewer_name}--></span><!--{/if}-->
-                <input type="text" class="box60" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size=30>
             </td>
         </tr>
@@ -65,5 +65,5 @@
             <td>
                 <!--{if $arrErr.reviewer_url}--><span class="attention"><!--{$arrErr.reviewer_url}--></span><!--{/if}-->
-                <input type="text" class="box60" name="reviewer_url" maxlength="<!--{$smarty.const.URL_LEN}-->" value="<!--{$arrForm.reviewer_url|h}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="reviewer_url" maxlength="<!--{$smarty.const.URL_LEN}-->" value="<!--{$arrForm.reviewer_url|h}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size=30>
             </td>
         </tr>
@@ -89,5 +89,5 @@
             <td>
                 <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
-                <input type="text" class="box60" name="title" value="<!--{$arrForm.title|h}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="title" value="<!--{$arrForm.title|h}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size=30><span class="attention">
             </td>
         </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl	(revision 22796)
@@ -38,5 +38,5 @@
             $('#' + disp_id).css("display", "none");
 
-            $('#' + inner_id).html('    URL <a href="#" onclick="lfnDispChange();"> &gt;&gt; カテゴリ表示<\/a>');
+            $('#' + inner_id).html('    URL <a href="#" onClick="lfnDispChange();"> &gt;&gt; カテゴリ表示<\/a>');
         }
     }else{
@@ -48,5 +48,5 @@
             $('#' + disp_id).css("display", "");
 
-            $('#' + inner_id).html('    カテゴリ <a href="#" onclick="lfnDispChange();"> &gt;&gt; URL表示<\/a>');
+            $('#' + inner_id).html('    カテゴリ <a href="#" onClick="lfnDispChange();"> &gt;&gt; URL表示<\/a>');
         }
     }
@@ -235,5 +235,5 @@
             </tr>
             <tr>
-                <th nowrap="nowrap"><a href="#" onclick="lfnDispChange(); return false;">カテゴリ ⇔ URL</a></th>
+                <th nowrap><a href="#" onClick="lfnDispChange(); return false;">カテゴリ ⇔ URL</a></th>
             </tr>
 
@@ -244,5 +244,5 @@
                     <td class="id" rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
                     <td class="thumbnail" rowspan="2">
-                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" />            </td>
+                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65">            </td>
                     <td rowspan="2"><!--{$arrProducts[cnt].product_code_min|h}-->
                         <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl	(revision 22596)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl	(revision 22796)
@@ -34,7 +34,7 @@
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="edit" />
-<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id|h}-->" />
-<input type="hidden" name="category_id" value="<!--{$arrForm.category_id|h}-->" />
-<input type="hidden" name="keySet" value="" />
+<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id|h}-->">
+<input type="hidden" name="category_id" value="<!--{$arrForm.category_id|h}-->">
+<input type="hidden" name="keySet" value="">
 <div id="products" class="contents-main">
     <div class="btn">
@@ -45,10 +45,44 @@
     <!--{* ▼画面左 *}-->
     <div id="products-category-left">
-        <ul>
-            <li>
-                <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />&nbsp;ホーム</a>
-                <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/category_tree_fork.tpl" children=$arrTree treeID="f0" display=1}-->
-            </li>
-        </ul>
+        <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">&nbsp;ホーム</a><br />
+        <!--{section name=cnt loop=$arrTree}-->
+            <!--{assign var=level value="`$arrTree[cnt].level`}-->
+
+            <!--{* 上の階層表示の時にdivを閉じる *}-->
+            <!--{assign var=close_cnt value="`$before_level-$level+1`"}-->
+            <!--{if $close_cnt > 0}-->
+                <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{* スペース繰り返し *}-->
+            <!--{section name=n loop=$level}-->　　<!--{/section}-->
+
+            <!--{* カテゴリ名表示 *}-->
+            <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+            <!--{if $arrTree[cnt].level != $smarty.const.LEVEL_MAX}-->
+                <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false;">
+                <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+                    <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ">
+                <!--{else}-->
+                    <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
+                <!--{/if}-->
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
+            <!--{else}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
+            <!--{/if}-->
+
+            <!--{if $arrTree[cnt].display == true}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->">
+            <!--{else}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+            <!--{/if}-->
+
+            <!--{if $smarty.section.cnt.last}-->
+                <!--{section name=n loop=$level}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+        <!--{/section}-->
     </div>
     <!--{* ▲画面左 *}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl	(revision 22796)
@@ -72,5 +72,5 @@
 <input type="hidden" name="mode" value="edit" />
 <input type="hidden" name="image_key" value="" />
-<input type="hidden" name="down_key" value="" />
+<input type="hidden" name="down_key" value="">
 <input type="hidden" name="product_id" value="<!--{$arrForm.product_id|h}-->" />
 <input type="hidden" name="product_class_id" value="<!--{$arrForm.product_class_id|h}-->" />
@@ -105,5 +105,5 @@
                     <tr>
                         <td>
-                            <select name="category_id[]" id="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> height: 120px; min-width: 200px;" onchange="" size="10" multiple="multiple">
+                            <select name="category_id[]" id="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> height: 120px; min-width: 200px;" onchange="" size="10" multiple>
                             </select>
                         </td>
@@ -113,5 +113,5 @@
                         </td>
                         <td>
-                            <select name="category_id_unselect[]" id="category_id_unselect" onchange="" size="10" style="height: 120px; min-width: 200px;" multiple="multiple">
+                            <select name="category_id_unselect[]" id="category_id_unselect" onchange="" size="10" style="height: 120px; min-width: 200px;" multiple>
                                 <!--{html_options values=$arrCatVal output=$arrCatOut selected=$arrForm.category_id}-->
                             </select>
@@ -156,5 +156,5 @@
                     <!--{if $arrForm.down_realfilename != ""}-->
                         <!--{$arrForm.down_realfilename|h}--><input type="hidden" name="down_realfilename" value="<!--{$arrForm.down_realfilename|h}-->">
-                        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br />
+                        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
                     <!--{/if}-->
                     <input type="file" name="down_file" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
Index: anches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl	(revision 22596)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}-->">
-        <!--{* カテゴリ名表示 *}-->
-        <!--{assign var=disp_name value="`$child.category_id`.`$child.category_name`"}-->
-        <!--{if $child.level != $smarty.const.LEVEL_MAX}-->
-            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$child.category_id}-->); return false;">
-            <!--{if $arrForm.parent_category_id == $child.category_id}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ" />
-            <!--{else}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{/if}-->
-            <!--{$disp_name|sfCutString:10:false|h}--></a>
-        <!--{else}-->
-            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{$disp_name|sfCutString:10:false|h}-->
-        <!--{/if}-->
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/category_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: anches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl	(revision 22597)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}-->">
-        <!--{* カテゴリ名表示 *}-->
-        <!--{assign var=disp_name value="`$child.category_id`.`$child.category_name`"}-->
-        <!--{if $child.level != $smarty.const.LEVEL_MAX}-->
-            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$child.category_id}-->); return false;">
-            <!--{if $arrForm.parent_category_id == $child.category_id}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ" />
-            <!--{else}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{/if}-->
-            <!--{$disp_name|sfCutString:10:false|h}--></a>
-        <!--{else}-->
-            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{$disp_name|sfCutString:10:false|h}-->
-        <!--{/if}-->
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/product_rank_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl	(revision 22796)
@@ -52,5 +52,5 @@
             <td>
                 <!--{assign var=key value="css_data"}-->
-                <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows="<!--{$area_row}-->" align="left" style="width: 650px;"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+                <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows=<!--{$area_row}--> align="left" style="width: 650px;"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
                 <input type="hidden" name="area_row" value="<!--{$area_row}-->" />
                 <div class="btn">
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl	(revision 22796)
@@ -60,5 +60,5 @@
     <input type="hidden" name="mode" value="" />
     <input type="hidden" name="division" value="footer" />
-    <input type="hidden" name="footer_row" value="<!--{$footer_row}-->" />
+    <input type="hidden" name="footer_row" value=<!--{$footer_row}--> />
     <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 22796)
@@ -82,5 +82,5 @@
                 <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" value="1" <!--{if $arrForm.footer_chk.value == "1"}-->checked="checked"<!--{/if}--> />共通のフッターを使用する</label>
                 <div>
-                    <textarea id="tpl_data" class="top" name="tpl_data" rows="<!--{$text_row}-->" style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
+                    <textarea id="tpl_data" class="top" name="tpl_data" rows=<!--{$text_row}--> style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
                     <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /><br />
                     <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#tpl_data', 50, 13); return false;"><span>拡大</span></a>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl	(revision 22796)
@@ -72,6 +72,6 @@
             <td class="left"><!--{$tpl.template_name|h}--></td>
             <td class="left">data/Smarty/templates/<!--{$tplcode|h}-->/</td>
-            <td><span class="icon_confirm"><a href="javascript:;" onclick="fnFormModeSubmit('form2', 'download','template_code','<!--{$tplcode}-->');return false;">ダウンロード</a></span></td>
-            <td><span class="icon_delete"><a href="javascript:;" onclick="fnFormModeSubmit('form2', 'delete','template_code','<!--{$tplcode}-->');return false;">削除</a></span></td>
+            <td><span class="icon_confirm"><a href="javascript:;" onClick="fnFormModeSubmit('form2', 'download','template_code','<!--{$tplcode}-->');return false;">ダウンロード</a></span></td>
+            <td><span class="icon_delete"><a href="javascript:;" onClick="fnFormModeSubmit('form2', 'delete','template_code','<!--{$tplcode}-->');return false;">削除</a></span></td>
         </tr>
         <!--{/foreach}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 22796)
@@ -58,5 +58,5 @@
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
             </td>
         </tr>
@@ -66,5 +66,5 @@
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
             </td>
         </tr>
@@ -76,5 +76,5 @@
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> />
+                <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
             </td>
         </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl	(revision 22796)
@@ -23,9 +23,9 @@
 *}-->
 
-<form name="form1" id="form1" method="post" action="?" >
+<form name="form1" id="form1" method="POST" action="?" >
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="" />
 <input type="hidden" name="status" value="<!--{if $arrForm.status == ""}-->1<!--{else}--><!--{$arrForm.status}--><!--{/if}-->" />
-<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
+<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" >
 <input type="hidden" name="order_id" value="" />
 <div id="order" class="contents-main">
@@ -58,5 +58,5 @@
             <a class="btn-normal" href="javascript:;" onclick="fnSelectCheckSubmit(); return false;"><span>移動</span></a>
         </div>
-        <span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->に変更時には、在庫数を手動で戻してください。</span><br />
+        <span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->もしくは、削除に変更時には、在庫数を手動で戻してください。</span><br />
 
         <p class="remark">
@@ -89,5 +89,5 @@
             <!--{assign var=status value="`$arrStatus[cnt].status`"}-->
             <tr style="background:<!--{$arrORDERSTATUS_COLOR[$status]}-->;">
-                <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" /></td>
+                <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" ></td>
                 <td><!--{$arrORDERSTATUS[$status]}--></td>
                 <td><a href="#" onclick="fnOpenWindow('./disp.php?order_id=<!--{$arrStatus[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrStatus[cnt].order_id}--></a></td>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 22796)
@@ -39,5 +39,5 @@
         var shipping_data = $('input[name^=shipping_name01]').attr('name'); 
         var shipping_slt  = shipping_data.split("shipping_name01");
-
+        
         var shipping_key = "[0]";
         if(shipping_slt.length > 1) {
@@ -82,10 +82,4 @@
     }
 
-    $(document).ready(function() {
-        if(<!--{$arrForm.shipping_quantity.value}--> > 1){
-            $("input[name^='quantity[']").attr("disabled","disabled");
-        }
-    });
-
 //-->
 </script>
@@ -98,5 +92,4 @@
 <input type="hidden" id="add_product_id" name="add_product_id" value="" />
 <input type="hidden" id="add_product_class_id" name="add_product_class_id" value="" />
-<input type="hidden" id="select_shipping_id" name="select_shipping_id" value="" />
 <input type="hidden" id="edit_product_id" name="edit_product_id" value="" />
 <input type="hidden" id="edit_product_class_id" name="edit_product_class_id" value="" />
@@ -120,5 +113,5 @@
         <tr>
             <th>帳票出力</th>
-            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value|h}-->','pdf_input','615','650'); return false;">帳票出力</a></td>
+            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value|h}-->','pdf','615','650'); return false;">帳票出力</a></td>
         </tr>
         <!--{/if}-->
@@ -281,7 +274,5 @@
         受注商品情報
         <a class="btn-normal" href="javascript:;" name="recalculate" onclick="fnModeSubmit('recalculate','anchor_key','order_products');">計算結果の確認</a>
-        <!--{if $arrForm.shipping_quantity.value <= 1}-->
-        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$top_shipping_id}-->', 'search', '615', '500'); return false;">商品の追加</a>
-        <!--{/if}-->
+        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->', 'search', '615', '500'); return false;">商品の追加</a>
     </h2>
 
@@ -290,5 +281,5 @@
     <!--{/if}-->
 
-    <table class="list order-edit-products">
+    <table class="list" id="order-edit-products">
         <tr>
             <th class="id">商品コード</th>
@@ -312,9 +303,7 @@
                 <input type="hidden" name="classcategory_name2[<!--{$product_index}-->]" value="<!--{$arrForm.classcategory_name2.value[$product_index]|h}-->" id="classcategory_name2_<!--{$product_index}-->" />
                 <br />
-                <!--{if $arrForm.shipping_quantity.value <= 1}-->
-                    <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$product_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$top_shipping_id}-->', 'search', '615', '500'); return false;">変更</a>
-                    <!--{if count($arrForm.quantity.value) > 1}-->
-                        <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$product_index}-->); fnSetFormVal('form1', 'select_shipping_id', '<!--{$top_shipping_id}-->'); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
-                    <!--{/if}-->
+                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$product_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->', 'search', '615', '500'); return false;">変更</a>
+                <!--{if count($arrForm.quantity.value) > 1}-->
+                    <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$product_index}-->); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
                 <!--{/if}-->
             <input type="hidden" name="product_type_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_type_id.value[$product_index]|h}-->" id="product_type_id_<!--{$product_index}-->" />
@@ -322,6 +311,4 @@
             <input type="hidden" name="product_class_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_class_id.value[$product_index]|h}-->" id="product_class_id_<!--{$product_index}-->" />
             <input type="hidden" name="point_rate[<!--{$product_index}-->]" value="<!--{$arrForm.point_rate.value[$product_index]|h}-->" id="point_rate_<!--{$product_index}-->" />
-            <input type="hidden" name="tax_rate[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rate.value[$product_index]|h}-->" id="tax_rate_<!--{$product_index}-->" />
-            <input type="hidden" name="tax_rule[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rule.value[$product_index]|h}-->" id="tax_rule_<!--{$product_index}-->" />
             </td>
             <td align="center">
@@ -337,8 +324,6 @@
             <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
             <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
-            <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
-            <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
-            <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円(税率<!--{$tax_rate|number_format}-->%)</td>
-            <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+            <td class="right"><!--{$price|sfCalcIncTax|number_format}--> 円</td>
+            <td class="right"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</td>
         </tr>
         <!--{/section}-->
@@ -403,6 +388,4 @@
                 <th colspan="5" class="column right">お誕生日ポイント</th>
                 <td class="right">
-                    <!--{assign var=key value="birth_point"}-->
-                    <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->"/>
                     <!--{$arrForm.birth_point.value|number_format}-->
                     pt
@@ -440,11 +423,9 @@
         <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key]|default:"0"|h}-->" id="<!--{$key}-->_<!--{$shipping_index}-->" />
         <!--{if $arrForm.shipping_quantity.value > 1}-->
-            <h2>届け先商品情報&nbsp;<a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->&shipping_id=<!--{$shipping_index}-->', 'search', '615', '500'); return false;">商品の追加</a>
-            </h2>
             <!--{assign var=product_quantity value="shipping_product_quantity"}-->
             <input type="hidden" name="<!--{$product_quantity}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$product_quantity]|h}-->" />
 
             <!--{if count($arrShipping.shipment_product_class_id) > 0}-->
-                <table class="list order-edit-products">
+                <table class="list" id="order-edit-products">
                     <tr>
                         <th class="id">商品コード</th>
@@ -472,19 +453,14 @@
                                 <input type="hidden" name="<!--{$key3}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key3][$item_index]|h}-->" />
                                 <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default:"(なし)"|h}-->/<!--{$arrShipping[$key3][$item_index]|default:"(なし)"|h}-->
-                                <br />
-                                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$item_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$shipping_index}-->', 'search', '615', '500'); return false;">変更</a>
-                                <!--{if count($arrForm.quantity.value) > 1}-->
-                                <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$item_index}-->);fnSetFormVal('form1', 'select_shipping_id', <!--{$shipping_index}-->); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
-                                <!--{/if}-->
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->
-                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->円
+                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax|number_format}-->円
                                 <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_quantity"}-->
-                                <span class="attention"><!--{$arrErr[$key][$shipping_index][$item_index]}--></span>
-                                <input type="text" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" />
+                                <!--{$arrShipping[$key][$item_index]|h}-->
+                                <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
                             </td>
                         </tr>
@@ -492,25 +468,4 @@
                 </table>
             <!--{/if}-->
-        <!--{else}-->
-            <!-- 配送先が１つでも、shipment_itemを更新するために必要 -->
-            <!--{assign var=product_quantity value="shipping_product_quantity"}-->
-            <input type="hidden" name="<!--{$product_quantity}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$product_quantity]|h}-->" />
-            <!--{section name=item loop=$arrShipping.shipment_product_class_id|@count}-->
-                <!--{assign var=item_index value="`$smarty.section.item.index`"}-->
-                        <!--{assign var=key value="shipment_product_class_id"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_product_code"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key1 value="shipment_product_name"}-->
-                        <!--{assign var=key2 value="shipment_classcategory_name1"}-->
-                        <!--{assign var=key3 value="shipment_classcategory_name2"}-->
-                        <input type="hidden" name="<!--{$key1}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key1][$item_index]|h}-->" />
-                        <input type="hidden" name="<!--{$key2}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key2][$item_index]|h}-->" />
-                        <input type="hidden" name="<!--{$key3}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key3][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_price"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_quantity"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-            <!--{/section}-->
         <!--{/if}-->
 
@@ -595,5 +550,5 @@
                     <span class="attention"><!--{$arrErr[$key][$shipping_index]}--></span>
                     <select name="<!--{$key}-->[<!--{$shipping_index}-->]" style="<!--{$arrErr[$key][$shipping_index]|sfGetErrorColor}-->">
-                        <option value="">指定無し</option>
+                        <option value="" selected="0">指定無し</option>
                         <!--{html_options options=$arrDelivTime selected=$arrShipping[$key]}-->
                     </select>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl	(revision 22796)
@@ -390,15 +390,15 @@
             <td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
             <td class="center">
-                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">一括出力</label><br />
-                <a href="./" onclick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','620','650'); return false;"><span class="icon_class">個別出力</span></a>
+                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">一括出力</label><br>
+                <a href="./" onClick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','620','650'); return false;"><span class="icon_class">個別出力</span></a>
             </td>
             <td class="center"><a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_EDIT_URLPATH}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_edit">編集</span></a></td>
             <td class="center">
                 <!--{if $arrResults[cnt].order_email|strlen >= 1}-->
-                    <input type="checkbox" name="mail_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="mail_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="mail_order_id_<!--{$arrResults[cnt].order_id}-->">一括通知</label><br />
+                    <input type="checkbox" name="mail_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="mail_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="mail_order_id_<!--{$arrResults[cnt].order_id}-->">一括通知</label><br>
                     <a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_MAIL_URLPATH}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_mail">個別通知</span></a>
                 <!--{/if}-->
             </td>
-            <td class="center"><a href="?" onclick="fnModeSubmit('delete', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">削除</span></a></td>
+            <td class="center"><a href="?" onclick="fnModeSubmit('delete_order', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">削除</span></a></td>
         </tr>
         <!--{/section}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 22796)
@@ -42,5 +42,5 @@
 <input type="hidden" name="mode" value="confirm" />
 <!--{foreach from=$arrForm.order_id item=order_id}-->
-    <input type="hidden" name="order_id[]" value="<!--{$order_id|h}-->" />
+    <input type="hidden" name="order_id[]" value="<!--{$order_id|h}-->">
 <!--{/foreach}-->
 
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 22218)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 22796)
@@ -141,8 +141,6 @@
                 <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
                 <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
-                <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
-                <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
-                <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円(税率<!--{$tax_rate|number_format}-->%)</td>
-                <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+                <td class="right"><!--{$price|sfCalcIncTax|number_format}--> 円</td>
+                <td class="right"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</td>
         </tr>
         <!--{/section}-->
@@ -221,5 +219,5 @@
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->
-                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->円
+                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax|number_format}-->円
                             </td>
                             <td class="right">
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 22796)
@@ -37,10 +37,8 @@
         var class1_id = document.getElementById(class1).value;
         var class2_id = document.getElementById(class2).value;
-
         var product_class_id = document.getElementById("product_class_id" + product_id).value;
         var opner_product_id = 'add_product_id';
         var opner_product_class_id = 'add_product_class_id';
         var tpl_no = '<!--{$tpl_no}-->';
-        var shipping_id = '<!--{$shipping_id}-->';
 
         if (tpl_no != '') {
@@ -49,7 +47,4 @@
             fm1.getElementById("no").value = escape('<!--{$tpl_no}-->');
         }
-        if (shipping_id != '') {
-            fm1.getElementById("select_shipping_id").value = escape('<!--{$shipping_id}-->');
-        }
         if (document.getElementById(class1).type == 'select-one' && class1_id == '__unselected') {
             err_text = class_name1 + "を選択してください。\n";
@@ -58,13 +53,4 @@
             err_text = err_text + class_name2 + "を選択してください。\n";
         }
-
-        if(!class1_id){
-            err_text = productsClassCategories[product_id]['__unselected2']['#0']['stock_find'] ? '' : '只今品切れ中です';
-        }else if(class1_id && !class2_id){
-            err_text = productsClassCategories[product_id][class1_id]['#0']['stock_find'] ? '' : '只今品切れ中です';
-        }else{
-            err_text = productsClassCategories[product_id][class1_id]['#' + class2_id]['stock_find'] ? '' : '只今品切れ中です';
-        }
-
         if (err_text != '') {
             alert(err_text);
@@ -140,5 +126,4 @@
 <input name="anchor_key" type="hidden" value="" />
 <input name="search_pageno" type="hidden" value="" />
-<input name="shipping_id" type="hidden" value="<!--{$shipping_id}-->" />
 <input name="no" type="hidden" value="<!--{$tpl_no|h}-->" />
 <table class="form">
@@ -191,4 +176,5 @@
             <!--{assign var=id value=$arrProducts[cnt].product_id}-->
             <form name="product_form<!--{$id|h}-->" action="?" onsubmit="return false;">
+                <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                 <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
                 <!--{assign var=status value="`$arrProducts[cnt].status`"}-->
@@ -198,5 +184,4 @@
                     </td>
                     <td>
-                        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                         <!--{assign var=codemin value=`$arrProducts[cnt].product_code_min`}-->
                         <!--{assign var=codemax value=`$arrProducts[cnt].product_code_max`}-->
@@ -209,42 +194,40 @@
                     </td>
                     <td>
-                    <!--{$arrProducts[cnt].name|h}-->
-                    <!--{assign var=class1 value=classcategory_id`$id`_1}-->
-                    <!--{assign var=class2 value=classcategory_id`$id`_2}-->
-                    <!--{if $tpl_classcat_find1[$id]}-->
-                    <dl>
-                        <dt><!--{$tpl_class_name1[$id]|h}-->：</dt>
-                        <dd>
-                            <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"    onchange="fnSetClassCategories(this.form);">
-                                <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
-                            </select>
-                            <!--{if $arrErr[$class1] != ""}-->
-                            <br /><span class="attention">※ <!--{$tpl_class_name1[$id]}-->を入力して下さい。</span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-                    <!--{else}-->
-                    <input type="hidden" name="<!--{$class1}-->" id="<!--{$class1}-->" value="" />
-                    <!--{/if}-->
-
-                    <!--{if $tpl_classcat_find2[$id]}-->
-                    <dl>
-                        <dt><!--{$tpl_class_name2[$id]|h}-->：</dt>
-                        <dd>
-                            <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->" onchange="fnCheckStock(this.form);"></select>
-                            <!--{if $arrErr[$class2] != ""}-->
-                            <br /><span class="attention">※ <!--{$tpl_class_name2[$id]}-->を入力して下さい。</span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-                    <!--{else}-->
-                    <input type="hidden" name="<!--{$class2}-->" id="<!--{$class2}-->" value="" />
-                    <!--{/if}-->
-                    <!--{if !$tpl_stock_find[$id]}-->
-                        <div class="attention">只今品切れ中です。</div>
-                    <!--{/if}-->
-                    <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
-                    <input type="hidden" name="product_class_id<!--{$id|h}-->" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
-                    <input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
+                        <!--{$arrProducts[cnt].name|h}-->
+
+                        <!--{assign var=class1 value=classcategory_id`$id`_1}-->
+                        <!--{assign var=class2 value=classcategory_id`$id`_2}-->
+                        <!--{if $tpl_classcat_find1[$id]}-->
+                        <dl>
+                            <dt><!--{$tpl_class_name1[$id]|h}-->：</dt>
+                            <dd>
+                                <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"    onchange="fnSetClassCategories(this.form);">
+                                    <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
+                                </select>
+                                <!--{if $arrErr[$class1] != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name1[$id]}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </dd>
+                        </dl>
+                        <!--{else}-->
+                        <input type="hidden" name="<!--{$class1}-->" id="<!--{$class1}-->" value="" />
+                        <!--{/if}-->
+
+                        <!--{if $tpl_classcat_find2[$id]}-->
+                        <dl>
+                            <dt><!--{$tpl_class_name2[$id]|h}-->：</dt>
+                            <dd>
+                                <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->" onchange="fnCheckStock(this.form);"></select>
+                                <!--{if $arrErr[$class2] != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name2[$id]}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </dd>
+                        </dl>
+                        <!--{else}-->
+                        <input type="hidden" name="<!--{$class2}-->" id="<!--{$class2}-->" value="" />
+                        <!--{/if}-->
+                        <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
+                        <input type="hidden" name="product_class_id<!--{$id|h}-->" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
+                        <input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
                     </td>
                     <td class="center"><a href="javascript:;" onclick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->'); return false;">決定</a></td>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	(revision 22796)
@@ -57,5 +57,5 @@
         <!--{if $arrForm.mail_method.value ne 2}-->
             <tr>
-                <td colspan="2"><a href="javascript:;" onclick="winSubmitMail('','form2','preview',650,700); return false;">HTMLで確認</a>
+                <td colspan="2"><a href="javascript:;" onClick="winSubmitMail('','form2','preview',650,700); return false;">HTMLで確認</a>
             </tr>
         <!--{/if}-->
@@ -69,5 +69,5 @@
         <ul>
             <li><a class="btn-action" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' ); return false;"><span class="btn-prev">テンプレート設定画面へ戻る</span></a></li>
-            <li><a class="btn-action" href="javascript:;" name="subm03" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;"><span class="btn-next">配信する</span></a></li>
+            <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;"><span class="btn-next">配信する</span></a></li>
         </ul>
     </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl	(revision 22796)
@@ -31,10 +31,10 @@
 </script>
 
-<form name="form1" id="form1" method="post" action="">
+<form name="form1" id="form1" method="post" action="" onsubmit="return fnRegistMember();">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="<!--{$tpl_mode|h}-->" />
-<input type="hidden" name="member_id" value="<!--{$tpl_member_id|h}-->" />
-<input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->" />
-<input type="hidden" name="old_login_id" value="<!--{$tpl_old_login_id|h}-->" />
+<input type="hidden" name="mode" value="<!--{$tpl_mode|h}-->">
+<input type="hidden" name="member_id" value="<!--{$tpl_member_id|h}-->">
+<input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->">
+<input type="hidden" name="old_login_id" value="<!--{$tpl_old_login_id|h}-->">
 
 <h2>メンバー登録/編集</h2>
@@ -95,6 +95,6 @@
             <!--{if $arrErr.work}--><span class="attention"><!--{$arrErr.work}--></span><!--{/if}-->
             <!--{assign var=key value="work"}-->
-            <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1"><!--{$arrWORK.1}--></label>
-            <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0"><!--{$arrWORK.0}--></label>
+            <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1">稼働</label>
+            <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0">非稼働</label>
             <span class="attention">※必須入力</span>
         </td>
@@ -104,5 +104,5 @@
 <div class="btn-area">
     <ul>
-        <li><a class="btn-action" href="javascript:;" onclick="if (!fnConfirm()) return false; fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+        <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
     </ul>
 </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 22796)
@@ -23,5 +23,5 @@
 *}-->
 
-<script type="text/javascript">
+<script>
     function fnRestore(list_name) {
         if (window.confirm('リストアしますか?')) {
@@ -101,5 +101,5 @@
         <div class="message">
             <!--{if $tpl_restore_err == false}-->
-                <div class="btn"><a class="btn-normal" href="javascript:;" name="restore_config" onclick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$tpl_restore_name|h}-->'; submit(); return false;"><span>エラーを無視してリストアする</span></a></div>
+                <div class="btn"><a class="btn-normal" href="javascript:;" name="restore_config" onClick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$tpl_restore_name|h}-->'; submit(); return false;"><span>エラーを無視してリストアする</span></a></div>
             <!--{/if}-->
             <!--{$tpl_restore_msg|h}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl	(revision 22796)
@@ -29,5 +29,5 @@
             <th>
             <!--{$info.title|h}-->
-            </th>
+            </td>
             <td>
             <!--{$info.value|h|nl2br}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl	(revision 22796)
@@ -32,7 +32,4 @@
     </div>
 
-    <div class="btn">
-        <a class="btn-action" href="javascript:;" onclick="win02('./input.php','input','620','450'); return false;"><span class="btn-next">メンバーを新規入力</span></a>
-    </div>
     <!--▼メンバー一覧ここから-->
     <table class="list">
@@ -44,4 +41,7 @@
         <col width="7.5%" />
         <col width="20%" />
+        <div class="btn">
+            <a class="btn-action" href="javascript:;" onclick="win02('./input.php','input','620','450'); return false;"><span class="btn-next">メンバーを新規入力</span></a>
+        </div>
         <tr>
             <th>権限</th>
@@ -59,6 +59,6 @@
             <td><!--{$list_data[data].department|h}--></td>
             <!--{assign var="work" value=$list_data[data].work}--><td><!--{$arrWORK[$work]|h}--></td>
-            <td align="center"><a href="#" onclick="win02('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','620','450'); return false;">編集</a></td>
-            <td align="center"><!--{if $workmax > 1}--><a href="#" onclick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
+            <td align="center"><a href="#" onClick="win02('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','620','450'); return false;">編集</a></td>
+            <td align="center"><!--{if $workmax > 1}--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
             <td align="center">
             <!--{$tpl_nomove}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 22796)
@@ -48,15 +48,13 @@
         <!--{section name=cnt loop=$arrForm}-->
             <tr>
-                <td class="center">
-                    <input type="hidden" name="table_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].table_name}-->" />
-                    <input type="hidden" name="column_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].column_name}-->" />
-                    <input type="hidden" name="indexflag[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].indexflag}-->" />
-                    <input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="1" <!--{if $arrForm[cnt].indexflag == "1"}-->checked="checked"<!--{/if}--> />
-                </td>
-                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="" <!--{if $arrForm[cnt].indexflag != "1"}-->checked="checked"<!--{/if}--> /></td>
+                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="1" <!--{if $arrForm[cnt].indexflag == "1"}-->checked<!--{/if}--> /></td>
+                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="" <!--{if $arrForm[cnt].indexflag != "1"}-->checked<!--{/if}--> /></td>
                 <th class="column"><!--{$arrForm[cnt].table_name}--></th>
                 <th class="column"><!--{$arrForm[cnt].column_name}--></th>
                 <td><!--{$arrForm[cnt].recommend_comment}--></td>
             </tr>
+            <input type="hidden" name="table_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].table_name}-->" />
+            <input type="hidden" name="column_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].column_name}-->" />
+            <input type="hidden" name="indexflag[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].indexflag}-->" />
         <!--{/section}-->
     </table>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl	(revision 22796)
@@ -133,5 +133,5 @@
                 <!--{assign var=key value="plugin_file"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="file" name="<!--{ $key }-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" />
+                <input type="file" name="<!--{ $key }-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->">
                 <a class="btn-action" href="javascript:;" onclick="install(); return false;"><span class="btn-next">インストール</span></a>
             </td>
@@ -157,5 +157,5 @@
                 <td class="center plugin_img">
                     <!--{if $plugin.plugin_site_url != '' }-->
-                        <a href="?" onclick="win03('<!--{$plugin.plugin_site_url|h}-->','plugin_site_url','620','760'); return false;"><img src="<!--{$plugin.logo}-->" width="65" height="65" /></a>&nbsp;
+                        <a href="?" onclick="win03('<!--{$plugin.plugin_site_url|h}-->','plugin_site_url','620','760'); return false;"><img src="<!--{$plugin.logo}-->" width="65" height="65"/></a>&nbsp;
                     <!--{else}-->
                         <img src="<!--{$plugin.logo}-->" width="65" height="65"/>
@@ -203,7 +203,7 @@
                             <!-- 有効/無効 -->
                                 <!--{if $plugin.enable == $smarty.const.PLUGIN_ENABLE_TRUE}-->
-                                    <label><input id="plugin_enable" type="checkbox" name="disable" value="<!--{$plugin.plugin_id}-->" checked="checked" />有効</label><br/>
+                                    <label><input id="plugin_enable" type="checkbox" name="disable" value="<!--{$plugin.plugin_id}-->" id="login_memory" checked="checked">有効</input></label><br/>
                                 <!--{else}-->
-                                    <label><input id="plugin_enable" type="checkbox" name="enable" value="<!--{$plugin.plugin_id}-->" />有効にする</label><br/>
+                                    <label><input id="plugin_enable" type="checkbox" name="enable" value="<!--{$plugin.plugin_id}-->" id="login_memory">有効にする</input></label><br/>
                                 <!--{/if}-->
 
@@ -218,5 +218,5 @@
                 <td class="center">
                     <span class="attention"><!--{$arrErr.priority[$plugin.plugin_id]}--></span>
-                    <input type="text" class="center" name="priority_<!--{$plugin.plugin_code}--> priority" value="<!--{$plugin.priority|h}-->" size="1" />
+                    <input type="text" class="center" name="priority_<!--{$plugin.plugin_code}-->" value="<!--{$plugin.priority|h}-->" size="1" class="priority" />
                     <a class="btn-action" href="javascript:;" onclick="update_priority(<!--{$plugin.plugin_id}-->, '<!--{$plugin.plugin_code}-->'); return false;"><span class="btn-next">変更</span></a><br/>
                     <span><!--{$plugin.priority_message}--></span>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl	(revision 22572)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl	(revision 22796)
@@ -66,14 +66,4 @@
             <td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
         </tr>
-        <tr>
-            <th>商品ステータス</th>
-            <td>
-                <input type="hidden" name="search_status" value="1" />
-                <label>
-                    <input type="checkbox" name="search_status" value="" <!--{if $arrForm.search_status === ""}-->checked<!--{/if}--> />
-                    非公開の商品を含む
-                </label>
-            </td>
-        </tr>
     </table>
     <div class="btn-area">
@@ -87,5 +77,5 @@
     <!--{$tpl_strnavi}-->
 
-    <table id="recommend-search-results" class="list">
+    <table class="list">
         <col width="15%" />
         <col width="12.5%" />
@@ -101,5 +91,5 @@
         <!--{foreach name=loop from=$arrProducts item=arr}-->
         <!--▼商品<!--{$smarty.foreach.loop.iteration}-->-->
-        <tr class="<!--{if $arr.status == "2"}-->hidden<!--{/if}-->">
+        <tr>
             <td class="center">
                 <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arr.main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="" />
@@ -116,5 +106,5 @@
             </td>
             <td><!--{$arr.name|h}--></td>
-            <td class="center"><a href="" onclick="return func_submit(<!--{$arr.product_id}-->)">決定</a></td>
+            <td class="center"><a href="" onClick="return func_submit(<!--{$arr.product_id}-->)">決定</a></td>
         </tr>
         <!--▲商品<!--{$smarty.foreach.loop.iteration}-->-->    
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 22581)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 22796)
@@ -23,9 +23,96 @@
 *}-->
 
+<script type="text/javascript">
+<!--
+
+function func_regist(url) {
+    res = confirm('この内容で<!--{if $edit_mode eq "on"}-->編集<!--{else}-->登録<!--{/if}-->しても宜しいですか？');
+    if(res == true) {
+        document.form1.mode.value = 'regist';
+        document.form1.submit();
+        return false;
+    }
+    return false;
+}
+
+function func_edit(news_id) {
+    document.form1.mode.value = "search";
+    document.form1.news_id.value = news_id;
+    document.form1.submit();
+}
+
+function func_del(news_id) {
+    res = confirm('この新着情報を削除しても宜しいですか？');
+    if(res == true) {
+        document.form1.mode.value = "delete";
+        document.form1.news_id.value = news_id;
+        document.form1.submit();
+    }
+    return false;
+}
+
+function func_rankMove(term,news_id) {
+    document.form1.mode.value = "move";
+    document.form1.news_id.value = news_id;
+    document.form1.term.value = term;
+    document.form1.submit();
+}
+
+function moving(news_id,rank, max_rank) {
+
+    var val;
+    var ml;
+    var len;
+
+    ml = document.move;
+    len = document.move.elements.length;
+    j = 0;
+    for( var i = 0 ; i < len ; i++) {
+            if ( ml.elements[i].name == 'position' && ml.elements[i].value != "" ) {
+            val = ml.elements[i].value;
+            j ++;
+            }
+    }
+
+    if ( j > 1) {
+        alert( '移動順位は１つだけ入力してください。' );
+        return false;
+    } else if( ! val ) {
+        alert( '移動順位を入力してください。' );
+        return false;
+    } else if( val.length > 4){
+        alert( '移動順位は4桁以内で入力してください。' );
+        return false;
+    } else if( val.match(/[0-9]+/g) != val){
+        alert( '移動順位は数字で入力してください。' );
+        return false;
+    } else if( val == rank ){
+        alert( '移動させる番号が重複しています。' );
+        return false;
+    } else if( val == 0 ){
+        alert( '移動順位は0以上で入力してください。' );
+        return false;
+    } else if( val > max_rank ){
+        alert( '入力された順位は、登録数の最大値を超えています。' );
+        return false;
+    } else {
+        ml.moveposition.value = val;
+        ml.rank.value = rank;
+        ml.news_id.value = news_id;
+        ml.submit();
+        return false;
+    }
+}
+
+//-->
+</script>
+
+
 <div id="admin-contents" class="contents-main">
 <form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="" />
-<input type="hidden" name="news_id" value="<!--{$arrForm.news_id.value|h}-->" />
+<input type="hidden" name="news_id" value="<!--{$arrForm.news_id|h}-->" />
+<input type="hidden" name="term" value="" />
     <!--{* ▼登録テーブルここから *}-->
     <table>
@@ -36,13 +123,13 @@
                 <select name="year" <!--{if $arrErr.year || $arrErr.month || $arrErr.day }-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">----</option>
-                    <!--{html_options options=$arrYear selected=$arrForm.year.value}-->
+                    <!--{html_options options=$arrYear selected=$arrForm.year}-->
                 </select>年
                 <select name="month" <!--{if $arrErr.year || $arrErr.month || $arrErr.day}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">--</option>
-                    <!--{html_options options=$arrMonth selected=$arrForm.month.value}-->
+                    <!--{html_options options=$arrMonth selected=$arrForm.month}-->
                 </select>月
                 <select name="day" <!--{if $arrErr.year || $arrErr.month || $arrErr.day}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">--</option>
-                    <!--{html_options options=$arrDay selected=$arrForm.day.value}-->
+                    <!--{html_options options=$arrDay selected=$arrForm.day}-->
                 </select>日
             </td>
@@ -52,5 +139,5 @@
             <td>
                 <!--{if $arrErr.news_title}--><span class="attention"><!--{$arrErr.news_title}--></span><!--{/if}-->
-                <textarea name="news_title" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" <!--{if $arrErr.news_title}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><!--{"\n"}--><!--{$arrForm.news_title.value|h}--></textarea><br />
+                <textarea name="news_title" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" <!--{if $arrErr.news_title}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><!--{"\n"}--><!--{$arrForm.news_title|h}--></textarea><br />
                 <span class="attention"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
             </td>
@@ -60,5 +147,5 @@
             <td>
                 <span class="attention"><!--{$arrErr.news_url}--></span>
-                <input type="text" name="news_url" size="60" class="box60"    value="<!--{$arrForm.news_url.value|h}-->" <!--{if $arrErr.news_url}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> maxlength="<!--{$smarty.const.URL_LEN}-->" />
+                <input type="text" name="news_url" size="60" class="box60"    value="<!--{$arrForm.news_url|h}-->" <!--{if $arrErr.news_url}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> maxlength="<!--{$smarty.const.URL_LEN}-->" />
                 <span class="attention"> (上限<!--{$smarty.const.URL_LEN}-->文字)</span>
             </td>
@@ -66,5 +153,5 @@
         <tr>
             <th>リンク</th>
-            <td><label><input type="checkbox" name="link_method" value="2" <!--{if $arrForm.link_method.value eq 2}--> checked <!--{/if}--> /> 別ウィンドウで開く</label></td>
+            <td><label><input type="checkbox" name="link_method" value="2" <!--{if $arrForm.link_method eq 2}--> checked <!--{/if}--> /> 別ウィンドウで開く</label></td>
         </tr>
         <tr>
@@ -72,5 +159,5 @@
             <td>
                 <!--{if $arrErr.news_comment}--><span class="attention"><!--{$arrErr.news_comment}--></span><!--{/if}-->
-                <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment.value|h}--></textarea><br />
+                <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment|h}--></textarea><br />
                 <span class="attention"> (上限3000文字)</span>
             </td>
@@ -81,5 +168,5 @@
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="return func_regist();"><span class="btn-next">この内容で登録する</span></a></li>
         </ul>
     </div>
@@ -94,4 +181,5 @@
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
     <input type="hidden" name="mode" value="moveRankSet" />
+    <input type="hidden" name="term" value="setposition" />
     <input type="hidden" name="news_id" value="" />
     <input type="hidden" name="moveposition" value="" />
@@ -126,20 +214,15 @@
             <td>
                 <!--{if $arrNews[data].news_id != $tpl_news_id}-->
-                <a href="#" onclick="fnFormModeSubmit('move','pre_edit','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">編集</a>
+                <a href="#" onclick="return func_edit('<!--{$arrNews[data].news_id|h}-->');">編集</a>
                 <!--{else}-->
                 編集中
                 <!--{/if}-->
             </td>
-            <td><a href="#" onclick="fnFormModeSubmit('move','delete','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">削除</a></td>
-            <td>
-                <!--{if count($arrNews) != 1}-->
-                <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />番目へ<a href="?" onclick="fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">移動</a><br />
-                <!--{/if}-->
-                <!--{if $smarty.section.data.iteration != 1}-->
-                <a href="?" onclick="fnFormModeSubmit('move','up','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">上へ</a>
-                <!--{/if}-->
-                <!--{if !$smarty.section.data.last}-->
-                <a href="?" onclick="fnFormModeSubmit('move','down','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">下へ</a>
-                <!--{/if}-->
+            <td><a href="#" onclick="return func_del('<!--{$arrNews[data].news_id|h}-->');">削除</a></td>
+            <td>
+            <!--{if count($arrNews) != 1}-->
+            <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />番目へ<a href="?" onclick="fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">移動</a><br />
+            <!--{/if}-->
+            <!--{if $arrNews[data].rank ne $max_rank}--><a href="#" onclick="return func_rankMove('up', '<!--{$arrNews[data].news_id|h}-->', '<!--{$max_rank|h}-->');">上へ</a><!--{/if}-->　<!--{if $arrNews[data].rank ne 1}--><a href="#" onclick="return func_rankMove('down', '<!--{$arrNews[data].news_id|h}-->', '<!--{$max_rank|h}-->');">下へ</a><!--{/if}-->
             </td>
         </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl	(revision 22796)
@@ -27,5 +27,5 @@
 <li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/recommend.php"><span>おすすめ商品管理</span></a></li>
 <li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/file_manager.php"><span>ファイル管理</span></a></li>
-<li class="on_level2 <!--{if $tpl_subno == 'csv'}--> on<!--{/if}--> " id="navi-contents-csv"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV出力項目設定</span></a>
+<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> class="on_level2" id="navi-contents-csv"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV出力項目設定</span></a>
     <ul id="navi-csv-sub" class="level2">
     <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=product"><span>商品管理</span></a></li>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 22796)
@@ -63,5 +63,5 @@
                 <td>
                     <!--{if $arrErr.upload_file}--><span class="attention"><!--{$arrErr.upload_file}--></span><!--{/if}-->
-                    <input type="file" name="upload_file" size="40" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> /><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">アップロード</a>
+                    <input type="file" name="upload_file" size="40" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">アップロード</a>
                 </td>
             </tr>
@@ -70,5 +70,5 @@
                 <td>
                     <!--{if $arrErr.create_file}--><span class="attention"><!--{$arrErr.create_file}--></span><!--{/if}-->
-                    <input type="text" name="create_file" value="" style="width:336px;<!--{if $arrErr.create_file}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" /><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('create','',''); return false;">作成</a>
+                    <input type="text" name="create_file" value="" style="width:336px;<!--{if $arrErr.create_file}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('create','',''); return false;">作成</a>
                 </td>
             </tr>
@@ -101,7 +101,7 @@
                     <td class="file-name" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$arrFileList[cnt].file_path|h}-->', <!--{if $arrFileList[cnt].is_dir|h}-->true<!--{else}-->false<!--{/if}-->, '<!--{$tpl_now_dir|h}-->', false)">
                         <!--{if $arrFileList[cnt].is_dir}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
+                            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
                         <!--{else}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/contents/file.gif" />
+                            <img src="<!--{$TPL_URLPATH}-->img/contents/file.gif">
                         <!--{/if}-->
                         <!--{$arrFileList[cnt].file_name|h}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl	(revision 22582)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl	(revision 22796)
@@ -21,6 +21,5 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-
- *}-->
+*}-->
 
 <script type="text/javascript">
@@ -76,5 +75,5 @@
     if ( flag ){
         document.form1["mode"].value = mode;
-        document.form1["best_id"].value = data;
+        document.form1["rank"].value = data;
         document.form1.submit();
     }
@@ -84,39 +83,36 @@
 </script>
 
+        <!--{section name=cnt loop=$tpl_disp_max}-->
+
 <div id="admin-contents" class="contents-main">
-    <!--{section name=cnt loop=$tpl_disp_max}-->
-    <div class="recommend-product <!--{if $arrItems[$smarty.section.cnt.iteration].status == "2"}-->hidden<!--{/if}-->">
-        <table class="list center recommend-table">
-            <col width="13%" />
-            <col width="73%" />
-            <col width="7%" />
-            <col width="7%" />
-            <tr>
-                <th>順位</th>
-                <th>商品/コメント</th>
-                <th>編集</th>
-                <th>削除</th>
-                <th>並び替え</th>
-            </tr>
+    <table class="list center" id="recommend-table">
+        <col width="13%" />
+        <col width="73%" />
+        <col width="7%" />
+        <col width="7%" />
+        <tr>
+            <th>順位</th>
+            <th>商品/コメント</th>
+            <th>編集</th>
+            <th>削除</th>
+            <th>並び替え</th>
+        </tr>
 
-            <tr>
-                <td>おすすめ商品(<!--{$smarty.section.cnt.iteration}-->)</td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <td>
-                            <div class="clearfix table-wrap">
-                                <div class="table-img">
-                                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                                        <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrItems[$smarty.section.cnt.iteration].main_list_image|sfNoImageMainList|h}-->" alt="<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->" width="100" height="100" />
-                                    <!--{/if}-->
-                                </div>
-                                <div class="table-detail">
-                                    <div class="detail-name">
-                                        商品名： <!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->
-                                    </div>
+        <tr>
+            <td>おすすめ商品(<!--{$smarty.section.cnt.iteration}-->)</td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <td>
+                        <div id="table-wrap" class="clearfix">
+                            <div class="table-img">
+                                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                                    <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrItems[$smarty.section.cnt.iteration].main_list_image|sfNoImageMainList|h}-->" alt="<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->" width="100" height="100" />
+                                <!--{/if}-->
+                            </div>
+                            <div class="table-detail">
+                                <div class="detail-name">商品名： <!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></div>
                                     <div class="detail-form">
                                         <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
                                             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                                             <input type="hidden" name="mode" value="regist" />
-                                            <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
                                             <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
                                             <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
@@ -128,50 +124,53 @@
                                 </div>
                             </div>
-                        </td>
-                    <!--{else}-->
-                        <td class="AlignLeft">
-                            <a class="btn-action-m" href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank"><span class="btn-next">商品を選択する</span></a>
-                            <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
-                                <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-                                <input type="hidden" name="mode" value="regist" />
-                                <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
-                                <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
-                                <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
-                                <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
-                            </form>
-                        </td>
-                    <!--{/if}-->
-                <td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank">
-                            編集
-                        </a>
-                    <!--{else}-->
-                        - -
-                    <!--{/if}-->
-                </td>
-                <td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                            <a href="javascript:;" onclick="return fnInsertValAndSubmit( document.form<!--{$smarty.section.cnt.iteration}-->, 'mode', 'delete', '削除します。宜しいですか' )">削除</a>
-                    <!--{else}-->
-                        - -
-                    <!--{/if}-->
-                </td>
-                <td>
-                    <!--{* 移動 *}-->
-                    <!--{if $smarty.section.cnt.iteration != 1 && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">上へ</a><br />&nbsp;
-                    <!--{/if}-->
-                    <!--{if $smarty.section.cnt.iteration != $tpl_disp_max && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">下へ</a>
-                    <!--{/if}-->
-                </td>
-            </tr>
-        </table>
-        <div class="btn-area">
-            <a class="btn-action" href="javascript:;" onclick="lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">この内容で登録する</span></a>
-        </div>
-    </div>
+                        </div>
+                    </td>
+                <!--{else}-->
+                    <td class="AlignLeft">
+                        <a class="btn-action-m" href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank"><span class="btn-next">商品を選択する</span></a>
+                        <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
+                            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+                            <input type="hidden" name="mode" value="regist" />
+                            <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
+                            <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
+                            <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
+                        </form>
+                    </td>
+                <!--{/if}-->
+            <td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank">
+                        編集</a>
+                <!--{else}-->
+                    - -
+                <!--{/if}-->
+            </td>
+            <td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                        <a href="javascript:;" onClick="return fnInsertValAndSubmit( document.form<!--{$smarty.section.cnt.iteration}-->, 'mode', 'delete', '削除します。宜しいですか' )">削除</a>
+                <!--{else}-->
+                    - -
+                <!--{/if}-->
+            </td>
+            <td>
+                <!--{* 移動 *}-->
+                <!--{if $smarty.section.cnt.iteration != 1 && $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">上へ</a><br>&nbsp;
+                <!--{/if}-->
+                <!--{if $smarty.section.cnt.iteration != $tpl_disp_max && $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">下へ</a>
+                <!--{/if}-->
+            </td>
+        </tr>
+
+        <tr><td colspan="4" class="no-border-w" height="20"></td></tr>
+        <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+        <tr><td colspan="4" class="no-border">
+        <a class="btn-action" href="javascript:;" onclick="lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">この内容で登録する</span></a>
+        </td>
+        </tr>
+        <!--{/if}-->
     <!--▲おすすめ商品<!--{$smarty.section.cnt.iteration}-->-->
     <!--{/section}-->
+    </table>
 </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 22571)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 22796)
@@ -66,5 +66,5 @@
     <div class="ms2side__area">
         <span class="attention"><!--{$arrErr.output_list}--></span>
-        <select multiple="multiple" name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
+        <select multiple name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
             <!--{html_options options=$arrOptions selected=$arrSelected}-->
         </select>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl	(revision 22563)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl	(revision 22796)
@@ -102,6 +102,4 @@
     var url = "<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php";
     var statusImagePath = "<!--{$TPL_URLPATH}-->";
-    var arrPayment = <!--{$json_payment}-->
-    var arrCustomerOrderStatus = <!--{$json_customer_order_status}-->
 
     function getHistory(limit) {
@@ -136,26 +134,15 @@
                         historyEl = $(historyEl).clone(true).insertAfter(historyEl);
                         maxCnt++;
-                        
-                        var regex = new RegExp('([0-9]{2,4}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).');
-                        var matches = history.create_date.match(regex);
-                        var formatted_date = history.create_date;
-                        if(matches != null){
-                            formatted_date = matches[1]+'/'+matches[2]+'/'+matches[3]+' '+matches[4]+':'+matches[5];
-                        }
-                        
-                        var formatted_payment_total = history.payment_total.toString().replace(/([0-9]+?)(?=(?:[0-9]{3})+$)/g , '$1,');
 
                         //注文番号をセット
                         $($(".arrowBox span.order_id").get(maxCnt)).text(history.order_id);
                         //購入日時をセット
-                        $($(".arrowBox span.create_date").get(maxCnt)).text(formatted_date);
+                        $($(".arrowBox span.create_date").get(maxCnt)).text(history.create_date);
                         //支払い方法をセット
-                        $($(".arrowBox span.payment_id").get(maxCnt)).text(arrPayment[history.payment_id]);
+                        $($(".arrowBox span.payment_id").get(maxCnt)).text(history.payment_id);
                         //合計金額をセット
-                        $($(".arrowBox span.payment_total").get(maxCnt)).text(formatted_payment_total);
+                        $($(".arrowBox span.payment_total").get(maxCnt)).text(history.payment_total);
                         //履歴URLをセット
                         $($(".arrowBox a").get(maxCnt)).attr("href", url + "?order_id=" + history.order_id);
-                        //注文状況をセット
-                        $($(".arrowBox span.order_status").get(maxCnt)).text(arrCustomerOrderStatus[history.status]);
                     }
                 }
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 22796)
@@ -25,5 +25,5 @@
 <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`popup_header.tpl" subtitle="新しいお届け先の追加・変更"}-->
 
-<section>
+<section id="windowcolumn">
     <h2 class="title"><!--{$tpl_title|h}--></h2>
 
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	(revision 22499)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	(revision 22796)
@@ -159,12 +159,12 @@
                         //販売価格が範囲か判定
                         if (product.price02_min == product.price02_max) {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_inctax_format + '円';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_tax_format + '円';
                         } else {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_inctax_format + '～' + product.price02_max_inctax_format + '円';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_tax_format + '～' + product.price02_max_tax_format + '円';
                         }
                         price.append(priceVale);
 
                         //削除ボタンをセット
-                        $($(".favoriteBox p.btn_delete img").get(maxCnt)).attr("onclick", "javascript:fnModeSubmit('delete_favorite','product_id','" + product.product_id + "');");
+                        $($(".favoriteBox p.btn_delete a").get(maxCnt)).attr("href", "javascript:fnModeSubmit('delete_favorite','product_id','" + product.product_id + "');");
 
                     }
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 22601)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 22796)
@@ -35,4 +35,12 @@
                 <em>購入日時</em>：&nbsp;<!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
                 <em>お支払い方法</em>：&nbsp;<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <!--{if $tpl_arrOrderData.deliv_time_id != ""}-->
+                    <br />
+                    <em>お届け時間</em>：&nbsp;</strong><!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
+                <!--{/if}-->
+                <!--{if $tpl_arrOrderData.deliv_date != ""}-->
+                    <br />
+                    <em>お届け日</em>：&nbsp;</strong><!--{$tpl_arrOrderData.deliv_date|h}-->
+                <!--{/if}-->
             </p>
 
@@ -43,43 +51,4 @@
             </form>
         </div>
-        <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
-            <h3>お届け先<!--{if $isMultiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-        <div class="historyBox">	
-        <p>
-            <!--{if $isMultiple}-->
-                    <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                        <em>商品コード：&nbsp;</em><!--{$item.productsClass.product_code|h}--><br />
-                        <em>商品名：&nbsp;</em>
-                                <!--{$item.productsClass.name|h}--><br />
-                                <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                    <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br />
-                                <!--{/if}-->
-                                <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                    <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--><br />
-                                <!--{/if}-->
-                        
-                        <em>単価：&nbsp;</em><!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->円<br />
-                        <em>数量：&nbsp;</em><!--{$item.quantity}--><br />
-                        <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                        <em>小計</em><!--{$item.total_inctax|number_format}-->円
-                        *}-->
-                        <br />
-                    <!--{/foreach}-->
-            <!--{/if}-->
-
-            <em>お名前</em>：&nbsp;<!--{$shippingItem.shipping_name01|h}-->&nbsp;<!--{$shippingItem.shipping_name02|h}--><br />
-            <em>お名前(フリガナ)</em>：&nbsp;<!--{$shippingItem.shipping_kana01|h}-->&nbsp;<!--{$shippingItem.shipping_kana02|h}--><br />
-            <em>郵便番号</em>：&nbsp;〒<!--{$shippingItem.shipping_zip01}-->-<!--{$shippingItem.shipping_zip02}--><br />
-            <em>住所</em>：&nbsp;<!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--><br />
-            <em>電話番号</em>：&nbsp;<!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--><br />
-                            <!--{if $shippingItem.shipping_fax01 > 0}-->
-            <em>FAX番号</em>：&nbsp;<!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}--><br />
-                            <!--{/if}-->            
-            <em>お届け日</em>：&nbsp;<!--{$shippingItem.shipping_date|default:'指定なし'|h}--><br />
-            <em>お届け時間</em>：&nbsp;<!--{$shippingItem.shipping_time|default:'指定なし'|h}--><br />
-</p>
-</div>
-
-        <!--{/foreach}-->
 
         <div class="formBox">
@@ -117,9 +86,8 @@
                                 <!--←商品種別-->
                             </div>
-                            <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-                            <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
+
                             <ul>
                                 <li><span class="mini">数量：</span><!--{$quantity|h}--></li>
-                                <li class="result"><span class="mini">小計：</span><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</li>
+                                <li class="result"><span class="mini">小計：</span><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</li>
                             </ul>
                         </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 22796)
@@ -111,5 +111,5 @@
         <div class="btn_area">
             <ul class="btn_btm">
-                <li><input type="submit" value="完了ページへ" class="btn data-role-none" name="complete" id="complete" /></li>
+                <li><input type="submit" value="完了ページへ" class="btn data-role-none" alt="完了ページへ" name="complete" id="complete" /></li>
                 <li><a class="btn_back" href="Javascript:fnModeSubmit('return', '', '');" rel="external">戻る</a></li>
             </ul>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl	(revision 22796)
@@ -70,5 +70,5 @@
                             </p>
                             <ul>
-                                <li class="result"><span class="mini">数量</span></li>
+                                <li class="result"><span class="mini">数量</li>
                                 <li>
                                     <input type="number" name="<!--{$key}-->[<!--{$index}-->]" class="cartin_quantity txt" value="<!--{$arrForm[$key].value[$index]}-->" max="9" style="" />
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 22458)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 22796)
@@ -169,5 +169,6 @@
 
         <!--★お届け先の確認★-->
-        <!--{if $arrShipping}-->
+        <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け先を表示しない） *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
             <section class="delivconfirm_area">
                 <h3 class="subtitle">お届け先</h3>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 22523)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 22796)
@@ -205,9 +205,8 @@
                                     <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="boxLong top data-role-none">
                                         <option value="" selected="">お届け日：指定なし</option>
-                                        <!--{assign var=shipping_date_value value=$arrForm[$key].value|default:$shippingItem.shipping_date}-->
-                                        <!--{html_options options=$arrDelivDate selected=$shipping_date_value}-->
+                                        <!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
                                     </select>
                                 <!--{/if}-->
-                                
+
                                 <!--★お届け時間★-->
                                 <!--{assign var=key value="deliv_time_id`$index`"}-->
@@ -215,6 +214,5 @@
                                 <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="boxLong data-role-none">
                                     <option value="" selected="">お届け時間：指定なし</option>
-                                    <!--{assign var=shipping_time_value value=$arrForm[$key].value|default:$shippingItem.time_id}-->
-                                    <!--{html_options options=$arrDelivTime selected=$shipping_time_value}-->
+                                    <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
                                 </select>
                             </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 22796)
@@ -125,5 +125,5 @@
                                             <li class="quantity"><span class="mini">数量:</span><!--{$arrItem.quantity|number_format}--></li>
                                             <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.png" width="22" height="21" alt="＋" onclick="fnFormModeSubmit('form<!--{$key}-->', 'up','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></li>
-                                            <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.png" width="22" height="21" alt="-" onclick="fnFormModeSubmit('form<!--{$key}-->', 'down','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></li>
+                                            <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.png" width="22" height="21" alt="-" onclick="fnFormModeSubmit('form<!--{$key}-->', 'down','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></a></li>
                                             <li class="result"><span class="mini">小計：</span><!--{$arrItem.total_inctax|number_format}-->円</li>
                                         </ul>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl	(revision 22796)
@@ -62,5 +62,5 @@
                     value="<!--{$arrForm.kana01.value|default:$arrData.kana01|h}-->"
                     maxlength="<!--{$smarty.const.STEXT_LEN}-->"
-                    style="<!--{$arrErr.kana01|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="セイ"/>&nbsp;&nbsp;
+                    style="<!--{$arrErr.kana01|sfGetErrorColor}-->"class="boxHarf text data-role-none" placeholder="セイ"/>&nbsp;&nbsp;
                 <input type="text" name="kana02"
                     value="<!--{$arrForm.kana02.value|default:$arrData.kana02|h}-->"
@@ -93,5 +93,5 @@
                 <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
                 <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->" class="boxHarf top data-role-none">
-                    <option value="">都道府県</option>
+                    <option value="" selected="selected">都道府県</option>
                     <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}-->
                 </select>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl	(revision 22438)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl	(revision 22796)
@@ -47,9 +47,8 @@
             <p>
                 メールアドレス<br />
-                <span class="attention"><!--{$arrErr.email}--></span>
                 <input type="email" name="email"
                 value="<!--{$tpl_login_email|h}-->"
-                style="<!--{$arrErr.email|sfGetErrorColor}-->; ime-mode: disabled;"
-                maxlength="200" class="text boxLong data-role-none" />
+                style="<!--{$errmsg|sfGetErrorColor}-->; ime-mode: disabled;"
+                maxlength="200" class="boxLong data-role-none" />
             </p>
             <span class="attention"><!--{$errmsg}--></span>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	(revision 22494)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	(revision 22796)
@@ -34,5 +34,5 @@
                             <p class="mini comment"><!--{$arrBestProducts[cnt].comment|h|nl2br}--></p>
                             <p class="sale_price">
-                                <span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->(税込):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> 円</span>
+                                <span class="mini">販売価格(税込):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> 円</span>
                             </p>
                         </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	(revision 22583)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	(revision 22796)
@@ -29,5 +29,5 @@
                 <a id="windowcolumn<!--{$smarty.section.data.index}-->" href="javascript:getNewsDetail(<!--{$arrNews[data].news_id}-->);">
                 <span class="news_title"><!--{$arrNews[data].news_title|h}--></span></a><br />
-                <span class="news_date"><!--{$arrNews[data].cast_news_date|date_format:"%Y年 %m月 %d日"}--></span>
+                <span class="news_date"><!--{$arrNews[data].news_date_disp|date_format:"%Y年 %m月 %d日"}--></span>
             </li>
         <!--{/section}-->
@@ -79,5 +79,5 @@
 
                             //年月をセット
-                            var newsDateDispArray = news.cast_news_date.split("-"); //ハイフンで年月日を分解
+                            var newsDateDispArray = news.news_date_disp.split("-"); //ハイフンで年月日を分解
                             var newsDateDisp = newsDateDispArray[0] + "年 " + newsDateDispArray[1] + "月 " + newsDateDispArray[2] + "日";
                             $($("#news_area ul.newslist li span.news_date").get(maxCnt)).text(newsDateDisp);
@@ -134,5 +134,5 @@
 
                         //年月をセット
-                        //var newsDateDispArray = news.cast_news_date.split("-"); //ハイフンで年月日を分解
+                        //var newsDateDispArray = news.news_date_disp.split("-"); //ハイフンで年月日を分解
                         //var newsDateDisp = newsDateDispArray[0] + "年 " + newsDateDispArray[1] + "月 " + newsDateDispArray[2] + "日";
                         //$($("#windowcolumn dl.view_detail dt").get(maxCnt)).text(newsDateDisp);
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 22602)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 22796)
@@ -25,7 +25,53 @@
     <h2 class="title_block">商品カテゴリ</h2>
     <nav id="categorytree">
-        <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$arrTree treeID="categorytreelist" display=1 level=0}-->
+        <ul id="categorytreelist">
+            <!--{assign var=preLev value=1}-->
+            <!--{assign var=firstdone value=0}-->
+            <!--{section name=cnt loop=$arrTree}-->
+                <!--{* インデントは Smarty 構文を優先としています。 *}-->
+                <!--{* カテゴリ表示・非表示切り替え *}-->
+                <!--{if $arrTree[cnt].view_flg != "2"}-->
+                    <!--{* 表示フラグがTRUEなら表示 *}-->
+                    <!--{assign var=level value=`$arrTree[cnt].level`}-->
+                    <!--{* level2以下なら表示（level指定可能） *}-->
+                    <!--{if $level <= 5 || $arrTree[cnt].display == 1}-->
+                        <!--{assign var=levdiff value=`$level-$preLev`}-->
+                        <!--{if $levdiff > 0}-->
+                            <ul>
+                        <!--{elseif $levdiff == 0 && $firstdone == 1}-->
+                            </li>
+                        <!--{elseif $levdiff < 0}-->
+                            <!--{section name=d loop=`$levdiff*-1`}-->
+                                    </li>
+                                </ul>
+                            <!--{/section}-->
+                            </li>
+                        <!--{/if}-->
+
+                        <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
+                        <!--{if $firstdone == 0}-->
+                            <!--{assign var=firstdone value=1}-->
+                        <!--{/if}-->
+                        <!--{assign var=preLev value=`$level`}-->
+                    <!--{/if}-->
+
+                    <!--{* セクションの最後に閉じタグを追加 *}-->
+                    <!--{if $smarty.section.cnt.last}-->
+                        <!--{if $preLev-1 > 0}-->
+                            <!--{section name=d loop=`$preLev-1`}-->
+                                    </li>
+                                </ul>
+                            <!--{/section}-->
+                            </li>
+                        <!--{else}-->
+                            </li>
+                        <!--{/if}-->
+                    <!--{/if}-->
+                <!--{/if}-->
+            <!--{/section}-->
+        </ul>
 
         <script>//<![CDATA[
+            initCategoryList(); //カテゴリリストの初期化
         //]]></script>
     </nav>
Index: anches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl	(revision 22602)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if $level > 5 || !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}--><!--{if in_array($child.category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
-        <span class="category_header"></span><span class="category_body"><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></span>
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children treeID="" display=$disp_child level=$child.level}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	(revision 22796)
@@ -65,5 +65,5 @@
     <!--{/if}-->
     <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" class="boxHarf top data-role-none">
-        <option value="">都道府県</option>
+        <option value="" selected="selected">都道府県</option>
         <!--{html_options options=$arrPref selected=$arrForm[$key3]}-->
     </select>
@@ -128,6 +128,6 @@
         <!--{/if}-->
         <span style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
-            <input type="radio" id="man" name="<!--{$key1}-->" value="1" <!--{if $arrForm[$key1] eq 1}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="man">男性</label>&nbsp;&nbsp;
-            <input type="radio" id="woman" name="<!--{$key1}-->" value="2" <!--{if $arrForm[$key1] eq 2}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="woman">女性</label>
+            <p><input type="radio" id="man" name="<!--{$key1}-->" value="1" <!--{if $arrForm[$key1] eq 1}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="man">男性</label>&nbsp;&nbsp;
+            <input type="radio" id="woman" name="<!--{$key1}-->" value="2" <!--{if $arrForm[$key1] eq 2}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="woman">女性</label></p>
         </span>
     </dd>
@@ -140,5 +140,5 @@
         <!--{/if}-->
         <select name="<!--{$key1}-->" class="boxLong data-role-none">
-            <option value="">選択してください</option>
+            <option value="" selected="selected">選択してください</option>
             <!--{html_options options=$arrJob selected=$arrForm[$key1]}-->
         </select>
@@ -179,5 +179,5 @@
             <!--{/if}-->
             <select name="reminder" style="<!--{$arrErr.reminder|sfGetErrorColor}-->" class="boxLong top data-role-none">
-                <option value="">質問を選択してください</option>
+                <option value="" selected="selected">質問を選択してください</option>
                 <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
             </select>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 22796)
@@ -65,5 +65,5 @@
         <div class="btn_area">
             <ul class="btn_btm">
-                <li><input type="submit" value="完了ページへ" class="btn data-role-none" name="complete" id="complete" /></li>
+                <li><input type="submit" value="完了ページへ" class="btn data-role-none" alt="完了ページへ" name="complete" id="complete" /></li>
                 <li><a class="btn_back" href="Javascript:fnModeSubmit('return', '', '');" rel="external">戻る</a></li>
             </ul>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl	(revision 22796)
@@ -79,5 +79,5 @@
         </table>
         <div class="btn_area">
-                <p><input type="submit" value="次へ" class="btn data-role-none" name="next" id="next" /></p>
+                <p><input type="submit" value="次へ" class="btn data-role-none" alt="次へ" name="next" id="next" /></p>
             </div>
     </form>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 22796)
@@ -210,14 +210,4 @@
                     <!--{/if}-->
 
-                    <!--▼メーカー-->
-                    <!--{if $arrProduct.maker_name|strlen >= 1}-->
-                        <p class="maker">
-                            <span class="mini">メーカー：</span><span>
-                                <!--{$arrProduct.maker_name|h}-->
-                            </span>
-                        </p>
-                    <!--{/if}-->
-                    <!--▲メーカー-->
-
                     <!--▼メーカーURL-->
                     <!--{if $arrProduct.comment1|strlen >= 1}-->
@@ -370,5 +360,5 @@
                 <!--{if count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
                     <!--★新規コメントを書き込む★-->
-                    <a href="./review.php?product_id=<!--{$arrProduct.product_id}-->" target="_blank" class="btn_sub">新規コメントを書き込む</a>
+                    <a href="./review.php?product_id=<!--{$arrProduct.product_id}-->" target="_blank" class="btn_sub" />新規コメントを書き込む</a>
                 <!--{/if}-->
             </div>
@@ -387,5 +377,5 @@
             <!--{/if}-->
         </div>
-    
+    </div>
     <!--お客様の声ここまで-->
 
@@ -424,5 +414,5 @@
 
     <div class="btn_area">
-        <p><a href="javascript:void(0);" class="btn_more" data-rel="back">戻る</a></p>
+        <p><a href="javascript:void(0);" class="btn_more" data-rel="back">商品一覧に戻る</a></p>
     </div>
 </section>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	(revision 22494)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	(revision 22796)
@@ -95,5 +95,5 @@
                 <!--★商品価格★-->
                 <p>
-                    <span class="pricebox sale_price"><span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->(税込):</span></span>
+                    <span class="pricebox sale_price"><span class="mini">販売価格(税込):</span></span>
                     <span class="price">
                         <span id="price02_default_<!--{$id}-->">
@@ -207,7 +207,7 @@
                     //販売価格が範囲か判定
                     if (product.price02_min == product.price02_max) {
-                        priceVale = product.price02_min_inctax_format + '円';
+                        priceVale = product.price02_min_tax_format + '円';
                     } else {
-                        priceVale = product.price02_min_inctax_format + '～' + product.price02_max_inctax_format + '円';
+                        priceVale = product.price02_min_tax_format + '～' + product.price02_max_tax_format + '円';
                     }
                     price.append(priceVale);
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl	(revision 22363)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl	(revision 22796)
@@ -21,5 +21,5 @@
  *}-->
 
-<body class="<!--{$tpl_page_class_name|h}-->">
+<body>
     <div data-role="page" data-keep-native=".data-role-none" data-theme="f">
 
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl	(revision 22574)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl	(revision 22796)
@@ -29,4 +29,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0" />
     <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="Content-Script-Type" content="text/javascript" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
     <!--{* 共通CSS *}-->
     <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->css/import.css" />
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 22363)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 22796)
@@ -22,5 +22,5 @@
  *}-->
 
-<html lang="ja">
+<html lang="ja" class="<!--{$tpl_page_class_name|h}-->">
     <head>
         <meta charset="UTF-8">
Index: /branches/version-2_12-dev/data/include/image_converter.inc
===================================================================
--- /branches/version-2_12-dev/data/include/image_converter.inc	(revision 22567)
+++ /branches/version-2_12-dev/data/include/image_converter.inc	(revision 22796)
@@ -3,6 +3,5 @@
  * 画像ファイルの変換を行う
  */
-class ImageConverter 
-{
+class ImageConverter {
     var $outputImageDir;         // 変換後の画像の保存先
     var $outputImageType;        // 変換後の画像の形式
@@ -12,6 +11,5 @@
 
     // コンストラクタ
-    function ImageConverter()
-    {
+    function ImageConverter() {
         $this->outputImageDir    = realpath(realpath(dirname(__FILE__)));
         $this->outputImageType   = 'jpg';
@@ -22,6 +20,5 @@
 
     // 変換実行
-    function execute($inputImagePath)
-    {
+    function execute($inputImagePath) {
         // 前処理
         $filestat         = @stat($inputImagePath);
@@ -164,48 +161,20 @@
 
     // Setter
-    function setOutputDir($outputDir)
-    {
-        $this->outputImageDir   = $outputDir;
-    }
-    function setImageType($imageType)
-    {
-        $this->outputImageType  = $imageType;
-    }
-    function setImageWidth($imageWidth)
-    {
-        $this->outputImageWidth = $imageWidth;
-    }
-    function setImageHeight($imageHeight)
-    {
-        $this->outputImageHeight = $imageHeight;
-    }
-    function setFileSize($fileSize)
-    {
-        $this->outputFileSize   = $fileSize;
-    }
+    function setOutputDir($outputDir)   { $this->outputImageDir   = $outputDir;  }
+    function setImageType($imageType)   { $this->outputImageType  = $imageType;  }
+    function setImageWidth($imageWidth) { $this->outputImageWidth = $imageWidth; }
+    function setImageHeight($imageHeight) { $this->outputImageHeight = $imageHeight; }
+    function setFileSize($fileSize)     { $this->outputFileSize   = $fileSize;   }
 
     // Getter
-    function getOutputDir()
-    {
-        return $this->outputDir;
-    }
-    function getImageType()
-    {
-        return $this->outputImageType;
-    }
-    function getImageWidth()
-    {
-        return $this->outputImageWidth;
-    }
-    function getImageHeight()
-    {
-        return $this->outputImageHeight;
-    }
+    function getOutputDir()   { return $this->outputDir;         }
+    function getImageType()   { return $this->outputImageType;   }
+    function getImageWidth()  { return $this->outputImageWidth;  }
+    function getImageHeight() { return $this->outputImageHeight; }
 
     /*
      * PrivateMethod
      */
-    function beforeExecute()
-    {
+    function beforeExecute() {
     }
 
@@ -217,6 +186,5 @@
      * @return array 色情報
      */
-    function getTransparentColor($image)
-    {
+    function getTransparentColor($image) {
         $max_x = imagesx($image) - 1;
         $max_y = imagesy($image) - 1;
Index: /branches/version-2_12-dev/templates/templates.xml
===================================================================
--- /branches/version-2_12-dev/templates/templates.xml	(revision 22567)
+++ /branches/version-2_12-dev/templates/templates.xml	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $$Id$$
  */
-class LC_Page_XXX extends LC_Page_Ex
-{
+class LC_Page_XXX extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
     }
 
@@ -62,6 +59,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -103,6 +99,5 @@
  * @version $$Id$$
  */
-class LC_Page_XXX_Ex extends LC_Page_XXX
-{
+class LC_Page_XXX_Ex extends LC_Page_XXX {
 
     // }}}
@@ -114,6 +109,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -124,6 +118,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -134,6 +127,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/templates/page_class_extends.php
===================================================================
--- /branches/version-2_12-dev/templates/page_class_extends.php	(revision 22567)
+++ /branches/version-2_12-dev/templates/page_class_extends.php	(revision 22796)
@@ -34,6 +34,5 @@
  * @version $Id$
  */
-class LC_Page_XXX_Ex extends LC_Page_XXX
-{
+class LC_Page_XXX_Ex extends LC_Page_XXX {
 
     // }}}
@@ -45,6 +44,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -55,6 +53,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
@@ -65,6 +62,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
Index: /branches/version-2_12-dev/templates/mobile_class.php
===================================================================
--- /branches/version-2_12-dev/templates/mobile_class.php	(revision 22567)
+++ /branches/version-2_12-dev/templates/mobile_class.php	(revision 22796)
@@ -5,6 +5,5 @@
      * @return void
      */
-    function mobileInit()
-    {
+    function mobileInit() {
         $this->init();
     }
@@ -15,6 +14,5 @@
      * @return void
      */
-    function mobileProcess()
-    {
+    function mobileProcess() {
     }
 /*
Index: /branches/version-2_12-dev/templates/page_class.php
===================================================================
--- /branches/version-2_12-dev/templates/page_class.php	(revision 22567)
+++ /branches/version-2_12-dev/templates/page_class.php	(revision 22796)
@@ -32,6 +32,5 @@
  * @version $Id$
  */
-class LC_Page_XXX extends LC_Page_Ex 
-{
+class LC_Page_XXX extends LC_Page_Ex {
 
     // }}}
@@ -43,6 +42,5 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
@@ -53,6 +51,5 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
     }
 
@@ -62,6 +59,5 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
