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/__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/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/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/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/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/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/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/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)
 );