Index: tmp/version-2_5-test/html/user_data/packages/default/js/jquery.easing.1.3.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/jquery.easing.1.3.js	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/jquery.easing.1.3.js	(revision 18609)
@@ -0,0 +1,205 @@
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2008 George McGinley Smith
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+*/
+
+// t: current time, b: begInnIng value, c: change In value, d: duration
+jQuery.easing['jswing'] = jQuery.easing['swing'];
+
+jQuery.extend( jQuery.easing,
+{
+	def: 'easeOutQuad',
+	swing: function (x, t, b, c, d) {
+		//alert(jQuery.easing.default);
+		return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
+	},
+	easeInQuad: function (x, t, b, c, d) {
+		return c*(t/=d)*t + b;
+	},
+	easeOutQuad: function (x, t, b, c, d) {
+		return -c *(t/=d)*(t-2) + b;
+	},
+	easeInOutQuad: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t + b;
+		return -c/2 * ((--t)*(t-2) - 1) + b;
+	},
+	easeInCubic: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t + b;
+	},
+	easeOutCubic: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	},
+	easeInOutCubic: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t + b;
+		return c/2*((t-=2)*t*t + 2) + b;
+	},
+	easeInQuart: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t + b;
+	},
+	easeOutQuart: function (x, t, b, c, d) {
+		return -c * ((t=t/d-1)*t*t*t - 1) + b;
+	},
+	easeInOutQuart: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+		return -c/2 * ((t-=2)*t*t*t - 2) + b;
+	},
+	easeInQuint: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t*t + b;
+	},
+	easeOutQuint: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t*t*t + 1) + b;
+	},
+	easeInOutQuint: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+		return c/2*((t-=2)*t*t*t*t + 2) + b;
+	},
+	easeInSine: function (x, t, b, c, d) {
+		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+	},
+	easeOutSine: function (x, t, b, c, d) {
+		return c * Math.sin(t/d * (Math.PI/2)) + b;
+	},
+	easeInOutSine: function (x, t, b, c, d) {
+		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+	},
+	easeInExpo: function (x, t, b, c, d) {
+		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+	},
+	easeOutExpo: function (x, t, b, c, d) {
+		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+	},
+	easeInOutExpo: function (x, t, b, c, d) {
+		if (t==0) return b;
+		if (t==d) return b+c;
+		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+	},
+	easeInCirc: function (x, t, b, c, d) {
+		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+	},
+	easeOutCirc: function (x, t, b, c, d) {
+		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+	},
+	easeInOutCirc: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+	},
+	easeInElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+	},
+	easeOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+	},
+	easeInOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+	},
+	easeInBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*(t/=d)*t*((s+1)*t - s) + b;
+	},
+	easeOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+	},
+	easeInOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158; 
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+	},
+	easeInBounce: function (x, t, b, c, d) {
+		return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
+	},
+	easeOutBounce: function (x, t, b, c, d) {
+		if ((t/=d) < (1/2.75)) {
+			return c*(7.5625*t*t) + b;
+		} else if (t < (2/2.75)) {
+			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+		} else if (t < (2.5/2.75)) {
+			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+		} else {
+			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+		}
+	},
+	easeInOutBounce: function (x, t, b, c, d) {
+		if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
+		return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
+	}
+});
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2001 Robert Penner
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+ */
Index: tmp/version-2_5-test/html/user_data/packages/default/js/ui.sortable.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/ui.sortable.js	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/ui.sortable.js	(revision 18609)
@@ -0,0 +1,13 @@
+/*
+ * jQuery UI Sortable 1.7.2
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(a){a.widget("ui.sortable",a.extend({},a.ui.mouse,{_init:function(){var b=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--){this.items[b].item.removeData("sortable-item")}},_mouseCapture:function(e,f){if(this.reverting){return false}if(this.options.disabled||this.options.type=="static"){return false}this._refreshItems(e);var d=null,c=this,b=a(e.target).parents().each(function(){if(a.data(this,"sortable-item")==c){d=a(this);return false}});if(a.data(e.target,"sortable-item")==c){d=a(e.target)}if(!d){return false}if(this.options.handle&&!f){var g=false;a(this.options.handle,d).find("*").andSelf().each(function(){if(this==e.target){g=true}});if(!g){return false}}this.currentItem=d;this._removeCurrentsFromItems();return true},_mouseStart:function(e,f,b){var g=this.options,c=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(e);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(e);this.originalPageX=e.pageX;this.originalPageY=e.pageY;if(g.cursorAt){this._adjustOffsetFromHelper(g.cursorAt)}this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};if(this.helper[0]!=this.currentItem[0]){this.currentItem.hide()}this._createPlaceholder();if(g.containment){this._setContainment()}if(g.cursor){if(a("body").css("cursor")){this._storedCursor=a("body").css("cursor")}a("body").css("cursor",g.cursor)}if(g.opacity){if(this.helper.css("opacity")){this._storedOpacity=this.helper.css("opacity")}this.helper.css("opacity",g.opacity)}if(g.zIndex){if(this.helper.css("zIndex")){this._storedZIndex=this.helper.css("zIndex")}this.helper.css("zIndex",g.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){this.overflowOffset=this.scrollParent.offset()}this._trigger("start",e,this._uiHash());if(!this._preserveHelperProportions){this._cacheHelperProportions()}if(!b){for(var d=this.containers.length-1;d>=0;d--){this.containers[d]._trigger("activate",e,c._uiHash(this))}}if(a.ui.ddmanager){a.ui.ddmanager.current=this}if(a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,e)}this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(e);return true},_mouseDrag:function(f){this.position=this._generatePosition(f);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs){this.lastPositionAbs=this.positionAbs}if(this.options.scroll){var g=this.options,b=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if((this.overflowOffset.top+this.scrollParent[0].offsetHeight)-f.pageY<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop+g.scrollSpeed}else{if(f.pageY-this.overflowOffset.top<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop-g.scrollSpeed}}if((this.overflowOffset.left+this.scrollParent[0].offsetWidth)-f.pageX<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft+g.scrollSpeed}else{if(f.pageX-this.overflowOffset.left<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft-g.scrollSpeed}}}else{if(f.pageY-a(document).scrollTop()<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-g.scrollSpeed)}else{if(a(window).height()-(f.pageY-a(document).scrollTop())<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+g.scrollSpeed)}}if(f.pageX-a(document).scrollLeft()<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-g.scrollSpeed)}else{if(a(window).width()-(f.pageX-a(document).scrollLeft())<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+g.scrollSpeed)}}}if(b!==false&&a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,f)}}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d],c=e.item[0],h=this._intersectsWithPointer(e);if(!h){continue}if(c!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=c&&!a.ui.contains(this.placeholder[0],c)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],c):true)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e)){this._rearrange(f,e)}else{break}this._trigger("change",f,this._uiHash());break}}this._contactContainers(f);if(a.ui.ddmanager){a.ui.ddmanager.drag(this,f)}this._trigger("sort",f,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(c,d){if(!c){return}if(a.ui.ddmanager&&!this.options.dropBehaviour){a.ui.ddmanager.drop(this,c)}if(this.options.revert){var b=this;var e=b.placeholder.offset();b.reverting=true;a(this.helper).animate({left:e.left-this.offset.parent.left-b.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-b.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){b._clear(c)})}else{this._clear(c,d)}return false},cancel:function(){var b=this;if(this.dragging){this._mouseUp();if(this.options.helper=="original"){this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,b._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,b._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder[0].parentNode){this.placeholder[0].parentNode.removeChild(this.placeholder[0])}if(this.options.helper!="original"&&this.helper&&this.helper[0].parentNode){this.helper.remove()}a.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});if(this.domPosition.prev){a(this.domPosition.prev).after(this.currentItem)}else{a(this.domPosition.parent).prepend(this.currentItem)}return true},serialize:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};a(b).each(function(){var e=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||(/(.+)[-=_](.+)/));if(e){c.push((d.key||e[1]+"[]")+"="+(d.key&&d.expression?e[1]:e[2]))}});return c.join("&")},toArray:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};b.each(function(){c.push(a(d.item||this).attr(d.attribute||"id")||"")});return c},_intersectsWith:function(m){var e=this.positionAbs.left,d=e+this.helperProportions.width,k=this.positionAbs.top,j=k+this.helperProportions.height;var f=m.left,c=f+m.width,n=m.top,i=n+m.height;var o=this.offset.click.top,h=this.offset.click.left;var g=(k+o)>n&&(k+o)<i&&(e+h)>f&&(e+h)<c;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>m[this.floating?"width":"height"])){return g}else{return(f<e+(this.helperProportions.width/2)&&d-(this.helperProportions.width/2)<c&&n<k+(this.helperProportions.height/2)&&j-(this.helperProportions.height/2)<i)}},_intersectsWithPointer:function(d){var e=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height),c=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width),g=e&&c,b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(!g){return false}return this.floating?(((f&&f=="right")||b=="down")?2:1):(b&&(b=="down"?2:1))},_intersectsWithSides:function(e){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+(e.height/2),e.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+(e.width/2),e.width),b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(this.floating&&f){return((f=="right"&&d)||(f=="left"&&!d))}else{return b&&((b=="down"&&c)||(b=="up"&&!c))}},_getDragVerticalDirection:function(){var b=this.positionAbs.top-this.lastPositionAbs.top;return b!=0&&(b>0?"down":"up")},_getDragHorizontalDirection:function(){var b=this.positionAbs.left-this.lastPositionAbs.left;return b!=0&&(b>0?"right":"left")},refresh:function(b){this._refreshItems(b);this.refreshPositions()},_connectWith:function(){var b=this.options;return b.connectWith.constructor==String?[b.connectWith]:b.connectWith},_getItemsAsjQuery:function(b){var l=this;var g=[];var e=[];var h=this._connectWith();if(h&&b){for(var d=h.length-1;d>=0;d--){var k=a(h[d]);for(var c=k.length-1;c>=0;c--){var f=a.data(k[c],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element):a(f.options.items,f.element).not(".ui-sortable-helper"),f])}}}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper"),this]);for(var d=e.length-1;d>=0;d--){e[d][0].each(function(){g.push(this)})}return a(g)},_removeCurrentsFromItems:function(){var d=this.currentItem.find(":data(sortable-item)");for(var c=0;c<this.items.length;c++){for(var b=0;b<d.length;b++){if(d[b]==this.items[c].item[0]){this.items.splice(c,1)}}}},_refreshItems:function(b){this.items=[];this.containers=[this];var h=this.items;var p=this;var f=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]];var l=this._connectWith();if(l){for(var e=l.length-1;e>=0;e--){var m=a(l[e]);for(var d=m.length-1;d>=0;d--){var g=a.data(m[d],"sortable");if(g&&g!=this&&!g.options.disabled){f.push([a.isFunction(g.options.items)?g.options.items.call(g.element[0],b,{item:this.currentItem}):a(g.options.items,g.element),g]);this.containers.push(g)}}}}for(var e=f.length-1;e>=0;e--){var k=f[e][1];var c=f[e][0];for(var d=0,n=c.length;d<n;d++){var o=a(c[d]);o.data("sortable-item",k);h.push({item:o,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){if(this.offsetParent&&this.helper){this.offset.parent=this._getParentOffset()}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d];if(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0]){continue}var c=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!b){e.width=c.outerWidth();e.height=c.outerHeight()}var f=c.offset();e.left=f.left;e.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var d=this.containers.length-1;d>=0;d--){var f=this.containers[d].element.offset();this.containers[d].containerCache.left=f.left;this.containers[d].containerCache.top=f.top;this.containers[d].containerCache.width=this.containers[d].element.outerWidth();this.containers[d].containerCache.height=this.containers[d].element.outerHeight()}}},_createPlaceholder:function(d){var b=d||this,e=b.options;if(!e.placeholder||e.placeholder.constructor==String){var c=e.placeholder;e.placeholder={element:function(){var f=a(document.createElement(b.currentItem[0].nodeName)).addClass(c||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!c){f.style.visibility="hidden"}return f},update:function(f,g){if(c&&!e.forcePlaceholderSize){return}if(!g.height()){g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10))}if(!g.width()){g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=a(e.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);e.placeholder.update(b,b.placeholder)},_contactContainers:function(d){for(var c=this.containers.length-1;c>=0;c--){if(this._intersectsWith(this.containers[c].containerCache)){if(!this.containers[c].containerCache.over){if(this.currentContainer!=this.containers[c]){var h=10000;var g=null;var e=this.positionAbs[this.containers[c].floating?"left":"top"];for(var b=this.items.length-1;b>=0;b--){if(!a.ui.contains(this.containers[c].element[0],this.items[b].item[0])){continue}var f=this.items[b][this.containers[c].floating?"left":"top"];if(Math.abs(f-e)<h){h=Math.abs(f-e);g=this.items[b]}}if(!g&&!this.options.dropOnEmpty){continue}this.currentContainer=this.containers[c];g?this._rearrange(d,g,null,true):this._rearrange(d,null,this.containers[c].element,true);this._trigger("change",d,this._uiHash());this.containers[c]._trigger("change",d,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder)}this.containers[c]._trigger("over",d,this._uiHash(this));this.containers[c].containerCache.over=1}}else{if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",d,this._uiHash(this));this.containers[c].containerCache.over=0}}}},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c,this.currentItem])):(d.helper=="clone"?this.currentItem.clone():this.currentItem);if(!b.parents("body").length){a(d.appendTo!="parent"?d.appendTo:this.currentItem[0].parentNode)[0].appendChild(b[0])}if(b[0]==this.currentItem[0]){this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}}if(b[0].style.width==""||d.forceHelperSize){b.width(this.currentItem.width())}if(b[0].style.height==""||d.forceHelperSize){b.height(this.currentItem.height())}return b},_adjustOffsetFromHelper:function(b){if(b.left!=undefined){this.offset.click.left=b.left+this.margins.left}if(b.right!=undefined){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if(b.top!=undefined){this.offset.click.top=b.top+this.margins.top}if(b.bottom!=undefined){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.currentItem.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)){var c=a(e.containment)[0];var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c)),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c))}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop())))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft())))}},_rearrange:function(g,f,c,e){c?c[0].appendChild(this.placeholder[0]):f.item[0].parentNode.insertBefore(this.placeholder[0],(this.direction=="down"?f.item[0]:f.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var d=this,b=this.counter;window.setTimeout(function(){if(b==d.counter){d.refreshPositions(!e)}},0)},_clear:function(d,e){this.reverting=false;var f=[],b=this;if(!this._noFinalSort&&this.currentItem[0].parentNode){this.placeholder.before(this.currentItem)}this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var c in this._storedCSS){if(this._storedCSS[c]=="auto"||this._storedCSS[c]=="static"){this._storedCSS[c]=""}}this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}if(this.fromOutside&&!e){f.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))})}if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!e){f.push(function(g){this._trigger("update",g,this._uiHash())})}if(!a.ui.contains(this.element[0],this.currentItem[0])){if(!e){f.push(function(g){this._trigger("remove",g,this._uiHash())})}for(var c=this.containers.length-1;c>=0;c--){if(a.ui.contains(this.containers[c].element[0],this.currentItem[0])&&!e){f.push((function(g){return function(h){g._trigger("receive",h,this._uiHash(this))}}).call(this,this.containers[c]));f.push((function(g){return function(h){g._trigger("update",h,this._uiHash(this))}}).call(this,this.containers[c]))}}}for(var c=this.containers.length-1;c>=0;c--){if(!e){f.push((function(g){return function(h){g._trigger("deactivate",h,this._uiHash(this))}}).call(this,this.containers[c]))}if(this.containers[c].containerCache.over){f.push((function(g){return function(h){g._trigger("out",h,this._uiHash(this))}}).call(this,this.containers[c]));this.containers[c].containerCache.over=0}}if(this._storedCursor){a("body").css("cursor",this._storedCursor)}if(this._storedOpacity){this.helper.css("opacity",this._storedOpacity)}if(this._storedZIndex){this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex)}this.dragging=false;if(this.cancelHelperRemoval){if(!e){this._trigger("beforeStop",d,this._uiHash());for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}return false}if(!e){this._trigger("beforeStop",d,this._uiHash())}this.placeholder[0].parentNode.removeChild(this.placeholder[0]);if(this.helper[0]!=this.currentItem[0]){this.helper.remove()}this.helper=null;if(!e){for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){if(a.widget.prototype._trigger.apply(this,arguments)===false){this.cancel()}},_uiHash:function(c){var b=c||this;return{helper:b.helper,placeholder:b.placeholder||a([]),position:b.position,absolutePosition:b.positionAbs,offset:b.positionAbs,item:b.currentItem,sender:c?c.element:null}}}));a.extend(a.ui.sortable,{getter:"serialize toArray",version:"1.7.2",eventPrefix:"sort",defaults:{appendTo:"parent",axis:false,cancel:":input,option",connectWith:false,containment:false,cursor:"auto",cursorAt:false,delay:0,distance:1,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1000}})})(jQuery);;
Index: tmp/version-2_5-test/html/user_data/packages/default/js/admin.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/admin.js	(revision 16757)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/admin.js	(revision 18609)
@@ -131,5 +131,5 @@
 // 管理者メンバーページの切替
 function fnMemberPage(pageno) {
-	location.href = "./index.php?pageno=" + pageno;
+	location.href = "?pageno=" + pageno;
 }
 
@@ -279,17 +279,4 @@
 }
 
-// 購入制限数判定
-function fnCheckSaleLimit(icolor) {
-	list = new Array(
-		'sale_limit'
-		);
-	if(document.form1['sale_unlimited'].checked) {
-		fnChangeDisabled(list, icolor);
-		document.form1['sale_limit'].value = "";
-	} else {
-		fnChangeDisabled(list, '');
-	}
-}
-
 // 在庫数判定
 function fnCheckAllStockLimit(max, icolor) {
@@ -430,4 +417,14 @@
 }
 
-
-
+// ページ読み込み時の処理
+$(function(){
+// ヘッダナビゲーション
+    $("#navi li").hover(
+        function(){
+            $(this).addClass("sfhover");
+        },
+        function(){
+            $(this).removeClass("sfhover");
+        }
+    );
+});
Index: tmp/version-2_5-test/html/user_data/packages/default/js/jquery.tablednd.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/jquery.tablednd.js	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/jquery.tablednd.js	(revision 18609)
@@ -0,0 +1,382 @@
+/**
+ * TableDnD plug-in for JQuery, allows you to drag and drop table rows
+ * You can set up various options to control how the system will work
+ * Copyright (c) Denis Howlett <denish@isocra.com>
+ * Licensed like jQuery, see http://docs.jquery.com/License.
+ *
+ * Configuration options:
+ * 
+ * onDragStyle
+ *     This is the style that is assigned to the row during drag. There are limitations to the styles that can be
+ *     associated with a row (such as you can't assign a border--well you can, but it won't be
+ *     displayed). (So instead consider using onDragClass.) The CSS style to apply is specified as
+ *     a map (as used in the jQuery css(...) function).
+ * onDropStyle
+ *     This is the style that is assigned to the row when it is dropped. As for onDragStyle, there are limitations
+ *     to what you can do. Also this replaces the original style, so again consider using onDragClass which
+ *     is simply added and then removed on drop.
+ * onDragClass
+ *     This class is added for the duration of the drag and then removed when the row is dropped. It is more
+ *     flexible than using onDragStyle since it can be inherited by the row cells and other content. The default
+ *     is class is tDnD_whileDrag. So to use the default, simply customise this CSS class in your
+ *     stylesheet.
+ * onDrop
+ *     Pass a function that will be called when the row is dropped. The function takes 2 parameters: the table
+ *     and the row that was dropped. You can work out the new order of the rows by using
+ *     table.rows.
+ * onDragStart
+ *     Pass a function that will be called when the user starts dragging. The function takes 2 parameters: the
+ *     table and the row which the user has started to drag.
+ * onAllowDrop
+ *     Pass a function that will be called as a row is over another row. If the function returns true, allow 
+ *     dropping on that row, otherwise not. The function takes 2 parameters: the dragged row and the row under
+ *     the cursor. It returns a boolean: true allows the drop, false doesn't allow it.
+ * scrollAmount
+ *     This is the number of pixels to scroll if the user moves the mouse cursor to the top or bottom of the
+ *     window. The page should automatically scroll up or down as appropriate (tested in IE6, IE7, Safari, FF2,
+ *     FF3 beta
+ * dragHandle
+ *     This is the name of a class that you assign to one or more cells in each row that is draggable. If you
+ *     specify this class, then you are responsible for setting cursor: move in the CSS and only these cells
+ *     will have the drag behaviour. If you do not specify a dragHandle, then you get the old behaviour where
+ *     the whole row is draggable.
+ * 
+ * Other ways to control behaviour:
+ *
+ * Add class="nodrop" to any rows for which you don't want to allow dropping, and class="nodrag" to any rows
+ * that you don't want to be draggable.
+ *
+ * Inside the onDrop method you can also call $.tableDnD.serialize() this returns a string of the form
+ * <tableID>[]=<rowID1>&<tableID>[]=<rowID2> so that you can send this back to the server. The table must have
+ * an ID as must all the rows.
+ *
+ * Other methods:
+ *
+ * $("...").tableDnDUpdate() 
+ * Will update all the matching tables, that is it will reapply the mousedown method to the rows (or handle cells).
+ * This is useful if you have updated the table rows using Ajax and you want to make the table draggable again.
+ * The table maintains the original configuration (so you don't have to specify it again).
+ *
+ * $("...").tableDnDSerialize()
+ * Will serialize and return the serialized string as above, but for each of the matching tables--so it can be
+ * called from anywhere and isn't dependent on the currentTable being set up correctly before calling
+ *
+ * Known problems:
+ * - Auto-scoll has some problems with IE7  (it scrolls even when it shouldn't), work-around: set scrollAmount to 0
+ * 
+ * Version 0.2: 2008-02-20 First public version
+ * Version 0.3: 2008-02-07 Added onDragStart option
+ *                         Made the scroll amount configurable (default is 5 as before)
+ * Version 0.4: 2008-03-15 Changed the noDrag/noDrop attributes to nodrag/nodrop classes
+ *                         Added onAllowDrop to control dropping
+ *                         Fixed a bug which meant that you couldn't set the scroll amount in both directions
+ *                         Added serialize method
+ * Version 0.5: 2008-05-16 Changed so that if you specify a dragHandle class it doesn't make the whole row
+ *                         draggable
+ *                         Improved the serialize method to use a default (and settable) regular expression.
+ *                         Added tableDnDupate() and tableDnDSerialize() to be called when you are outside the table
+ */
+jQuery.tableDnD = {
+    /** Keep hold of the current table being dragged */
+    currentTable : null,
+    /** Keep hold of the current drag object if any */
+    dragObject: null,
+    /** The current mouse offset */
+    mouseOffset: null,
+    /** Remember the old value of Y so that we don't do too much processing */
+    oldY: 0,
+
+    /** Actually build the structure */
+    build: function(options) {
+        // Set up the defaults if any
+
+        this.each(function() {
+            // This is bound to each matching table, set up the defaults and override with user options
+            this.tableDnDConfig = jQuery.extend({
+                onDragStyle: null,
+                onDropStyle: null,
+				// Add in the default class for whileDragging
+				onDragClass: "tDnD_whileDrag",
+                onDrop: null,
+                onDragStart: null,
+                scrollAmount: 5,
+				serializeRegexp: /[^\-]*$/, // The regular expression to use to trim row IDs
+				serializeParamName: null, // If you want to specify another parameter name instead of the table ID
+                dragHandle: null // If you give the name of a class here, then only Cells with this class will be draggable
+            }, options || {});
+            // Now make the rows draggable
+            jQuery.tableDnD.makeDraggable(this);
+        });
+
+        // Now we need to capture the mouse up and mouse move event
+        // We can use bind so that we don't interfere with other event handlers
+        jQuery(document)
+            .bind('mousemove', jQuery.tableDnD.mousemove)
+            .bind('mouseup', jQuery.tableDnD.mouseup);
+
+        // Don't break the chain
+        return this;
+    },
+
+    /** This function makes all the rows on the table draggable apart from those marked as "NoDrag" */
+    makeDraggable: function(table) {
+        var config = table.tableDnDConfig;
+		if (table.tableDnDConfig.dragHandle) {
+			// We only need to add the event to the specified cells
+			var cells = jQuery("td."+table.tableDnDConfig.dragHandle, table);
+			cells.each(function() {
+				// The cell is bound to "this"
+                jQuery(this).mousedown(function(ev) {
+                    jQuery.tableDnD.dragObject = this.parentNode;
+                    jQuery.tableDnD.currentTable = table;
+                    jQuery.tableDnD.mouseOffset = jQuery.tableDnD.getMouseOffset(this, ev);
+                    if (config.onDragStart) {
+                        // Call the onDrop method if there is one
+                        config.onDragStart(table, this);
+                    }
+                    return false;
+                });
+			})
+		} else {
+			// For backwards compatibility, we add the event to the whole row
+	        var rows = jQuery("tr", table); // get all the rows as a wrapped set
+	        rows.each(function() {
+				// Iterate through each row, the row is bound to "this"
+				var row = jQuery(this);
+				if (! row.hasClass("nodrag")) {
+	                row.mousedown(function(ev) {
+	                    if (ev.target.tagName == "TD") {
+	                        jQuery.tableDnD.dragObject = this;
+	                        jQuery.tableDnD.currentTable = table;
+	                        jQuery.tableDnD.mouseOffset = jQuery.tableDnD.getMouseOffset(this, ev);
+	                        if (config.onDragStart) {
+	                            // Call the onDrop method if there is one
+	                            config.onDragStart(table, this);
+	                        }
+	                        return false;
+	                    }
+	                }).css("cursor", "move"); // Store the tableDnD object
+				}
+			});
+		}
+	},
+
+	updateTables: function() {
+		this.each(function() {
+			// this is now bound to each matching table
+			if (this.tableDnDConfig) {
+				jQuery.tableDnD.makeDraggable(this);
+			}
+		})
+	},
+
+    /** Get the mouse coordinates from the event (allowing for browser differences) */
+    mouseCoords: function(ev){
+        if(ev.pageX || ev.pageY){
+            return {x:ev.pageX, y:ev.pageY};
+        }
+        return {
+            x:ev.clientX + document.body.scrollLeft - document.body.clientLeft,
+            y:ev.clientY + document.body.scrollTop  - document.body.clientTop
+        };
+    },
+
+    /** Given a target element and a mouse event, get the mouse offset from that element.
+        To do this we need the element's position and the mouse position */
+    getMouseOffset: function(target, ev) {
+        ev = ev || window.event;
+
+        var docPos    = this.getPosition(target);
+        var mousePos  = this.mouseCoords(ev);
+        return {x:mousePos.x - docPos.x, y:mousePos.y - docPos.y};
+    },
+
+    /** Get the position of an element by going up the DOM tree and adding up all the offsets */
+    getPosition: function(e){
+        var left = 0;
+        var top  = 0;
+        /** Safari fix -- thanks to Luis Chato for this! */
+        if (e.offsetHeight == 0) {
+            /** Safari 2 doesn't correctly grab the offsetTop of a table row
+            this is detailed here:
+            http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari/
+            the solution is likewise noted there, grab the offset of a table cell in the row - the firstChild.
+            note that firefox will return a text node as a first child, so designing a more thorough
+            solution may need to take that into account, for now this seems to work in firefox, safari, ie */
+            e = e.firstChild; // a table cell
+        }
+
+        while (e.offsetParent){
+            left += e.offsetLeft;
+            top  += e.offsetTop;
+            e     = e.offsetParent;
+        }
+
+        left += e.offsetLeft;
+        top  += e.offsetTop;
+
+        return {x:left, y:top};
+    },
+
+    mousemove: function(ev) {
+        if (jQuery.tableDnD.dragObject == null) {
+            return;
+        }
+
+        var dragObj = jQuery(jQuery.tableDnD.dragObject);
+        var config = jQuery.tableDnD.currentTable.tableDnDConfig;
+        var mousePos = jQuery.tableDnD.mouseCoords(ev);
+        var y = mousePos.y - jQuery.tableDnD.mouseOffset.y;
+        //auto scroll the window
+	    var yOffset = window.pageYOffset;
+	 	if (document.all) {
+	        // Windows version
+	        //yOffset=document.body.scrollTop;
+	        if (typeof document.compatMode != 'undefined' &&
+	             document.compatMode != 'BackCompat') {
+	           yOffset = document.documentElement.scrollTop;
+	        }
+	        else if (typeof document.body != 'undefined') {
+	           yOffset=document.body.scrollTop;
+	        }
+
+	    }
+		    
+		if (mousePos.y-yOffset < config.scrollAmount) {
+	    	window.scrollBy(0, -config.scrollAmount);
+	    } else {
+            var windowHeight = window.innerHeight ? window.innerHeight
+                    : document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight;
+            if (windowHeight-(mousePos.y-yOffset) < config.scrollAmount) {
+                window.scrollBy(0, config.scrollAmount);
+            }
+        }
+
+
+        if (y != jQuery.tableDnD.oldY) {
+            // work out if we're going up or down...
+            var movingDown = y > jQuery.tableDnD.oldY;
+            // update the old value
+            jQuery.tableDnD.oldY = y;
+            // update the style to show we're dragging
+			if (config.onDragClass) {
+				dragObj.addClass(config.onDragClass);
+			} else {
+	            dragObj.css(config.onDragStyle);
+			}
+            // If we're over a row then move the dragged row to there so that the user sees the
+            // effect dynamically
+            var currentRow = jQuery.tableDnD.findDropTargetRow(dragObj, y);
+            if (currentRow) {
+                // TODO worry about what happens when there are multiple TBODIES
+                if (movingDown && jQuery.tableDnD.dragObject != currentRow) {
+                    jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow.nextSibling);
+                } else if (! movingDown && jQuery.tableDnD.dragObject != currentRow) {
+                    jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow);
+                }
+            }
+        }
+
+        return false;
+    },
+
+    /** We're only worried about the y position really, because we can only move rows up and down */
+    findDropTargetRow: function(draggedRow, y) {
+        var rows = jQuery.tableDnD.currentTable.rows;
+        for (var i=0; i<rows.length; i++) {
+            var row = rows[i];
+            var rowY    = this.getPosition(row).y;
+            var rowHeight = parseInt(row.offsetHeight)/2;
+            if (row.offsetHeight == 0) {
+                rowY = this.getPosition(row.firstChild).y;
+                rowHeight = parseInt(row.firstChild.offsetHeight)/2;
+            }
+            // Because we always have to insert before, we need to offset the height a bit
+            if ((y > rowY - rowHeight) && (y < (rowY + rowHeight))) {
+                // that's the row we're over
+				// If it's the same as the current row, ignore it
+				if (row == draggedRow) {return null;}
+                var config = jQuery.tableDnD.currentTable.tableDnDConfig;
+                if (config.onAllowDrop) {
+                    if (config.onAllowDrop(draggedRow, row)) {
+                        return row;
+                    } else {
+                        return null;
+                    }
+                } else {
+					// If a row has nodrop class, then don't allow dropping (inspired by John Tarr and Famic)
+                    var nodrop = jQuery(row).hasClass("nodrop");
+                    if (! nodrop) {
+                        return row;
+                    } else {
+                        return null;
+                    }
+                }
+                return row;
+            }
+        }
+        return null;
+    },
+
+    mouseup: function(e) {
+        if (jQuery.tableDnD.currentTable && jQuery.tableDnD.dragObject) {
+            var droppedRow = jQuery.tableDnD.dragObject;
+            var config = jQuery.tableDnD.currentTable.tableDnDConfig;
+            // If we have a dragObject, then we need to release it,
+            // The row will already have been moved to the right place so we just reset stuff
+			if (config.onDragClass) {
+	            jQuery(droppedRow).removeClass(config.onDragClass);
+			} else {
+	            jQuery(droppedRow).css(config.onDropStyle);
+			}
+            jQuery.tableDnD.dragObject   = null;
+            if (config.onDrop) {
+                // Call the onDrop method if there is one
+                config.onDrop(jQuery.tableDnD.currentTable, droppedRow);
+            }
+            jQuery.tableDnD.currentTable = null; // let go of the table too
+        }
+    },
+
+    serialize: function() {
+        if (jQuery.tableDnD.currentTable) {
+            return jQuery.tableDnD.serializeTable(jQuery.tableDnD.currentTable);
+        } else {
+            return "Error: No Table id set, you need to set an id on your table and every row";
+        }
+    },
+
+	serializeTable: function(table) {
+        var result = "";
+        var tableId = table.id;
+        var rows = table.rows;
+        for (var i=0; i<rows.length; i++) {
+            if (result.length > 0) result += "&";
+            var rowId = rows[i].id;
+            if (rowId && rowId && table.tableDnDConfig && table.tableDnDConfig.serializeRegexp) {
+                rowId = rowId.match(table.tableDnDConfig.serializeRegexp)[0];
+            }
+
+            result += tableId + '[]=' + rowId;
+        }
+        return result;
+	},
+
+	serializeTables: function() {
+        var result = "";
+        this.each(function() {
+			// this is now bound to each matching table
+			result += jQuery.tableDnD.serializeTable(this);
+		});
+        return result;
+    }
+
+}
+
+jQuery.fn.extend(
+	{
+		tableDnD : jQuery.tableDnD.build,
+		tableDnDUpdate : jQuery.tableDnD.updateTables,
+		tableDnDSerialize: jQuery.tableDnD.serializeTables
+	}
+);
Index: tmp/version-2_5-test/html/user_data/packages/default/js/win_op.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/win_op.js	(revision 16708)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/win_op.js	(revision 18609)
@@ -51,17 +51,2 @@
 }
 //-->
-
-<!--
-	function ChangeParent()
-	{
-		window.opener.location.href="../contact/index.php";
-	}
-//-->
-
-
-<!--//
-function CloseChild()
-{
-	window.close();
-}
-//-->
Index: tmp/version-2_5-test/html/user_data/packages/default/js/navi.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/navi.js	(revision 16708)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/navi.js	(revision 18609)
@@ -20,38 +20,31 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-	var preLoadFlag = "false";
+var preLoadFlag = "false";
 
-	function preLoadImg(URL){
+function preLoadImg(URL){
 
-		arrImgList = new Array (
-			URL+"img/header/basis_on.jpg",URL+"img/header/product_on.jpg",URL+"img/header/customer_on.jpg",URL+"img/header/order_on.jpg",
-			URL+"img/header/sales_on.jpg",URL+"img/header/mail_on.jpg",URL+"img/header/contents_on.jpg",
-			URL+"img/header/mainpage_on.gif",URL+"img/header/sitecheck_on.gif",URL+"img/header/logout.gif",
-			URL+"img/contents/btn_search_on.jpg",URL+"img/contents/btn_regist_on.jpg",
-			URL+"img/contents/btn_csv_on.jpg",URL+"img/contents/arrow_left.jpg",URL+"img/contents/arrow_right.jpg"
-		);
-		arrPreLoad = new Array();
-		for (i in arrImgList) {
-			arrPreLoad[i] = new Image();
-			arrPreLoad[i].src = arrImgList[i];
-		}
-		preLoadFlag = "true";
-	}
+    arrImgList = new Array (
+        URL+"img/contents/btn_search_on.jpg",URL+"img/contents/btn_regist_on.jpg",
+        URL+"img/contents/btn_csv_on.jpg",URL+"img/contents/arrow_left.jpg",URL+"img/contents/arrow_right.jpg"
+    );
+    arrPreLoad = new Array();
+    for (i in arrImgList) {
+        arrPreLoad[i] = new Image();
+        arrPreLoad[i].src = arrImgList[i];
+    }
+    preLoadFlag = "true";
+}
 
-	function chgImg(fileName,imgName){
-		if (preLoadFlag == "true") {
-			document.images[imgName].src = fileName;
-		}
-	}
-	
-	function chgImgImageSubmit(fileName,imgObj){
-	imgObj.src = fileName;
-	}
-	
-	// サブナビの表示切替
-	function naviStyleChange(ids, bcColor, color){
-		document.getElementById(ids).style.backgroundColor = bcColor;
-	}	
+function chgImg(fileName,img){
+    if (preLoadFlag == "true") {
+        if (typeof(img) == "object") {
+            img.src = fileName;
+        } else {
+            document.images[img].src = fileName;
+        }
+    }
+}
 
-
-	
+function chgImgImageSubmit(fileName,imgObj){
+imgObj.src = fileName;
+}
Index: tmp/version-2_5-test/html/user_data/packages/default/js/jquery-1.3.2.min.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/jquery-1.3.2.min.js	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/jquery-1.3.2.min.js	(revision 18609)
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
Index: tmp/version-2_5-test/html/user_data/packages/default/js/site.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/site.js	(revision 18562)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/site.js	(revision 18609)
@@ -36,29 +36,32 @@
 // 郵便番号入力呼び出し.
 function fnCallAddress(php_url, tagname1, tagname2, input1, input2) {
-	zip1 = document.form1[tagname1].value;
-	zip2 = document.form1[tagname2].value;
-	
-	if(zip1.length == 3 && zip2.length == 4) {
-		url = php_url + "?zip1=" + zip1 + "&zip2=" + zip2 + "&input1=" + input1 + "&input2=" + input2;
-		window.open(url,"nomenu","width=500,height=350,scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
-	} else {
-		alert("郵便番号を正しく入力して下さい。");
+    zip1 = document.form1[tagname1].value;
+    zip2 = document.form1[tagname2].value;
+
+    if(zip1.length == 3 && zip2.length == 4) {
+        $.get(
+            php_url,
+            {zip1: zip1, zip2: zip2, input1: input1, input2: input2},
+            function(data) {
+                arrdata = data.split("|");
+                if (arrdata.length > 1) {
+                    fnPutAddress(input1, input2, arrdata[0], arrdata[1], arrdata[2]);
+                } else {
+                    alert(data);
+                }
+            }
+        );
+    } else {
+        alert("郵便番号を正しく入力して下さい。");
 	}
 }
 
 // 郵便番号から検索した住所を渡す.
-function fnPutAddress(input1, input2) {
-	// 親ウィンドウの存在確認。.
-	if(fnIsopener()) {
-		if(document.form1['state'].value != "") {
-			// 項目に値を入力する.
-			state_id = document.form1['state'].value;
-			town = document.form1['city'].value + document.form1['town'].value;
-			window.opener.document.form1[input1].selectedIndex = state_id;
-			window.opener.document.form1[input2].value = town;
-		}
-	} else {
-		window.close();
-	}		
+function fnPutAddress(input1, input2, state, city, town) {
+    if(state != "") {
+        // 項目に値を入力する.
+        document.form1[input1].selectedIndex = state;
+        document.form1[input2].value = city + town;
+    }
 }
 
@@ -79,16 +82,16 @@
 // セレクトボックスに項目を割り当てる.
 function fnSetSelect(name1, name2, val) {
-	sele1 = document.form1[name1]; 
+	sele1 = document.form1[name1];
 	sele2 = document.form1[name2];
-	
+
 	if(sele1 && sele2) {
 		index=sele1.selectedIndex;
-		
-		// セレクトボックスのクリア	
+
+		// セレクトボックスのクリア
 		count=sele2.options.length
 		for(i = count; i >= 0; i--) {
 			sele2.options[i]=null;
 		}
-		
+
 		// セレクトボックスに値を割り当てる。
 		len = lists[index].length
@@ -127,9 +130,4 @@
 		}
 		break;
-	case 'delete_order':
-		if(!window.confirm('在庫数は手動で戻してください。\n一度削除したデータは、元に戻せません。\n削除しても宜しいですか？')){
-			return;
-		}
-		break;
 	case 'confirm':
 		if(!window.confirm('登録しても宜しいですか')){
@@ -168,5 +166,5 @@
 			return;
 		}
-		break;		
+		break;
 	default:
 		break;
@@ -185,4 +183,8 @@
 }
 
+function fnSetVal(key, val) {
+	fnSetFormVal('form1', key, val);
+}
+
 function fnSetFormVal(form, key, val) {
 	document.forms[form][key].value = val;
@@ -205,5 +207,5 @@
 	}
 
-	function fnSubmit(){
+function fnSubmit(){
 	document.form1.submit();
 }
@@ -215,5 +217,5 @@
 						'use_point'
 						);
-	
+
 		if(!document.form1['point_check'][0].checked) {
 			color = "#dddddd";
@@ -223,5 +225,5 @@
 			flag = false;
 		}
-		
+
 		len = list.length
 		for(i = 0; i < len; i++) {
@@ -254,5 +256,5 @@
 						'deliv_tel03'
 						);
-	
+
 		if(!document.form1['deliv_check'].checked) {
 			fnChangeDisabled(list, '#dddddd');
@@ -263,23 +265,4 @@
 }
 
-
-// 購入時会員登録入力制限。
-function fnCheckInputMember() {
-	if(document.form1['member_check']) {
-		list = new Array(
-						'password',
-						'password_confirm',
-						'reminder',
-						'reminder_answer'
-						);
-
-		if(!document.form1['member_check'].checked) {
-			fnChangeDisabled(list, '#dddddd');
-		} else {
-			fnChangeDisabled(list, '');
-		}
-	}
-}
-
 // 最初に設定されていた色を保存しておく。
 var g_savecolor = new Array();
@@ -287,5 +270,5 @@
 function fnChangeDisabled(list, color) {
 	len = list.length;
-	
+
 	for(i = 0; i < len; i++) {
 		if(document.form1[list[i]]) {
@@ -298,6 +281,6 @@
 				document.form1[list[i]].disabled = true;
 				g_savecolor[list[i]] = document.form1[list[i]].style.backgroundColor;
-				document.form1[list[i]].style.backgroundColor = color;//"#f0f0f0";	
-			}			
+				document.form1[list[i]].style.backgroundColor = color;//"#f0f0f0";
+			}
 		}
 	}
@@ -308,5 +291,5 @@
 function fnCheckLogin(formname) {
 	var lstitem = new Array();
-	
+
 	if(formname == 'login_mypage'){
 	lstitem[0] = 'mypage_login_email';
@@ -319,5 +302,5 @@
 	var errflg = false;
 	var cnt = 0;
-	
+
 	//　必須項目のチェック
 	for(cnt = 0; cnt < max; cnt++) {
@@ -327,6 +310,6 @@
 		}
 	}
-	
-	// 必須項目が入力されていない場合	
+
+	// 必須項目が入力されていない場合
 	if(errflg == true) {
 		alert('メールアドレス/パスワードを入力して下さい。');
@@ -334,5 +317,5 @@
 	}
 }
-	
+
 // 時間の計測.
 function fnPassTime(){
@@ -350,5 +333,5 @@
 	} else {
 		window.close();
-	}		
+	}
 }
 
@@ -372,5 +355,5 @@
 // テキストエリアのサイズを変更する.
 function ChangeSize(button, TextArea, Max, Min, row_tmp){
-	
+
 	if(TextArea.rows <= Min){
 		TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
@@ -380,2 +363,43 @@
 }
 
+// お届け時間のリアル反映
+function fnSetDelivTime(mode, r_key, s_id) {
+    var f_key, f_val;
+    var f_cnt = document.form1.length;
+    var f_data = "mode=" + mode;
+
+    // formデータの形成
+    for (i = 0; i < f_cnt; i++) {
+        f_key = document.form1[i].name;
+        f_val = document.form1[i].value;
+        if (f_key != "mode") {
+            if (f_key == r_key) {
+                if (document.form1[i].checked === true) {
+                    f_data += "&" + f_key + "=" + f_val;
+                }
+            } else {
+                f_data += "&" + f_key + "=" + f_val;
+            }
+        }
+    }
+
+    // AJAX
+    $.ajax({
+        type: "POST",
+        url: document.form1.action,
+        data: f_data,
+        dataType: "json",
+        success: function(data) {
+            var elm_s = "select#" + s_id;
+            var elm_o = elm_s + " option";
+            $(elm_o).remove();
+            $(elm_s).append($('<option>').attr({value: ""}).text("指定なし"));
+            for (i = 0; i < data.length; i++) {
+                if (data[i].time_id > 0) {
+                    $(elm_s).append($('<option>').attr({value: data[i].time_id}).text(data[i].deliv_time));
+                    $(elm_s).width();
+                }
+            }
+        }
+    });
+}
Index: tmp/version-2_5-test/html/user_data/packages/default/js/ui.core.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/ui.core.js	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/ui.core.js	(revision 18609)
@@ -0,0 +1,10 @@
+/*
+ * jQuery UI 1.7.2
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI
+ */
+jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.2",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);;
Index: tmp/version-2_5-test/html/user_data/packages/default/js/layout_design.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/layout_design.js	(revision 16708)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/layout_design.js	(revision 18609)
@@ -2,5 +2,5 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2008 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -20,677 +20,55 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-// サイズ管理クラスの定義
-function SC_Size() {
-	this.id = '';				// ID
-	this.left = 0;				// 配置するY軸座標
-	this.top = 0;				// 配置するX軸座標
-	this.width = 0;				// オブジェクトの幅
-	this.height = 0;			// オブジェクトの高さ
-	this.target_id = '';		// 配置場所（左ナビとか）
-	this.margin = 10;			// 上のオブジェクトとの幅
-	this.obj;
-};
-
-// 変数宣言
-var defUnused = 500;	// 未使用領域のデフォルトの高さ
-var defNavi   = 400;	// 左右ナビのデフォルトの高さ
-var defMainNavi  = 100;	// メイン上下のデフォルトの高さ
-var defMain   = 200;	// メインのデフォルトの高さ
-
-var NowMaxHeight = 0;		// 現在の最大の高さ
-var MainHeight = 200;
-
-var marginUnused 	= 688;	// 未使用領域の左マージン
-var marginLeftNavi  = 180;	// 左ナビの左マージン
-var marginRightNavi = 512;	// 右ナビの左マージン
-var marginMain		= 348;	// メイン上下の左マージン
-var marginMainFootTop= 595;	// メイン下の上マージン
-
-var gDragged = "";			// ドラッグ中オブジェクト
-var gDropTarget = "";		// ドラッグ開始時のDropTarget
-
-var arrObj = new Object();	// ブロックオブジェクト格納用
-
-var mouseFlg = false;
-
-var all_elms;				// divタグオブジェクト格納用
-
-// ウィンドウサイズ
-var scrX;
-var scrY;
-
-// イベントの関連付けを行う
-function addEvent( elm, evtType, fn, useCapture) {
-
-    if (elm.addEventListener) {
-        elm.addEventListener(evtType, fn, useCapture);
-        return true;
-
-    }
-    else if (elm.attachEvent) {
-
-        var r = elm.attachEvent('on' + evtType, fn);
-        return r;
-
-    }
-    else {
-        elm['on'+evtType] = fn;
-
-    }
+(function($){
+    var updateUpDown = function(sortable){
+        $('div:not(.ui-sortable-helper)', sortable)
+            .removeClass('first')
+            .filter(':first').addClass('first').end()
+            .children('input.target-id').val(sortable.id).end()
+            .each(function(){
+                var top = $(this).prevAll().length + 1;
+                $(this).children('input.top').val(top);
+            });
+    };
     
-}
-
-
-// イベントの関連付けを解除
-function removeEvent( elm, evtType, fn, useCapture) {
-
-    if (elm.removeEventListener) {
-
-        elm.removeEventListener(evtType, fn, useCapture);
-        return true;
-
-    }
-    else if (elm.detachEvent) {
-
-        var r = elm.detachEvent('on' + evtType, fn);
-        return r;
-
-    }
-    else {
-
-        elm['on'+evtType] = fn;
-
-    }
-   
-}
-
-// マウスカーソルを変更
-function setCursor ( elm, curtype ) {
-	elm.style.cursor = curtype;
-}
-
-// オブジェクトの透明度を変更   
-function setOpacity(node,val) {
-
-    if (node.filters) {
-		node.filters["alpha"].opacity = val*100;
-    } else if (node.style.opacity) {
-        node.style.opacity = val;
-    }
-}
-
-// Zindexを変更する（前面表示切替）
-function setZindex(node, val) {
-	node.style.zIndex = val;
-//	alert(val);
-}
-
-// 値を取得
-function getAttrValue ( elm, attrname ) {
-
-	if (typeof(elm.attributes[ attrname ]) != 'undefined') {
-	    return elm.attributes[ attrname ].nodeValue;
-	}
-
-/*
-//	if (typeof(elm.attributes.getNamedItem(attrname)) != 'object'){
-		val = "";
-		if((typeof ScriptEngineMajorVersion)=='function')
-		{
-			if( Math.floor(ScriptEngineMajorVersion()) == 5 &&
-				navigator.userAgent.indexOf("Win")!=-1) //win-e5対応
-				{
-				val = elm.attributes.item(attrname)
-				}
-			else
-			{
-				val = elm.attributes.getNamedItem(attrname)
-			}
-		} else {
-			val = elm.attributes.getNamedItem(attrname)
-		}
-		
-		alert(val.value);
-		
-		return val.value;
-//	}
-*/
-}
-
-// 値をセット
-function setAttrValue ( elm, attrname, val ) {
-    elm.attributes[ attrname ].nodeValue = val;
-}
-
-// オブジェクトのX座標を取得
-function getX ( elm ) {
-//   return parseInt(elm.style.left);
-	return parseInt(elm.offsetLeft);
-}
-
-// オブジェクトのY座標を取得
-function getY ( elm ) {
-	return parseInt(elm.offsetTop);
-//    return parseInt(elm.style.top);
-}
-
-// X座標を取得
-function getEventX ( evt ) {
-    return evt.clientX ? evt.clientX : evt.pageX;
-}
-
-// Y座標を取得
-function getEventY ( evt ) {
-    return evt.clientY ? evt.clientY : evt.pageY;
-}
-
-// オブジェクトの幅を取得
-function getWidth ( elm ) {
-    return parseInt( elm.style.width );
-}
-
-// オブジェクトの高さを取得
-function getHeight ( elm ) {
-//    return parseInt( elm.style.height );
-    return parseInt( elm.offsetHeight );
-}
-
-// ページの可視領域のX座標を取得する
-function getPageScrollX()
-{
-	var x = 0;
-
-	if (document.body && document.body.scrollLeft != null) {
-		x = document.body.scrollLeft;
-	} else if (document.documentElement && document.documentElement.scrollLeft != null) {
-		x = document.documentElement.scrollLeft;
-	} else if (window.scrollX != null) {
-		x = window.scrollX;
-	} else if (window.pageXOffset != null) {
-		x = window.pageXOffset;
-	}
-	
-	return x;
-}
-
-// ページの可視領域のY座標を取得する
-function getPageScrollY()
-{
-	var y = 0;
-	
-	if (document.body && document.body.scrollTop != null) {
-		y = document.body.scrollTop;
-	} else if (document.documentElement && document.documentElement.scrollTop != null) {
-		y = document.documentElement.scrollTop;
-	} else if (window.scrollY != null) {
-		y = window.scrollY;
-	} else if (window.pageYOffset != null) {
-		y = window.pageYOffset;
-	}
-	
-	return y;
-}
-
-
-// オブジェクトの座標をセット
-function moveElm ( elm, x, y ) {
-    elm.style.left = x + 'px';
-    elm.style.top = y + 'px';
-}
-
-// マウスダウンイベント
-function onMouseDown (evt) {
-
-    var target = evt.target ? evt.target : evt.srcElement;
-    var x = getEventX ( evt );
-    var y = getEventY ( evt );
-
-    //
-    // Save Information to Globals
-    //
-  	if (mouseFlg == false) {
+    var sortableUpdate = function(e, ui){
+        updateUpDown(this);
+        if(ui.sender)
+            updateUpDown(ui.sender[0]);
+    };
     
-	    gDragged = target;
-	
-	    gDeltaX = x - getX(gDragged);
-	    gDeltaY = y - getY(gDragged);
-	
-	    gDraggedId = getAttrValue ( gDragged, 'did' );
-	    setCursor ( gDragged, 'move' );
-	
-	    gOrgX = getX ( gDragged );
-	    gOrgY = getY ( gDragged );
-	    gtarget_id = getAttrValue ( gDragged, 'target_id' );
-	
-	    //
-	    // Set
-	    //
-	   
-	    // ドラッグ中は半透明
-	    setOpacity ( gDragged, 0.6 );
-	
-	    // ドラッグ中は最前面表示
-	    setZindex ( gDragged , 2);
-	    
-	    addEvent ( document, 'mousemove', onMouseMove, false );
-	    addEvent ( document, 'mouseup', onMouseUp, false );
-
-	    // ドラッグを開始したときは高さを一度初期化する。
-	    NowMaxHeight = defNavi;
-	    	    
-	    mouseFlg = true;
-	}
-}
-
-
-// マウスムーブイベント
-function onMouseMove(evt) {
-
-	// 現在の座標を取得
-	var x = getEventX ( evt ) + document.body.scrollLeft;					// マウス座標 X
-	var y = getEventY ( evt ) + document.body.scrollTop;					// マウス座標 Y
-    var nowleft = getEventX ( evt ) - gDeltaX;	// オブジェクト座標 LEFT
-    var nowtop = getEventY ( evt ) - gDeltaY;	// オブジェクト座標 TOP
-
-    // オブジェクトを移動
-    moveElm ( gDragged, nowleft, nowtop );
-	
-    for ( var i = 0; i < all_elms.length; i++ ) {
-    	// drop_target上にきた場合にのみ処理を行う
-	    if ( isEventOnElm ( evt, all_elms[i].id ) ) {	    
-            if ( all_elms[i].attributes['tid'] ) {
-	            var tid = getAttrValue ( all_elms[i], 'tid' );
-	            
-	            // 背景色の変更 未使用領域は変更しない
-	            all_elms[i].style.background="#ffffdd";
-	            
-				// target_id の書き換え
-		        setAttrValue ( gDragged, 'target_id', tid );
-
-				//objCheckLine.style.top = parseInt(nowtop) + parseInt(gDragged.style.height) / 2 + 'px';
-				//objCheckLine.style.top = y;
-
-				// 配列の再作成
-				fnCreateArr(1, y, x);
-				// 配列の並び替え
-				fnChangeObj(tid);
-		    }
-		}else{
-			if ( all_elms[i].attributes['tid'] && all_elms[i].style.background!="#ffffff") {
-				// 背景色の変更
-				all_elms[i].style.background="#ffffff";
-			}
-		}
-    }
-}
-
-// マウスアップイベント       
-function onMouseUp(evt) {
-	// イベントの関連付け解除
-	if (mouseFlg == true) {
-	    removeEvent ( document, 'mousemove', onMouseMove, false );
-	    removeEvent ( document, 'mouseup', onMouseUp, false );
-	    mouseFlg = false;
-	}
-
-    if ( !isOnDropTarget (evt) ) {
-		// 元の位置に戻す
-        moveElm ( gDragged, gOrgX, gOrgY );
-        setAttrValue ( gDragged, 'target_id', gtarget_id );
-
-		// 配列の再作成
-		fnCreateArr(1, gOrgY, gOrgX);
-    }
+    $(document).ready(function(){
+        var els = ['#MainHead', '#MainFoot', '#LeftNavi', '#RightNavi', '#TopNavi', '#BottomNavi', '#HeadNavi', '#HeaderTopNavi', '#FooterBottomNavi', '#Unused'];
+        var $els = $(els.toString());
+        
+        $els.each(function(){
+            updateUpDown(this);
+        });
+        
+        $els.sortable({
+            items: '> div',
+            //handle: 'dt',
+            cursor: 'move',
+            //cursorAt: { top: 2, left: 2 },
+            //opacity: 0.8,
+            //helper: 'clone',
+            appendTo: 'body',
+            placeholder: 'clone',
+            placeholder: 'placeholder',
+            connectWith: els,
+            start: function(e,ui) {
+                ui.helper.css("width", ui.item.width());
+            },
+            //change: sortableChange,
+            update: sortableUpdate
+        });
+    });
     
-    // hidden要素の書き換え
-	var did = getAttrValue( gDragged, 'did' );
-	var target_id = "target_id_"+did;
-	document.form1[target_id].value = getAttrValue( gDragged, 'target_id' );
-	
-	// 半透明、マウスポインタ、最前面処理を戻す
-    setOpacity( gDragged, 1);
-    setCursor ( gDragged, 'move' );
-    setZindex ( gDragged , 1);
-    
-    // 並び替え
-	fnSortObj();
-	
-	// 背景色を戻す
-	for ( var i = 0; i < all_elms.length; i++ ) {
-    	// drop_target上にきた場合にのみ処理を行う
-	    if ( isEventOnElm ( evt, all_elms[i].id ) && all_elms[i].attributes['tid']) {
-			// 背景色の変更
-			all_elms[i].style.background="#ffffff";
-		}
-    }
-}
-
-// DropTarget上にオブジェクトが来たかを判断する
-function isOnDropTarget ( evt ) {
-   
-    for ( var i=0; i<all_elms.length; i++ ) {
-        if ( isEventOnElm ( evt, all_elms[i].id ) ) {
-            if ( all_elms[i].attributes['tid'] ) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-function isEventOnElm (evt, drop_target_id) {
-
-	if (drop_target_id == '') {
-		return '';
-	}
-
-    var evtX = getEventX(evt) + getPageScrollX();
-    var evtY = getEventY(evt) + getPageScrollY();
-    
-    var drop_target = document.getElementById( drop_target_id );
-
-	drp_left = getX( drop_target );
-	drp_top = getY( drop_target );
-
-    var x = drp_left;
-    var y = drp_top;
-
-	var width = getWidth ( drop_target );
-	var height = getHeight ( drop_target );
-    
-//	alert(evtX +" / "+ x +" / "+ evtY +" / "+ y +" / "+ width +" / "+ height);
-
-    return evtX > x && evtY > y && evtX < x + width && evtY < y + height;
-}
-
-// オブジェクトの並び替えを行う
-function fnSortObj(){
-	fnSetTargetHeight();
-    for ( var cnt = 0; cnt < all_elms.length; cnt++ ) {
-
-		// classが drop_target の場合のみ処理を行う
-        if ( getAttrValue ( all_elms[cnt], 'class' ) == 'drop_target' ) {
-        	var tid = getAttrValue ( all_elms[cnt], 'tid' );
-			
-			// 配列の並び替え
-			fnChangeObj(tid);
-			
-			// 配置
-			fnSetObj( tid, cnt );
-        }
-	}
-}
-
-function alerttest(msg, x, y){
- 	alert(msg);
-}
-
-// 配列の作成
-function fnCreateArr( addEvt , top , left ){
-
-	var arrObjtmp = new Object();
-	arrObjtmp['LeftNavi'] = Array();
-	arrObjtmp['RightNavi'] = Array();
-	arrObjtmp['MainHead'] = Array();
-	arrObjtmp['MainFoot'] = Array();
-	arrObjtmp['Unused'] = Array();
-
-	for ( var i = 1; i < all_elms.length; i++ ) {
-		// classが dragged_elm の場合のみ処理を行う
-		if ( getAttrValue ( all_elms[i], 'class' ) == 'dragged_elm' ) {
-        
-			// マウスダウンイベントと関連付けを行う
-			if (addEvt == 0) {
-	        	addEvent ( all_elms[i], 'mousedown', onMouseDown, false );
-			}
-
-			var target_id = getAttrValue ( all_elms[i], 'target_id' );	
-			var len = arrObjtmp[target_id].length;
-			var did = getAttrValue ( all_elms[i], 'did' );
-			
-			arrObjtmp[target_id][len] = new SC_Size();
-			arrObjtmp[target_id][len].id = did;
-			arrObjtmp[target_id][len].obj = all_elms[i];
-			arrObjtmp[target_id][len].width = getWidth( all_elms[i] );
-			arrObjtmp[target_id][len].height = getHeight( all_elms[i] );
-
-			// ドラッグ中のオブジェクトが存在すれば、そのオブジェクトだけマウスポインタの座標を指定する。
-			if (gDragged != "") {
-				if (did != getAttrValue ( gDragged, 'did' )) {
-					// top は常にオブジェクトの中心を取得するようにする
-					arrObjtmp[target_id][len].top = (parseInt(getY( all_elms[i] )) + arrObjtmp[target_id][len].height / 2 );
-					arrObjtmp[target_id][len].left = getX( all_elms[i] );
-				}else {
-					arrObjtmp[target_id][len].top = top;
-					arrObjtmp[target_id][len].left = left;
-				}
-			} else {
-				// top は常にオブジェクトの中心を取得するようにする
-				arrObjtmp[target_id][len].top = i;
-				arrObjtmp[target_id][len].left = getX( all_elms[i] );
-			}
-		}
-    }
-    
-    arrObj = arrObjtmp;
-}
-
-// 配列の並び替え (バブルソートで並び替えを行う) 
-function fnChangeObj( tid ){
-	for ( var i = 0; i < arrObj[tid].length-1; i++ ) {
-    	for ( var j = arrObj[tid].length-1; j > i; j-- ) {
-			if ( arrObj[tid][j].top < arrObj[tid][i].top ) {
-				var arrTemp = new Array();
-				arrTemp = arrObj[tid][j];
-				arrObj[tid][j] = arrObj[tid][i];
-				arrObj[tid][i] = arrTemp;
-			}
-		}
-	}
-}
-
-// 配置
-function fnSetObj( tid, cnt ){
-	var target_height = 0;
-	
-	drp_left = getX(all_elms[cnt]); //all_elms[cnt].offsetLeft;
-	drp_top = getY(all_elms[cnt]); //all_elms[cnt].offsetTop;
-
-	for ( var j = 0; j < arrObj[tid].length; j++ ) {
-		// 配置する座標の取得
-	    var left = parseInt(drp_left) + parseInt(all_elms[cnt].style.width) / 2 - parseInt(arrObj[tid][j].width) / 2;
-	    if (j == 0){
-	    	var top = drp_top + arrObj[tid][j].margin;
-	    }else{
-	    	var top = arrObj[tid][j-1].top + arrObj[tid][j].margin + arrObj[tid][j-1].height
-	    }
-
-		// 座標を保持
-		arrObj[tid][j].top = top;
-		arrObj[tid][j].left = left;
-
-		// 配置を行う
-		moveElm ( arrObj[tid][j].obj, left ,top);
-
-		// 高さ計算
-		target_height = target_height + arrObj[tid][j].margin + arrObj[tid][j].height;
-
-		// hiddenの値を書き換え
-		var top_id = "top_" + arrObj[tid][j].id;
-		document.form1[top_id].value = top;
-
-	}
-}
-
-// ドロップターゲットの高さ調整
-function fnSetTargetHeight(){
-
-	var NaviHeight = defNavi;
-	var MainHeadHeight = defMainNavi;
-	var MainFootHeight = defMainNavi;
-	var UnusedHeight = defUnused;
-
-	// 高さ計算
-    for ( var cnt = 0; cnt < all_elms.length; cnt++ ) {
-		var target_height = 0;
-    
-		// classが drop_target の場合のみ処理を行う
-        if ( getAttrValue ( all_elms[cnt], 'class' ) == 'drop_target' ) {
-        	var tid = getAttrValue ( all_elms[cnt], 'tid' );
-
-			for ( var j = 0; j < arrObj[tid].length; j++ ) {
-				target_height = target_height + arrObj[tid][j].margin + arrObj[tid][j].height;
-			}
-
-			// 下の幅
-			target_height = target_height + 20;
-
-			// 左右ナビ、未使用領域の高さを保持
-			if (tid == 'LeftNavi' || tid == 'RightNavi' || tid == 'Unused') {
-				if (NaviHeight < target_height) {
-					NaviHeight = target_height;
-				}
-			}
-
-			// メイン上部領域の高さを保持
-			if (tid == 'MainHead') {
-				if (target_height > defMainNavi) {
-					MainHeadHeight = target_height;
-				}
-			}
-
-			// メイン下部領域の高さを保持
-			if (tid == 'MainFoot') {
-				if (target_height > defMainNavi) {
-					MainFootHeight = target_height;
-				}
-			}	
-        }
-	}
-
-	// メイン領域の高さを保持
-//	alert(NaviHeight+"/"+MainHeadHeight+"/"+MainFootHeight);
-	MainHeight = NaviHeight - ( MainHeadHeight + MainFootHeight );
-	if (MainHeight < defMain) {
-		MainHeight = defMain;
-	}
-
-	// メイン部分のほうが大きい場合には左右ナビも大きくする
-	if (NaviHeight < MainHeadHeight + MainFootHeight + MainHeight) {
-		NaviHeight = MainHeadHeight + MainFootHeight + MainHeight;	
-	}
-	// 変更
-    for ( var cnt = 0; cnt < all_elms.length; cnt++ ) {
-    	var target_height = 0;
-
-		// classが drop_target の場合のみ処理を行う
-        if ( getAttrValue ( all_elms[cnt], 'class' ) == 'drop_target' ) {
-        	var tid = getAttrValue ( all_elms[cnt], 'tid' );
-        	
-        	// tidによって処理を分ける
-			if (tid == 'LeftNavi' || tid == 'RightNavi') {
-				target_height = NaviHeight;
-			}else if (tid == 'MainHead' ) {
-				target_height = MainHeadHeight;
-			}else if (tid == 'MainFoot') {
-				target_height = MainFootHeight;
-			}else if (tid == 'Unused'){
-				target_height = NaviHeight+100;
-			}
-
-			all_elms[cnt].style.height = target_height;
-		}
-	}
-	
-	// メインテーブルの高さも変更
-    for (var i = 0; i < all_td.length; i++) {
-    	name = getAttrValue ( all_td[i], 'name' );
-		if (name == 'Main') {
-			all_td[i].height = MainHeight-2;
-		}
-    }
-}
-
-//ウインドウサイズ取得
-function GetWindowSize(type){
-    var ua = navigator.userAgent;       										// ユーザーエージェント
-    var nWidth, nHeight;                  										// サイズ
-    var nHit = ua.indexOf("MSIE");     											// 合致した部分の先頭文字の添え字
-    var bIE = (nHit >=  0);                										// IE かどうか
-    var bVer6 = (bIE && ua.substr(nHit+5, 1) == "6");  							// バージョンが 6 かどうか
-    var bStd = (document.compatMode && document.compatMode=="CSS1Compat");		// 標準モードかどうか
-
-	switch(type){
-		case "width":
-			if(bIE){
-				if (bVer6 && bStd) {
-					return document.documentElement.clientWidth;
-				} else {
-					return document.body.clientWidth;
-				}
-			}else if(document.layers){
-				return(innerWidth);
-			}else{
-				return(-1);
-			}
-		break;
-		case "height":
-			if(bIE){
-				if (bVer6 && bStd) {
-					return document.documentElement.clientHeight;
-				} else {
-					return document.body.clientHeight;
-				}
-				return(document.body.clientHeight);
-			}else if(document.layers){
-				return(innerHeight);
-			}else{
-				return(-1);
-			}
-		break;
-		default:
-			return(-1);
-		break;
-	}
-}
-
-// ウィンドウサイズが変更になったときは全てのオブジェクトも移動する
-function fnMoveObject() {
-
-    // ウィンドウの幅変更比率を取得
-	var moveX = GetWindowSize("width") - scrX;
-	var BlankX = ( GetWindowSize("width") - 878 ) / 2
-	
-	for ( var i = 0; i < all_elms.length; i++) {
-		if (all_elms[i].style.left != "" ) {
-
-			var elm_class = getAttrValue ( all_elms[i], 'class' );
-
-			if (elm_class == 'drop_target') {
-				var tid = getAttrValue ( all_elms[i], 'tid' );
-				
-				if (tid == 'LeftNavi') {
-					LeftMargin = marginLeftNavi;
-				}else if (tid == 'RightNavi') {
-					LeftMargin = marginRightNavi;
-				}else if (tid == 'MainHead' || tid == 'MainFoot') {
-					LeftMargin = marginMain;
-				}else{
-					LeftMargin = marginUnused;
-				}
-
-				if (BlankX > 0) {
-					all_elms[i].style.left = BlankX + LeftMargin + 'px';
-				}else{
-					all_elms[i].style.left = LeftMargin + 'px';
-				}
-			}
-		}
-	}
-	
-	scrX = GetWindowSize("width");
-	scrY = GetWindowSize("height");
-	
-	fnSortObj();
-}
-// 画面のロードイベントに関連付け
-addEvent ( window, 'load', init, false );
+    $(window).bind('load',function(){
+        setTimeout(function(){
+            $('#overlay').fadeOut(function(){
+                $('body').css('overflow', 'auto');
+            });
+        }, 750);
+    });
+})(jQuery);
Index: tmp/version-2_5-test/html/user_data/packages/default/js/file_manager.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/file_manager.js	(revision 16748)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/file_manager.js	(revision 18609)
@@ -158,9 +158,9 @@
 function fnTreeMenu(tName, imgName, path) {
 
-	tMenu = document.all[tName].style;
-
-	if(tMenu.display == 'none') {
+	tMenu = $("#" + tName);
+
+	if(tMenu.css("display") == 'none') {
 		fnChgImg(IMG_MINUS, imgName);
-		tMenu.display = "block";
+		tMenu.show();
 		// 階層の開いた状態を保持
 		arrTreeStatus.push(path);
@@ -168,5 +168,5 @@
 	} else {
 		fnChgImg(IMG_PLUS, imgName);
-		tMenu.display = "none";
+		tMenu.hide();
 		// 閉じ状態を保持
 		fnDelTreeStatus(path);
@@ -225,11 +225,11 @@
 // imgタグの画像変更
 function fnChgImg(fileName,imgName){
-	document.getElementById(imgName).src = fileName;
+	$("#" + imgName).attr("src", fileName);
 }
 
 // ファイル選択
 function fnSelectFile(id, val) {
-	if(old_select_id != '') document.getElementById(old_select_id).style.backgroundColor = '';
-	document.getElementById(id).style.backgroundColor = val;
+	if(old_select_id != '') $("#" + old_select_id).children("td").css("background-color", "#FFFFFF");
+	$("#" + id).children("td").css("background-color", val);
 	old_select_id = id;
 }
@@ -238,5 +238,5 @@
 function fnChangeBgColor(id, val) {
 	if (old_select_id != id) {
-		document.getElementById(id).style.backgroundColor = val;
+		$("#" + id).children("td").css("background-color", val);
 	}
 }
@@ -244,4 +244,4 @@
 // test
 function view_test(id) {
-	document.getElementById(id).value=tree
-}
+	$("#" + id).val(tree)
+}
Index: tmp/version-2_5-test/html/user_data/packages/default/js/ownersstore.js.php
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/js/ownersstore.js.php	(revision 17167)
+++ tmp/version-2_5-test/html/user_data/packages/default/js/ownersstore.js.php	(revision 18609)
@@ -20,5 +20,5 @@
 (function() {
 // オーナーズストア通信スクリプトのパス
-var upgrade_url = '[%URL_DIR%]upgrade/index.php';
+var upgrade_url = '[%URL_DIR%]upgrade/<?php echo DIR_INDEX_URL; ?>';
 
 // ロード中メッセージ(配信サーバと通信中です…)
Index: tmp/version-2_5-test/html/user_data/packages/default/jquery.fancybox/jquery.fancybox-1.2.1.pack.js
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/jquery.fancybox/jquery.fancybox-1.2.1.pack.js	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/jquery.fancybox/jquery.fancybox-1.2.1.pack.js	(revision 18609)
@@ -0,0 +1,9 @@
+/*
+ * FancyBox - simple and fancy jQuery plugin
+ * Examples and documentation at: http://fancy.klade.lv/
+ * Version: 1.2.1 (13/03/2009)
+ * Copyright (c) 2009 Janis Skarnelis
+ * Licensed under the MIT License: http://en.wikipedia.org/wiki/MIT_License
+ * Requires: jQuery v1.3+
+*/
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}(';(7($){$.b.2Q=7(){u B.2t(7(){9 1J=$(B).n(\'2Z\');5(1J.1c(/^3w\\(["\']?(.*\\.2p)["\']?\\)$/i)){1J=3t.$1;$(B).n({\'2Z\':\'45\',\'2o\':"3W:3R.4m.4d(3h=F, 3T="+($(B).n(\'41\')==\'2J-3Z\'?\'4c\':\'3N\')+", Q=\'"+1J+"\')"}).2t(7(){9 1b=$(B).n(\'1b\');5(1b!=\'2e\'&&1b!=\'2n\')$(B).n(\'1b\',\'2n\')})}})};9 A,4,16=D,s=1t 1o,1w,1v=1,1y=/\\.(3A|3Y|2p|3c|3d)(.*)?$/i;9 P=($.2q.3K&&2f($.2q.3z.2k(0,1))<8);$.b.c=7(Y){Y=$.3x({},$.b.c.2R,Y);9 2s=B;7 2h(){A=B;4=Y;2r();u D};7 2r(){5(16)u;5($.1O(4.2c)){4.2c()}4.j=[];4.h=0;5(Y.j.N>0){4.j=Y.j}t{9 O={};5(!A.1H||A.1H==\'\'){9 O={d:A.d,X:A.X};5($(A).1G("1m:1D").N){O.1a=$(A).1G("1m:1D")}4.j.2j(O)}t{9 Z=$(2s).2o("a[1H="+A.1H+"]");9 O={};3C(9 i=0;i<Z.N;i++){O={d:Z[i].d,X:Z[i].X};5($(Z[i]).1G("1m:1D").N){O.1a=$(Z[i]).1G("1m:1D")}4.j.2j(O)}3F(4.j[4.h].d!=A.d){4.h++}}}5(4.23){5(P){$(\'1U, 1Q, 1P\').n(\'1S\',\'3s\')}$("#1i").n(\'25\',4.2U).J()}1d()};7 1d(){$("#1f, #1e, #V, #G").S();9 d=4.j[4.h].d;5(d.1c(/#/)){9 U=11.3r.d.3f(\'#\')[0];U=d.3g(U,\'\');U=U.2k(U.2l(\'#\'));1k(\'<6 l="3e">\'+$(U).o()+\'</6>\',4.1I,4.1x)}t 5(d.1c(1y)){s=1t 1o;s.Q=d;5(s.3a){1K()}t{$.b.c.34();$(s).x().14(\'3b\',7(){$(".I").S();1K()})}}t 5(d.1c("17")||A.3j.2l("17")>=0){1k(\'<17 l="35" 3q="$.b.c.38()" 3o="3n\'+C.T(C.3l()*3m)+\'" 2K="0" 3E="0" Q="\'+d+\'"></17>\',4.1I,4.1x)}t{$.4p(d,7(2m){1k(\'<6 l="3L">\'+2m+\'</6>\',4.1I,4.1x)})}};7 1K(){5(4.30){9 w=$.b.c.1n();9 r=C.1M(C.1M(w[0]-36,s.g)/s.g,C.1M(w[1]-4b,s.f)/s.f);9 g=C.T(r*s.g);9 f=C.T(r*s.f)}t{9 g=s.g;9 f=s.f}1k(\'<1m 48="" l="49" Q="\'+s.Q+\'" />\',g,f)};7 2F(){5((4.j.N-1)>4.h){9 d=4.j[4.h+1].d;5(d.1c(1y)){1A=1t 1o();1A.Q=d}}5(4.h>0){9 d=4.j[4.h-1].d;5(d.1c(1y)){1A=1t 1o();1A.Q=d}}};7 1k(1j,g,f){16=F;9 L=4.2Y;5(P){$("#q")[0].1E.2u("f");$("#q")[0].1E.2u("g")}5(L>0){g+=L*2;f+=L*2;$("#q").n({\'v\':L+\'z\',\'2E\':L+\'z\',\'2i\':L+\'z\',\'y\':L+\'z\',\'g\':\'2B\',\'f\':\'2B\'});5(P){$("#q")[0].1E.2C(\'f\',\'(B.2D.4j - 20)\');$("#q")[0].1E.2C(\'g\',\'(B.2D.3S - 20)\')}}t{$("#q").n({\'v\':0,\'2E\':0,\'2i\':0,\'y\':0,\'g\':\'2z%\',\'f\':\'2z%\'})}5($("#k").1u(":19")&&g==$("#k").g()&&f==$("#k").f()){$("#q").1Z("2N",7(){$("#q").1C().1F($(1j)).21("1s",7(){1g()})});u}9 w=$.b.c.1n();9 2v=(g+36)>w[0]?w[2]:(w[2]+C.T((w[0]-g-36)/2));9 2w=(f+1z)>w[1]?w[3]:(w[3]+C.T((w[1]-f-1z)/2));9 K={\'y\':2v,\'v\':2w,\'g\':g+\'z\',\'f\':f+\'z\'};5($("#k").1u(":19")){$("#q").1Z("1s",7(){$("#q").1C();$("#k").24(K,4.2X,4.2T,7(){$("#q").1F($(1j)).21("1s",7(){1g()})})})}t{5(4.1W>0&&4.j[4.h].1a!==1L){$("#q").1C().1F($(1j));9 M=4.j[4.h].1a;9 15=$.b.c.1R(M);$("#k").n({\'y\':(15.y-18)+\'z\',\'v\':(15.v-18)+\'z\',\'g\':$(M).g(),\'f\':$(M).f()});5(4.1X){K.25=\'J\'}$("#k").24(K,4.1W,4.2W,7(){1g()})}t{$("#q").S().1C().1F($(1j)).J();$("#k").n(K).21("1s",7(){1g()})}}};7 2y(){5(4.h!=0){$("#1e, #2O").x().14("R",7(e){e.2x();4.h--;1d();u D});$("#1e").J()}5(4.h!=(4.j.N-1)){$("#1f, #2M").x().14("R",7(e){e.2x();4.h++;1d();u D});$("#1f").J()}};7 1g(){2y();2F();$(W).1B(7(e){5(e.29==27){$.b.c.1l();$(W).x("1B")}t 5(e.29==37&&4.h!=0){4.h--;1d();$(W).x("1B")}t 5(e.29==39&&4.h!=(4.j.N-1)){4.h++;1d();$(W).x("1B")}});5(4.1r){$(11).14("1N 1T",$.b.c.2g)}t{$("6#k").n("1b","2e")}5(4.2b){$("#22").R($.b.c.1l)}$("#1i, #V").14("R",$.b.c.1l);$("#V").J();5(4.j[4.h].X!==1L&&4.j[4.h].X.N>0){$(\'#G 6\').o(4.j[4.h].X);$(\'#G\').J()}5(4.23&&P){$(\'1U, 1Q, 1P\',$(\'#q\')).n(\'1S\',\'19\')}5($.1O(4.2a)){4.2a()}16=D};u B.x(\'R\').R(2h)};$.b.c.2g=7(){9 m=$.b.c.1n();$("#k").n(\'y\',(($("#k").g()+36)>m[0]?m[2]:m[2]+C.T((m[0]-$("#k").g()-36)/2)));$("#k").n(\'v\',(($("#k").f()+1z)>m[1]?m[3]:m[3]+C.T((m[1]-$("#k").f()-1z)/2)))};$.b.c.1h=7(H,2A){u 2f($.3I(H.3u?H[0]:H,2A,F))||0};$.b.c.1R=7(H){9 m=H.4g();m.v+=$.b.c.1h(H,\'3k\');m.v+=$.b.c.1h(H,\'3J\');m.y+=$.b.c.1h(H,\'3H\');m.y+=$.b.c.1h(H,\'3D\');u m};$.b.c.38=7(){$(".I").S();$("#35").J()};$.b.c.1n=7(){u[$(11).g(),$(11).f(),$(W).3i(),$(W).3p()]};$.b.c.2G=7(){5(!$("#I").1u(\':19\')){33(1w);u}$("#I > 6").n(\'v\',(1v*-40)+\'z\');1v=(1v+1)%12};$.b.c.34=7(){33(1w);9 m=$.b.c.1n();$("#I").n({\'y\':((m[0]-40)/2+m[2]),\'v\':((m[1]-40)/2+m[3])}).J();$("#I").14(\'R\',$.b.c.1l);1w=3Q($.b.c.2G,3X)};$.b.c.1l=7(){16=F;$(s).x();$("#1i, #V").x();5(4.2b){$("#22").x()}$("#V, .I, #1e, #1f, #G").S();5(4.1r){$(11).x("1N 1T")}1q=7(){$("#1i, #k").S();5(4.1r){$(11).x("1N 1T")}5(P){$(\'1U, 1Q, 1P\').n(\'1S\',\'19\')}5($.1O(4.1V)){4.1V()}16=D};5($("#k").1u(":19")!==D){5(4.26>0&&4.j[4.h].1a!==1L){9 M=4.j[4.h].1a;9 15=$.b.c.1R(M);9 K={\'y\':(15.y-18)+\'z\',\'v\':(15.v-18)+\'z\',\'g\':$(M).g(),\'f\':$(M).f()};5(4.1X){K.25=\'S\'}$("#k").31(D,F).24(K,4.26,4.2S,1q)}t{$("#k").31(D,F).1Z("2N",1q)}}t{1q()}u D};$.b.c.2V=7(){9 o=\'\';o+=\'<6 l="1i"></6>\';o+=\'<6 l="22">\';o+=\'<6 p="I" l="I"><6></6></6>\';o+=\'<6 l="k">\';o+=\'<6 l="2I">\';o+=\'<6 l="V"></6>\';o+=\'<6 l="E"><6 p="E 44"></6><6 p="E 43"></6><6 p="E 42"></6><6 p="E 3V"></6><6 p="E 3U"></6><6 p="E 3O"></6><6 p="E 3M"></6><6 p="E 3P"></6></6>\';o+=\'<a d="2P:;" l="1e"><1p p="1Y" l="2O"></1p></a><a d="2P:;" l="1f"><1p p="1Y" l="2M"></1p></a>\';o+=\'<6 l="q"></6>\';o+=\'<6 l="G"></6>\';o+=\'</6>\';o+=\'</6>\';o+=\'</6>\';$(o).2H("46");$(\'<32 4i="0" 4h="0" 4k="0"><2L><13 p="G" l="4l"></13><13 p="G" l="4o"><6></6></13><13 p="G" l="4n"></13></2L></32>\').2H(\'#G\');5(P){$("#2I").47(\'<17 p="4a" 4e="2J" 2K="0"></17>\');$("#V, .E, .G, .1Y").2Q()}};$.b.c.2R={2Y:10,30:F,1X:D,1W:0,26:0,2X:3G,2W:\'28\',2S:\'28\',2T:\'28\',1I:3B,1x:3v,23:F,2U:0.3,2b:F,1r:F,j:[],2c:2d,2a:2d,1V:2d};$(W).3y(7(){$.b.c.2V()})})(4f);',62,274,'||||opts|if|div|function||var||fn|fancybox|href||height|width|itemCurrent||itemArray|fancy_outer|id|pos|css|html|class|fancy_content||imagePreloader|else|return|top||unbind|left|px|elem|this|Math|false|fancy_bg|true|fancy_title|el|fancy_loading|show|itemOpts|pad|orig_item|length|item|isIE|src|click|hide|round|target|fancy_close|document|title|settings|subGroup||window||td|bind|orig_pos|busy|iframe||visible|orig|position|match|_change_item|fancy_left|fancy_right|_finish|getNumeric|fancy_overlay|value|_set_content|close|img|getViewport|Image|span|__cleanup|centerOnScroll|normal|new|is|loadingFrame|loadingTimer|frameHeight|imageRegExp|50|objNext|keydown|empty|first|style|append|children|rel|frameWidth|image|_proceed_image|undefined|min|resize|isFunction|select|object|getPosition|visibility|scroll|embed|callbackOnClose|zoomSpeedIn|zoomOpacity|fancy_ico|fadeOut||fadeIn|fancy_wrap|overlayShow|animate|opacity|zoomSpeedOut||swing|keyCode|callbackOnShow|hideOnContentClick|callbackOnStart|null|absolute|parseInt|scrollBox|_initialize|bottom|push|substr|indexOf|data|relative|filter|png|browser|_start|matchedGroup|each|removeExpression|itemLeft|itemTop|stopPropagation|_set_navigation|100|prop|auto|setExpression|parentNode|right|_preload_neighbor_images|animateLoading|appendTo|fancy_inner|no|frameborder|tr|fancy_right_ico|fast|fancy_left_ico|javascript|fixPNG|defaults|easingOut|easingChange|overlayOpacity|build|easingIn|zoomSpeedChange|padding|backgroundImage|imageScale|stop|table|clearInterval|showLoading|fancy_frame|||showIframe||complete|load|bmp|jpeg|fancy_div|split|replace|enabled|scrollLeft|className|paddingTop|random|1000|fancy_iframe|name|scrollTop|onload|location|hidden|RegExp|jquery|355|url|extend|ready|version|jpg|425|for|borderLeftWidth|hspace|while|300|paddingLeft|curCSS|borderTopWidth|msie|fancy_ajax|fancy_bg_w|scale|fancy_bg_sw|fancy_bg_nw|setInterval|DXImageTransform|clientWidth|sizingMethod|fancy_bg_s|fancy_bg_se|progid|66|gif|repeat||backgroundRepeat|fancy_bg_e|fancy_bg_ne|fancy_bg_n|none|body|prepend|alt|fancy_img|fancy_bigIframe|60|crop|AlphaImageLoader|scrolling|jQuery|offset|cellpadding|cellspacing|clientHeight|border|fancy_title_left|Microsoft|fancy_title_right|fancy_title_main|get'.split('|'),0,{}))
Index: tmp/version-2_5-test/html/user_data/packages/default/jquery.fancybox/jquery.fancybox.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/jquery.fancybox/jquery.fancybox.css	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/jquery.fancybox/jquery.fancybox.css	(revision 18609)
@@ -0,0 +1,315 @@
+html, body {
+	height: 100%;
+}
+
+div#fancy_overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: #666;
+	display: none;
+	z-index: 30;
+}
+
+* html div#fancy_overlay {
+	position: absolute;
+	height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+div#fancy_wrap {
+	text-align: left;
+}
+
+div#fancy_loading {
+	position: absolute;
+	height: 40px;
+	width: 40px;
+	cursor: pointer;
+	display: none;
+	overflow: hidden;
+	background: transparent;
+	z-index: 100;
+}
+
+div#fancy_loading div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 40px;
+	height: 480px;
+	background: transparent url('fancy_progress.png') no-repeat;
+}
+
+div#fancy_loading_overlay {
+	position: absolute;
+	background-color: #FFF;
+	z-index: 30;
+}
+
+div#fancy_loading_icon {
+	position: absolute;
+	background: url('fancy_loading.gif') no-repeat;
+	z-index: 35;
+	width: 16px;
+	height: 16px;
+}
+
+div#fancy_outer {
+	position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 90;
+    padding: 18px 18px 33px 18px;
+    margin: 0;
+    overflow: hidden;
+    background: transparent;
+    display: none;
+}
+
+div#fancy_inner {
+	position: relative;
+	width:100%;
+	height:100%;
+	border: 1px solid #BBB;
+	background: #FFF;
+}
+
+div#fancy_content {
+	margin: 0;
+	z-index: 100;
+	position: absolute;
+}
+
+div#fancy_div {
+	background: #000;
+	color: #FFF;
+	height: 100%;
+	width: 100%;
+	z-index: 100;
+}
+
+img#fancy_img {
+	position: absolute;
+	top: 0;
+	left: 0;
+	border:0; 
+	padding: 0; 
+	margin: 0;
+	z-index: 100;
+	width: 100%;
+	height: 100%;
+}
+
+div#fancy_close {
+	position: absolute;
+	top: -12px;
+	right: -15px;
+	height: 30px;
+	width: 30px;
+	background: url('fancy_closebox.png') top left no-repeat;
+	cursor: pointer;
+	z-index: 181;
+	display: none;
+}
+
+#fancy_frame {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	display: none;
+}
+
+#fancy_ajax {
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+}
+
+a#fancy_left, a#fancy_right {
+	position: absolute; 
+	bottom: 0px; 
+	height: 100%; 
+	width: 35%; 
+	cursor: pointer;
+	z-index: 111; 
+	display: none;
+	background-image: url(data:image/gif;base64,AAAA);
+	outline: none;
+}
+
+a#fancy_left {
+	left: 0px; 
+}
+
+a#fancy_right {
+	right: 0px; 
+}
+
+span.fancy_ico {
+	position: absolute; 
+	top: 50%;
+	margin-top: -15px;
+	width: 30px;
+	height: 30px;
+	z-index: 112; 
+	cursor: pointer;
+	display: block;
+}
+
+span#fancy_left_ico {
+	left: -9999px;
+	background: transparent url('fancy_left.png') no-repeat;
+}
+
+span#fancy_right_ico {
+	right: -9999px;
+	background: transparent url('fancy_right.png') no-repeat;
+}
+
+a#fancy_left:hover {
+  visibility: visible;
+}
+
+a#fancy_right:hover {
+  visibility: visible;
+}
+
+a#fancy_left:hover span {
+	left: 20px; 
+}
+
+a#fancy_right:hover span {
+	right: 20px; 
+}
+
+.fancy_bigIframe {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: transparent;
+}
+
+div#fancy_bg {
+	position: absolute;
+	top: 0; left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 70;
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+	
+div.fancy_bg {
+	position: absolute;
+	display: block;
+	z-index: 70;
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+
+div.fancy_bg_n {
+	top: -18px;
+	width: 100%;
+	height: 18px;
+	background: transparent url('fancy_shadow_n.png') repeat-x;
+}
+
+div.fancy_bg_ne {
+	top: -18px;
+	right: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_ne.png') no-repeat;
+}
+
+div.fancy_bg_e {
+	right: -13px;
+	height: 100%;
+	width: 13px;
+	background: transparent url('fancy_shadow_e.png') repeat-y;
+}
+
+div.fancy_bg_se {
+	bottom: -18px;
+	right: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_se.png') no-repeat;
+}
+
+div.fancy_bg_s {
+	bottom: -18px;
+	width: 100%;
+	height: 18px;
+	background: transparent url('fancy_shadow_s.png') repeat-x;
+}
+
+div.fancy_bg_sw {
+	bottom: -18px;
+	left: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_sw.png') no-repeat;
+}
+
+div.fancy_bg_w {
+	left: -13px;
+	height: 100%;
+	width: 13px;
+	background: transparent url('fancy_shadow_w.png') repeat-y;
+}
+
+div.fancy_bg_nw {
+	top: -18px;
+	left: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_nw.png') no-repeat;
+}
+
+div#fancy_title {
+	position: absolute;
+	bottom: -33px;
+	left: 0;
+	width: 100%;
+	z-index: 100;
+	display: none;
+}
+
+div#fancy_title div {
+	color: #FFF;
+	font: bold 12px Arial;
+	padding-bottom: 3px;
+}
+
+div#fancy_title table {
+	margin: 0 auto;
+}
+
+div#fancy_title table td {
+	padding: 0;
+	vertical-align: middle;
+}
+
+td#fancy_title_left {
+	height: 32px;
+	width: 15px;
+	background: transparent url(fancy_title_left.png) repeat-x;
+}
+
+td#fancy_title_main {
+	height: 32px;
+	background: transparent url(fancy_title_main.png) repeat-x;
+}
+
+td#fancy_title_right {
+	height: 32px;
+	width: 15px;
+	background: transparent url(fancy_title_right.png) repeat-x;
+}
Index: tmp/version-2_5-test/html/user_data/packages/default/css/under.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/under.css	(revision 17104)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/under.css	(revision 18609)
@@ -7,9 +7,4 @@
     width: 580px;
     margin: 15px auto 0 auto;
-}
-
-div#undercolumn h2.title{
-    width: 580px;
-    margin: 0 0 15px 0;
 }
 
Index: tmp/version-2_5-test/html/user_data/packages/default/css/under02.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/under02.css	(revision 17000)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/under02.css	(revision 18609)
@@ -7,9 +7,4 @@
     width: 700px;
     margin: 15px auto 0 auto;
-}
-
-div#under02column h2.title{
-    width: 700px;
-    margin: 0 0 15px 0;
 }
 
@@ -100,5 +95,5 @@
 
 
-/* お届け先指定
+/* お届け先の指定
 ----------------------------------------------- */
 div#under02column_shopping table th {
Index: tmp/version-2_5-test/html/user_data/packages/default/css/admin_file_manager.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/admin_file_manager.css	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/admin_file_manager.css	(revision 18609)
@@ -0,0 +1,38 @@
+#contents-filemanager-tree {
+    float: left;
+    width: 328px;
+    height: 430px;
+}
+#tree{
+    height: 410px;
+    width: 308px;
+    overflow: auto;
+    margin: 0px;
+    background-color : #FFFFFF;
+    border-style: solid;
+    border-color: #C0C0C0;
+    border-width: 1px
+}
+#contents-filemanager-nowdir {
+    margin: 0 0 20px 0;
+}
+#file_view {
+    height: 380px;
+    width: 330px;
+    overflow: auto;
+    background-color : #FFFFFF;
+    border-style: solid;
+    border-color: #C0C0C0;
+    border-width: 1px
+}
+#now_dir {
+    height: 20px;
+    width: 300px;
+    padding-left: 3px;
+    margin: 0 0 10px 0;
+    overflow: hidden;
+    background-color : #FFFFFF;
+    border-style: solid;
+    border-color: #C0C0C0;
+    border-width: 1px
+}
Index: tmp/version-2_5-test/html/user_data/packages/default/css/mypage.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/mypage.css	(revision 18007)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/mypage.css	(revision 18609)
@@ -9,7 +9,14 @@
 }
 
-div#mypagecolumn h2.title{
-    width: 700px;
-    margin: 0 0 15px 0;
+div#mypagecolumn h3 {
+    margin: 0 0 10px 0;
+    border-style: solid;
+    border-width: 0 0 2px 0;
+    border-color: #bbbba4;
+    padding: 5px 0 5px 12px;
+    font-size: 140%;
+    color: #333;
+    background-color: #f1f1ec;
+    letter-spacing: 0.15em;
 }
 
@@ -20,4 +27,5 @@
 div#mycontentsarea {
     width: 510px;
+    float: right;
 }
 
@@ -42,7 +50,4 @@
 }
 
-
-/* 購入履歴一覧/詳細
------------------------------------------------ */
 div#mynavarea {
     float: left;
@@ -50,17 +55,11 @@
 }
 
-div#mynavarea li {
-    display: block;
-    height: 30px;
+div#mynavarea ul.button_like {
+    width: 170px;
 }
 
-div#mycontentsarea {
-    float: right;
-}
 
-div#mycontentsarea h3 {
-    margin: 0 0 10px 0;
-}
-
+/* 購入履歴一覧/詳細
+----------------------------------------------- */
 div#mycontentsarea table th {
     text-align: center;
Index: tmp/version-2_5-test/html/user_data/packages/default/css/products.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/products.css	(revision 18007)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/products.css	(revision 18609)
@@ -15,69 +15,48 @@
 /* ページ送り
 ----------------------------------------------- */
-.pagenumberarea, .pagecondarea {
-    clear: both;
-    width: 560px;
+.pagenumberarea,
+.pagecondarea {
+    clear: both;
+}
+
+/* 背景色(改行対策) */
+.pagenumberarea,
+.pagenumberarea .navi,
+.pagenumberarea .change,
+.pagecondarea {
+    background-color: #f3f3f3;
+}
+
+.pagenumberarea {
+    margin: 1em 0;
+    padding: 1ex 1em;
+}
+
+.pagecondarea {
     margin: 20px 0;
     padding: 10px;
-    background-color: #f3f3f3;
-}
-
-ul.pagenumberarea {
-    height: 2.5ex;
-}
-
-ul.pagecondarea {
     border: 1px solid #CCCCCC;
 }
 
-ul.pagenumberarea li {
-    float: left;
-    width: 32.9%;
-}
-
-ul.pagenumberarea li.left {
-    text-align: left;
-    white-space: nowrap;
-}
-
-ul.pagenumberarea li.center {
+.pagenumberarea .navi {
+    padding-right: 38%;
     text-align: center;
-    white-space: pre;
-}
-
-ul.pagenumberarea li.right {
+}
+
+.pagenumberarea .change {
+    float: right;
     text-align: right;
     white-space: nowrap;
 }
 
-.pagenumberarea .pagenumber{
-    color: #ff0000;
-    font-weight: bold;
-}
-
-p.pagenumberarea .number{
-    font-weight: bold;
-}
-
 /* 商品一覧 */
 
 /* タイトル
 ----------------------------------------------- */
-div#listtitle {
-    width: 580px;
-    margin: 0 0 10px 0;
-    border-top: 2px solid #ff0000;
-    border-left: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    border-bottom: 2px solid #999;
+.product h2.title {
+    border-color: #f00 #ccc;
     background: url("../img/products/title_icon.gif") no-repeat left center;
     background-color: #ffebca;
 }
-
-div#listtitle h2 {
-    padding: 10px 0 10px 30px;
-    font-size: 140%;
-}
-
 
 /* 商品
@@ -116,5 +95,4 @@
 
 div.listrightblock h3 a {
-    font-size: 100%;
     font-weight: bold;
 }
@@ -126,8 +104,4 @@
 div.listrightblock .pricebox {
     float: left;
-}
-
-div.listrightblock .soldout {
-    clear: both;
 }
 
@@ -165,11 +139,9 @@
 div.listrightblock .cartbtn {
     clear: both;
-    text-align: center;
 }
 
 div.listrightblock .cartbtn img {
-    display: block;
     width: 115px;
-    margin: 5px auto 0 auto;
+    margin: 5px 0 0 0;
 }
 
@@ -179,24 +151,10 @@
 }
 
+.product_list .pagenumber{
+    color: #ff0000;
+    font-weight: bold;
+}
+
 /* 商品詳細 */
-
-/* タイトル
------------------------------------------------ */
-div#detailtitle {
-    width: 580px;
-    margin: 0 0 10px 0;
-    border-top: 2px solid #ff0000;
-    border-left: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    border-bottom: 2px solid #999;
-    background: url("../img/products/title_icon.gif") no-repeat left center;
-    background-color: #ffebca;
-}
-
-div#detailtitle h2 {
-    padding: 10px 0 10px 30px;
-    font-size: 140%;
-}
-
 
 /* 商品
@@ -234,9 +192,10 @@
 
 div#detailrightblock dl {
-    padding: 15px 0 0 0;
+    padding: 0;
 }
 
 div#detailrightblock dt {
     font-weight: bold;
+    margin: 15px 0 0 0;
     padding: 0 0 0 15px;
     background: url("../img/common/arrow_gray.gif") no-repeat left center;
@@ -261,4 +220,10 @@
 }
 
+/* 商品共通 */
+
+.cartbtn {
+    text-align: center;
+}
+
 /* サブタイトル
 ----------------------------------------------- */
@@ -270,9 +235,9 @@
 
 div.subarea h3 {
-    width: 560px;
     font-size: 120%;
     margin: 0 0 10px 0;
     padding: 5px 10px;
     background-color: #e4e4e4;
+    clear: both;
 }
 
@@ -321,4 +286,8 @@
 }
 
+.recommend_level {
+    color: #FF0000;
+}
+
 /* トラックバック
 ----------------------------------------------- */
@@ -344,5 +313,5 @@
 }
 
-/* この商品を買った人はこんな商品も買っています
+/* 関連商品
 ----------------------------------------------- */
 div#whoboughtarea {
Index: tmp/version-2_5-test/html/user_data/packages/default/css/main.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/main.css	(revision 18562)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/main.css	(revision 18609)
@@ -5,5 +5,5 @@
 }
 
-table,img,p {
+table,img,p { 
     border: 0;
 }
@@ -48,5 +48,8 @@
     color: #3a75af;
 }
-a:hover {
+a:link:hover {
+    color: #ff6600;
+}
+a[href]:hover { /* 「a:link:hover」の Firefox 向けハック。上と Grouping 構文で統合すると、IE で動作しなくなる。 */
     color: #ff6600;
 }
@@ -57,5 +60,15 @@
     line-height: 150%;
 }
-.price { color: #ff0000; font-weight: bold; }
+.price {
+}
+/* FIXME ポイントがクラス「price」を利用しているようだが、専用のクラスを用意すべき。 */
+.sale_price {
+    color: #ff0000;
+}
+.sale_price .price {
+    font-weight: bold;
+}
+.normal_price {
+}
 .attention { color: #ff0000; }
 .mini { font-size: 90%; }
@@ -64,4 +77,21 @@
     color: #ff0000;
 }
+
+/* 見出し
+----------------------------------------------- */
+h2 {
+    padding: 15px 0 0 0;
+}
+h2.title {
+    margin: 0 0 10px 0;
+    border-style: solid;
+    border-width: 2px 1px;
+    border-color: #999 #ccc;
+    background: url("../img/title/title_icon.gif") no-repeat 7px center;
+    padding: 7px 0 7px 30px;
+    font-size: 140%;
+    color: #000;
+}
+
 /* テーブル共通指定
 ----------------------------------------------- */
@@ -132,5 +162,5 @@
     width: 292px;
     height: 81px;
-    background: url("../img/header/logo.gif");
+    background: url("../img/header/logo.gif") no-repeat;
 }
 div#header em {
@@ -173,15 +203,7 @@
 }
 
-div#leftcolumn h2 {
-    padding: 15px 0 0 0;
-}
-
 div#rightcolumn {
     float: left;
     width: 166px;
-}
-
-div#rightcolumn h2 {
-    padding: 15px 0 0 0;
 }
 
@@ -195,8 +217,4 @@
 }
 
-div#three_maincolumn h2 {
-    padding: 15px 0 0 0;
-}
-
 /* 2カラム設定 */
 div#two_maincolumn {
@@ -206,8 +224,4 @@
 }
 
-div#two_maincolumn h2 {
-    padding: 15px 0 0 0;
-}
-
 /* 1カラム設定 */
 div#one_maincolumn {
@@ -215,4 +229,44 @@
 }
 
+/* 上下のブロックエリア
+----------------------------------------------- */
+div#topcolumn{
+	clear:both;
+	margin:0px;	
+}
+div#bottomcolumn{
+	clear: both;
+	margin:0px;
+}
+
+/* リストをボタンのような外観に
+----------------------------------------------- */
+ul.button_like li {
+    margin: 0;
+    padding: 0;
+}
+ul.button_like li a {
+    display: block;
+    padding: 7px 0 7px 15px;
+    text-decoration: none;
+    border: 1px solid;
+    border-color: #ccc #999 #999 #ccc;
+    background: url("../img/common/button_like_bg.gif") 5px 7px no-repeat;
+    outline: none;
+    margin: 0;
+}
+ul.button_like li a:link,
+ul.button_like li a:visited {
+    color: #000;
+}
+ul.button_like li a:hover,
+ul.button_like li a.selected:link,
+ul.button_like li a.selected:visited {
+    color: #f60;
+}
+ul.button_like li a:active {
+    border-color: #999 #ccc #ccc #999;
+}
+
 /* カゴの中
 ----------------------------------------------- */
@@ -237,4 +291,10 @@
 }
 
+div#cartarea .price {
+    color: #FF0000;
+    font-weight: bold;
+}
+
+
 /* カテゴリー
 ----------------------------------------------- */
@@ -274,9 +334,11 @@
     color: #ff0000;
 }
+
+
 /* ガイドリンク
 ----------------------------------------------- */
-#guidearea {
-    padding: 15px 0 0 0;
-    line-height: 0;
+#guidearea ul.button_like {
+    margin-top: 1em;
+    font-size: 11px;
 }
 
@@ -306,4 +368,5 @@
     border: solid 1px #ccc;
 }
+
 
 /* 検索
@@ -357,4 +420,5 @@
     color: #DD4400;
 }
+
 
 /* バナー
Index: tmp/version-2_5-test/html/user_data/packages/default/css/admin_contents.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/admin_contents.css	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/admin_contents.css	(revision 18609)
@@ -0,0 +1,534 @@
+@charset "utf-8";
+
+* { margin: 0; padding: 0; }
+
+/* 上記による Fierfox 2 崩れ対応 */
+option {
+    margin-right: 0.5em;
+}
+
+html {height: 100%;}
+body {
+    font-size: 80%;
+    font-family:"ＭＳ Ｐゴシック","Hiragino Maru Gothic Pro","ヒラギノ丸ゴ Pro W4",Osaka,sans-serif;
+    background: #FFFFFF;
+    min-width: 800px;
+    height: 100%;
+    line-height: 150%;
+}
+body#popup {
+    min-width: 0px;
+    padding: 10px;
+    height: auto;
+}
+input,select,option,textarea {
+    font-size: 1em;
+}
+img {
+    border: 0;
+}
+h1 {
+    background: url(../img/admin/contents/subtitle_back.gif) 0 0 repeat-y #818287;
+    border-top: 1px solid #666666;
+    height: 30px;
+    line-height: 30px;
+    color: #FFFFFF;
+    font-size: 1.2em;
+    text-indent: 20px;
+}
+h2 {
+    font-size: 1.2em;
+    border-bottom: 3px solid #CCCCCC;
+    margin: 0 0 10px 0;
+    padding: 3px 0;
+    color: #DD7010;
+}
+h3, h4 {font-size: 1em;}
+em {color: #FF0000;font-style: normal;}
+
+table {
+    font-size: 1em;
+    border-collapse: collapse;
+    width: 100%;
+    margin: 0 0 20px;
+}
+th, td {padding: 5px;border:1px solid #CCCCCC;}
+th {background: #f2f1ec;font-weight:normal;text-align:left;}
+
+table.list th { text-align: center; }
+table.list th.left { text-align: left; }
+table.list th.right { text-align: right; }
+table.form th { width: 25%; }
+table.form td { width: 75%; }
+table.form thead th { text-align: center; width: auto; }
+
+#contents ul {margin: 0 0 0 2em;}
+
+/*LINK*/
+a:link { color: #006699; text-decoration: none; }
+a:visited { color: #006699; text-decoration: none; }
+a:hover { color: #f9a406; text-decoration: underline; }
+
+.left { text-align: left; }
+.center { text-align: center; }
+.right { text-align: right; }
+
+.attention { color: #FF0000; }
+
+
+/* ヘッダー
+----------------------------------------------- */
+#header {
+    position: relative;
+    z-index: 9999;
+    width: 100%;
+    height: 50px;
+    margin: 0;
+    padding: 0;
+    background: url(../img/admin/header/header_back.jpg) 0 0 repeat-x;
+}
+#logo {position: absolute; top: 0; left: 0;}
+#header p {
+    color: #FFFFFF;
+    position: absolute;
+    top: 25px;
+    right: 10px;
+    text-align: right;
+}
+#header p span {font-weight:bold;}
+#sites {
+    position: absolute;
+    top: 5px;
+    right: 10px;
+    list-style: none;
+}
+#sites li {float:right;}
+#header p a, #sites a {color: #99CC33;padding: 0 8px;border-left: 1px solid #FFFFFF;}
+#siteswitch {
+    position: absolute;
+    left: 240px;
+    height: 50px;
+    line-height: 50px;
+}
+#siteswitch label { color: #FFFFFF; }
+
+
+/* ヘッダーナビ
+----------------------------------------------- */
+#navi, #navi li {
+    height: 30px;
+    background: url(../img/admin/header/navi_back.jpg) 0 0 repeat-x;
+    z-index:90;
+}
+#navi li, #navi li a, #navi li a span {
+    line-height: 30px;
+    display: block;
+    float: left;
+    white-space: nowrap;
+}
+#navi li {
+    position: relative;
+    border-right: 1px solid #999999;
+    border-left: 1px solid #FFFFFF;
+}
+#navi li a {
+    color: #333355;
+    font-weight: bold;
+    text-decoration: none;
+}
+#navi li a span {padding: 0 8px;}
+#navi li a:hover {background: url(../img/admin/header/navi_on.jpg) left 0 repeat-x;}
+#navi li a:hover span {background: url(../img/admin/header/navi_on_right.jpg) right 0 no-repeat;}
+#navi li.on a {background: url(../img/admin/header/navi_on.jpg) left 0 no-repeat;}
+#navi li.on a span {background: url(../img/admin/header/navi_on_right.jpg) right 0 no-repeat;}
+#navi li.sfhover a {background: url(../img/admin/header/navi_on.jpg) left 0 repeat-x;}
+#navi li.sfhover a span {background: url(../img/admin/header/navi_on_right.jpg) right 0 no-repeat;}
+
+#navi li ul {
+    position: absolute;
+    top: 30px;
+    left: -999em;
+    height: auto;
+    width: 14.4em;
+    font-weight: normal;
+    clear: both;
+    z-index: 100;
+}
+#navi li li, #navi li li a, #navi li li a span {
+    width: 14.4em;
+    height: 2em;
+    line-height: 2em;
+    display: block;
+    background: #DDEEEE;
+    padding: 0;
+}
+#navi li li {border: solid #AAAAAA;border-width: 0 1px 1px;}
+#navi li li a span {text-indent: 8px;}
+#navi li li a:hover { background: #AACCCC; }
+#navi li li a:hover span { background: #AACCCC;}
+#navi li.on li a, #navi li.on li a span, #navi li li.on a, #navi li li.on a span { background: transparent; }
+#navi li.sfhover li a, #navi li.sfhover li a span, #navi li li.sfhover a, #navi li li.sfhover a span { background: transparent; }
+#navi li.sfhover li a:hover, #navi li li.sfhover a:hover { background: #AACCCC; }
+
+#navi li ul ul {
+    margin: -1.75em 0 0 12em;
+}
+#navi li:hover ul ul, #navi li:hover ul ul ul, #navi li.sfhover ul ul, #navi li.sfhover ul ul ul {
+    left: -999em;
+}
+#navi li:hover ul, #navi li li:hover ul, #navi li li li:hover ul,
+#navi li.sfhover ul, #navi li li.sfhover ul, #navi li li li.sfhover ul {
+    left: auto;
+}
+
+
+/*subnavi*/
+.subnavi a{
+    background-color: #818287;
+    width:140px;
+    padding: 6px 5px 4px 5px;
+    color:#ffffff;
+    text-decoration:none;
+    display:block;
+}
+.subnavi a:visited {
+    color:#ffffff;
+    text-decoration:none;
+}
+.subnavi a:hover {
+    background-color: #b7b7b7;
+    color:#000000;
+    text-decoration:none;
+}
+.subnavi_text {
+    font-size: 71%;
+    padding: 0 0 0 8px;
+}
+.subnavi-on a{
+    background-color: #b7b7b7;
+    width:140px;
+    padding: 6px 5px 4px 5px;
+    color:#000000;
+    text-decoration:none;
+    display:block;
+}
+.subnavi-on a:visited {
+    color:#000000;
+    text-decoration:none;
+}
+.subnavi-on a:hover {
+    background-color: #b7b7b7;
+    color:#000000;
+    text-decoration:none;
+}
+.number-on a:visited {
+    color:#ffffff;
+    text-decoration:none;
+}
+.number a:visited {
+    color:#ffffff;
+    text-decoration:none;
+}
+
+#agreement{
+    height: 120px;
+    width: 480px;
+    overflow: auto;
+    margin: 0px;
+    background-color : #FFFFFF;
+    border-style: solid;
+    border-color: #C0C0C0;
+    border-width: 1px
+}
+/* ページャ */
+#contents .pager ul {list-style-type: none;margin: 10px 0;}
+.pager li {display: inline;}
+.pager li a {border: 1px solid #CCCCCC;padding: 3px 5px;}
+.pager li.on a {background: #f2f1ec;border: 1px solid #333333;}
+.pager li a:hover, .pager li.on a:hover {background: #FFF5EE;}
+
+
+/* コンテンツ
+----------------------------------------------- */
+* html div#container{
+    height:100%;
+}
+body > #container {
+    height: auto;
+}
+#container {
+    position: relative;
+    min-height: 100%;
+}
+
+#contents {padding: 20px 20px 8em;}
+
+#footer {
+    position: absolute;
+    bottom: 0px;
+    width: 100%;
+    height: 7em;
+    text-align: right;
+    background: #EEEEEE;
+    border-top: 1px solid #CCCCCC;
+}
+
+/* ログイン
+----------------------------------------------- */
+#login-main {
+    height: 250px;
+    width: 556px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin: -125px 0 0 -278px;
+    padding: 36px 0 0 0;
+    background: url(../img/admin/contents/admin_login_top.jpg) center top no-repeat;
+    color: #FFFFFF;
+}
+#login-main form {
+    width: 556px;
+    height: 172px;
+    background: url(../img/admin/contents/admin_login_back.jpg) center top repeat-x;
+}
+#login-main h1 {
+    background: url(../img/admin/contents/admin_login_logo.jpg) 0 0 no-repeat;
+    border: none;
+    text-indent: -9999em;
+    width: 230px;
+    height: 172px;
+    float:left;
+}
+#login-main #login-form {
+    width: 310px;
+    height: 172px;
+    float: right;
+    background: url(../img/admin/contents/admin_login_right.jpg) right 0 no-repeat;
+}
+#login-main label {display:block;}
+#login-main input {margin-bottom: 10px;}
+#login-main #login-address {
+    clear:both;
+    width: 556px;
+    height: 42px;
+    line-height: 42px;
+    text-align: center;
+    background: url(../img/admin/contents/admin_login_bottom.jpg) center bottom no-repeat;
+}
+
+#login-error {
+    width: 500px;
+    height: 200px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin: -125px 0 0 -278px;
+    padding: 25px 28px;
+    border: 3px solid #666666;
+    text-align:center;
+}
+
+
+/* メインページ
+----------------------------------------------- */
+#home-main {margin-right: 300px;}
+#home-main table {width: 100%;}
+* html #home-main table {width: 99%;}
+
+#home .shop-info {margin: 0 0 20px;}
+#home .shop-info td {text-align:right;width: 60%;}
+
+#home-info {width: 280px;float: right;border-left: 1px solid #CCCCCC;}
+
+.home-info-item {width: 260px;margin: 0 0 15px 20px;font-size: 0.8em;line-height: 1.4em;}
+.home-info-item .body {margin: 5px 0 0 0;}
+.home-info-item .date {background: #DDDDDD;padding: 5px 10px 0px;}
+.home-info-item .title {background: #DDDDDD;padding: 0px 10px 5px;}
+
+
+/* 商品管理
+----------------------------------------------- */
+#products-category-left, #products-rank-left {float:left;width:20em;}
+#products-category-right, #products-rank-right {margin-left: 22em;}
+#products-class-list .action {width: 100px;}
+
+
+/* 受注管理
+----------------------------------------------- */
+/* ステータス管理 */
+#order-status-list th.id {width: 40px;}
+
+
+/* デザイン管理
+----------------------------------------------- */
+/* レイアウト設定 */
+
+.design-layout {
+    table-layout: fixed;
+}
+.design-layout th,
+.design-layout td {
+    vertical-align: top;
+    text-align: center;
+}
+#design-layout-used {
+    width: 525px;
+}
+#design-layout-unused {
+    width: 175px;
+}
+.design-layout #LeftNavi,
+.design-layout #MainHead,
+.design-layout #RightNavi {
+    width: 33.33%;
+}
+.design-layout #TopNavi,
+.design-layout #HeadNavi,
+.design-layout #HeaderTopNavi,
+.design-layout #LeftNavi,
+.design-layout #MainHead,
+.design-layout #MainFoot,
+.design-layout #RightNavi,
+.design-layout #BottomNavi,
+.design-layout #FooterBottomNavi,
+.design-layout #Unused {
+    padding-bottom: 20px;
+    height: 10px; /* IE6応急処置 */
+}
+.design-layout div.sort {
+    border:     1px solid black;
+    background: rgb(195,217,255);
+    color:      #333;
+    padding:    5px 2px;
+    margin:     5px 0;
+    font-size:  10pt;
+    text-align: center;
+}
+.design-layout .anywherecheck {
+    white-space: nowrap;
+}
+.placeholder {
+    border: 1px dashed #AAA;
+    height: 20px;
+}
+
+
+/* フォーム
+----------------------------------------------- */
+div.btn {
+    margin: 0 0 20px 0;
+}
+/*FORM*/
+.box3 { width: 33px; }	/*W3*/
+.box6 { width: 54px; }	/*W6*/
+.box10 { width: 82px; }	/*W10*/
+.box20 { width: 152px; }	/*W20*/
+.box25 { width: 187px; }	/*W25*/
+.box30 { width: 222px; }	/*W30*/
+.box33 { width: 243px; }	/*W33*/
+.box35 { width: 257px; }	/*W35*/
+.box40 { width: 292px; }	/*W40*/
+.box45 { width: 341px; }	/*W45*/
+.box50 { width: 362px; }	/*W50*/
+.box52 { width: 376px; }	/*W52*/
+.box54 { width: 390px; }	/*W54*/
+.box60 { width: 432px; }	/*W60*/
+.box65 { width: 467px; }	/*W65*/
+.box68 { width: 488px; }	/*W68*/
+.box76 { width: 544px; }	/*W76*/
+
+.area40 { width: 302px; height: 134px; }	/*W40×H8*/
+.area45 { width: 337px; height: 290px; }	/*W40×H20*/
+.area46 { width: 337px; height: 134px; }	/*W40×H8*/
+.area50 { width: 372px; height: 82px; }	/*W50?H4*/
+.area55 { width: 407px; height: 82px; }	/*W50?H4*/
+.area59 { width: 432px; height: 134px; }	/*W59×H8*/
+.area60 { width: 433px; height: 134px; }	/*W60?H8*/
+.area61 { width: 433px; height: 82px; }	/*W60?H4*/
+.area65 { width: 444px; height: 290px; }	/*W65×H20*/
+.area70 { width: 512px; height: 186px; }	/*W70?H12*/
+.area75 { width: 547px; height: 186px; }	/*W75?H12*/
+.area80 { width: 572px; height: 134px; }	/*W80×H8*/
+.area90 { width: 650px; height: 420px; }
+.area96 { width: 694px; height: 420px; }	/*W80×H30*/
+.area96_2 { width: 694px; height: 160px; }	/*W80×H10*/
+.area99 { width: 715px; height: 523px; }	/*W99?H40*/
+
+/*COLOR*/
+.red { color: #ff0000; }
+
+/*
+** Markup free clearing
+** Details: http://www.positioniseverything.net/easyclearing.html
+*/
+.clear-block:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+
+.clear-block {
+  display: inline-block;
+}
+
+/* Hides from IE-mac \*/
+* html .clear-block {
+    height: 1%;
+}
+.clear-block {
+    display: block;
+}
+/* End hide from IE-mac */
+
+/* 権限 */
+x-dummy
+,.authority_1 #navi-basis-masterdata
+,.authority_1 #navi-contents-file
+,.authority_1 #navi-design-bloc
+,.authority_1 #navi-design-template
+,.authority_1 #navi-design-add
+,.authority_1 #navi-system
+,.authority_1 #navi-ownersstore
+{
+    /* display: none; --- IE で不具合 */
+    height: 0;
+    width: 0;
+    overflow: hidden;
+    border: none;
+    visibility: hidden;
+}
+
+/* DnD並び替え系の設定 */
+tr.movingHandle td {
+    background-color: #EEE;
+}
+.dragHandle { /* ハンドルの設定 */
+    text-align: center;
+	font-weight: bold;
+	cursor: n-resize;
+}
+.activeHandle { /* アクティブハンドルの設定 */
+    color: #F9A406;
+}
+
+table.layout,
+table.layout th,
+table.layout td {
+    border: none;
+    margin: 0;
+    padding: 0;
+    width: auto;
+    vertical-align: top;
+}
+
+/* ログ表示用 */
+.log td {
+    padding-top: 0;
+    padding-bottom: 0;
+    vertical-align: top;
+}
+.log .date {
+    white-space: nowrap;
+}
Index: tmp/version-2_5-test/html/user_data/packages/default/css/index.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/index.css	(revision 18562)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/index.css	(revision 18609)
@@ -10,5 +10,5 @@
 
 
-/* ニュース
+/* 新着情報
 ----------------------------------------------- */
 div#newsarea {
@@ -34,14 +34,13 @@
 
 
-/* おすすめ
+/* おすすめ商品
 ----------------------------------------------- */
 div#recomendarea {
-    width: 400px;
-    margin: 0 auto;
+    margin: 0 10px;
 }
 
 div.recomendblock {
     clear: both;
-    width: 400px;
+    width: 100%;
     padding: 10px 0;
     overflow: auto;
@@ -49,21 +48,25 @@
 }
 
+div.recomendleft,
+div.recomendright {
+    width: 47.5%;
+}
+
 div.recomendleft {
     float: left;
-    width: 190px;
-    margin: 0 5px 0 0;
-}
-
-div.recomendleft p {
-    margin: 0 0 5px 0;
 }
 
 div.recomendright {
     float: right;
-    width: 190px;
     position: relative;
 }
 
-div.recomendleft img, div.recomendright img {
+div.recomendleft p,
+div.recomendright p {
+    margin: 0 0 5px 0;
+}
+
+div.recomendleft img,
+div.recomendright img {
     display: block;
     float: left;
@@ -71,12 +74,5 @@
 }
 
-div.recomendright p {
-    margin: 0 0 5px 0;
-}
-
-div.recomendleft h3 {
-    font-size: 100%;
-}
-
+div.recomendleft h3,
 div.recomendright h3 {
     font-size: 100%;
Index: tmp/version-2_5-test/html/user_data/packages/default/css/window.css
===================================================================
--- tmp/version-2_5-test/html/user_data/packages/default/css/window.css	(revision 16708)
+++ tmp/version-2_5-test/html/user_data/packages/default/css/window.css	(revision 18609)
@@ -1,27 +1,23 @@
 @charset "utf-8";
 
-
-/* 商品詳細拡大写真
+/* ポップアップウィンドウ
 ----------------------------------------------- */
-div#bigimage {
-    width: 520px;
-    margin: 15px auto 0 auto;
-    background-color: #ffffff;
+div#windowcolumn {
+    margin: 15px 15px 0 15px;
+    background-color: #fff;
+    border-top: 5px solid #ffa85c;
+    border-bottom: 5px solid #ffa85c;
 }
 
-div#bigimage img {
-    padding: 10px;
+/* 商品詳細拡大写真、カート拡大写真
+----------------------------------------------- */
+div#bigimage,
+div#cartimage {
+    margin-top: 15px;
     background-color: #ffffff;
+    text-align: center;
 }
 
-
-/* カート拡大写真
------------------------------------------------ */
-div#cartimage {
-    width: 280px;
-    margin: 15px auto 0 auto;
-    background-color: #ffffff;
-}
-
+div#bigimage img,
 div#cartimage img {
     padding: 10px;
@@ -29,17 +25,7 @@
 }
 
-
-/* お客様の声の書き込み・新しいお届け先の追加・変更
+/* お客様の声の書き込み、新しいお届け先の追加・変更
 ----------------------------------------------- */
-div#windowcolumn {
-    width: 550px;
-    margin: 15px auto 0 auto;
-    background-color: #fff;
-    border-top: 5px solid #ffa85c;
-    border-bottom: 5px solid #ffa85c;
-}
-
 div#windowcolumn h2 {
-    width: 500px;
     margin: 0 0 15px 0;
 }
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/bloc.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/bloc.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/bloc.php	(revision 18609)
@@ -0,0 +1,30 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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.
+ */
+$arrPluginInfo = SC_Utils_Ex::sfLoadPluginInfo(dirname(__FILE__) . '/plugin_info.php');
+require_once $arrPluginInfo['fullpath'] . 'classes/LC_Page_FrontParts_Bloc_Recommend.php';
+
+$objPage = new LC_Page_FrontParts_Bloc_Recommend();
+$objPage->arrPluginInfo = $arrPluginInfo;
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/admin/index.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/admin/index.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/admin/index.php	(revision 18609)
@@ -0,0 +1,32 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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 '../../../../admin/require.php';
+$arrPluginInfo = SC_Utils_Ex::sfLoadPluginInfo('../plugin_info.php');
+require_once $arrPluginInfo['fullpath'] . 'classes/LC_Page_Admin_Plugin_Recommend.php';
+
+$objPage = new LC_Page_Admin_Plugin_Recommend();
+$objPage->arrPluginInfo = $arrPluginInfo;
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/classes/LC_Page_Admin_Plugin_Recommend.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/classes/LC_Page_Admin_Plugin_Recommend.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/classes/LC_Page_Admin_Plugin_Recommend.php	(revision 18609)
@@ -0,0 +1,74 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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_PATH . "pages/LC_Page.php";
+
+/**
+ * こんな商品も買っていますプラグインの管理画面を制御するクラス.
+ *
+ * @package Page
+ * @author Seasoft 塚田将久
+ * @version $Id:$
+ */
+class LC_Page_Admin_Plugin_Recommend extends LC_Page {
+
+    /** プラグイン情報配列 (呼び出し元でセットする) */
+    var $arrPluginInfo;
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+        $this->tpl_mainpage = $this->arrPluginInfo['fullpath'] . 'tpl/admin/index.tpl';
+        $this->tpl_mainno   = 'plugin';
+        $this->tpl_subno    = $this->arrPluginInfo['path'];
+        $this->tpl_subtitle = "プラグイン「{$this->arrPluginInfo['name']}」の設定";
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        // 認証可否の判定
+        SC_Utils_Ex::sfIsSuccess(new SC_Session());
+
+        $objView = new SC_AdminView();
+        $objView->assignobj($this);
+        $objView->display(MAIN_FRAME);
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+}
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/classes/LC_Page_FrontParts_Bloc_Recommend.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/classes/LC_Page_FrontParts_Bloc_Recommend.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/classes/LC_Page_FrontParts_Bloc_Recommend.php	(revision 18609)
@@ -0,0 +1,113 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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_PATH . 'pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php';
+
+/**
+ * こんな商品も買っていますプラグインを制御するクラス
+ *
+ * @package Page
+ * @author Seasoft 塚田将久
+ * @version $Id:$
+ */
+class LC_Page_FrontParts_Bloc_Recommend extends LC_Page_FrontParts_Bloc {
+
+    /** プラグイン情報配列 (呼び出し元でセットする) */
+    var $arrPluginInfo;
+
+    /** 取得する上限数 */
+    var $max = 4;
+
+    var $arrRecommendProducts = array();
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+        $this->tpl_mainpage = $this->arrPluginInfo['fullpath'] . 'tpl/bloc.tpl';
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        $objSubView = new SC_SiteView(false);
+
+        $this->arrRecommendProducts = $this->lfGetRecommendProducts($_REQUEST['product_id']);
+
+        $objSubView->assignobj($this);
+        $objSubView->display($this->tpl_mainpage);
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function lfGetRecommendProducts($product_id) {
+
+        $objQuery = new SC_Query();
+        $cols = '*, (SELECT COUNT(*) FROM dtb_order_detail WHERE product_id = alldtl.product_id) AS cnt';
+        $from = 'vw_products_allclass_detail AS alldtl';
+        $where = <<< __EOS__
+            del_flg = 0
+            AND status = 1
+            AND product_id IN (
+                SELECT product_id
+                FROM
+                    dtb_order_detail
+                    INNER JOIN dtb_order
+                        ON dtb_order_detail.order_id = dtb_order.order_id
+                WHERE 0=0
+                    AND dtb_order.del_flg = 0
+                    AND dtb_order.order_id IN (
+                        SELECT order_id
+                        FROM dtb_order_detail
+                        WHERE 0=0
+                            AND product_id = ?
+                    )
+                    AND dtb_order_detail.product_id <> ?
+            )
+__EOS__;
+        $objQuery->setorder('cnt DESC, RANDOM()');
+        $objQuery->setlimit($this->max);
+        $recommendProducts = $objQuery->select($cols, $from, $where, array($product_id, $product_id));
+
+        return $recommendProducts;
+    }
+}
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/plugin_info.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/plugin_info.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/plugin_info.php	(revision 18609)
@@ -0,0 +1,8 @@
+<?php
+$arrPluginInfo = SC_Utils_Ex::sfMakePluginInfoArray(__FILE__);
+
+$arrPluginInfo['name']      = 'こんな商品も買っています';
+$arrPluginInfo['version']   = ECCUBE_VERSION . ' 付属';
+$arrPluginInfo['auther']    = 'EC-CUBE 標準添付 (サンプル)';
+
+return $arrPluginInfo;
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/sql/install.sql
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/sql/install.sql	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/sql/install.sql	(revision 18609)
@@ -0,0 +1,1 @@
+INSERT INTO dtb_bloc (bloc_name, tpl_path, filename, php_path, del_flg) VALUES ('こんな商品も買っています', 'user_data/plugins/recommend/tpl/bloc.tpl', 'recommend', 'user_data/plugins/recommend/bloc.php', 1);
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/sql/uninstall.sql
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/sql/uninstall.sql	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/sql/uninstall.sql	(revision 18609)
@@ -0,0 +1,2 @@
+DELETE FROM dtb_blocposition WHERE bloc_id = (SELECT bloc_id FROM dtb_bloc WHERE filename = 'recommend');
+DELETE FROM dtb_bloc WHERE filename = 'recommend';
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/tpl/bloc.tpl
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/tpl/bloc.tpl	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/tpl/bloc.tpl	(revision 18609)
@@ -0,0 +1,40 @@
+<!--▼こんな商品も買っています-->
+<!--{foreach from="$arrRecommendProducts" item="arrProduct" name="arrProduct"}-->
+    <!--{if $smarty.foreach.arrProduct.first}-->
+        <div id="undercolumn" class="product product_detail" style="margin-top: 0;"><!--{* FIXME detail.tpl と id 重複 *}-->
+            <div id="whoboughtarea">
+                <h2><img src="<!--{$smarty.const.PLUGIN_URL|escape}--><!--{$arrPluginInfo.path}-->/img/title_recommend.png" width="580" height="30" alt="この商品を買った人はこんな商品も買っています" /></h2>
+                <div class="whoboughtblock">
+    <!--{/if}-->
+
+
+    <!--{if ($smarty.section.cnt.index % 2) == 0}-->
+        <!--{if $arrProduct.product_id}-->
+            <div class="whoboughtleft"><!--{* XXX whoboughtleft は本来左列用なので、動作に不具合があるかもしれない。 *}-->
+                
+                <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrProduct.product_id}-->">
+                    <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProduct.main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProduct.name|escape}-->" /></a>
+
+                <!--{assign var=price02_min value=`$arrProduct.price02_min`}-->
+                <!--{assign var=price02_max value=`$arrProduct.price02_max`}-->
+                <h3><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrProduct.product_id}-->"><!--{$arrProduct.name|escape}--></a></h3>
+
+                <p class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}--><span class="mini">(税込)</span>：<span class="price">
+                    <!--{if $price02_min == $price02_max}-->
+                        <!--{$price02_min|sfPreTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
+                    <!--{else}-->
+                        <!--{$price02_min|sfPreTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->～<!--{$price02_max|sfPreTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
+                    <!--{/if}-->円</span></p>
+                <p class="mini"><!--{$arrProduct.comment|escape|nl2br}--></p>
+            </div>
+        <!--{/if}-->
+    <!--{/if}-->
+
+
+    <!--{if $smarty.foreach.arrProduct.last}-->
+                </div>
+            </div>
+        </div>
+    <!--{/if}-->
+<!--{/foreach}-->
+<!--▲こんな商品も買っています-->
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/tpl/admin/index.tpl
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/tpl/admin/index.tpl	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/tpl/admin/index.tpl	(revision 18609)
@@ -0,0 +1,3 @@
+<div>
+    このプラグインには、設定項目がありません。
+</div>
Index: tmp/version-2_5-test/html/user_data/plugins/recommend/require.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/recommend/require.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/recommend/require.php	(revision 18609)
@@ -0,0 +1,5 @@
+<?php
+/*
+ * EC-CUBE 本体で, このプラグインの関数を使用したい場合は, ここで require する
+ */
+
Index: tmp/version-2_5-test/html/user_data/plugins/plugins.xml
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/plugins.xml	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/plugins.xml	(revision 18609)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<plugins>
+</plugins>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/require.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/require.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/require.php	(revision 18609)
@@ -0,0 +1,6 @@
+<?php
+/*
+ * EC-CUBE 本体で, このプラグインの関数を使用したい場合は, ここで require する
+ */
+require_once(dirname(__FILE__) . '/classes/pages/ga_config.php');
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/admin/index.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/admin/index.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/admin/index.php	(revision 18609)
@@ -0,0 +1,36 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2007 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 '../../../../admin/require.php';
+$arrPluginInfo = SC_Utils_Ex::sfLoadPluginInfo('../plugin_info.php');
+require_once $arrPluginInfo['fullpath'] . 'classes/pages/LC_Page_Admin_GoogleAnalytics.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Admin_GoogleAnalytics();
+$objPage->arrPluginInfo = $arrPluginInfo;
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/LC_Page_Admin_GoogleAnalytics.php	(revision 18609)
@@ -0,0 +1,146 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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_PATH . "pages/LC_Page.php";
+
+/**
+ * Google Analytics プラグインの管理画面を制御するクラス.
+ *
+ * @package Page
+ * @author Kentaro Ohkouchi
+ * @version $Id: LC_Page_Admin_GoogleAnalytics.php 18370 2009-11-06 16:38:52Z Seasoft $
+ */
+class LC_Page_Admin_GoogleAnalytics extends LC_Page {
+
+    /** プラグイン情報配列 (呼び出し元でセットする) */
+    var $arrPluginInfo;
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+        $this->tpl_mainpage = $this->arrPluginInfo['fullpath'] . 'tpl/admin/index.tpl';
+        $this->tpl_mainno   = 'plugin';
+        $this->tpl_subno    = $this->arrPluginInfo['path'];
+        $this->tpl_subtitle = "プラグイン「{$this->arrPluginInfo['name']}」の設定";
+
+        if (empty($_POST["mode"])) {
+            $_POST["mode"] = "";
+        }
+
+        if (empty($_GET["mode"])) {
+            $_GET["mode"] = "";
+        }
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * POST パラメータ "mode" が register の場合は登録処理を行う.
+     * 登録処理の後, 自ページをリロードし, GET パラメータ "mode" を付与する.
+     * 登録に成功し, GET パラメータ "mode" の値が success の場合は
+     * 「登録に成功しました」というメッセージをポップアップで表示する.
+     * 登録に失敗し, GET パラメータ "mode" の値が failure の場合は
+     * 「登録に失敗しました」というメッセージをポップアップで表示する.
+     *
+     * TODO Transaction Token を使用する
+     *
+     * @return void
+     */
+    function process() {
+        // 認証可否の判定
+        SC_Utils_Ex::sfIsSuccess(new SC_Session());
+
+        switch ($_POST["mode"]) {
+        case "register":
+            if ($this->register($_POST['ga_ua'])) {
+                $this->reload(array("mode" => "success"));
+                exit;
+            } else {
+                $this->reload(array("mode" => "failure"));
+                exit;
+            }
+            break;
+
+          default:
+        }
+
+        switch ($_GET["mode"]) {
+        case "success":
+            $this->tpl_onload .= "window.alert('登録に成功しました。');";
+            break;
+
+        case "failure":
+            $this->tpl_onload .= "window.alert('登録に失敗しました。');";
+            break;
+
+          default:
+        }
+
+        $objView = new SC_AdminView();
+        $objView->assignobj($this);
+        $objView->display(MAIN_FRAME);
+    }
+
+    /**
+     * UA の登録を行う.
+     *
+     * classes/pages/ga_config.php を読み込み, ウェブプロパティID の文字列
+     * を定数として書き出す.
+     *
+     * @param string ウェブプロパティID の文字列
+     * @return boolean 登録に成功した場合 true; 失敗した場合 false;
+     */
+    function register($ua) {
+        $data = "<?php\ndefine('GA_UA', '" 
+            . htmlspecialchars($ua, ENT_QUOTES) . "');\n?>\n";
+
+        $configFile = $this->arrPluginInfo['fullpath'] . "classes/pages/ga_config.php";
+        $handle = fopen($configFile, "w");
+        if (!$handle) {
+            return false;
+        }
+        // ファイルの内容を書き出す.
+        if (fwrite($handle, $data) === false) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+}
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/ga_config.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/ga_config.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/ga_config.php	(revision 18609)
@@ -0,0 +1,3 @@
+<?php
+define('GA_UA', '');
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php	(revision 18609)
@@ -0,0 +1,72 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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_PATH . "pages/LC_Page.php";
+
+/**
+ * Google Analytics プラグインを制御するクラス.
+ *
+ * @package Page
+ * @author Kentaro Ohkouchi
+ * @version $Id: LC_Page_FrontParts_Bloc_GoogleAnalytics.php 18370 2009-11-06 16:38:52Z Seasoft $
+ */
+class LC_Page_FrontParts_Bloc_GoogleAnalytics extends LC_Page {
+
+    /** プラグイン情報配列 (呼び出し元でセットする) */
+    var $arrPluginInfo;
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+        $this->tpl_mainpage = $this->arrPluginInfo['fullpath'] . 'tpl/ga.tpl';
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        $objView = new SC_SiteView();
+        $objView->assignobj($this);
+        $objView->display($this->tpl_mainpage);
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+}
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/ga.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/ga.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/ga.php	(revision 18609)
@@ -0,0 +1,36 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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
+$arrPluginInfo = SC_Utils_Ex::sfLoadPluginInfo(dirname(__FILE__) . '/plugin_info.php');
+require_once $arrPluginInfo['fullpath'] . 'classes/pages/LC_Page_FrontParts_Bloc_GoogleAnalytics.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_FrontParts_Bloc_GoogleAnalytics();
+$objPage->arrPluginInfo = $arrPluginInfo;
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/plugin_info.php
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/plugin_info.php	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/plugin_info.php	(revision 18609)
@@ -0,0 +1,8 @@
+<?php
+$arrPluginInfo = SC_Utils_Ex::sfMakePluginInfoArray(__FILE__);
+
+$arrPluginInfo['name']      = 'Google Analytics';
+$arrPluginInfo['version']   = ECCUBE_VERSION . ' 付属';
+$arrPluginInfo['auther']    = 'EC-CUBE 標準添付 (サンプル)';
+
+return $arrPluginInfo;
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/sql/install.sql
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/sql/install.sql	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/sql/install.sql	(revision 18609)
@@ -0,0 +1,1 @@
+INSERT INTO dtb_bloc (bloc_name, tpl_path, filename, php_path, del_flg) VALUES ('Google Analytics', 'user_data/plugins/google_analytics/tpl/ga.tpl', 'google_analytics', 'user_data/plugins/google_analytics/ga.php', 1);
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/sql/uninstall.sql
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/sql/uninstall.sql	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/sql/uninstall.sql	(revision 18609)
@@ -0,0 +1,2 @@
+DELETE FROM dtb_bloc WHERE bloc_name = 'Google Analytics';
+DELETE FROM dtb_blocposition WHERE bloc_id = (SELECT bloc_id FROM dtb_bloc WHERE bloc_name = 'Google Analytics');
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/tpl/ga.tpl
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/tpl/ga.tpl	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/tpl/ga.tpl	(revision 18609)
@@ -0,0 +1,9 @@
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-<!--{$smarty.const.GA_UA}-->");
+pageTracker._trackPageview();
+} catch(err) {}</script>
Index: tmp/version-2_5-test/html/user_data/plugins/google_analytics/tpl/admin/index.tpl
===================================================================
--- tmp/version-2_5-test/html/user_data/plugins/google_analytics/tpl/admin/index.tpl	(revision 18609)
+++ tmp/version-2_5-test/html/user_data/plugins/google_analytics/tpl/admin/index.tpl	(revision 18609)
@@ -0,0 +1,14 @@
+<form method="post" action="index.php">
+    <div id="system" class="contents-main">
+        <table class="list">
+            <tr>
+                <th>ウェブ プロパティ ID</th>
+                <td>UA-<input type="text" name="ga_ua" value="<!--{$smarty.const.GA_UA}-->" /></td>
+            </tr>
+        </table>
+        <div class="btn addnew">
+            <input type="hidden" name="mode" value="register" />
+            <button type="submit"><span>この内容で登録する</span></button>
+        </div>
+    </div>
+</form>
Index: tmp/version-2_5-test/html/.htaccess
===================================================================
--- tmp/version-2_5-test/html/.htaccess	(revision 16447)
+++ tmp/version-2_5-test/html/.htaccess	(revision 18609)
@@ -1,3 +1,3 @@
-#基本はphp_ini.incで設定するが、ini_setで反映されないものはここで設定する
+#基本は SC_Initial.php で設定するが、ini_setで反映されないものはここで設定する
 php_value mbstring.language Japanese
 php_value output_handler mb_output_handler
@@ -12,2 +12,3 @@
 # デフォルトテンプレートの状態で 2M近くになるため
 php_value upload_max_filesize 5M
+#php_value post_max_size 8M
Index: tmp/version-2_5-test/html/mypage/favorite.php
===================================================================
--- tmp/version-2_5-test/html/mypage/favorite.php	(revision 18007)
+++ tmp/version-2_5-test/html/mypage/favorite.php	(revision 18609)
@@ -21,9 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
 // {{{ requires
 require_once("../require.php");
 require_once(CLASS_EX_PATH . "page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php");
+
 // }}}
 // {{{ generate page
+
 $objPage = new LC_Page_Mypage_Favorite_Ex();
 register_shutdown_function(array($objPage, "destroy"));
Index: tmp/version-2_5-test/html/mypage/order.php
===================================================================
--- tmp/version-2_5-test/html/mypage/order.php	(revision 18609)
+++ tmp/version-2_5-test/html/mypage/order.php	(revision 18609)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2007 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("../require.php");
+require_once(CLASS_EX_PATH . "page_extends/mypage/LC_Page_Mypage_Order_Ex.php");
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Mypage_Order_Ex();
+register_shutdown_function(array($objPage, "destroy"));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/mypage/mail_view.php
===================================================================
--- tmp/version-2_5-test/html/mypage/mail_view.php	(revision 18609)
+++ tmp/version-2_5-test/html/mypage/mail_view.php	(revision 18609)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2007 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("../require.php");
+require_once(CLASS_EX_PATH . "page_extends/mypage/LC_Page_Mypage_MailView_Ex.php");
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Mypage_MailView_Ex();
+register_shutdown_function(array($objPage, "destroy"));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/admin/css/install.css
===================================================================
--- tmp/version-2_5-test/html/admin/css/install.css	(revision 16582)
+++ tmp/version-2_5-test/html/admin/css/install.css	(revision 18609)
@@ -20,4 +20,96 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
+@charset "utf-8";
+
+input,select,option,textarea {
+    font-family:"lr oSVbN","Hiragino Maru Gothic Pro","qMmÛS Pro W4",Osaka,sans-serif;
+    font-size: 13px;
+}
+
+
+/*LINK*/
+a:link { color: #006699; text-decoration: none; }
+a:visited { color: #006699; text-decoration: none; }
+a:hover { color: #f9a406; text-decoration: underline; }
+
+
+/*FORM*/
+.box3 { width: 33px; }	/*W3*/
+.box6 { width: 54px; }	/*W6*/
+.box10 { width: 82px; }	/*W10*/
+.box20 { width: 152px; }	/*W20*/
+.box25 { width: 187px; }	/*W25*/
+.box30 { width: 222px; }	/*W30*/
+.box33 { width: 243px; }	/*W33*/
+.box35 { width: 257px; }	/*W35*/
+.box40 { width: 292px; }	/*W40*/
+.box45 { width: 341px; }	/*W45*/
+.box50 { width: 362px; }	/*W50*/
+.box52 { width: 376px; }	/*W52*/
+.box54 { width: 390px; }	/*W54*/
+.box60 { width: 432px; }	/*W60*/
+.box65 { width: 467px; }	/*W65*/
+.box68 { width: 488px; }	/*W68*/
+.box76 { width: 544px; }	/*W76*/
+
+.area40 { width: 302px; height: 134px; }	/*W40~H8*/
+.area45 { width: 337px; height: 290px; }	/*W40~H20*/
+.area46 { width: 337px; height: 134px; }	/*W40~H8*/
+.area50 { width: 372px; height: 82px; }	/*W50?H4*/
+.area55 { width: 407px; height: 82px; }	/*W50?H4*/
+.area59 { width: 432px; height: 134px; }	/*W59~H8*/
+.area60 { width: 433px; height: 134px; }	/*W60?H8*/
+.area61 { width: 433px; height: 82px; }	/*W60?H4*/
+.area65 { width: 444px; height: 290px; }	/*W65~H20*/
+.area70 { width: 512px; height: 186px; }	/*W70?H12*/
+.area75 { width: 547px; height: 186px; }	/*W75?H12*/
+.area80 { width: 572px; height: 134px; }	/*W80~H8*/
+.area90 { width: 650px; height: 420px; }
+.area96 { width: 694px; height: 420px; }	/*W80~H30*/
+.area96_2 { width: 694px; height: 160px; }	/*W80~H10*/
+.area99 { width: 715px; height: 523px; }	/*W99?H40*/
+
+/*COLOR*/
+.ast { color: #cc0000; font-size: 90%; }
+.darkred { color: #cc0000; }
+.gray { color: #b6b7ba; }
+.white { color: #ffffff; }
+.whitest { color: #ffffff; font-weight: bold; }
+.white10 { color: #ffffff; font-size: 62.5%;}
+.red { color: #ff0000; }
+.red10 { color:#ff0000; font-size: 10px; }
+.red12 { color:#cc0000; font-size: 12px; }
+.reselt { color: #ffcc00; font-size: 120%; font-weight: bold; }
+
+
+.infodate {
+    color: #cccccc; font-size: 62.5%; font-weight: bold;
+    padding: 0 0 0 8px;
+}
+
+.infottl {
+    color: #ffffff;
+    font-size: 62.5%;
+    line-height: 150%;
+}
+
+.info {
+    padding: 0 4px;
+    display: block;
+}
+
+.title {
+    padding: 0px 0px 20px 25px;
+    color: #ffffff;
+    font-weight: bold;
+    line-height: 120%;
+}
+
+/*IMG*/
+img {
+    border: 0;
+}
+
 #agreement{
     height: 120px;
Index: tmp/version-2_5-test/html/admin/ownersstore/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/ownersstore/index.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/ownersstore/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php';
 
 // }}}
@@ -32,4 +32,4 @@
 $objPage->init();
 $objPage->process();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 ?>
Index: tmp/version-2_5-test/html/admin/ownersstore/settings.php
===================================================================
--- tmp/version-2_5-test/html/admin/ownersstore/settings.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/ownersstore/settings.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php';
 
 // }}}
@@ -32,4 +32,4 @@
 $objPage->init();
 $objPage->process();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 ?>
Index: tmp/version-2_5-test/html/admin/ownersstore/log.php
===================================================================
--- tmp/version-2_5-test/html/admin/ownersstore/log.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/ownersstore/log.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php';
 
 // }}}
@@ -32,4 +32,4 @@
 $objPage->init();
 $objPage->process();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 ?>
Index: tmp/version-2_5-test/html/admin/contents/csv.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/csv.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/contents/csv.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_CSV_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/campaign_create_tag.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/campaign_create_tag.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/contents/campaign_create_tag.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_CampaignCreateTag_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_CampaignCreateTag_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_CampaignCreateTag_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/recommend_search.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/recommend_search.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/contents/recommend_search.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_RecommendSearch_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/campaign.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/campaign.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/contents/campaign.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_Campaign_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_Campaign_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_Campaign_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/campaign_preview.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/campaign_preview.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/contents/campaign_preview.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_CampaignPreview_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_CampaignPreview_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_CampaignPreview_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/inquiry.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/inquiry.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/contents/inquiry.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_Inquiry_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_Inquiry_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_Inquiry_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/index.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/contents/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/campaign_design.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/campaign_design.php	(revision 18562)
+++ tmp/version-2_5-test/html/admin/contents/campaign_design.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_CampaignDesign_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_CampaignDesign_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_CampaignDesign_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/file_manager.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/file_manager.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/contents/file_manager.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_FileManager_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/file_view.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/file_view.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/contents/file_view.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_FileView_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/recommend.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/recommend.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/contents/recommend.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_Recommend_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/contents/csv_sql.php
===================================================================
--- tmp/version-2_5-test/html/admin/contents/csv_sql.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/contents/csv_sql.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Contents_CsvSql_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/index.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/index.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("./require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/LC_Page_Admin_Ex.php");
+require_once './require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/login.php
===================================================================
--- tmp/version-2_5-test/html/admin/login.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/login.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("./require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/LC_Page_Admin_Login_Ex.php");
+require_once './require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/LC_Page_Admin_Login_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Login_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/plugin/install.php
===================================================================
--- tmp/version-2_5-test/html/admin/plugin/install.php	(revision 18609)
+++ tmp/version-2_5-test/html/admin/plugin/install.php	(revision 18609)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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 '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/plugin/LC_Page_Admin_Plugin_Install_Ex.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Admin_Plugin_Install_Ex();
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/admin/plugin/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/plugin/index.php	(revision 18609)
+++ tmp/version-2_5-test/html/admin/plugin/index.php	(revision 18609)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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 '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/plugin/LC_Page_Admin_Plugin_Ex.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Admin_Plugin_Ex();
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/admin/plugin/uninstall.php
===================================================================
--- tmp/version-2_5-test/html/admin/plugin/uninstall.php	(revision 18609)
+++ tmp/version-2_5-test/html/admin/plugin/uninstall.php	(revision 18609)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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 '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/plugin/LC_Page_Admin_Plugin_Uninstall_Ex.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Admin_Plugin_Uninstall_Ex();
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/admin/load_module_config.php
===================================================================
--- tmp/version-2_5-test/html/admin/load_module_config.php	(revision 16877)
+++ tmp/version-2_5-test/html/admin/load_module_config.php	(revision 18609)
@@ -1,13 +1,7 @@
 <?php
-/**
- * モジュール設定スクリプトをロードする。
- * GETのクエリにmodule_idを渡す。
- *
- * 管理画面から呼び出すことを想定しているので、
- * 認証は外さないこと
- *
+/*
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2008 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -27,4 +21,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
+/**
+ * モジュール設定スクリプトをロードする。
+ * GETのクエリにmodule_idを渡す。
+ *
+ * 管理画面から呼び出すことを想定しているので、
+ * 認証は外さないこと
+ */
+
 require_once 'require.php';
 
Index: tmp/version-2_5-test/html/admin/logout.php
===================================================================
--- tmp/version-2_5-test/html/admin/logout.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/logout.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("./require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/LC_Page_Admin_Logout_Ex.php");
+require_once './require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/LC_Page_Admin_Logout_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Logout_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/index.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/index.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/zip_install.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/zip_install.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/zip_install.php	(revision 18609)
@@ -23,8 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php");
-
-ini_set("max_execution_time", 600);
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php';
 
 // }}}
@@ -32,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_ZipInstall_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/holiday.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/holiday.php	(revision 17143)
+++ tmp/version-2_5-test/html/admin/basis/holiday.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Holiday_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/point.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/point.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/point.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Point_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/payment_input.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/payment_input.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/payment_input.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Input_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Input_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Payment_Input_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/kiyaku.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/kiyaku.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/kiyaku.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Kiyaku_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/payment.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/payment.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/payment.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Payment_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/control.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/control.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/control.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Control_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Control_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Control_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/delivery_input.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/delivery_input.php	(revision 18562)
+++ tmp/version-2_5-test/html/admin/basis/delivery_input.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Input_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Input_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Delivery_Input_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/mail.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/mail.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/mail.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Mail_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/delivery.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/delivery.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/delivery.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Delivery_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/tradelaw.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/tradelaw.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/tradelaw.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Tradelaw_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/basis/seo.php
===================================================================
--- tmp/version-2_5-test/html/admin/basis/seo.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/basis/seo.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Basis_Seo_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/customer/edit.php
===================================================================
--- tmp/version-2_5-test/html/admin/customer/edit.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/customer/edit.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Customer_Edit_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/customer/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/customer/index.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/customer/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Customer_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/require.php
===================================================================
--- tmp/version-2_5-test/html/admin/require.php	(revision 18562)
+++ tmp/version-2_5-test/html/admin/require.php	(revision 18609)
@@ -21,6 +21,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-$admin_require_php_dir = realpath(dirname( __FILE__));
-require_once($admin_require_php_dir . "/../define.php");
-require_once($admin_require_php_dir . "/../" . HTML2DATA_DIR . "require_base.php");
+
+// rtrim は PHP バージョン依存対策
+define('HTML_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
+define('ADMIN_FUNCTION', true);
+
+require_once HTML_PATH . 'handle_error.php';
+require_once HTML_PATH . 'define.php';
+
+require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+
+ob_start();
 ?>
Index: tmp/version-2_5-test/html/admin/products/review_edit.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/review_edit.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/review_edit.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_ReviewEdit_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/index.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/products/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/trackback_edit.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/trackback_edit.php	(revision 18562)
+++ tmp/version-2_5-test/html/admin/products/trackback_edit.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_TrackbackEdit_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_TrackbackEdit_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Products_TrackbackEdit_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/product_rank.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/product_rank.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/product_rank.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_ProductRank_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/upload_csv_category.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/upload_csv_category.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/upload_csv_category.php	(revision 18609)
@@ -21,7 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php';
 
 // }}}
@@ -29,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_UploadCSVCategory_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/category.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/category.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/category.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_Category_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/maker.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/maker.php	(revision 18609)
+++ tmp/version-2_5-test/html/admin/products/maker.php	(revision 18609)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2007 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 '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Admin_Products_Maker_Ex();
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/admin/products/product_select.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/product_select.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/product_select.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_ProductSelect_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/upload_csv.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/upload_csv.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/upload_csv.php	(revision 18609)
@@ -21,7 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php';
 
 // }}}
@@ -29,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_UploadCSV_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/product.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/product.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/products/product.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_Product_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/review.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/review.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/review.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_Review_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/classcategory.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/classcategory.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/classcategory.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_ClassCategory_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/class.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/class.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/class.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_Class_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/product_class.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/product_class.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/products/product_class.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_ProductClass_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/products/trackback.php
===================================================================
--- tmp/version-2_5-test/html/admin/products/trackback.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/products/trackback.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/products/LC_Page_Admin_Products_Trackback_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/products/LC_Page_Admin_Products_Trackback_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Products_Trackback_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/upload.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/upload.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/upload.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_Up_Down_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_Up_Down_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_Up_Down_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/index.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/css.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/css.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/css.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_CSS_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/header.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/header.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/header.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_Header_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/main_edit.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/main_edit.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/main_edit.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_MainEdit_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/template.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/template.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/template.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_Template_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/up_down.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/up_down.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/up_down.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_Up_Down_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_Up_Down_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_Up_Down_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/design/bloc.php
===================================================================
--- tmp/version-2_5-test/html/admin/design/bloc.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/design/bloc.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Design_Bloc_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/order/edit.php
===================================================================
--- tmp/version-2_5-test/html/admin/order/edit.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/order/edit.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Order_Edit_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/order/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/order/index.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/order/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/order/LC_Page_Admin_Order_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/order/LC_Page_Admin_Order_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Order_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/order/pdf.php
===================================================================
--- tmp/version-2_5-test/html/admin/order/pdf.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/order/pdf.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Order_Pdf_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/order/mail_view.php
===================================================================
--- tmp/version-2_5-test/html/admin/order/mail_view.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/order/mail_view.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Order_MailView_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/order/product_select.php
===================================================================
--- tmp/version-2_5-test/html/admin/order/product_select.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/order/product_select.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Order_ProductSelect_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/order/mail.php
===================================================================
--- tmp/version-2_5-test/html/admin/order/mail.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/order/mail.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Order_Mail_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/order/status.php
===================================================================
--- tmp/version-2_5-test/html/admin/order/status.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/order/status.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Order_Status_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/home.php
===================================================================
--- tmp/version-2_5-test/html/admin/home.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/home.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("./require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/LC_Page_Admin_Home_Ex.php");
+require_once './require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/LC_Page_Admin_Home_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_Home_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/mail/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/mail/index.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/mail/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Mail_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/mail/template_input.php
===================================================================
--- tmp/version-2_5-test/html/admin/mail/template_input.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/mail/template_input.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Mail_TemplateInput_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/mail/template.php
===================================================================
--- tmp/version-2_5-test/html/admin/mail/template.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/mail/template.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Mail_Template_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/mail/sendmail.php
===================================================================
--- tmp/version-2_5-test/html/admin/mail/sendmail.php	(revision 18562)
+++ tmp/version-2_5-test/html/admin/mail/sendmail.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Mail_Sendmail_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/mail/history.php
===================================================================
--- tmp/version-2_5-test/html/admin/mail/history.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/mail/history.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Mail_History_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/mail/preview.php
===================================================================
--- tmp/version-2_5-test/html/admin/mail/preview.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/mail/preview.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Mail_Preview_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/total/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/total/index.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/total/index.php	(revision 18609)
@@ -21,7 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/total/LC_Page_Admin_Total_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/total/LC_Page_Admin_Total_Ex.php';
 
 // }}}
@@ -29,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_Total_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/masterdata.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/masterdata.php	(revision 17267)
+++ tmp/version-2_5-test/html/admin/system/masterdata.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_System_Masterdata_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/index.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/index.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/system/index.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_System_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/rank.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/rank.php	(revision 18562)
+++ tmp/version-2_5-test/html/admin/system/rank.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_System_Rank_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/input.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/input.php	(revision 16582)
+++ tmp/version-2_5-test/html/admin/system/input.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_System_Input_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/parameter.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/parameter.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/system/parameter.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_System_Parameter_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/bkup.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/bkup.php	(revision 18007)
+++ tmp/version-2_5-test/html/admin/system/bkup.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_System_Bkup_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/log.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/log.php	(revision 18609)
+++ tmp/version-2_5-test/html/admin/system/log.php	(revision 18609)
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2008 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 '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php';
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Admin_System_Log_Ex();
+register_shutdown_function(array($objPage, 'destroy'));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/admin/system/delete.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/delete.php	(revision 16747)
+++ tmp/version-2_5-test/html/admin/system/delete.php	(revision 18609)
@@ -22,6 +22,6 @@
  */
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php';
 
 // }}}
@@ -29,5 +29,5 @@
 
 $objPage = new LC_Page_Admin_System_Delete_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/admin/system/system.php
===================================================================
--- tmp/version-2_5-test/html/admin/system/system.php	(revision 17325)
+++ tmp/version-2_5-test/html/admin/system/system.php	(revision 18609)
@@ -23,6 +23,6 @@
 
 // {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/admin/system/LC_Page_Admin_System_System_Ex.php");
+require_once '../require.php';
+require_once CLASS_EX_PATH . 'page_extends/admin/system/LC_Page_Admin_System_System_Ex.php';
 
 // }}}
@@ -30,5 +30,5 @@
 
 $objPage = new LC_Page_Admin_System_System_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();
Index: tmp/version-2_5-test/html/require.php
===================================================================
--- tmp/version-2_5-test/html/require.php	(revision 18562)
+++ tmp/version-2_5-test/html/require.php	(revision 18609)
@@ -22,26 +22,16 @@
  */
 
-$require_php_dir = realpath(dirname( __FILE__));
-require_once($require_php_dir . "/define.php");
-require_once($require_php_dir . HTML2DATA_DIR . "require_base.php");
+// rtrim は PHP バージョン依存対策
+define("HTML_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/');
 
-// 携帯端末の場合は mobile 以下へリダイレクトする。
-if (SC_MobileUserAgent::isMobile()) {
-    $url = "";
-    if (SC_Utils_Ex::sfIsHTTPS()) {
-        $url = MOBILE_SSL_URL;
-    } else {
-        $url = MOBILE_SITE_URL;
-    }
+require_once HTML_PATH . 'handle_error.php';
+require_once HTML_PATH . 'define.php';
+define('FRONT_FUNCTION_PC_SITE', true);
+require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
 
-    if (preg_match('|^' . URL_DIR . '(.*)$|', $_SERVER['REQUEST_URI'], $matches)) {
-        $path = $matches[1];
-    } else {
-        $path = '';
-    }
+// 携帯端末の場合、モバイルサイトへリダイレクトする
+SC_MobileUserAgent::sfAutoRedirectMobileSite();
 
-    header("Location: ". SC_Utils_Ex::sfRmDupSlash($url . $path));
-    exit;
-}
-
+// 絵文字変換 (除去) フィルターを組み込む。
+ob_start(array('SC_MobileEmoji', 'handler'));
 ?>
Index: tmp/version-2_5-test/html/install/index.php
===================================================================
--- tmp/version-2_5-test/html/install/index.php	(revision 18562)
+++ tmp/version-2_5-test/html/install/index.php	(revision 18609)
@@ -3,5 +3,5 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2008 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -21,10 +21,17 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-require_once("../require.php");
+// ▼require.php 相当
+// rtrim は PHP バージョン依存対策
+define('HTML_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
+
+require_once HTML_PATH . 'define.php';
+define('INSTALL_FUNCTION', true);
+require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+// ▲require.php 相当
+
 $INSTALL_DIR = realpath(dirname( __FILE__));
-require_once("../" . HTML2DATA_DIR . "module/Request.php");
+require_once(DATA_PATH . "module/Request.php");
 
 define("INSTALL_LOG", "./temp/install.log");
-define("INSTALL_INFO_URL", "http://www.ec-cube.net/install_info/index.php");
 ini_set("max_execution_time", 300);
 
@@ -62,5 +69,7 @@
 $objDBParam->setParam($_POST);
 
-switch($_POST['mode']) {
+$mode = isset($_POST['mode_overwrite']) ? $_POST['mode_overwrite'] : $_POST['mode'];
+
+switch($mode) {
 // ようこそ
 case 'welcome':
@@ -101,4 +110,6 @@
     $objPage->arrErr = lfCheckDBError($objDBParam);
     if(count($objPage->arrErr) == 0) {
+        // 設定ファイルの生成
+        lfMakeConfigFile();
         $objPage = lfDispStep3($objPage);
     } else {
@@ -137,6 +148,4 @@
         $skip = $_POST["db_skip"];
         if ($skip == "on") {
-            // 設定ファイルの生成
-            lfMakeConfigFile();
             $objPage = lfDispComplete($objPage);
             //$objPage = lfDispStep4($objPage);
@@ -195,6 +204,4 @@
 
     if(count($objPage->arrErr) == 0) {
-        // 設定ファイルの生成
-        lfMakeConfigFile();
         $objPage = lfDispStep3($objPage);
         $objPage->tpl_mode = 'step4';
@@ -282,5 +289,4 @@
     $objQuery->query($sql, array($login_id, $login_pass));
 
-    global $GLOBAL_ERR;
     $GLOBAL_ERR = "";
     $objPage = lfDispComplete($objPage);
@@ -306,4 +312,5 @@
     }
     $req->clearPostData();
+
     break;
 case 'return_step0':
@@ -328,4 +335,5 @@
     break;
 }
+
 //フォーム用のパラメータを返す
 $objPage->arrForm = $objWebParam->getFormParamList();
@@ -366,5 +374,5 @@
 }
 
-// STEP0画面の表示(ファイル権限チェック)
+// STEP0画面の表示(チェック)
 function lfDispStep0($objPage) {
     global $objWebParam;
@@ -377,22 +385,21 @@
     $objPage->arrHidden['agreement'] = $_POST['agreement'];
     $objPage->tpl_mainpage = 'step0.tpl';
-    $objPage->tpl_mode = 'step0';
 
     // プログラムで書込みされるファイル・ディレクトリ
     $arrWriteFile = array(
-        ".." . HTML2DATA_DIR . "install.php",
-        "../user_data",
-        "../cp",
-        "../upload",
-        ".." . HTML2DATA_DIR . "cache/",
-        ".." . HTML2DATA_DIR . "class/",
-        ".." . HTML2DATA_DIR . "Smarty/",
-        ".." . HTML2DATA_DIR . "logs/",
-        ".." . HTML2DATA_DIR . "downloads/",
-        ".." . HTML2DATA_DIR . "upload/"
+        DATA_PATH . "install.php",
+        HTML_PATH . "user_data",
+        HTML_PATH . "cp",
+        HTML_PATH . "upload",
+        DATA_PATH . "cache/",
+        DATA_PATH . "class/",
+        DATA_PATH . "Smarty/",
+        DATA_PATH . "logs/",
+        DATA_PATH . "downloads/",
+        DATA_PATH . "upload/",
     );
 
     $mess = "";
-    $err_file = false;
+    $hasErr = false;
     foreach($arrWriteFile as $val) {
         // listdirsの保持データを初期化
@@ -406,5 +413,5 @@
         foreach ($arrDirs as $path) {
             if(file_exists($path)) {
-                $mode = lfGetFileMode($path);
+                $filemode = lfGetFileMode($path);
                 $real_path = realpath($path);
 
@@ -412,6 +419,6 @@
                 if(is_dir($path)) {
                     if(!is_writable($path)) {
-                        $mess.= ">> ×：$real_path($mode) <br>ユーザ書込み権限(777, 707等)を付与して下さい。<br>";
-                        $err_file = true;
+                        $mess.= ">> ×：$real_path($filemode) <br>ユーザ書込み権限(777, 707等)を付与して下さい。<br>";
+                        $hasErr = true;
                     } else {
                         GC_Utils_Ex::gfPrintLog("WRITABLE：".$path, INSTALL_LOG);
@@ -419,6 +426,6 @@
                 } else {
                     if(!is_writable($path)) {
-                        $mess.= ">> ×：$real_path($mode) <br>ユーザ書込み権限(666, 606等)を付与して下さい。<br>";
-                        $err_file = true;
+                        $mess.= ">> ×：$real_path($filemode) <br>ユーザ書込み権限(666, 606等)を付与して下さい。<br>";
+                        $hasErr = true;
                     } else {
                         GC_Utils_Ex::gfPrintLog("WRITABLE：".$path, INSTALL_LOG);
@@ -427,53 +434,59 @@
             } else {
                 $mess.= ">> ×：$path が見つかりません。<br>";
-                $err_file = true;
+                $hasErr = true;
             }
         }
     }
 
-    // 権限エラー等が発生していない場合
-    if(!$err_file) {
+    if (ini_get('safe_mode')) {
+        $mess .= ">> ×：PHPのセーフモードが有効になっています。<br>";
+        $hasErr = true;
+    }
+
+    // 問題点を検出している場合
+    if ($hasErr) {
+        $objPage->tpl_mode = 'return_step0';
+    }
+    // 問題点を検出していない場合
+    else {
+        $objPage->tpl_mode = 'step0';
         umask(0);
-    	$path = "../upload/temp_template";
+        $path = HTML_PATH . "upload/temp_template";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = "../upload/save_image";
+        $path = HTML_PATH . "upload/save_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = "../upload/temp_image";
+        $path = HTML_PATH . "upload/temp_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = "../upload/graph_image";
+        $path = HTML_PATH . "upload/graph_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = "../upload/mobile_image";
+        $path = HTML_PATH . "upload/mobile_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = "../upload/csv";
+        $path = DATA_PATH . "downloads/module";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = ".." . HTML2DATA_DIR . "downloads/module";
+        $path = DATA_PATH . "downloads/update";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = ".." . HTML2DATA_DIR . "downloads/update";
+        $path = DATA_PATH . "upload/csv";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = ".." . HTML2DATA_DIR . "upload/csv";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
         $mess.= ">> ○：アクセス権限は正常です。<br>";
     }
 
     $objPage->mess = $mess;
-    $objPage->err_file = $err_file;
+    $objPage->hasErr = $hasErr;
 
     return $objPage;
@@ -494,24 +507,6 @@
     $objPage->tpl_mode = 'step0_1';
     // ファイルコピー
-    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./user_data/", "../user_data/", $objPage->copy_mess);
-    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./save_image/", "../upload/save_image/", $objPage->copy_mess);
-    return $objPage;
-}
-
-// STEP0_2画面の表示(ファイルのコピー)
-function lfDispStep0_2($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hiddenに入力値を保持
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hiddenに入力値を保持
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_mainpage = 'step0_1.tpl';
-    $objPage->tpl_mode = 'step0_1';
-    // ファイルコピー
-    $objPage->copy_mess =  SC_Utils_Ex::sfCopyDir("./user_data/", "../user_data/", $objPage->copy_mess);
-    $objPage->copy_mess =  SC_Utils_Ex::sfCopyDir("./save_image/", "../upload/save_image/", $objPage->copy_mess);
+    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./user_data/", HTML_PATH . "user_data/", $objPage->copy_mess);
+    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./save_image/", HTML_PATH . "upload/save_image/", $objPage->copy_mess);
     return $objPage;
 }
@@ -613,6 +608,4 @@
     }
     $objPage->tpl_sslurl = $secure_url;
-    //EC-CUBEオフィシャルサイトからのお知らせURL
-    $objPage->install_info_url = INSTALL_INFO_URL;
     return $objPage;
 }
@@ -621,11 +614,4 @@
 function lfInitWebParam($objWebParam) {
     global $objDb;
-
-    if(defined('HTML_PATH')) {
-        $install_dir = HTML_PATH;
-    } else {
-		$install_dir = realpath(dirname( __FILE__) . "/../");
-		$install_dir = rtrim($install_dir, '\\/') . '/';
-    }
 
     if(defined('SITE_URL')) {
@@ -658,5 +644,4 @@
     $objWebParam->addParam("管理者：ログインID", "login_id", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
     $objWebParam->addParam("管理者：パスワード", "login_pass", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
-    $objWebParam->addParam("インストールディレクトリ", "install_dir", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $install_dir);
     $objWebParam->addParam("URL(通常)", "normal_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $normal_url);
     $objWebParam->addParam("URL(セキュア)", "secure_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $secure_url);
@@ -737,5 +722,4 @@
 function lfCheckDBError($objFormParam) {
     global $objPage;
-    global $objDb;
 
     // 入力データを渡す。
@@ -748,5 +732,4 @@
         // 接続確認
         $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
-        define("DB_TYPE", $arrRet['db_type']);
         // Debugモード指定
         $options['debug'] = PEAR_DB_DEBUG;
@@ -754,6 +737,7 @@
         // 接続成功
         if(!PEAR::isError($objDB)) {
+            $dbFactory = SC_DB_DBFactory_Ex::getInstance();
             // データベースバージョン情報の取得
-            $objPage->tpl_db_version = $objDb->sfGetDBVersion($dsn);
+            $objPage->tpl_db_version = $dbFactory->sfGetDBVersion($dsn);
         } else {
             $objErr->arrErr['all'] = ">> " . $objDB->message . "<br>";
@@ -812,12 +796,5 @@
     global $objWebParam;
     global $objDBParam;
-
-    $root_dir = $objWebParam->getValue('install_dir');
-    $root_dir = str_replace("\\", "/", $root_dir);
-    // 語尾に'/'をつける
-    if (!ereg("/$", $root_dir)) {
-		$root_dir = $root_dir . "/";
-    }
-
+    
     $normal_url = $objWebParam->getValue('normal_url');
     // 語尾に'/'をつける
@@ -835,17 +812,9 @@
     $url_dir = ereg_replace("^https?://[a-zA-Z0-9_:~=&\?\.\-]+", "", $normal_url);
 
-    $data_path = SC_Utils_Ex::sfRmDupSlash($root_dir . HTML2DATA_DIR);
-    $data_path = str_replace("\\", "/", realpath($data_path));
-    // 語尾に'/'をつける
-    if (!ereg("/$", $data_path)) {
-		$data_path = $data_path . "/";
-    }
-
-    $filepath = $data_path . "install.php";
+    $filepath = DATA_PATH . "install.php";
 
     $config_data =
     "<?php\n".
     "    define ('ECCUBE_INSTALL', 'ON');\n" .
-    "    define ('HTML_PATH', '" . $root_dir . "');\n" .
     "    define ('SITE_URL', '" . $normal_url . "');\n" .
     "    define ('SSL_URL', '" . $secure_url . "');\n" .
@@ -858,5 +827,4 @@
     "    define ('DB_NAME', '" . $objDBParam->getValue('db_name') . "');\n" .
     "    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
-    "    define ('DATA_PATH', '".$data_path."');\n" .
     "    define ('MOBILE_HTML_PATH', HTML_PATH . 'mobile/');\n" .
     "    define ('MOBILE_SITE_URL', SITE_URL . 'mobile/');\n" .
@@ -869,35 +837,4 @@
         fclose($fp);
     }
-/* install_mobile.incは使用しない用に変更
-
-    // モバイル版の設定ファイル install_mobile.inc を作成する。
-    $filepath = $data_path . "install_mobile.inc";
-
-    $config_data =
-    "<?php\n".
-    "    define ('ECCUBE_INSTALL', 'ON');\n" .
-    "    define ('HTML_PATH', '" . $root_dir . "mobile/');\n" .
-    "    define ('PC_HTML_PATH', '" . $root_dir . "');\n" .
-    "    define ('SITE_URL', '" . $normal_url . "mobile/');\n" .
-    "    define ('PC_SITE_URL', '" . $normal_url . "');\n" .
-    "    define ('SSL_URL', '" . $secure_url . "mobile/');\n" .
-    "    define ('PC_SSL_URL', '" . $secure_url . "');\n" .
-    "    define ('URL_DIR', '" . $url_dir . "mobile/');\n" .
-    "    define ('PC_URL_DIR', '" . $url_dir . "');\n" .
-    "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
-    "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .
-    "    define ('DB_USER', '" . $objDBParam->getValue('db_user') . "');\n" .
-    "    define ('DB_PASSWORD', '" . $objDBParam->getValue('db_password') . "');\n" .
-    "    define ('DB_SERVER', '" . $objDBParam->getValue('db_server') . "');\n" .
-    "    define ('DB_NAME', '" . $objDBParam->getValue('db_name') . "');\n" .
-    "    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
-    "    define ('DATA_PATH', '".$data_path."');\n" .
-    "?>";
-
-    if($fp = fopen($filepath,"w")) {
-        fwrite($fp, $config_data);
-        fclose($fp);
-    }
-*/
 }
 
@@ -1085,8 +1022,8 @@
     $dirs = glob($dir . '/*');
     if (is_array($dirs) && count($dirs) > 0) {
-        foreach ($dirs as $d) $alldirs[] = $d;
-    }
-    if (is_array($dirs)) {
-        foreach ($dirs as $dir) listdirs($dir);
+        foreach ($dirs as $d) {
+            $alldirs[] = $d;
+            listdirs($d);
+        }
     }
     return $alldirs;
@@ -1100,2 +1037,4 @@
     $alldirs = array();
 }
+
+?>
Index: tmp/version-2_5-test/html/install/templates/agreement.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/agreement.tpl	(revision 16582)
+++ tmp/version-2_5-test/html/install/templates/agreement.tpl	(revision 18609)
@@ -37,5 +37,5 @@
 
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <input type="hidden" name="step" value="0">
Index: tmp/version-2_5-test/html/install/templates/complete.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/complete.tpl	(revision 18177)
+++ tmp/version-2_5-test/html/install/templates/complete.tpl	(revision 18609)
@@ -21,5 +21,5 @@
  *}-->
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 
@@ -28,10 +28,10 @@
 <!--{/foreach}-->
 
-<tr><td height="30"></td></tr>
+<tr><td height="80"></td></tr>
 <tr>
     <td align="center" class="fs12">
         <strong>EC CUBE インストールが完了しました。</strong><br>
         <br>
-        <a href="<!--{$tpl_sslurl}-->admin/">管理画面</a>にログインできます。
+        <a href="<!--{$tpl_sslurl}-->admin/<!--{$smarty.const.DIR_INDEX_URL}-->">管理画面</a>にログインできます。
     </td>
 </tr>
@@ -41,5 +41,5 @@
     </td>
 </tr>
-<tr><td height="30"></td></tr>
+<tr><td height="80"></td></tr>
 
 </table>
Index: tmp/version-2_5-test/html/install/templates/step0.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/step0.tpl	(revision 16724)
+++ tmp/version-2_5-test/html/install/templates/step0.tpl	(revision 18609)
@@ -21,5 +21,5 @@
  *}-->
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <input type="hidden" name="step" value="0">
@@ -30,5 +30,5 @@
 
 <tr><td height="30"></td></tr>
-<tr><td align="left" class="fs12st">■アクセス権限のチェック</td></tr>
+<tr><td align="left" class="fs12st">■チェック結果</td></tr>
 <tr>
     <td bgcolor="#cccccc">
@@ -44,10 +44,16 @@
 </table>
 
-<!--{if !$err_file}-->
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<tr><td height="15"></td></tr>
-<tr><td align="left" class="fs12">必要なファイルのコピーを開始します。</td></tr>
+    <tr><td height="15"></td></tr>
+    <tr><td align="left" class="fs12">
+        <!--{if $hasErr}-->
+            <p>[次へ進む] をクリックすると、チェックを再実行します。</p>
+            <div><input type="checkbox" name="mode_overwrite" value="step0" id="mode_overwrite"> <label for="mode_overwrite">問題点を無視して次へ進む (上級者向け)</label></div>
+            <div class="red">※ 問題点を解決せずに無視して進めると、トラブルの原因となる場合があります。</div>
+        <!--{else}-->
+            必要なファイルのコピーを開始します。
+        <!--{/if}-->
+    </td></tr>
 </table>
-<!--{/if}-->
 
 <table width="500" border="0" cellspacing="1" cellpadding="8" summary=" ">
@@ -55,11 +61,6 @@
     <tr>
         <td align="center">
-        <!--{if !$err_file}-->
-        <a href="#" onmouseover="chgImg('../<!--{$default_dir}-->/img/install/back_on.jpg','back')" onmouseout="chgImg('../<!--{$default_dir}-->/img/install/back.jpg','back')" onclick="document.form1['mode'].value='return_welcome';document.form1.submit();" /><img  width="105" src="../<!--{$default_dir}-->/img/install/back.jpg"  height="24" alt="前へ戻る" border="0" name="back"></a>
-        <input type="image" onMouseover="chgImgImageSubmit('../<!--{$default_dir}-->/img/install/next_on.jpg',this)" onMouseout="chgImgImageSubmit('../<!--{$default_dir}-->/img/install/next.jpg',this)" src="../<!--{$default_dir}-->/img/install/next.jpg" width="105" height="24" alt="次へ進む" border="0" name="next">
-        <!--{else}-->
-        <a href="#" onmouseover="chgImg('../<!--{$default_dir}-->/img/install/back_on.jpg','back')" onmouseout="chgImg('../<!--{$default_dir}-->/img/install/back.jpg','back')" onclick="document.form1['mode'].value='return_welcome';document.form1.submit();" /><img  width="105" src="../<!--{$default_dir}-->/img/install/back.jpg"  height="24" alt="前へ戻る" border="0" name="back"></a>
-        <img src="../<!--{$default_dir}-->/img/install/next_off.jpg" width="105" height="24" alt="次へ進む" border="0" name="next">
-        <!--{/if}-->
+            <a href="#" onmouseover="chgImg('../<!--{$default_dir}-->/img/install/back_on.jpg','back')" onmouseout="chgImg('../<!--{$default_dir}-->/img/install/back.jpg','back')" onclick="document.form1['mode'].value='return_welcome';document.form1.submit();" /><img  width="105" src="../<!--{$default_dir}-->/img/install/back.jpg"  height="24" alt="前へ戻る" border="0" name="back"></a>
+            <input type="image" onMouseover="chgImgImageSubmit('../<!--{$default_dir}-->/img/install/next_on.jpg',this)" onMouseout="chgImgImageSubmit('../<!--{$default_dir}-->/img/install/next.jpg',this)" src="../<!--{$default_dir}-->/img/install/next.jpg" width="105" height="24" alt="次へ進む" border="0" name="next">
         </td>
     </tr>
Index: tmp/version-2_5-test/html/install/templates/step0_1.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/step0_1.tpl	(revision 16724)
+++ tmp/version-2_5-test/html/install/templates/step0_1.tpl	(revision 18609)
@@ -39,5 +39,5 @@
 
 <table width="500" border="0" cellspacing="1" cellpadding="8" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <input type="hidden" name="step" value="0">
Index: tmp/version-2_5-test/html/install/templates/welcome.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/welcome.tpl	(revision 16724)
+++ tmp/version-2_5-test/html/install/templates/welcome.tpl	(revision 18609)
@@ -21,5 +21,5 @@
  *}-->
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="./<!--{$smarty.const.DIR_INDEX_URL}-->">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 
Index: tmp/version-2_5-test/html/install/templates/step1.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/step1.tpl	(revision 18007)
+++ tmp/version-2_5-test/html/install/templates/step1.tpl	(revision 18609)
@@ -21,5 +21,5 @@
  *}-->
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <input type="hidden" name="step" value="0">
@@ -53,5 +53,5 @@
         </tr>
         <tr>
-            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：ログインID<span class="red">※</span></span><br/><span class="fs10">半角英数字<!--{$smarty.const.ID_MIN_LEN}-->〜<!--{$smarty.const.ID_MAX_LEN}-->文字</span></td>
+            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：ログインID<span class="red">※</span></span><br/><span class="fs10">半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字</span></td>
             <td bgcolor="#ffffff" width="332">
             <!--{assign var=key value="login_id"}-->
@@ -62,5 +62,5 @@
         </tr>
         <tr>
-            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：パスワード<span class="red">※</span></span><br/><span class="fs10">半角英数字<!--{$smarty.const.ID_MIN_LEN}-->〜<!--{$smarty.const.ID_MAX_LEN}-->文字</span></td>
+            <td bgcolor="#f2f1ec" width="150"><span class="fs12n">管理者：パスワード<span class="red">※</span></span><br/><span class="fs10">半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字</span></td>
             <td bgcolor="#ffffff" width="332">
             <!--{assign var=key value="login_pass"}-->
@@ -78,12 +78,4 @@
     <td bgcolor="#cccccc">
     <table width="500" border="0" cellspacing="1" cellpadding="8" summary=" ">
-        <tr>
-            <td bgcolor="#f2f1ec" width="150" class="fs12n">HTMLパス<span class="red">※</span></td>
-            <td bgcolor="#ffffff" width="332" class="fs12">
-            <!--{assign var=key value="install_dir"}-->
-            <span class="red"><!--{$arrErr[$key]}--></span>
-            <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box40" />
-            </td>
-        </tr>
         <tr>
             <td bgcolor="#f2f1ec" width="150" class="fs12n">URL(通常)<span class="red">※</span></td>
Index: tmp/version-2_5-test/html/install/templates/step2.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/step2.tpl	(revision 16724)
+++ tmp/version-2_5-test/html/install/templates/step2.tpl	(revision 18609)
@@ -35,5 +35,5 @@
 </script>
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <input type="hidden" name="step" value="0">
Index: tmp/version-2_5-test/html/install/templates/step3.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/step3.tpl	(revision 16724)
+++ tmp/version-2_5-test/html/install/templates/step3.tpl	(revision 18609)
@@ -40,5 +40,5 @@
 
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <input type="hidden" name="step" value="0">
Index: tmp/version-2_5-test/html/install/templates/step4.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/step4.tpl	(revision 16724)
+++ tmp/version-2_5-test/html/install/templates/step4.tpl	(revision 18609)
@@ -21,5 +21,5 @@
  *}-->
 <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
-<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <input type="hidden" name="step" value="0">
Index: tmp/version-2_5-test/html/install/templates/install_frame.tpl
===================================================================
--- tmp/version-2_5-test/html/install/templates/install_frame.tpl	(revision 18177)
+++ tmp/version-2_5-test/html/install/templates/install_frame.tpl	(revision 18609)
@@ -22,13 +22,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+<!--{assign var=default_dir value="`$smarty.const.USER_DIR``$smarty.const.USER_PACKAGE_DIR``$smarty.const.DEFAULT_TEMPLATE_NAME`/"}-->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->">
 <meta http-equiv="content-script-type" content="text/javascript">
 <meta http-equiv="content-style-type" content="text/css">
-<link rel="stylesheet" href="../admin/css/contents.css" type="text/css" >
 <link rel="stylesheet" href="../admin/css/install.css" type="text/css" >
-<!--{assign var=default_dir value=`$smarty.const.USER_DIR``$smarty.const.USER_PACKAGE_DIR``$smarty.const.DEFAULT_TEMPLATE_NAME`}-->
-<script type="text/javascript" src="../<!--{$default_dir}-->/js/css.js"></script>
-<script type="text/javascript" src="../<!--{$default_dir}-->/js/navi.js"></script>
+<script type="text/javascript" src="../<!--{$default_dir}-->js/css.js"></script>
+<script type="text/javascript" src="../<!--{$default_dir}-->js/navi.js"></script>
 <title>EC CUBE インストール画面</title>
 </head>
@@ -36,5 +35,5 @@
 <body bgcolor="#ffffff" text="#000000" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 <noscript>
-<link rel="stylesheet" href="../<!--{$default_dir}-->/css/common.css" type="text/css" >
+<link rel="stylesheet" href="../<!--{$default_dir}-->css/common.css" type="text/css" >
 </noscript>
 <div align="center">
@@ -44,14 +43,14 @@
 <table width="912" border="0" cellspacing="0" cellpadding="0" summary=" ">
     <tr valign="top">
-        <td><img src="../<!--{$default_dir}-->/img/header/header_left.jpg" width="17" height="50" alt=""></td>
+        <td><img src="../<!--{$default_dir}-->img/header/header_left.jpg" width="17" height="50" alt=""></td>
         <td>
-        <table width="878" border="0" cellspacing="0" cellpadding="0" summary=" " background="../<!--{$default_dir}-->/img/header/header_bg2.jpg">
+        <table width="878" border="0" cellspacing="0" cellpadding="0" summary=" " background="../<!--{$default_dir}-->img/header/header_bg2.jpg">
             <tr valign="top">
-                <td><img src="../<!--{$default_dir}-->/img/admin/header/logo.jpg" width="230" height="50" alt="EC CUBE" border="0"></td>
+                <td><img src="../<!--{$default_dir}-->img/admin/header/logo.jpg" width="230" height="50" alt="EC CUBE" border="0"></td>
                 <td width="648" align="right"></td>
             </tr>
         </table>
         </td>
-        <td><img src="../<!--{$default_dir}-->/img/header/header_right.jpg" width="17" height="50" alt=""></td>
+        <td><img src="../<!--{$default_dir}-->img/header/header_right.jpg" width="17" height="50" alt=""></td>
     </tr>
 </table>
@@ -61,5 +60,5 @@
 <table width="912" border="0" cellspacing="0" cellpadding="0" summary=" ">
     <tr valign="top">
-        <td background="../<!--{$default_dir}-->/img/common/left_bg.jpg"><img src="../<!--{$default_dir}-->/img/common/left.jpg" width="17" height="443" alt=""></td>
+        <td background="../<!--{$default_dir}-->img/common/left_bg.jpg"><img src="../<!--{$default_dir}-->img/common/left.jpg" width="17" height="443" alt=""></td>
         <td>
         <!--★★メインコンテンツ★★-->
@@ -70,8 +69,8 @@
                     <tr><td height="40"></td></tr>
                     <tr>
-                        <td colspan="3"><img src="../<!--{$default_dir}-->/img/contents/error_top.jpg" width="562" height="14" alt=""></td>
+                        <td colspan="3"><img src="../<!--{$default_dir}-->img/contents/error_top.jpg" width="562" height="14" alt=""></td>
                     </tr>
                     <tr>
-                        <td background="../<!--{$default_dir}-->/img/contents/main_left.jpg"><img src="../<!--{$default_dir}-->/img/common/_.gif" width="14" height="1" alt=""></td>
+                        <td background="../<!--{$default_dir}-->img/contents/main_left.jpg"><img src="../<!--{$default_dir}-->img/common/_.gif" width="14" height="1" alt=""></td>
                         <td bgcolor="#cccccc">
                         <!--検索条件設定テーブルここから-->
@@ -85,23 +84,11 @@
                         <!--検索条件設定テーブルここまで-->
                         </td>
-                        <td background="../<!--{$default_dir}-->/img/contents/main_right.jpg"><img src="../<!--{$default_dir}-->/img/common/_.gif" width="14" height="1" alt=""></td>
+                        <td background="../<!--{$default_dir}-->img/contents/main_right.jpg"><img src="../<!--{$default_dir}-->img/common/_.gif" width="14" height="1" alt=""></td>
                     </tr>
                     <tr>
-                        <td colspan="3"><img src="../<!--{$default_dir}-->/img/contents/error_bottom.jpg" width="562" height="14" alt=""></td>
+                        <td colspan="3"><img src="../<!--{$default_dir}-->img/contents/error_bottom.jpg" width="562" height="14" alt=""></td>
                     </tr>
                     <tr><td height="40"></td></tr>
                 </table>
-                <!--{if strlen($install_info_url) != 0}-->
-                <table width="562" border="0" cellspacing="0" cellpadding="0" summary=" ">
-                    <tr>
-                        <td align="center">
-                            <iframe src="<!--{$install_info_url}-->" width="562" height="460" frameborder="no" scrolling="no">
-                                                         こちらはEC-CUBEからのお知らせです。この部分は iframe対応ブラウザでご覧下さい。
-                            </iframe>
-                        </td>
-                    </tr>
-                    <tr><td height="20"></td></tr>
-                </table>
-                <!--{/if}-->
                 </td>
             </tr>
@@ -109,5 +96,5 @@
         <!--★★メインコンテンツ★★-->
         </td>
-        <td background="../<!--{$default_dir}-->/img/common/right_bg.jpg"><div align="justify"><img src="../<!--{$default_dir}-->/img/common/right.jpg" width="17" height="443" alt=""></div></td>
+        <td background="../<!--{$default_dir}-->img/common/right_bg.jpg"><div align="justify"><img src="../<!--{$default_dir}-->img/common/right.jpg" width="17" height="443" alt=""></div></td>
     </tr>
 </table>
@@ -117,5 +104,5 @@
 <table width="912" border="0" cellspacing="0" cellpadding="0" summary=" ">
     <tr valign="top">
-        <td background="../<!--{$default_dir}-->/img/common/left_bg.jpg"><img src="../<!--{$default_dir}-->/img/common/_.gif" width="17" height="1" alt=""></td>
+        <td background="../<!--{$default_dir}-->img/common/left_bg.jpg"><img src="../<!--{$default_dir}-->img/common/_.gif" width="17" height="1" alt=""></td>
         <td bgcolor="#636469">
         <table width="878" border="0" cellspacing="0" cellpadding="0" summary=" ">
@@ -124,5 +111,5 @@
                 <table width="840" border="0" cellspacing="0" cellpadding="0" summary=" ">
                     <tr>
-                        <td height="45" align="right"><a href="#top"><img src="../<!--{$default_dir}-->/img/admin/common/pagetop.gif" width="105" height="17" alt="GO TO PAGE TOP" border="0"></a></td>
+                        <td height="45" align="right"><a href="#top"><img src="../<!--{$default_dir}-->img/admin/common/pagetop.gif" width="105" height="17" alt="GO TO PAGE TOP" border="0"></a></td>
                     </tr>
                 </table>
@@ -136,8 +123,8 @@
         </table>
         </td>
-        <td background="../<!--{$default_dir}-->/img/common/right_bg.jpg"><img src="../<!--{$default_dir}-->/img/common/_.gif" width="17" height="1" alt=""></td>
+        <td background="../<!--{$default_dir}-->img/common/right_bg.jpg"><img src="../<!--{$default_dir}-->img/common/_.gif" width="17" height="1" alt=""></td>
     </tr>
     <tr>
-        <td colspan="3"><img src="../<!--{$default_dir}-->/img/common/fotter.jpg" width="912" height="19" alt=""></td>
+        <td colspan="3"><img src="../<!--{$default_dir}-->img/common/fotter.jpg" width="912" height="19" alt=""></td>
     </tr>
     <tr><td height="10"></td></tr>
Index: tmp/version-2_5-test/html/install/sql/column_comment.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/column_comment.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/column_comment.sql	(revision 18609)
@@ -96,5 +96,5 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mailmaga_template','template_id','テンプレートID');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mailmaga_template','subject','件名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mailmaga_template','charge_image','担当者の写真');
+INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mailmaga_template','charge_image','メール担当写真');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mailmaga_template','mail_method','1:テキストメール 2:HTMLメール 3:HTMLTEMPLATE');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mailmaga_template','header','ヘッダーテキスト');
@@ -143,5 +143,4 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','deliv_fee','商品送料');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','sale_limit','購入制限数');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','sale_unlimited','購入制限（1:購入制限無し)');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','category_id','商品カテゴリー');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','rank','表示ランク');
@@ -155,5 +154,4 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','comment5','コメント5');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','comment6','コメント6');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','note','備考欄(SHOP専用)');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','file1','アップロードファイル1');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','file2','アップロードファイル2');
@@ -204,6 +202,6 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','stock_unlimited','在庫制限（1:無制限)');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','sale_limit','販売制限');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','price01','価格');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','price02','商品価格');
+INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','price01','通常価格');
+INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','price02','販売価格');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','status','状態（表示:1、非表示:2）');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products_class','creator_id','作成者ID');
@@ -314,5 +312,5 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_news','update_date','更新日時');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_news','del_flg ','0:既定、1:削除');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','best_id','注文番号');
+INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','best_id','注文ID');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','category_id','カテゴリID');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','rank','順位');
@@ -536,5 +534,5 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','classcategory_name2','規格名2');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','price','価格');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','quantity','個数');
+INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','quantity','数量');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','point_rate','ポイント付与率');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('mtb_pref','pref_id','都道府県ID');
Index: tmp/version-2_5-test/html/install/sql/create_table_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/create_table_mysql.sql	(revision 18007)
+++ tmp/version-2_5-test/html/install/sql/create_table_mysql.sql	(revision 18609)
@@ -1,5 +1,5 @@
 create table dtb_module_update_logs(
-    log_id int auto_increment primary key NOT NULL,
-    module_id int not null,
+    log_id int auto_increment NOT NULL,
+    module_id int NOT NULL,
     buckup_path text,
     error_flg smallint DEFAULT 0,
@@ -7,24 +7,26 @@
     ok text,
     create_date datetime NOT NULL,
-    update_date datetime NOT NULL
-) TYPE=InnoDB ;
+    update_date datetime NOT NULL,
+    PRIMARY KEY (log_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_ownersstore_settings (
     public_key text
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_kiyaku (
-    kiyaku_id int auto_increment primary key NOT NULL,
+    kiyaku_id int auto_increment NOT NULL,
     kiyaku_title text NOT NULL,
     kiyaku_text text NOT NULL,
     rank int NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
+    create_date datetime NOT NULL,
     update_date datetime NOT NULL,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (kiyaku_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_holiday (
-    holiday_id int auto_increment primary key NOT NULL,
+    holiday_id int auto_increment NOT NULL,
     title text NOT NULL,
     month smallint NOT NULL,
@@ -34,6 +36,7 @@
     create_date datetime NOT NULL,
     update_date datetime NOT NULL,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (holiday_id)
+) TYPE=InnoDB;
 
 CREATE TABLE mtb_zip (
@@ -53,5 +56,5 @@
     flg5 text,
     flg6 text
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_bat_order_daily_age (
@@ -64,8 +67,8 @@
     order_date datetime,
     create_date datetime NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_update (
-    module_id int NOT NULL UNIQUE,
+    module_id int NOT NULL,
     module_name text NOT NULL,
     now_version text,
@@ -78,8 +81,9 @@
     other_files text,
     del_flg smallint NOT NULL DEFAULT 0,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    release_date datetime NOT NULL
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    release_date datetime NOT NULL,
+    PRIMARY KEY (module_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_baseinfo (
@@ -123,6 +127,6 @@
     law_term09 text,
     law_term10 text,
-    tax numeric DEFAULT 5,
-    tax_rule smallint DEFAULT 1,
+    tax numeric NOT NULL DEFAULT 5,
+    tax_rule smallint NOT NULL DEFAULT 1,
     email01 text,
     email02 text,
@@ -133,6 +137,6 @@
     shop_name text,
     shop_kana text,
-    point_rate numeric,
-    welcome_point numeric,
+    point_rate numeric NOT NULL DEFAULT 0,
+    welcome_point numeric NOT NULL DEFAULT 0,
     update_date datetime,
     top_tpl text,
@@ -143,8 +147,8 @@
     message text,
     regular_holiday_ids text
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_deliv (
-    deliv_id int auto_increment primary key NOT NULL,
+    deliv_id int auto_increment NOT NULL,
     name text,
     service_name text,
@@ -154,23 +158,26 @@
     del_flg smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    PRIMARY KEY (deliv_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_delivtime (
     deliv_id int NOT NULL,
-    time_id int auto_increment primary key NOT NULL,
-    deliv_time text NOT NULL
-) TYPE=InnoDB ;
+    time_id int NOT NULL,
+    deliv_time text NOT NULL,
+    PRIMARY KEY (deliv_id, time_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_delivfee (
     deliv_id int NOT NULL,
-    fee_id int auto_increment primary key NOT NULL,
+    fee_id int auto_increment NOT NULL,
     fee text NOT NULL,
-    pref smallint
-) TYPE=InnoDB ;
+    pref smallint,
+    PRIMARY KEY (fee_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_payment (
-    payment_id int auto_increment primary key NOT NULL,
+    payment_id int auto_increment NOT NULL,
     payment_method text,
     charge numeric,
@@ -183,12 +190,12 @@
     del_flg smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
+    create_date datetime NOT NULL,
     update_date datetime,
     payment_image text,
     upper_rule numeric,
-    charge_flg int2 DEFAULT 1,
+    charge_flg smallint DEFAULT 1,
     rule_min numeric,
     upper_rule_max numeric,
-    module_id int4,
+    module_id int,
     module_path text,
     memo01 text,
@@ -201,6 +208,7 @@
     memo08 text,
     memo09 text,
-    memo10 text
-) TYPE=InnoDB ;
+    memo10 text,
+    PRIMARY KEY (payment_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_mailtemplate (
@@ -211,10 +219,10 @@
     creator_id int NOT NULL,
     del_flg smallint NOT NULL DEFAULT 0,
-    create_date datetime NOT NULL ,
+    create_date datetime NOT NULL,
     update_date datetime NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_mailmaga_template (
-    template_id int auto_increment primary key NOT NULL UNIQUE,
+    template_id int auto_increment NOT NULL,
     subject text,
     charge_image text,
@@ -241,10 +249,11 @@
     del_flg smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    PRIMARY KEY (template_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_send_history (
-    send_id int auto_increment primary key NOT NULL,
+    send_id int auto_increment NOT NULL,
     mail_method smallint,
     subject text,
@@ -257,7 +266,8 @@
     del_flg smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime NOT NULL
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL,
+    PRIMARY KEY (send_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_send_customer (
@@ -267,13 +277,13 @@
     name text,
     send_flag smallint
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_products (
-    product_id int auto_increment primary key NOT NULL UNIQUE,
+    product_id int auto_increment NOT NULL,
     name text,
     deliv_fee numeric,
     sale_limit numeric,
-    sale_unlimited smallint DEFAULT 0,
     category_id int,
+    maker_id int,
     rank int,
     status smallint NOT NULL DEFAULT 2,
@@ -324,11 +334,12 @@
     del_flg smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    deliv_date_id int
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    deliv_date_id int,
+    PRIMARY KEY (product_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_products_class (
-    product_class_id int auto_increment primary key NOT NULL UNIQUE,
+    product_class_id int auto_increment NOT NULL,
     product_id int NOT NULL,
     classcategory_id1 int NOT NULL DEFAULT 0,
@@ -336,5 +347,5 @@
     product_code text,
     stock numeric,
-    stock_unlimited smallint DEFAULT 0,
+    stock_unlimited smallint NOT NULL DEFAULT 0,
     sale_limit numeric,
     price01 numeric,
@@ -342,22 +353,24 @@
     status smallint,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    PRIMARY KEY (product_class_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_class (
-    class_id int auto_increment primary key NOT NULL,
+    class_id int auto_increment NOT NULL,
     name text,
     status smallint,
     rank int,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0,
-    product_id int
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    del_flg smallint NOT NULL DEFAULT 0,
+    product_id int,
+    PRIMARY KEY (class_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_classcategory (
-    classcategory_id int auto_increment primary key NOT NULL,
+    classcategory_id int auto_increment NOT NULL,
     name text,
     class_id int NOT NULL,
@@ -365,11 +378,12 @@
     rank int,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (classcategory_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_category (
-    category_id int auto_increment primary key NOT NULL,
+    category_id int auto_increment NOT NULL,
     category_name text,
     parent_category_id int NOT NULL DEFAULT 0,
@@ -377,13 +391,14 @@
     rank int,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (category_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_product_categories (
-    product_id int4 NOT NULL,
-    category_id int4 NOT NULL,
-    rank int4,
+    product_id int NOT NULL,
+    category_id int NOT NULL,
+    rank int NOT NULL,
     PRIMARY KEY(product_id, category_id)
 ) TYPE=InnoDB;
@@ -401,6 +416,6 @@
     total numeric NOT NULL DEFAULT 0,
     total_average numeric NOT NULL DEFAULT 0,
-    order_date datetime NOT NULL ,
-    create_date datetime NOT NULL ,
+    order_date datetime NOT NULL,
+    create_date datetime NOT NULL,
     year smallint NOT NULL,
     month smallint NOT NULL,
@@ -411,5 +426,5 @@
     key_year text NOT NULL,
     key_wday text NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_bat_order_daily_hour (
@@ -426,7 +441,7 @@
     total_average numeric NOT NULL DEFAULT 0,
     hour smallint NOT NULL DEFAULT 0,
-    order_date datetime ,
+    order_date datetime,
     create_date datetime NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_recommend_products (
@@ -437,10 +452,10 @@
     status smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
+    create_date datetime NOT NULL,
     update_date datetime NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_review (
-    review_id int auto_increment primary key NOT NULL,
+    review_id int auto_increment NOT NULL,
     product_id int NOT NULL,
     reviewer_name text NOT NULL,
@@ -455,6 +470,14 @@
     create_date datetime,
     update_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (review_id)
+) TYPE=InnoDB;
+
+CREATE TABLE dtb_customer_reading (
+    reading_product_id int NOT NULL,
+    customer_id int NOT NULL,
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_customer_favorite_products (
@@ -463,12 +486,5 @@
     create_date datetime NOT NULL,
     update_date datetime NOT NULL
-) TYPE=InnoDB ;
-
-CREATE TABLE dtb_customer_reading (
-    reading_product_id int NOT NULL,
-    customer_id int NOT NULL,
-    create_date datetime NOT NULL,
-    update_date datetime NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_category_count (
@@ -476,5 +492,5 @@
     product_count int NOT NULL,
     create_date datetime NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_category_total_count (
@@ -482,8 +498,8 @@
     product_count int,
     create_date datetime NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_news (
-    news_id int auto_increment primary key NOT NULL UNIQUE,
+    news_id int auto_increment NOT NULL,
     news_date datetime,
     rank int,
@@ -494,11 +510,12 @@
     link_method text,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (news_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_best_products (
-    best_id int auto_increment primary key NOT NULL,
+    best_id int auto_increment NOT NULL,
     category_id int NOT NULL,
     rank int NOT NULL DEFAULT 0,
@@ -507,11 +524,12 @@
     comment text,
     creator_id int NOT NULL,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (best_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_mail_history (
-    send_id int auto_increment primary key  NOT NULL,
+    send_id int auto_increment NOT NULL,
     order_id int NOT NULL,
     send_date datetime,
@@ -519,9 +537,10 @@
     creator_id int NOT NULL,
     subject text,
-    mail_body text
-) TYPE=InnoDB ;
+    mail_body text,
+    PRIMARY KEY (send_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_customer (
-    customer_id int auto_increment primary key  NOT NULL,
+    customer_id int auto_increment NOT NULL,
     name01 text NOT NULL,
     name02 text NOT NULL,
@@ -555,13 +574,14 @@
     note text,
     status smallint NOT NULL DEFAULT 1,
-    create_date datetime NOT NULL ,
-    update_date datetime ,
-    del_flg  smallint NOT NULL DEFAULT 0,
+    create_date datetime NOT NULL,
+    update_date datetime,
+    del_flg smallint NOT NULL DEFAULT 0,
     cell01 text,
     cell02 text,
     cell03 text,
     mobile_phone_id text,
-    mailmaga_flg smallint
-) TYPE=InnoDB ;
+    mailmaga_flg smallint,
+    PRIMARY KEY (customer_id)
+) TYPE=InnoDB;
 
 CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id(64));
@@ -570,12 +590,13 @@
     email varchar(50) NOT NULL UNIQUE,
     mail_flag smallint,
-    temp_id varchar(50) NOT NULL UNIQUE,
+    temp_id varchar(50) NOT NULL,
     end_flag smallint,
-    update_date datetime NOT NULL ,
-    create_data datetime NOT NULL
-) TYPE=InnoDB ;
+    update_date datetime NOT NULL,
+    create_data datetime NOT NULL,
+    PRIMARY KEY (temp_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_order (
-    order_id int auto_increment primary key NOT NULL,
+    order_id int auto_increment NOT NULL,
     order_temp_id text,
     customer_id int NOT NULL,
@@ -594,5 +615,5 @@
     order_zip01 text,
     order_zip02 text,
-    order_pref text,
+    order_pref smallint,
     order_addr01 text,
     order_addr02 text,
@@ -612,5 +633,5 @@
     deliv_zip01 text,
     deliv_zip02 text,
-    deliv_pref text,
+    deliv_pref smallint,
     deliv_addr01 text,
     deliv_addr02 text,
@@ -633,5 +654,5 @@
     note text,
     status smallint,
-    create_date datetime NOT NULL ,
+    create_date datetime NOT NULL,
     loan_result text,
     credit_result text,
@@ -639,5 +660,5 @@
     update_date datetime,
     commit_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0,
+    del_flg smallint NOT NULL DEFAULT 0,
     deliv_date text,
     conveni_data text,
@@ -655,6 +676,7 @@
     memo09 text,
     memo10 text,
-    campaign_id int
-) TYPE=InnoDB ;
+    campaign_id int,
+    PRIMARY KEY (order_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_order_temp (
@@ -675,5 +697,5 @@
     order_zip01 text,
     order_zip02 text,
-    order_pref text,
+    order_pref smallint,
     order_addr01 text,
     order_addr02 text,
@@ -693,5 +715,5 @@
     deliv_zip01 text,
     deliv_zip02 text,
-    deliv_pref text,
+    deliv_pref smallint,
     deliv_addr01 text,
     deliv_addr02 text,
@@ -720,7 +742,7 @@
     credit_result text,
     credit_msg text,
-    create_date datetime NOT NULL ,
-    update_date datetime,
-    del_flg  smallint NOT NULL DEFAULT 0,
+    create_date datetime NOT NULL,
+    update_date datetime,
+    del_flg smallint NOT NULL DEFAULT 0,
     deliv_date text,
     conveni_data text,
@@ -728,5 +750,5 @@
     cell02 text,
     cell03 text,
-    order_id int4,
+    order_id int,
     memo01 text,
     memo02 text,
@@ -740,8 +762,8 @@
     memo10 text,
     session text
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_other_deliv (
-    other_deliv_id int auto_increment primary key NOT NULL,
+    other_deliv_id int auto_increment NOT NULL,
     customer_id int NOT NULL,
     name01 text,
@@ -751,11 +773,12 @@
     zip01 text,
     zip02 text,
-    pref text,
+    pref smallint,
     addr01 text,
     addr02 text,
     tel01 text,
     tel02 text,
-    tel03 text
-) TYPE=InnoDB ;
+    tel03 text,
+    PRIMARY KEY (other_deliv_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_order_detail (
@@ -771,14 +794,15 @@
     quantity numeric,
     point_rate numeric
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE mtb_pref (
     pref_id smallint NOT NULL,
     pref_name text,
-    rank smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    rank smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (pref_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_member (
-    member_id int auto_increment primary key NOT NULL,
+    member_id int auto_increment NOT NULL,
     name text,
     department text,
@@ -791,18 +815,20 @@
     creator_id int NOT NULL,
     update_date datetime,
-    create_date datetime NOT NULL ,
-    login_date datetime
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    login_date datetime,
+    PRIMARY KEY (member_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_question (
-    question_id int auto_increment primary key NOT NULL,
+    question_id int auto_increment NOT NULL,
     question_name text,
     question text,
-    create_date datetime NOT NULL ,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (question_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_question_result (
-    result_id int auto_increment primary key NOT NULL,
+    result_id int auto_increment NOT NULL,
     question_id int NOT NULL,
     question_date datetime,
@@ -827,7 +853,8 @@
     question05 text,
     question06 text,
-    create_date datetime NOT NULL ,
-    del_flg  smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (result_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_bat_relate_products (
@@ -836,8 +863,8 @@
     customer_id int,
     create_date datetime
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_campaign (
-    campaign_id int auto_increment primary key NOT NULL,
+    campaign_id int auto_increment NOT NULL,
     campaign_name text,
     campaign_point_rate numeric NOT NULL,
@@ -846,14 +873,15 @@
     end_date datetime NOT NULL,
     directory_name text NOT NULL,
-    limit_count int4 NOT NULL DEFAULT 0,
-    total_count int4 NOT NULL DEFAULT 0,
-    orverlapping_flg int2 NOT NULL DEFAULT 0,
-    cart_flg int2 NOT NULL DEFAULT 0,
-    deliv_free_flg int2 NOT NULL DEFAULT 0,
+    limit_count int NOT NULL DEFAULT 0,
+    total_count int NOT NULL DEFAULT 0,
+    orverlapping_flg smallint NOT NULL DEFAULT 0,
+    cart_flg smallint NOT NULL DEFAULT 0,
+    deliv_free_flg smallint NOT NULL DEFAULT 0,
     search_condition text,
     del_flg smallint NOT NULL DEFAULT 0,
     create_date datetime NOT NULL,
-    update_date datetime NOT NULL
-) TYPE=InnoDB ;
+    update_date datetime NOT NULL,
+    PRIMARY KEY (campaign_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_campaign_detail (
@@ -861,8 +889,8 @@
     product_id int NOT NULL,
     campaign_point_rate numeric NOT NULL
-) TYPE=InnoDB ;
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_pagelayout (
-    page_id int auto_increment primary key NOT NULL,
+    page_id int auto_increment NOT NULL,
     page_name text,
     url text NOT NULL,
@@ -877,18 +905,20 @@
     keyword text,
     update_url text,
-    create_date datetime NOT NULL ,
-    update_date datetime NOT NULL
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL,
+    PRIMARY KEY (page_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_bloc (
-    bloc_id int auto_increment primary key NOT NULL,
+    bloc_id int auto_increment NOT NULL,
     bloc_name text,
     tpl_path text,
     filename varchar(50) NOT NULL UNIQUE,
-    create_date datetime NOT NULL ,
-    update_date datetime NOT NULL ,
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL,
     php_path text,
-    del_flg smallint NOT NULL DEFAULT 0
-) TYPE=InnoDB ;
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (bloc_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_blocposition (
@@ -897,9 +927,10 @@
     bloc_id int,
     bloc_row int,
-    filename text
-) TYPE=InnoDB ;
+    filename text,
+    anywhere int DEFAULT 0 NOT NULL
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_csv (
-    no int auto_increment primary key,
+    no int auto_increment,
     csv_id int NOT NULL,
     col text,
@@ -907,18 +938,20 @@
     rank int,
     status smallint NOT NULL DEFAULT 1,
-    create_date datetime NOT NULL ,
-    update_date datetime NOT NULL
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL,
+    PRIMARY KEY (no)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_csv_sql (
-    sql_id int auto_increment primary key,
+    sql_id int auto_increment,
     sql_name text NOT NULL,
     csv_sql text,
     update_date datetime NOT NULL,
-    create_date datetime NOT NULL
-) TYPE=InnoDB ;
+    create_date datetime NOT NULL,
+    PRIMARY KEY (sql_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_user_regist (
-    user_id int auto_increment primary key NOT NULL,
+    user_id int auto_increment NOT NULL,
     org_name text,
     post_name text,
@@ -934,293 +967,314 @@
     del_flg smallint DEFAULT 0,
     create_date datetime NOT NULL,
-    update_date datetime NOT NULL
-) TYPE=InnoDB ;
+    update_date datetime NOT NULL,
+    PRIMARY KEY (user_id)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_templates
 (
-    template_code        varchar(50) NOT NULL UNIQUE    ,
-    template_name        text            ,
-    create_date        datetime        NOT NULL    ,
-    update_date        datetime        NOT NULL
-) TYPE=InnoDB ;
+    template_code varchar(50) NOT NULL,
+    template_name text,
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL,
+    PRIMARY KEY (template_code)
+) TYPE=InnoDB;
 
 CREATE TABLE dtb_table_comment
 (
-    id    int auto_increment primary key,
-    table_name    text,
-    column_name    text,
-    description    text
-) TYPE=InnoDB ;
+    id int auto_increment,
+    table_name text,
+    column_name text,
+    description text,
+    PRIMARY KEY (id)
+) TYPE=InnoDB;
+
+CREATE TABLE dtb_maker (
+    maker_id int auto_increment,
+    name text NOT NULL,
+    rank int NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (maker_id)
+) TYPE=InnoDB;
+
+CREATE TABLE dtb_maker_count (
+    maker_id int NOT NULL,
+    product_count int NOT NULL,
+    create_date datetime NOT NULL
+) TYPE=InnoDB;
+
 
 CREATE TABLE mtb_permission (
     id text,
     name text,
-    rank int2 NOT NULL DEFAULT 0,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id(32))
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_disable_logout (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_authority (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_work (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_disp (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_class (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_srank (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_status (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_status_image (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_allowed_tag (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_page_max (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_magazine_type (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_mail_magazine_type (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_recommend (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_taxrule (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_mail_template (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_mail_tpl_path (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_job (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_reminder (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_sex (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_page_rows (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_mail_type (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_order_status (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_product_status_color (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_order_status_color (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_wday (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_delivery_date (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_product_list_max (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_convenience (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_conveni_message (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_db (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_target (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_review_deny_url (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_track_back_status (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_site_control_track_back (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_site_control_affiliate (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_mobile_domain (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_ownersstore_err (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
 CREATE TABLE mtb_ownersstore_ips (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 ) TYPE=InnoDB;
@@ -1229,5 +1283,6 @@
     id text,
     name text,
-    rank int2 NOT NULL DEFAULT 0,
-    remarks text
-) TYPE=InnoDB;
+    rank smallint NOT NULL DEFAULT 0,
+    remarks text,
+    PRIMARY KEY (id(64))
+) TYPE=InnoDB;
Index: tmp/version-2_5-test/html/install/sql/create_table_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/create_table_pgsql.sql	(revision 18007)
+++ tmp/version-2_5-test/html/install/sql/create_table_pgsql.sql	(revision 18609)
@@ -3,9 +3,10 @@
     module_id int NOT NULL,
     buckup_path text,
-    error_flg int2 default 0,
+    error_flg smallint DEFAULT 0,
     error text,
     ok text,
     create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp NOT NULL DEFAULT now()
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (log_id)
 );
 
@@ -18,9 +19,10 @@
     kiyaku_title text NOT NULL,
     kiyaku_text text NOT NULL,
-    rank int4 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
+    rank int NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp NOT NULL,
-    del_flg  int2 NOT NULL DEFAULT 0
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (kiyaku_id)
 );
 
@@ -28,11 +30,12 @@
     holiday_id serial NOT NULL,
     title text NOT NULL,
-    month int2 NOT NULL,
-    day int2 NOT NULL,
-    rank int4 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
+    month smallint NOT NULL,
+    day smallint NOT NULL,
+    rank int NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp NOT NULL,
-    del_flg  int2 NOT NULL DEFAULT 0
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (holiday_id)
 );
 
@@ -59,7 +62,7 @@
     total numeric NOT NULL DEFAULT 0,
     total_average numeric NOT NULL DEFAULT 0,
-    start_age int2,
-    end_age int2,
-    member int2,
+    start_age smallint,
+    end_age smallint,
+    member smallint,
     order_date timestamp DEFAULT now(),
     create_date timestamp NOT NULL DEFAULT now()
@@ -67,5 +70,5 @@
 
 CREATE TABLE dtb_update (
-    module_id int4 NOT NULL UNIQUE,
+    module_id int NOT NULL,
     module_name text NOT NULL,
     now_version text,
@@ -77,8 +80,9 @@
     uninstall_sql text,
     other_files text,
-    del_flg int2 NOT NULL DEFAULT 0,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    release_date timestamp NOT NULL
+    del_flg smallint NOT NULL DEFAULT 0,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    release_date timestamp NOT NULL,
+    PRIMARY KEY (module_id)
 );
 
@@ -88,5 +92,5 @@
     zip01 text,
     zip02 text,
-    pref int2,
+    pref smallint,
     addr01 text,
     addr02 text,
@@ -102,5 +106,5 @@
     law_zip01 text,
     law_zip02 text,
-    law_pref int2,
+    law_pref smallint,
     law_addr01 text,
     law_addr02 text,
@@ -123,6 +127,6 @@
     law_term09 text,
     law_term10 text,
-    tax numeric DEFAULT 5,
-    tax_rule int2 DEFAULT 1,
+    tax numeric NOT NULL DEFAULT 5,
+    tax_rule smallint NOT NULL DEFAULT 1,
     email01 text,
     email02 text,
@@ -133,6 +137,6 @@
     shop_name text,
     shop_kana text,
-    point_rate numeric,
-    welcome_point numeric,
+    point_rate numeric NOT NULL DEFAULT 0,
+    welcome_point numeric NOT NULL DEFAULT 0,
     update_date timestamp,
     top_tpl text,
@@ -150,23 +154,26 @@
     service_name text,
     confirm_url text,
-    rank int4,
-    status int2 NOT NULL DEFAULT 1,
-    del_flg int2 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp
+    rank int,
+    status smallint NOT NULL DEFAULT 1,
+    del_flg smallint NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    PRIMARY KEY (deliv_id)
 );
 
 CREATE TABLE dtb_delivtime (
-    deliv_id int4 NOT NULL,
-    time_id serial NOT NULL,
-    deliv_time text NOT NULL
+    deliv_id int NOT NULL,
+    time_id int NOT NULL,
+    deliv_time text NOT NULL,
+    PRIMARY KEY (deliv_id, time_id)
 );
 
 CREATE TABLE dtb_delivfee (
-    deliv_id int4 NOT NULL,
+    deliv_id int NOT NULL,
     fee_id serial NOT NULL,
     fee text NOT NULL,
-    pref int2
+    pref smallint,
+    PRIMARY KEY (fee_id)
 );
 
@@ -176,19 +183,19 @@
     charge numeric,
     rule numeric,
-    deliv_id int4 DEFAULT 0,
-    rank int4,
+    deliv_id int DEFAULT 0,
+    rank int,
     note text,
-    fix int2,
-    status int2 NOT NULL DEFAULT 1,
-    del_flg int2 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
+    fix smallint,
+    status smallint NOT NULL DEFAULT 1,
+    del_flg smallint NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp,
     payment_image text,
     upper_rule numeric,
-    charge_flg int2 DEFAULT 1,
+    charge_flg smallint DEFAULT 1,
     rule_min numeric,
     upper_rule_max numeric,
-    module_id int4,
+    module_id int,
     module_path text,
     memo01 text,
@@ -201,14 +208,15 @@
     memo08 text,
     memo09 text,
-    memo10 text
+    memo10 text,
+    PRIMARY KEY (payment_id)
 );
 
 CREATE TABLE dtb_mailtemplate (
-    template_id int4 NOT NULL,
+    template_id int NOT NULL,
     subject text,
     header text,
     footer text,
-    creator_id int4 NOT NULL,
-    del_flg int2 NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    del_flg smallint NOT NULL DEFAULT 0,
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp NOT NULL
@@ -216,66 +224,68 @@
 
 CREATE TABLE dtb_mailmaga_template (
-    template_id serial NOT NULL UNIQUE,
+    template_id serial NOT NULL,
     subject text,
     charge_image text,
-    mail_method int4,
+    mail_method int,
     header text,
     body text,
     main_title text,
     main_comment text,
-    main_product_id int4,
+    main_product_id int,
     sub_title text,
     sub_comment text,
-    sub_product_id01 int4,
-    sub_product_id02 int4,
-    sub_product_id03 int4,
-    sub_product_id04 int4,
-    sub_product_id05 int4,
-    sub_product_id06 int4,
-    sub_product_id07 int4,
-    sub_product_id08 int4,
-    sub_product_id09 int4,
-    sub_product_id10 int4,
-    sub_product_id11 int4,
-    sub_product_id12 int4,
-    del_flg int2 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp
+    sub_product_id01 int,
+    sub_product_id02 int,
+    sub_product_id03 int,
+    sub_product_id04 int,
+    sub_product_id05 int,
+    sub_product_id06 int,
+    sub_product_id07 int,
+    sub_product_id08 int,
+    sub_product_id09 int,
+    sub_product_id10 int,
+    sub_product_id11 int,
+    sub_product_id12 int,
+    del_flg smallint NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    PRIMARY KEY (template_id)
 );
 
 CREATE TABLE dtb_send_history (
     send_id serial NOT NULL,
-    mail_method int2,
+    mail_method smallint,
     subject text,
     body text,
-    send_count int4,
-    complete_count int4 NOT NULL DEFAULT 0,
+    send_count int,
+    complete_count int NOT NULL DEFAULT 0,
     start_date timestamp,
     end_date timestamp,
     search_data text,
-    del_flg int2 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp NOT NULL DEFAULT now()
+    del_flg smallint NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (send_id)
 );
 
 CREATE TABLE dtb_send_customer (
-    customer_id int4,
+    customer_id int,
     send_id serial NOT NULL,
     email text,
     name text,
-    send_flag int2
+    send_flag smallint
 );
 
 CREATE TABLE dtb_products (
-    product_id serial NOT NULL UNIQUE,
+    product_id serial NOT NULL,
     name text,
     deliv_fee numeric,
     sale_limit numeric,
-    sale_unlimited int2 DEFAULT 0,
-    category_id int4,
-    rank int4,
-    status int2 NOT NULL DEFAULT 2,
+    category_id int,
+    maker_id int,
+    rank int,
+    status smallint NOT NULL DEFAULT 2,
     product_flag text,
     point_rate numeric,
@@ -322,26 +332,28 @@
     sub_image6 text,
     sub_large_image6 text,
-    del_flg int2 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    deliv_date_id int4
+    del_flg smallint NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    deliv_date_id int,
+    PRIMARY KEY (product_id)
 );
 
 CREATE TABLE dtb_products_class (
-    product_class_id serial NOT NULL UNIQUE,
-    product_id int4 NOT NULL,
-    classcategory_id1 int4 NOT NULL DEFAULT 0,
-    classcategory_id2 int4 NOT NULL DEFAULT 0,
+    product_class_id serial NOT NULL,
+    product_id int NOT NULL,
+    classcategory_id1 int NOT NULL DEFAULT 0,
+    classcategory_id2 int NOT NULL DEFAULT 0,
     product_code text,
     stock numeric,
-    stock_unlimited int2 DEFAULT 0,
+    stock_unlimited smallint NOT NULL DEFAULT 0,
     sale_limit numeric,
     price01 numeric,
     price02 numeric,
-    status int2,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp
+    status smallint,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    PRIMARY KEY (product_class_id)
 );
 
@@ -349,11 +361,12 @@
     class_id serial NOT NULL,
     name text,
-    status int2,
-    rank int4,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0,
-    product_id int4
+    status smallint,
+    rank int,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    del_flg smallint NOT NULL DEFAULT 0,
+    product_id int,
+    PRIMARY KEY (class_id)
 );
 
@@ -361,11 +374,12 @@
     classcategory_id serial NOT NULL,
     name text,
-    class_id int4 NOT NULL,
-    status int2,
-    rank int4,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0
+    class_id int NOT NULL,
+    status smallint,
+    rank int,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (classcategory_id)
 );
 
@@ -373,17 +387,18 @@
     category_id serial NOT NULL,
     category_name text,
-    parent_category_id int4 NOT NULL DEFAULT 0,
-    level int4 NOT NULL,
-    rank int4,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0
+    parent_category_id int NOT NULL DEFAULT 0,
+    level int NOT NULL,
+    rank int,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (category_id)
 );
 
 CREATE TABLE dtb_product_categories (
-    product_id int4 NOT NULL,
-    category_id int4 NOT NULL,
-    rank int4,
+    product_id int NOT NULL,
+    category_id int NOT NULL,
+    rank int NOT NULL,
     PRIMARY KEY(product_id, category_id)
 );
@@ -403,8 +418,8 @@
     order_date timestamp NOT NULL DEFAULT now(),
     create_date timestamp NOT NULL DEFAULT now(),
-    year int2 NOT NULL,
-    month int2 NOT NULL,
-    day int2 NOT NULL,
-    wday int2 NOT NULL,
+    year smallint NOT NULL,
+    month smallint NOT NULL,
+    day smallint NOT NULL,
+    wday smallint NOT NULL,
     key_day text NOT NULL,
     key_month text NOT NULL,
@@ -425,5 +440,5 @@
     total numeric NOT NULL DEFAULT 0,
     total_average numeric NOT NULL DEFAULT 0,
-    hour int2 NOT NULL DEFAULT 0,
+    hour smallint NOT NULL DEFAULT 0,
     order_date timestamp DEFAULT now(),
     create_date timestamp NOT NULL DEFAULT now()
@@ -431,10 +446,10 @@
 
 CREATE TABLE dtb_recommend_products (
-    product_id int4 NOT NULL,
-    recommend_product_id int4 NOT NULL,
-    rank int4 NOT NULL,
+    product_id int NOT NULL,
+    recommend_product_id int NOT NULL,
+    rank int NOT NULL,
     comment text,
-    status int2 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
+    status smallint NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp NOT NULL DEFAULT now()
@@ -443,22 +458,23 @@
 CREATE TABLE dtb_review (
     review_id serial NOT NULL,
-    product_id int4 NOT NULL,
+    product_id int NOT NULL,
     reviewer_name text NOT NULL,
     reviewer_url text,
-    sex int2,
-    customer_id int4,
-    recommend_level int2 NOT NULL,
+    sex smallint,
+    customer_id int,
+    recommend_level smallint NOT NULL,
     title text NOT NULL,
     comment text NOT NULL,
-    status int2 DEFAULT 2,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0
+    status smallint DEFAULT 2,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (review_id)
 );
 
 CREATE TABLE dtb_customer_reading (
-    reading_product_id int4 NOT NULL,
-    customer_id int4 NOT NULL,
+    reading_product_id int NOT NULL,
+    customer_id int NOT NULL,
     create_date timestamp NOT NULL,
     update_date timestamp NOT NULL DEFAULT NOW()
@@ -466,6 +482,6 @@
 
 CREATE TABLE dtb_customer_favorite_products (
-    customer_id int4 NOT NULL,
-    product_id int4 NOT NULL,
+    customer_id int NOT NULL,
+    product_id int NOT NULL,
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp NOT NULL DEFAULT now(),
@@ -474,55 +490,58 @@
 
 CREATE TABLE dtb_category_count (
-    category_id int4 NOT NULL,
-    product_count int4 NOT NULL,
+    category_id int NOT NULL,
+    product_count int NOT NULL,
     create_date timestamp NOT NULL DEFAULT Now()
 );
 
 CREATE TABLE dtb_category_total_count (
-    category_id int4 NOT NULL,
-    product_count int4,
+    category_id int NOT NULL,
+    product_count int,
     create_date timestamp NOT NULL DEFAULT Now()
 );
 
 CREATE TABLE dtb_news (
-    news_id serial NOT NULL UNIQUE,
+    news_id serial NOT NULL,
     news_date timestamp,
-    rank int4,
+    rank int,
     news_title text NOT NULL,
     news_comment text,
     news_url text,
-    news_select int2 NOT NULL DEFAULT 0,
+    news_select smallint NOT NULL DEFAULT 0,
     link_method text,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (news_id)
 );
 
 CREATE TABLE dtb_best_products (
     best_id serial NOT NULL,
-    category_id int4 NOT NULL,
-    rank int4 NOT NULL DEFAULT 0,
-    product_id int4 NOT NULL,
+    category_id int NOT NULL,
+    rank int NOT NULL DEFAULT 0,
+    product_id int NOT NULL,
     title text,
     comment text,
-    creator_id int4 NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (best_id)
 );
 
 CREATE TABLE dtb_mail_history (
-    send_id serial  NOT NULL,
-    order_id int4 NOT NULL,
+    send_id serial NOT NULL,
+    order_id int NOT NULL,
     send_date timestamp,
-    template_id int4,
-    creator_id int4 NOT NULL,
+    template_id int,
+    creator_id int NOT NULL,
     subject text,
-    mail_body text
+    mail_body text,
+    PRIMARY KEY (send_id)
 );
 
 CREATE TABLE dtb_customer (
-    customer_id serial  NOT NULL,
+    customer_id serial NOT NULL,
     name01 text NOT NULL,
     name02 text NOT NULL,
@@ -531,5 +550,5 @@
     zip01 text,
     zip02 text,
-    pref int2,
+    pref smallint,
     addr01 text,
     addr02 text,
@@ -542,9 +561,9 @@
     fax02 text,
     fax03 text,
-    sex int2,
-    job int2,
+    sex smallint,
+    job smallint,
     birth timestamp,
     password text,
-    reminder int2,
+    reminder smallint,
     reminder_answer text,
     secret_key text NOT NULL UNIQUE,
@@ -555,13 +574,14 @@
     point numeric DEFAULT 0,
     note text,
-    status int2 NOT NULL DEFAULT 1,
+    status smallint NOT NULL DEFAULT 1,
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp DEFAULT now(),
-    del_flg  int2 NOT NULL DEFAULT 0,
+    del_flg smallint NOT NULL DEFAULT 0,
     cell01 text,
     cell02 text,
     cell03 text,
     mobile_phone_id text,
-    mailmaga_flg int2
+    mailmaga_flg smallint,
+    PRIMARY KEY (customer_id)
 );
 
@@ -570,9 +590,10 @@
 CREATE TABLE dtb_customer_mail_temp (
     email text NOT NULL UNIQUE,
-    mail_flag int2,
-    temp_id text NOT NULL UNIQUE,
-    end_flag int2,
+    mail_flag smallint,
+    temp_id text NOT NULL,
+    end_flag smallint,
     update_date timestamp NOT NULL DEFAULT Now(),
-    create_data timestamp NOT NULL DEFAULT Now()
+    create_data timestamp NOT NULL DEFAULT Now(),
+    PRIMARY KEY (temp_id)
 );
 
@@ -580,5 +601,5 @@
     order_id serial NOT NULL,
     order_temp_id text,
-    customer_id int4 NOT NULL,
+    customer_id int NOT NULL,
     message text,
     order_name01 text,
@@ -595,10 +616,10 @@
     order_zip01 text,
     order_zip02 text,
-    order_pref text,
+    order_pref smallint,
     order_addr01 text,
     order_addr02 text,
-    order_sex int2,
+    order_sex smallint,
     order_birth timestamp,
-    order_job int4,
+    order_job int,
     deliv_name01 text,
     deliv_name02 text,
@@ -613,5 +634,5 @@
     deliv_zip01 text,
     deliv_zip02 text,
-    deliv_pref text,
+    deliv_pref smallint,
     deliv_addr01 text,
     deliv_addr02 text,
@@ -626,12 +647,12 @@
     total numeric,
     payment_total numeric,
-    payment_id int4,
+    payment_id int,
     payment_method text,
-    deliv_id int4,
-    deliv_time_id int4,
+    deliv_id int,
+    deliv_time_id int,
     deliv_time text,
     deliv_no text,
     note text,
-    status int2,
+    status smallint,
     create_date timestamp NOT NULL DEFAULT now(),
     loan_result text,
@@ -640,5 +661,5 @@
     update_date timestamp,
     commit_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0,
+    del_flg smallint NOT NULL DEFAULT 0,
     deliv_date text,
     conveni_data text,
@@ -656,10 +677,11 @@
     memo09 text,
     memo10 text,
-    campaign_id int4
+    campaign_id int,
+    PRIMARY KEY (order_id)
 );
 
 CREATE TABLE dtb_order_temp (
     order_temp_id text NOT NULL,
-    customer_id int4 NOT NULL,
+    customer_id int NOT NULL,
     message text,
     order_name01 text,
@@ -676,10 +698,10 @@
     order_zip01 text,
     order_zip02 text,
-    order_pref text,
+    order_pref smallint,
     order_addr01 text,
     order_addr02 text,
-    order_sex int2,
+    order_sex smallint,
     order_birth timestamp,
-    order_job int4,
+    order_job int,
     deliv_name01 text,
     deliv_name02 text,
@@ -694,5 +716,5 @@
     deliv_zip01 text,
     deliv_zip02 text,
-    deliv_pref text,
+    deliv_pref smallint,
     deliv_addr01 text,
     deliv_addr02 text,
@@ -707,15 +729,15 @@
     total numeric,
     payment_total numeric,
-    payment_id int4,
+    payment_id int,
     payment_method text,
-    deliv_id int4,
-    deliv_time_id int4,
+    deliv_id int,
+    deliv_time_id int,
     deliv_time text,
     deliv_no text,
     note text,
-    mail_flag int2,
-    status int2,
-    deliv_check int2,
-    point_check int2,
+    mail_flag smallint,
+    status smallint,
+    deliv_check smallint,
+    point_check smallint,
     loan_result text,
     credit_result text,
@@ -723,5 +745,5 @@
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp,
-    del_flg  int2 NOT NULL DEFAULT 0,
+    del_flg smallint NOT NULL DEFAULT 0,
     deliv_date text,
     conveni_data text,
@@ -729,5 +751,5 @@
     cell02 text,
     cell03 text,
-    order_id int4,
+    order_id int,
     memo01 text,
     memo02 text,
@@ -745,5 +767,5 @@
 CREATE TABLE dtb_other_deliv (
     other_deliv_id serial NOT NULL,
-    customer_id int4 NOT NULL,
+    customer_id int NOT NULL,
     name01 text,
     name02 text,
@@ -752,17 +774,18 @@
     zip01 text,
     zip02 text,
-    pref text,
+    pref smallint,
     addr01 text,
     addr02 text,
     tel01 text,
     tel02 text,
-    tel03 text
+    tel03 text,
+    PRIMARY KEY (other_deliv_id)
 );
 
 CREATE TABLE dtb_order_detail (
-    order_id int4 NOT NULL,
-    product_id int4 NOT NULL,
-    classcategory_id1 int4 NOT NULL,
-    classcategory_id2 int4 NOT NULL,
+    order_id int NOT NULL,
+    product_id int NOT NULL,
+    classcategory_id1 int NOT NULL,
+    classcategory_id2 int NOT NULL,
     product_name text NOT NULL,
     product_code text,
@@ -775,7 +798,7 @@
 
 CREATE TABLE mtb_pref (
-    pref_id int2 NOT NULL,
+    pref_id smallint NOT NULL,
     pref_name text,
-    rank int2 NOT NULL DEFAULT 0,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (pref_id)
 );
@@ -787,12 +810,13 @@
     login_id text NOT NULL,
     password text NOT NULL,
-    authority int2 NOT NULL,
-    rank int4 NOT NULL DEFAULT 0,
-    work int2 NOT NULL DEFAULT 1,
-    del_flg int2 NOT NULL DEFAULT 0,
-    creator_id int4 NOT NULL,
-    update_date timestamp,
-    create_date timestamp NOT NULL DEFAULT now(),
-    login_date timestamp
+    authority smallint NOT NULL,
+    rank int NOT NULL DEFAULT 0,
+    work smallint NOT NULL DEFAULT 1,
+    del_flg smallint NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    update_date timestamp,
+    create_date timestamp NOT NULL DEFAULT now(),
+    login_date timestamp,
+    PRIMARY KEY (member_id)
 );
 
@@ -802,10 +826,11 @@
     question text,
     create_date timestamp NOT NULL DEFAULT now(),
-    del_flg  int2 NOT NULL DEFAULT 0
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (question_id)
 );
 
 CREATE TABLE dtb_question_result (
     result_id serial NOT NULL,
-    question_id int4 NOT NULL,
+    question_id int NOT NULL,
     question_date timestamp,
     question_name text,
@@ -816,5 +841,5 @@
     zip01 text,
     zip02 text,
-    pref int2,
+    pref smallint,
     addr01 text,
     addr02 text,
@@ -830,11 +855,12 @@
     question06 text,
     create_date timestamp NOT NULL DEFAULT now(),
-    del_flg  int2 NOT NULL DEFAULT 0
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (result_id)
 );
 
 CREATE TABLE dtb_bat_relate_products (
-    product_id int4,
-    relate_product_id int4,
-    customer_id int4,
+    product_id int,
+    relate_product_id int,
+    customer_id int,
     create_date timestamp DEFAULT now()
 );
@@ -844,22 +870,23 @@
     campaign_name text,
     campaign_point_rate numeric NOT NULL,
-    campaign_point_type int2,
+    campaign_point_type smallint,
     start_date timestamp NOT NULL,
     end_date timestamp NOT NULL,
     directory_name text NOT NULL,
-    limit_count int4 NOT NULL DEFAULT 0,
-    total_count int4 NOT NULL DEFAULT 0,
-    orverlapping_flg int2 NOT NULL DEFAULT 0,
-    cart_flg int2 NOT NULL DEFAULT 0,
-    deliv_free_flg int2 NOT NULL DEFAULT 0,
+    limit_count int NOT NULL DEFAULT 0,
+    total_count int NOT NULL DEFAULT 0,
+    orverlapping_flg smallint NOT NULL DEFAULT 0,
+    cart_flg smallint NOT NULL DEFAULT 0,
+    deliv_free_flg smallint NOT NULL DEFAULT 0,
     search_condition text,
-    del_flg int2 NOT NULL DEFAULT 0,
+    del_flg smallint NOT NULL DEFAULT 0,
     create_date timestamp NOT NULL,
-    update_date timestamp NOT NULL DEFAULT now()
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (campaign_id)
 );
 
 CREATE TABLE dtb_campaign_detail (
-    campaign_id int4 NOT NULL,
-    product_id int4 NOT NULL,
+    campaign_id int NOT NULL,
+    product_id int NOT NULL,
     campaign_point_rate numeric NOT NULL
 );
@@ -872,7 +899,7 @@
     tpl_dir text,
     filename text,
-    header_chk int2 DEFAULT 1,
-    footer_chk int2 DEFAULT 1,
-    edit_flg int2 DEFAULT 1,
+    header_chk smallint DEFAULT 1,
+    footer_chk smallint DEFAULT 1,
+    edit_flg smallint DEFAULT 1,
     author text,
     description text,
@@ -880,5 +907,6 @@
     update_url text,
     create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp NOT NULL DEFAULT now()
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (page_id)
 );
 
@@ -891,24 +919,27 @@
     update_date timestamp NOT NULL DEFAULT now(),
     php_path text,
-    del_flg int2 NOT NULL DEFAULT 0
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (bloc_id)
 );
 
 CREATE TABLE dtb_blocposition (
-    page_id int4 NOT NULL,
-    target_id int4,
-    bloc_id int4,
-    bloc_row int4,
-    filename text
+    page_id int NOT NULL,
+    target_id int,
+    bloc_id int,
+    bloc_row int,
+    filename text,
+    anywhere smallint DEFAULT 0 NOT NULL
 );
 
 CREATE TABLE dtb_csv (
     no serial,
-    csv_id int4 NOT NULL,
+    csv_id int NOT NULL,
     col text,
     disp_name text,
-    rank int4,
-    status int2 NOT NULL DEFAULT 1,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp NOT NULL DEFAULT now()
+    rank int,
+    status smallint NOT NULL DEFAULT 1,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (no)
 );
 
@@ -918,5 +949,6 @@
     csv_sql text,
     update_date timestamp NOT NULL DEFAULT now(),
-    create_date timestamp NOT NULL DEFAULT now()
+    create_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (sql_id)
 );
 
@@ -933,24 +965,42 @@
     note text,
     secret_key text NOT NULL UNIQUE,
-    status int2 NOT NULL,
-    del_flg int2 DEFAULT 0,
+    status smallint NOT NULL,
+    del_flg smallint DEFAULT 0,
     create_date timestamp NOT NULL,
-    update_date timestamp NOT NULL DEFAULT now()
-);
-
-create table dtb_templates
-(
-template_code        text        NOT NULL UNIQUE    ,
-template_name        text            ,
-create_date        timestamp        NOT NULL    default now(),
-update_date        timestamp        NOT NULL    default now()
-);
-
-create table dtb_table_comment
-(
-id    serial,
-table_name    text,
-column_name    text,
-description    text
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (user_id)
+);
+
+create table dtb_templates (
+    template_code text NOT NULL,
+    template_name text,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (template_code)
+);
+
+create table dtb_table_comment (
+    id serial,
+    table_name text,
+    column_name text,
+    description text,
+    PRIMARY KEY (id)
+);
+
+CREATE TABLE dtb_maker (
+    maker_id serial NOT NULL,
+    name text NOT NULL,
+    rank int NOT NULL DEFAULT 0,
+    creator_id int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp NOT NULL,
+    del_flg smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (maker_id)
+);
+
+CREATE TABLE dtb_maker_count (
+    maker_id int NOT NULL,
+    product_count int NOT NULL,
+    create_date timestamp NOT NULL DEFAULT Now()
 );
 
@@ -958,257 +1008,257 @@
     id text,
     name text,
-    rank int2 NOT NULL DEFAULT 0,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_disable_logout (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_authority (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_work (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_disp (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_class (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_srank (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_status (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_status_image (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_allowed_tag (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_page_max (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_magazine_type (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_mail_magazine_type (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_recommend (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_taxrule (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_mail_template (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_mail_tpl_path (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_job (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_reminder (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_sex (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_page_rows (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_mail_type (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_order_status (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_product_status_color (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_order_status_color (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_wday (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_delivery_date (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_product_list_max (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_convenience (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_conveni_message (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_db (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_target (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_review_deny_url (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_track_back_status (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_site_control_track_back (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_site_control_affiliate (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE mtb_mobile_domain (
-    id int2,
-    name text,
-    rank int2 NOT NULL DEFAULT 0,
+    id smallint,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
@@ -1217,5 +1267,5 @@
     id text,
     name text,
-    rank int2 NOT NULL DEFAULT 0,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
@@ -1224,5 +1274,5 @@
     id text,
     name text,
-    rank int2 NOT NULL DEFAULT 0,
+    rank smallint NOT NULL DEFAULT 0,
     PRIMARY KEY (id)
 );
@@ -1231,5 +1281,5 @@
     id text,
     name text,
-    rank int2 NOT NULL DEFAULT 0,
+    rank smallint NOT NULL DEFAULT 0,
     remarks text,
     PRIMARY KEY (id)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_session_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_session_mysql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_session_mysql.sql	(revision 18609)
@@ -1,7 +1,7 @@
 CREATE TABLE dtb_session (
-    sess_id text NOT NULL,
+    sess_id varchar(50) NOT NULL,
     sess_data text,
     create_date datetime NOT NULL,
-    update_date datetime NOT NULL
+    update_date datetime NOT NULL,
+    PRIMARY KEY (sess_id)
 ) TYPE=InnoDB;
-CREATE INDEX dtb_session_sess_id_key ON dtb_session (sess_id(32));
Index: tmp/version-2_5-test/html/install/sql/add/dtb_session_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_session_pgsql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_session_pgsql.sql	(revision 18609)
@@ -3,5 +3,5 @@
     sess_data text,
     create_date timestamp NOT NULL,
-    update_date timestamp NOT NULL
+    update_date timestamp NOT NULL,
+    PRIMARY KEY (sess_id)
 );
-CREATE INDEX dtb_session_sess_id_key ON dtb_session (sess_id);
Index: tmp/version-2_5-test/html/install/sql/add/dtb_site_control_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_site_control_mysql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_site_control_mysql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_module_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_module_mysql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_module_mysql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_site_control_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_site_control_pgsql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_site_control_pgsql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_trackback_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_trackback_mysql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_trackback_mysql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_mobile_ext_session_id_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_mobile_ext_session_id_mysql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_mobile_ext_session_id_mysql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_module_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_module_pgsql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_module_pgsql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_trackback_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_trackback_pgsql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_trackback_pgsql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_mobile_ext_session_id_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_mobile_ext_session_id_pgsql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_mobile_ext_session_id_pgsql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_mobile_kara_mail_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_mobile_kara_mail_mysql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_mobile_kara_mail_mysql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_mobile_kara_mail_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_mobile_kara_mail_pgsql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_mobile_kara_mail_pgsql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_campaign_order_mysql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_campaign_order_mysql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_campaign_order_mysql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/add/dtb_campaign_order_pgsql.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/add/dtb_campaign_order_pgsql.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/add/dtb_campaign_order_pgsql.sql	(revision 18609)
Index: tmp/version-2_5-test/html/install/sql/drop_table.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/drop_table.sql	(revision 18007)
+++ tmp/version-2_5-test/html/install/sql/drop_table.sql	(revision 18609)
@@ -92,4 +92,6 @@
 DROP TABLE mtb_ownersstore_err;
 DROP TABLE mtb_ownersstore_ips;
+DROP TABLE dtb_maker;
+DROP TABLE dtb_maker_count;
 DROP TABLE dtb_holiday;
 DROP TABLE dtb_customer_favorite_products;
Index: tmp/version-2_5-test/html/install/sql/create_view.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/create_view.sql	(revision 18432)
+++ tmp/version-2_5-test/html/install/sql/create_view.sql	(revision 18609)
@@ -1,49 +1,61 @@
 CREATE VIEW vw_cross_class as
-     SELECT T1.class_id AS class_id1,
-            T2.class_id AS class_id2,
-            T1.classcategory_id AS classcategory_id1,
-            T2.classcategory_id AS classcategory_id2,
-            T1.name AS name1,
-            T2.name AS name2,
-            T1.rank AS rank1,
-            T2.rank AS rank2
-       FROM dtb_classcategory AS T1,
-            dtb_classcategory AS T2;
+    SELECT
+        T1.class_id AS class_id1,
+        T2.class_id AS class_id2,
+        T1.classcategory_id AS classcategory_id1,
+        T2.classcategory_id AS classcategory_id2,
+        T1.name AS name1,
+        T2.name AS name2,
+        T1.rank AS rank1,
+        T2.rank AS rank2
+    FROM
+        dtb_classcategory AS T1,
+        dtb_classcategory AS T2
+;
 
 CREATE VIEW vw_cross_products_class AS
-     SELECT T1.class_id1,
-            T1.class_id2,
-            T1.classcategory_id1,
-            T1.classcategory_id2,
-            T2.product_id,
-            T1.name1,
-            T1.name2,
-            T2.product_code,
-            T2.stock,
-            T2.price01,
-            T2.price02,
-            T1.rank1,
-            T1.rank2
-       FROM vw_cross_class AS T1
-  LEFT JOIN dtb_products_class AS T2
-         ON T1.classcategory_id1 = T2.classcategory_id1
-        AND T1.classcategory_id2 = T2.classcategory_id2;
+    SELECT
+        T1.class_id1,
+        T1.class_id2,
+        T1.classcategory_id1,
+        T1.classcategory_id2,
+        T2.product_id,
+        T1.name1,
+        T1.name2,
+        T2.product_code,
+        T2.stock,
+        T2.price01,
+        T2.price02,
+        T1.rank1,
+        T1.rank2
+    FROM
+        vw_cross_class AS T1
+        LEFT JOIN dtb_products_class AS T2
+            ON T1.classcategory_id1 = T2.classcategory_id1
+            AND T1.classcategory_id2 = T2.classcategory_id2
+;
 
 CREATE VIEW vw_products_nonclass AS
-     SELECT *
-      FROM dtb_products AS T1 LEFT JOIN
-      (SELECT
-              product_id AS product_id_sub,
-              product_code,
-              price01,
-              price02,
-              stock,
-              stock_unlimited,
-              classcategory_id1,
-              classcategory_id2
-         FROM dtb_products_class
-        WHERE classcategory_id1 = 0
-          AND classcategory_id2 = 0) AS T2
-        ON T1.product_id = T2.product_id_sub;
+    SELECT *
+    FROM
+        dtb_products AS T1
+        LEFT JOIN
+        (
+            SELECT
+                product_id AS product_id_sub,
+                product_code,
+                price01,
+                price02,
+                stock,
+                stock_unlimited,
+                classcategory_id1,
+                classcategory_id2
+            FROM dtb_products_class
+            WHERE
+                classcategory_id1 = 0
+                AND classcategory_id2 = 0
+        ) AS T2
+        ON T1.product_id = T2.product_id_sub
+;
 
 CREATE VIEW vw_products_allclass_detail AS
@@ -53,9 +65,9 @@
         dtb_products.deliv_fee,
         dtb_products.sale_limit,
+        dtb_products.maker_id,
         dtb_products.rank,
         dtb_products.status,
         dtb_products.product_flag,
         dtb_products.point_rate,
-        dtb_products.sale_unlimited,
         dtb_products.comment1,
         dtb_products.comment2,
@@ -171,9 +183,9 @@
               stock_unlimited,
               product_code
-         FROM (dtb_products_class AS T1
+         FROM (dtb_products_class AS T1 
     LEFT JOIN dtb_classcategory AS T2
-           ON T1.classcategory_id1 = T2.classcategory_id) AS T3
+           ON T1.classcategory_id1 = T2.classcategory_id) AS T3 
   LEFT JOIN dtb_classcategory AS T4
-         ON T3.classcategory_id2 = T4.classcategory_id) AS T5
+         ON T3.classcategory_id2 = T4.classcategory_id) AS T5 
   LEFT JOIN dtb_products AS T6
          ON product_id_sub = T6.product_id;
@@ -186,6 +198,6 @@
             T1.rank,
             T2.product_count
-       FROM dtb_category AS T1
+       FROM dtb_category AS T1 
   LEFT JOIN dtb_category_total_count AS T2
          ON T1.category_id = T2.category_id
-
+;
Index: tmp/version-2_5-test/html/install/sql/insert_data.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/insert_data.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/insert_data.sql	(revision 18609)
@@ -1,5 +1,4 @@
 CREATE INDEX dtb_products_class_product_id_key ON dtb_products_class(product_id);
 CREATE INDEX dtb_order_detail_product_id_key ON dtb_order_detail(product_id);
-CREATE INDEX dtb_category_category_id_key ON dtb_category(category_id);
 CREATE INDEX dtb_send_customer_customer_id_key ON dtb_send_customer(customer_id);
 
@@ -7,233 +6,225 @@
 VALUES ('dummy','dummy',' ',0,0,1,1, now(), now());
 
-insert into dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) values ('カテゴリ',	'bloc/category.tpl', 'category','frontparts/bloc/category.php', 1, now(), now());
-insert into dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) values ('利用ガイド','bloc/guide.tpl', 'guide','', 1, now(), now());
-insert into dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) values ('かごの中',	'bloc/cart.tpl', 'cart','frontparts/bloc/cart.php', 1, now(), now());
-insert into dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) values ('商品検索',	'bloc/search_products.tpl', 'search_products','frontparts/bloc/search_products.php', 1, now(), now());
-insert into dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) values ('新着情報',	'bloc/news.tpl', 'news','frontparts/bloc/news.php', 1, now(), now());
-insert into dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) values ('ログイン',	'bloc/login.tpl', 'login','frontparts/bloc/login.php', 1, now(), now());
-insert into dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) values ('オススメ商品', 'bloc/best5.tpl', 'best5','frontparts/bloc/best5.php', 1, now(), now());
+INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('カテゴリ',	'bloc/category.tpl', 'category','frontparts/bloc/category.php', 1, now(), now());
+INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('利用ガイド','bloc/guide.tpl', 'guide','', 1, now(), now());
+INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('かごの中',	'bloc/cart.tpl', 'cart','frontparts/bloc/cart.php', 1, now(), now());
+INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('商品検索',	'bloc/search_products.tpl', 'search_products','frontparts/bloc/search_products.php', 1, now(), now());
+INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('新着情報',	'bloc/news.tpl', 'news','frontparts/bloc/news.php', 1, now(), now());
+INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('ログイン',	'bloc/login.tpl', 'login','frontparts/bloc/login.php', 1, now(), now());
+INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('おすすめ商品', 'bloc/best5.tpl', 'best5','frontparts/bloc/best5.php', 1, now(), now());
 INSERT INTO dtb_bloc ( bloc_name, tpl_path, filename, php_path, del_flg, create_date, update_date ) VALUES ('カレンダー', 'bloc/calendar.tpl', 'calendar', 'frontparts/bloc/calendar.php', 1, now(), now());
 
 
-insert into dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date)values('TOPページ','index.php',' ','user_data/templates/','top',2,now(),now());
-insert into dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date)values('商品一覧ページ','products/list.php',' ','user_data/templates/','list',2,now(),now());
-insert into dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date)values('商品詳細ページ','products/detail.php',' ','user_data/templates/','detail',2,now(),now());
-insert into dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date)values('MYページ','mypage/index.php',' ','','',2,now(),now());
-
-insert into dtb_pagelayout (page_id,page_name,url, create_date, update_date)values(0, 'プレビューデータ',' ',now(),now());
+INSERT INTO dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date) VALUES ('TOPページ','index.php',' ','user_data/templates/','top',2,now(),now());
+INSERT INTO dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date) VALUES ('商品一覧ページ','products/list.php',' ','user_data/templates/','list',2,now(),now());
+INSERT INTO dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date) VALUES ('商品詳細ページ','products/detail.php',' ','user_data/templates/','detail',2,now(),now());
+INSERT INTO dtb_pagelayout (page_name,url,php_dir,tpl_dir,filename,edit_flg, create_date, update_date) VALUES ('MYページ','mypage/index.php',' ','','',2,now(),now());
+
+INSERT INTO dtb_pagelayout (page_id,page_name,url, create_date, update_date) VALUES (0, 'プレビューデータ',' ',now(),now());
 update dtb_pagelayout set page_id = 0 where page_id = 5;
 
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(1,1,1,2,'category');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(1,1,2,3,'guide');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(1,1,3,1,'cart');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(1,3,4,2,'search_products');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(1,4,5,1,'news');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(1,3,6,1,'login');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(1,4,7,2,'best5');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(2,1,1,2,'category');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(2,1,2,3,'guide');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(2,1,3,1,'cart');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(2,5,4,0,'search_products');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(2,5,5,0,'news');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(2,5,6,0,'login');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(2,5,7,0,'best5');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(3,1,1,2,'category');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(3,1,2,3,'guide');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(3,1,3,1,'cart');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(3,5,4,0,'search_products');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(3,5,5,0,'news');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(3,5,6,0,'login');
-INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename)values(3,5,7,0,'best5');
-
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'product_id','商品ID',1,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'product_class_id','規格ID',2,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'classcategory_id1','規格名1',3,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'classcategory_id2','規格名2',4,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'name','商品名',5,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'status','公開フラグ',6,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'product_flag','商品ステータス',7,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'product_code','商品コード',8,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'price01','通常価格',9,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'price02','販売価格',10,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'stock','在庫数',11,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'deliv_fee','送料',12,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'point_rate','ポイント付与率',13,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sale_limit','購入制限',14,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'comment1','メーカーURL',15,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'comment3','検索ワード',16,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'note','備考欄(SHOP専用)',17,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'main_list_comment','一覧-メインコメント',18,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'main_list_image','一覧-メイン画像',19,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'main_comment','詳細-メインコメント',20,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'main_image','詳細-メイン画像',21,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'main_large_image','詳細-メイン拡大画像 ',22,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'file1','カラー比較画像',23,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'file2','商品詳細ファイル    ',24,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_title1','詳細-サブタイトル（1）',25,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_comment1','詳細-サブコメント（1）',26,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_image1','詳細-サブ画像（1）',27,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_large_image1','詳細-サブ拡大画像（1）',28,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_title2','詳細-サブタイトル（2）',29,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_comment2','詳細-サブコメント（2）',30,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_image2','詳細-サブ画像（2）',31,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_large_image2','詳細-サブ拡大画像（2）',32,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_title3','詳細-サブタイトル（3）',33,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_comment3','詳細-サブコメント（3）',34,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_image3','詳細-サブ画像（3）',35,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_large_image3','詳細-サブ拡大画像（3）',36,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_title4','詳細-サブタイトル（4）',37,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_comment4','詳細-サブコメント（4）',38,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_image4','詳細-サブ画像（4）',39,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_large_image4','詳細-サブ拡大画像（4）',40,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_title5','詳細-サブタイトル（5）',41,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_comment5','詳細-サブコメント（5）',42,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_image5','詳細-サブ画像（5）',43,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'sub_large_image5','詳細-サブ拡大画像（5）',44,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'deliv_date_id','発送日目安',45,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1) AS recommend_product_id1','おすすめ商品(1)',46,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1) AS recommend_comment1','おすすめコメント(1)',47,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 1) AS recommend_product_id2','おすすめ商品(2)',48,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 1) AS recommend_comment2','おすすめコメント(2)',49,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 2) AS recommend_product_id3','おすすめ商品(3)',50,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 2) AS recommend_comment3','おすすめコメント(3)',51,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 3) AS recommend_product_id4','おすすめ商品(4)',52,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 3) AS recommend_comment4','おすすめコメント(4)',53,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 4) AS recommend_product_id5','おすすめ商品(5)',54,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 4) AS recommend_comment5','おすすめコメント(5)',55,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 5) AS recommend_product_id6','おすすめ商品(6)',56,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY update_date DESC limit 1 offset 5) AS recommend_comment6','おすすめコメント(6)',57,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(1,'category_id','カテゴリID',58,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'customer_id','顧客ID',1,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'name01','名前1',2,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'name02','名前2',3,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'kana01','フリガナ1',4,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'kana02','フリガナ2',5,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'zip01', '郵便番号1',6,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'zip02', '郵便番号2',7,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'pref', '都道府県',8,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'addr01', '住所1',9,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'addr02', '住所2',10,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'email', 'E-MAIL',11,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'tel01', 'TEL1',12,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'tel02', 'TEL2',13,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'tel03', 'TEL3',14,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'fax01', 'FAX1',15,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'fax02', 'FAX2',16,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'fax03', 'FAX3',17,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'sex', '性別',18,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'job', '職業',19,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'birth', '誕生日',20,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'first_buy_date', '初回購入日',21,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'last_buy_date', '最終購入日',22,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'buy_times', '購入回数',23,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'point', 'ポイント残高',24,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'note', '備考',25,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'create_date','登録日',26,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'update_date','更新日',27,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_id','注文番号',1,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'customer_id','顧客ID',2,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'message','要望等',3,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_name01','顧客名1',4,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_name02','顧客名2',5,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_kana01','顧客名カナ1',6,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_kana02','顧客名カナ2',7,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_email','メールアドレス',8,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_tel01','電話番号1',9,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_tel02','電話番号2',10,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_tel03','電話番号3',11,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_fax01','FAX1',12,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_fax02','FAX2',13,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_fax03','FAX3',14,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_zip01','郵便番号1',15,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_zip02','郵便番号2',16,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_pref','都道府県',17,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_addr01','住所1',18,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_addr02','住所2',19,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_sex','性別',20,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_birth','生年月日',21,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_job','職種',22,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_name01','お届け先名前',23,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_name02','お届け先名前',24,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_kana01','お届け先カナ',25,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_kana02','お届け先カナ',26,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_tel01','電話番号1',27,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_tel02','電話番号2',28,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_tel03','電話番号3',29,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_fax01','FAX1',30,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_fax02','FAX2',31,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_fax03','FAX3',32,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_zip01','郵便番号1',33,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_zip02','郵便番号2',34,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_pref','都道府県',35,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_addr01','住所1',36,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_addr02','住所2',37,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'subtotal','小計',38,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'discount','値引き',39,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_fee','送料',40,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'charge','手数料',41,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'use_point','使用ポイント',42,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'add_point','加算ポイント',43,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'tax','税金',44,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'total','合計',45,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'payment_total','お支払い合計',46,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'payment_method','支払い方法',47,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_time','お届け時間',48,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_no','配送伝票番号',49,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'note','SHOPメモ',50,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'status','対応状況',51,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'create_date','注文日時',52,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'update_date','更新日時',53,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_id','注文番号',1,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'campaign_id','キャンペーンID',2,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'customer_id','顧客ID',3,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'message','要望等',4,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_name01','顧客名1',5,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_name02','顧客名2',6,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_kana01','顧客名カナ1',7,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_kana02','顧客名カナ2',8,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_email','メールアドレス',9,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_tel01','電話番号1',10,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_tel02','電話番号2',11,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_tel03','電話番号3',12,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_fax01','FAX1',13,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_fax02','FAX2',14,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_fax03','FAX3',15,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_zip01','郵便番号1',16,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_zip02','郵便番号2',17,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_pref','都道府県',18,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_addr01','住所1',19,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_addr02','住所2',20,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_sex','性別',21,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_birth','生年月日',22,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_job','職種',23,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_name01','お届け先名前',24,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_name02','お届け先名前',25,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_kana01','お届け先カナ',26,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_kana02','お届け先カナ',27,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_tel01','電話番号1',28,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_tel02','電話番号2',29,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_tel03','電話番号3',30,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_fax01','FAX1',31,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_fax02','FAX2',32,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_fax03','FAX3',33,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_zip01','郵便番号1',34,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_zip02','郵便番号2',35,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_pref','都道府県',36,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_addr01','住所1',37,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_addr02','住所2',38,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'payment_total','お支払い合計',39,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,status,create_date,update_date)values(5,'category_id','カテゴリID',1,1,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,status,create_date,update_date)values(5,'category_name','カテゴリ名',2,1,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,status,create_date,update_date)values(5,'parent_category_id',' 親カテゴリID',3,1,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,status,create_date,update_date)values(5,'level','階層',4,2,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,rank,status,create_date,update_date)values(5,'rank','表示ランク',5,2,now(),now());
-
-INSERT INTO dtb_templates (template_code, template_name, create_date, update_date) VALUES('default','デフォルト', now(), now());
-
-insert into dtb_mailtemplate (template_id, subject, header, footer, creator_id, update_date, create_date) values (
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (1,1,1,2,'category');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (1,1,2,3,'guide');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (1,1,3,1,'cart');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (1,3,4,2,'search_products');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (1,4,5,1,'news');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (1,3,6,1,'login');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (1,4,7,2,'best5');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (2,1,1,2,'category');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (2,1,2,3,'guide');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (2,1,3,1,'cart');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (3,1,1,2,'category');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (3,1,2,3,'guide');
+INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename) VALUES (3,1,3,1,'cart');
+
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'product_id','商品ID',1,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'product_class_id','規格ID',2,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'classcategory_id1','規格名1',3,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'classcategory_id2','規格名2',4,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'name','商品名',5,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'status','公開フラグ',6,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'product_flag','商品ステータス',7,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'product_code','商品コード',8,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'price01','通常価格',9,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'price02','販売価格',10,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'stock','在庫数',11,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'deliv_fee','送料',12,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'point_rate','ポイント付与率',13,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sale_limit','購入制限',14,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'comment1','メーカーURL',15,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'comment3','検索ワード',16,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'note','備考欄(SHOP専用)',17,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'main_list_comment','一覧-メインコメント',18,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'main_list_image','一覧-メイン画像',19,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'main_comment','詳細-メインコメント',20,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'main_image','詳細-メイン画像',21,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'main_large_image','詳細-メイン拡大画像 ',22,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'file1','カラー比較画像',23,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'file2','商品詳細ファイル    ',24,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_title1','詳細-サブタイトル（1）',25,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_comment1','詳細-サブコメント（1）',26,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_image1','詳細-サブ画像（1）',27,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_large_image1','詳細-サブ拡大画像（1）',28,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_title2','詳細-サブタイトル（2）',29,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_comment2','詳細-サブコメント（2）',30,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_image2','詳細-サブ画像（2）',31,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_large_image2','詳細-サブ拡大画像（2）',32,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_title3','詳細-サブタイトル（3）',33,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_comment3','詳細-サブコメント（3）',34,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_image3','詳細-サブ画像（3）',35,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_large_image3','詳細-サブ拡大画像（3）',36,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_title4','詳細-サブタイトル（4）',37,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_comment4','詳細-サブコメント（4）',38,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_image4','詳細-サブ画像（4）',39,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_large_image4','詳細-サブ拡大画像（4）',40,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_title5','詳細-サブタイトル（5）',41,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_comment5','詳細-サブコメント（5）',42,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_image5','詳細-サブ画像（5）',43,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'sub_large_image5','詳細-サブ拡大画像（5）',44,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'deliv_date_id','発送日目安',45,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 0) AS recommend_product_id1','関連商品(1)',46,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 0) AS recommend_comment1','関連商品コメント(1)',47,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 1) AS recommend_product_id2','関連商品(2)',48,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 1) AS recommend_comment2','関連商品コメント(2)',49,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 2) AS recommend_product_id3','関連商品(3)',50,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 2) AS recommend_comment3','関連商品コメント(3)',51,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 3) AS recommend_product_id4','関連商品(4)',52,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 3) AS recommend_comment4','関連商品コメント(4)',53,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 4) AS recommend_product_id5','関連商品(5)',54,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 4) AS recommend_comment5','関連商品コメント(5)',55,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT recommend_product_id FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 5) AS recommend_product_id6','関連商品(6)',56,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'(SELECT comment FROM dtb_recommend_products WHERE prdcls.product_id = dtb_recommend_products.product_id ORDER BY rank DESC, recommend_product_id DESC limit 1 offset 5) AS recommend_comment6','関連商品コメント(6)',57,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'category_id','カテゴリID',58,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'customer_id','顧客ID',1,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'name01','名前1',2,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'name02','名前2',3,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'kana01','フリガナ1',4,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'kana02','フリガナ2',5,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'zip01', '郵便番号1',6,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'zip02', '郵便番号2',7,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'pref', '都道府県',8,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'addr01', '住所1',9,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'addr02', '住所2',10,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'email', 'E-MAIL',11,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'tel01', 'TEL1',12,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'tel02', 'TEL2',13,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'tel03', 'TEL3',14,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'fax01', 'FAX1',15,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'fax02', 'FAX2',16,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'fax03', 'FAX3',17,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'sex', '性別',18,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'job', '職業',19,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'birth', '誕生日',20,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'first_buy_date', '初回購入日',21,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'last_buy_date', '最終購入日',22,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'buy_times', '購入回数',23,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'point', 'ポイント残高',24,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'note', '備考',25,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'create_date','登録日',26,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (2,'update_date','更新日',27,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_id','注文番号',1,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'customer_id','顧客ID',2,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'message','要望等',3,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_name01','顧客名1',4,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_name02','顧客名2',5,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_kana01','顧客名カナ1',6,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_kana02','顧客名カナ2',7,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_email','メールアドレス',8,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_tel01','電話番号1',9,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_tel02','電話番号2',10,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_tel03','電話番号3',11,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_fax01','FAX1',12,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_fax02','FAX2',13,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_fax03','FAX3',14,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_zip01','郵便番号1',15,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_zip02','郵便番号2',16,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_pref','都道府県',17,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_addr01','住所1',18,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_addr02','住所2',19,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_sex','性別',20,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_birth','生年月日',21,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'order_job','職種',22,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_name01','お届け先名前',23,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_name02','お届け先名前',24,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_kana01','お届け先カナ',25,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_kana02','お届け先カナ',26,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_tel01','電話番号1',27,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_tel02','電話番号2',28,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_tel03','電話番号3',29,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_fax01','FAX1',30,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_fax02','FAX2',31,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_fax03','FAX3',32,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_zip01','郵便番号1',33,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_zip02','郵便番号2',34,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_pref','都道府県',35,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_addr01','住所1',36,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_addr02','住所2',37,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'subtotal','小計',38,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'discount','値引き',39,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_fee','送料',40,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'charge','手数料',41,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'use_point','使用ポイント',42,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'add_point','加算ポイント',43,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'tax','税金',44,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'total','合計',45,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'payment_total','お支払い合計',46,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'payment_method','支払い方法',47,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_time','お届け時間',48,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'deliv_no','配送伝票番号',49,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'note','SHOPメモ',50,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'status','対応状況',51,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'create_date','注文日時',52,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (3,'update_date','更新日時',53,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_id','注文番号',1,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'campaign_id','キャンペーンID',2,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'customer_id','顧客ID',3,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'message','要望等',4,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_name01','顧客名1',5,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_name02','顧客名2',6,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_kana01','顧客名カナ1',7,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_kana02','顧客名カナ2',8,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_email','メールアドレス',9,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_tel01','電話番号1',10,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_tel02','電話番号2',11,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_tel03','電話番号3',12,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_fax01','FAX1',13,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_fax02','FAX2',14,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_fax03','FAX3',15,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_zip01','郵便番号1',16,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_zip02','郵便番号2',17,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_pref','都道府県',18,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_addr01','住所1',19,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_addr02','住所2',20,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_sex','性別',21,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_birth','生年月日',22,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'order_job','職種',23,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_name01','お届け先名前',24,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_name02','お届け先名前',25,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_kana01','お届け先カナ',26,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_kana02','お届け先カナ',27,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_tel01','電話番号1',28,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_tel02','電話番号2',29,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_tel03','電話番号3',30,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_fax01','FAX1',31,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_fax02','FAX2',32,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_fax03','FAX3',33,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_zip01','郵便番号1',34,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_zip02','郵便番号2',35,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_pref','都道府県',36,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_addr01','住所1',37,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'deliv_addr02','住所2',38,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (4,'payment_total','お支払い合計',39,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (5,'category_id','カテゴリID',1,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (5,'category_name','カテゴリ名',2,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (5,'parent_category_id','親カテゴリID',3,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,status,create_date,update_date) VALUES (5,'level','階層',2,now(),now());
+INSERT INTO dtb_csv(csv_id,col,disp_name,status,create_date,update_date) VALUES (5,'rank','表示ランク',2,now(),now());
+
+INSERT INTO dtb_templates (template_code, template_name, create_date, update_date) VALUES ('default','デフォルト', now(), now());
+
+INSERT INTO dtb_mailtemplate (template_id, subject, header, footer, creator_id, update_date, create_date) VALUES (
 1,
-'ご注文ありがとうございます。',
-'この度はご注文いただき誠に有難うございます。
+'ご注文ありがとうございます',
+'この度はご注文いただき誠にありがとうございます。
 下記ご注文内容にお間違えがないかご確認下さい。
 
@@ -241,5 +232,5 @@
 '
 
-==============================================================☆
+===============================================================
 
 
@@ -251,8 +242,13 @@
 http://------.co.jp
 
-',0,Now(), now());
-
-insert into dtb_news (news_date,rank, news_title, news_comment, creator_id, create_date, update_date)
-values(now(),1,'サイトオープンいたしました!','一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！',1, now(), now());
+',0,now(), now());
+INSERT INTO dtb_mailtemplate (template_id, subject, header, footer, creator_id, update_date, create_date) VALUES (
+5,
+'お問い合わせを受け付けました',
+'',
+'',0,now(), now());
+
+INSERT INTO dtb_news (news_date,rank, news_title, news_comment, creator_id, create_date, update_date)
+VALUES (CAST(now() AS date),1,'サイトオープンいたしました!','一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！',1, now(), now());
 
 INSERT INTO dtb_deliv (name,service_name,confirm_url,rank,status,del_flg,creator_id,create_date,update_date)
@@ -307,6 +303,6 @@
 INSERT INTO dtb_delivfee (deliv_id,fee,pref) VALUES (1, '1000', 47);
 
-INSERT INTO dtb_delivtime (deliv_id, deliv_time) VALUES (1, '午前');
-INSERT INTO dtb_delivtime (deliv_id, deliv_time) VALUES (1, '午後');
+INSERT INTO dtb_delivtime (deliv_id, time_id, deliv_time) VALUES (1, 1, '午前');
+INSERT INTO dtb_delivtime (deliv_id, time_id, deliv_time) VALUES (1, 2, '午後');
 
 INSERT INTO dtb_payment (payment_method,charge,rule,deliv_id,rank,note,fix,status,del_flg,creator_id,create_date,update_date,payment_image,upper_rule) VALUES ('郵便振替', 0, NULL, 1, 4, NULL, 2, 1, 0, 1, now(), now(), NULL, NULL);
@@ -315,12 +311,9 @@
 INSERT INTO dtb_payment (payment_method,charge,rule,deliv_id,rank,note,fix,status,del_flg,creator_id,create_date,update_date,payment_image,upper_rule) VALUES ('代金引換', 0, NULL, 1, 1, NULL, 2, 1, 0, 1, now(), now(), NULL, NULL);
 
-INSERT INTO dtb_products (name,deliv_fee,sale_limit,sale_unlimited,category_id,rank,status,product_flag,point_rate,comment1,comment2,comment3,comment4,comment5,comment6,file1,file2,file3,file4,file5,file6,main_list_comment,main_list_image,main_comment,main_image,main_large_image,sub_title1,sub_comment1,sub_image1,sub_large_image1,sub_title2,sub_comment2,sub_image2,sub_large_image2,sub_title3,sub_comment3,sub_image3,sub_large_image3,sub_title4,sub_comment4,sub_image4,sub_large_image4,sub_title5,sub_comment5,sub_image5,sub_large_image5,sub_title6,sub_comment6,sub_image6,sub_large_image6,del_flg,creator_id,create_date,update_date,deliv_date_id)
-VALUES ('アイスクリーム', NULL, NULL, NULL, 5, 1, 1, '10010', 10, NULL, NULL, 'アイス,バニラ,チョコ,抹茶', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '暑い夏にどうぞ。', '08311201_44f65122ee5fe.jpg', '冷たいものはいかがですか？', '08311202_44f6515906a41.jpg', '08311203_44f651959bcb5.jpg', NULL, '<b>おいしいよ<b>', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, now(), now(), 2);
-INSERT INTO dtb_products (name,deliv_fee,sale_limit,sale_unlimited,category_id,rank,status,product_flag,point_rate,comment1,comment2,comment3,comment4,comment5,comment6,file1,file2,file3,file4,file5,file6,main_list_comment,main_list_image,main_comment,main_image,main_large_image,sub_title1,sub_comment1,sub_image1,sub_large_image1,sub_title2,sub_comment2,sub_image2,sub_large_image2,sub_title3,sub_comment3,sub_image3,sub_large_image3,sub_title4,sub_comment4,sub_image4,sub_large_image4,sub_title5,sub_comment5,sub_image5,sub_large_image5,sub_title6,sub_comment6,sub_image6,sub_large_image6,del_flg,creator_id,create_date,update_date,deliv_date_id)
-VALUES ('おなべ', NULL, 5, NULL, NULL, 1, 1, '11001', 5, NULL, NULL, '鍋,なべ,ナベ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '一人用からあります。', '08311311_44f661811fec0.jpg', 'たまには鍋でもどうでしょう。', '08311313_44f661dc649fb.jpg', '08311313_44f661e5698a6.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, now(), now(), 3);
-
-INSERT INTO dtb_products_class (product_id,classcategory_id1,classcategory_id2,product_code,stock,stock_unlimited,sale_limit,price01,price02,status,creator_id,create_date,update_date)
-VALUES (1, 3, 6, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 2, now(), now());
-DELETE FROM dtb_products_class;
+INSERT INTO dtb_products (name,deliv_fee,sale_limit,category_id,rank,status,product_flag,point_rate,comment1,comment2,comment3,comment4,comment5,comment6,file1,file2,file3,file4,file5,file6,main_list_comment,main_list_image,main_comment,main_image,main_large_image,sub_title1,sub_comment1,sub_image1,sub_large_image1,sub_title2,sub_comment2,sub_image2,sub_large_image2,sub_title3,sub_comment3,sub_image3,sub_large_image3,sub_title4,sub_comment4,sub_image4,sub_large_image4,sub_title5,sub_comment5,sub_image5,sub_large_image5,sub_title6,sub_comment6,sub_image6,sub_large_image6,del_flg,creator_id,create_date,update_date,deliv_date_id)
+VALUES ('アイスクリーム', NULL, NULL, 5, 1, 1, '10010', 10, NULL, NULL, 'アイス,バニラ,チョコ,抹茶', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '暑い夏にどうぞ。', '08311201_44f65122ee5fe.jpg', '冷たいものはいかがですか？', '08311202_44f6515906a41.jpg', '08311203_44f651959bcb5.jpg', NULL, '<b>おいしいよ<b>', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, now(), now(), 2);
+INSERT INTO dtb_products (name,deliv_fee,sale_limit,category_id,rank,status,product_flag,point_rate,comment1,comment2,comment3,comment4,comment5,comment6,file1,file2,file3,file4,file5,file6,main_list_comment,main_list_image,main_comment,main_image,main_large_image,sub_title1,sub_comment1,sub_image1,sub_large_image1,sub_title2,sub_comment2,sub_image2,sub_large_image2,sub_title3,sub_comment3,sub_image3,sub_large_image3,sub_title4,sub_comment4,sub_image4,sub_large_image4,sub_title5,sub_comment5,sub_image5,sub_large_image5,sub_title6,sub_comment6,sub_image6,sub_large_image6,del_flg,creator_id,create_date,update_date,deliv_date_id)
+VALUES ('おなべ', NULL, 5, NULL, 1, 1, '11001', 5, NULL, NULL, '鍋,なべ,ナベ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '一人用からあります。', '08311311_44f661811fec0.jpg', 'たまには鍋でもどうでしょう。', '08311313_44f661dc649fb.jpg', '08311313_44f661e5698a6.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, now(), now(), 3);
+
 INSERT INTO dtb_products_class (product_id,classcategory_id1,classcategory_id2,product_code,stock,stock_unlimited,sale_limit,price01,price02,status,creator_id,create_date,update_date)
 VALUES (1, 3, 6, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 2, now(), now());
@@ -342,5 +335,5 @@
 VALUES (1, 1, 4, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 2, now(), now());
 INSERT INTO dtb_products_class (product_id,classcategory_id1,classcategory_id2,product_code,stock,stock_unlimited,sale_limit,price01,price02,status,creator_id,create_date,update_date)
-VALUES (2, 0, 0, 'nabe-01', 100, NULL, NULL, 1700, 1650, NULL, 2, now(), now());
+VALUES (2, 0, 0, 'nabe-01', 100, 0, NULL, 1700, 1650, NULL, 2, now(), now());
 
 INSERT INTO dtb_recommend_products (product_id, recommend_product_id, rank,comment,status,creator_id,create_date,update_date) VALUES (2, 1, 4, 'お口直しに。', 0, 2, now(), now());
@@ -382,5 +375,5 @@
 2. 「会員情報」とは、会員が当社に開示した会員の属性に関する情報および会員の取引に関する履歴等の情報をいいます。
 3. 本規約は、すべての会員に適用され、登録手続時および登録後にお守りいただく規約です。',
-12,0,Now(),0, now());
+12,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
@@ -395,14 +388,14 @@
 (2)パスワードは、他人に知られることがないよう定期的に変更する等、会員本人が責任をもって管理してください。
 (3)パスワードを用いて当社に対して行われた意思表示は、会員本人の意思表示とみなし、そのために生じる支払等はすべて会員の責任となります。',
-11,0,Now(),0, now());
+11,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
 VALUES ('第3条（変更）','1. 会員は、氏名、住所など当社に届け出た事項に変更があった場合には、速やかに当社に連絡するものとします。
 2. 変更登録がなされなかったことにより生じた損害について、当社は一切責任を負いません。また、変更登録がなされた場合でも、変更登録前にすでに手続がなされた取引は、変更登録前の情報に基づいて行われますのでご注意ください。',
-10,0,Now(),0, now());
+10,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
 VALUES ('第4条（退会）','会員が退会を希望する場合には、会員本人が退会手続きを行ってください。所定の退会手続の終了後に、退会となります。',
-9,0,Now(),0, now());
+9,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
@@ -413,5 +406,5 @@
 (3)当社が扱う商品の知的所有権を侵害する行為をすること
 (4)その他、この利用規約に反する行為をすること',
-8,0,Now(),0, now());
+8,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
@@ -421,5 +414,5 @@
 2. 会員情報につきましては、当社の「個人情報保護への取組み」に従い、当社が管理します。当社は、会員情報を、会員へのサービス提供、サービス内容の向上、サービスの利用促進、およびサービスの健全かつ円滑な運営の確保を図る目的のために、当社おいて利用することができるものとします。
 3. 当社は、会員に対して、メールマガジンその他の方法による情報提供（広告を含みます）を行うことができるものとします。会員が情報提供を希望しない場合は、当社所定の方法に従い、その旨を通知して頂ければ、情報提供を停止します。ただし、本サービス運営に必要な情報提供につきましては、会員の希望により停止をすることはできません。',
-7,0,Now(),0, now());
+7,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
@@ -435,5 +428,5 @@
 8. パスワードを第三者に貸与・譲渡すること、または第三者と共用すること
 9. その他当社が不適切と判断すること',
-6,0,Now(),0, now());
+6,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
@@ -443,9 +436,9 @@
 (3)火災、停電、第三者による妨害行為などによりシステムの運用が困難になった場合
 (4)その他、止むを得ずシステムの停止が必要と当社が判断した場合',
-5,0,Now(),0, now());
+5,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
 VALUES ('第9条（サービスの変更・廃止）','当社は、その判断によりサービスの全部または一部を事前の通知なく、適宜変更・廃止できるものとします。',
-4,0,Now(),0, now());
+4,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
@@ -453,13 +446,13 @@
 2. 当社は、当社のウェブページ・サーバ・ドメインなどから送られるメール・コンテンツに、コンピュータ・ウィルスなどの有害なものが含まれていないことを保証いたしません。
 3. 会員が本規約等に違反したことによって生じた損害については、当社は一切責任を負いません。',
-3,0,Now(),0, now());
+3,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
 VALUES ('第11条（本規約の改定）','当社は、本規約を任意に改定できるものとし、また、当社において本規約を補充する規約（以下「補充規約」といいます）を定めることができます。本規約の改定または補充は、改定後の本規約または補充規約を当社所定のサイトに掲示したときにその効力を生じるものとします。この場合、会員は、改定後の規約および補充規約に従うものと致します。',
-2,0,Now(),0, now());
+2,0,now(),0, now());
 
 INSERT INTO dtb_kiyaku (kiyaku_title, kiyaku_text, rank, creator_id, update_date, del_flg, create_date)
 VALUES ('第12条（準拠法、管轄裁判所）','本規約に関して紛争が生じた場合、当社本店所在地を管轄する地方裁判所を第一審の専属的合意管轄裁判所とします。 ',
-1,0,Now(),0, now());
+1,0,now(),0, now());
 
 
@@ -560,5 +553,6 @@
 INSERT INTO mtb_disable_logout VALUES ('4', '/shopping/card.php',3);
 INSERT INTO mtb_disable_logout VALUES ('5', '/shopping/loan.php',4);
-INSERT INTO mtb_authority VALUES ('0', '管理者',0);
+INSERT INTO mtb_authority VALUES ('0', 'システム管理者',0);
+INSERT INTO mtb_authority VALUES ('1', '店舗オーナー',1);
 INSERT INTO mtb_work VALUES ('0', '非稼働',0);
 INSERT INTO mtb_work VALUES ('1', '稼働',1);
@@ -645,10 +639,13 @@
 INSERT INTO mtb_taxrule VALUES ('3', '切り上げ',2);
 INSERT INTO mtb_mail_template VALUES ('1', '注文受付メール',0);
-INSERT INTO mtb_mail_template VALUES ('2', '注文キャンセル受付メール',1);
-INSERT INTO mtb_mail_template VALUES ('3', '取り寄せ確認メール',2);
+INSERT INTO mtb_mail_template VALUES ('2', '注文受付メール(携帯)',1);
+INSERT INTO mtb_mail_template VALUES ('3', '注文キャンセル受付メール',2);
+INSERT INTO mtb_mail_template VALUES ('4', '取り寄せ確認メール',3);
+INSERT INTO mtb_mail_template VALUES ('5', 'お問い合わせ受付メール',4);
 INSERT INTO mtb_mail_tpl_path VALUES ('1', 'mail_templates/order_mail.tpl',0);
 INSERT INTO mtb_mail_tpl_path VALUES ('2', 'mobile/mail_templates/order_mail.tpl',1);
 INSERT INTO mtb_mail_tpl_path VALUES ('3', 'mail_templates/order_mail.tpl',2);
-INSERT INTO mtb_mail_tpl_path VALUES ('4', 'mail_templates/contact_mail.tpl',3);
+INSERT INTO mtb_mail_tpl_path VALUES ('4', 'mail_templates/order_mail.tpl',3);
+INSERT INTO mtb_mail_tpl_path VALUES ('5', 'mail_templates/contact_mail.tpl',4);
 INSERT INTO mtb_job VALUES ('1', '公務員',0);
 INSERT INTO mtb_job VALUES ('2', 'コンサルタント',1);
@@ -713,6 +710,6 @@
 INSERT INTO mtb_wday VALUES ('6', '土',6);
 INSERT INTO mtb_delivery_date VALUES ('1', '即日',0);
-INSERT INTO mtb_delivery_date VALUES ('2', '1〜2日後',1);
-INSERT INTO mtb_delivery_date VALUES ('3', '3〜4日後',2);
+INSERT INTO mtb_delivery_date VALUES ('2', '1～2日後',1);
+INSERT INTO mtb_delivery_date VALUES ('3', '3～4日後',2);
 INSERT INTO mtb_delivery_date VALUES ('4', '1週間以降',3);
 INSERT INTO mtb_delivery_date VALUES ('5', '2週間以降',4);
@@ -736,9 +733,14 @@
 INSERT INTO mtb_db VALUES ('1', 'PostgreSQL',0);
 INSERT INTO mtb_db VALUES ('2', 'MySQL',1);
-INSERT INTO mtb_target VALUES ('1', 'LeftNavi',0);
-INSERT INTO mtb_target VALUES ('2', 'MainHead',1);
-INSERT INTO mtb_target VALUES ('3', 'RightNavi',2);
-INSERT INTO mtb_target VALUES ('4', 'MainFoot',3);
-INSERT INTO mtb_target VALUES ('5', 'Unused',4);
+INSERT INTO mtb_target VALUES ('0', 'Unused',0);
+INSERT INTO mtb_target VALUES ('1', 'LeftNavi',1);
+INSERT INTO mtb_target VALUES ('2', 'MainHead',2);
+INSERT INTO mtb_target VALUES ('3', 'RightNavi',3);
+INSERT INTO mtb_target VALUES ('4', 'MainFoot',4);
+INSERT INTO mtb_target VALUES ('5', 'TopNavi',5);
+INSERT INTO mtb_target VALUES ('6', 'BottomNavi',6);
+INSERT INTO mtb_target VALUES ('7', 'HeadNavi',7);
+INSERT INTO mtb_target VALUES ('8', 'HeaderTopNavi',8);
+INSERT INTO mtb_target VALUES ('9', 'FooterBottomNavi',9);
 INSERT INTO mtb_review_deny_url VALUES ('0', 'http://',0);
 INSERT INTO mtb_review_deny_url VALUES ('1', 'https://',1);
@@ -758,4 +760,5 @@
 INSERT INTO mtb_mobile_domain VALUES (5, 'pdx.ne.jp', 4);
 INSERT INTO mtb_mobile_domain VALUES (6, 'disney.ne.jp', 5);
+INSERT INTO mtb_mobile_domain VALUES (7, 'willcom.com', 6);
 INSERT INTO mtb_ownersstore_err VALUES ('1000', '不明なエラーが発生しました。', 0);
 INSERT INTO mtb_ownersstore_err VALUES ('1001', '不正なパラメータが送信されました。', 1);
@@ -782,6 +785,4 @@
 INSERT INTO mtb_constants VALUES ('USER_PATH','HTML_PATH . USER_DIR',4,'ユーザファイル保存先');
 INSERT INTO mtb_constants VALUES ('USER_INC_PATH','USER_PATH . "include/"',5,'ユーザインクルードファイル保存先');
-INSERT INTO mtb_constants VALUES ('DB_ERROR_MAIL_TO','""',6,'DBエラーメール送信先');
-INSERT INTO mtb_constants VALUES ('DB_ERROR_MAIL_SUBJECT','"OS_TEST_ERROR"',7,'DBエラーメール件名');
 INSERT INTO mtb_constants VALUES ('ZIP_DSN','DEFAULT_DSN',8,'郵便番号専用DB');
 INSERT INTO mtb_constants VALUES ('USER_URL','SITE_URL . USER_DIR',9,'ユーザー作成ページ等');
@@ -809,5 +810,5 @@
 INSERT INTO mtb_constants VALUES ('ECCUBE_PAYMENT','"EC-CUBE"',41,'決済モジュール付与文言');
 INSERT INTO mtb_constants VALUES ('PEAR_DB_DEBUG','9',42,'PEAR::DBのデバッグモード');
-INSERT INTO mtb_constants VALUES ('PEAR_DB_PERSISTENT','false',43,'PEAR::DBの持続的接続オプション(false:OFF、true:ON)');
+INSERT INTO mtb_constants VALUES ('PEAR_DB_PERSISTENT','false',43,'PEAR::DBの持続的接続オプション');
 INSERT INTO mtb_constants VALUES ('LOAD_BATCH_PASS','3600',44,'バッチを実行する最短の間隔(秒)');
 INSERT INTO mtb_constants VALUES ('CLOSE_DAY','31',45,'締め日の指定(末日の場合は、31を指定してください。)');
@@ -823,5 +824,5 @@
 INSERT INTO mtb_constants VALUES ('PRODUCTS_TOTAL_MAX','15',55,'商品集計で何位まで表示するか');
 INSERT INTO mtb_constants VALUES ('DEFAULT_PRODUCT_DISP','2',56,'1:公開 2:非公開');
-INSERT INTO mtb_constants VALUES ('DELIV_FREE_AMOUNT','0',57,'送料無料購入個数（0の場合は、何個買っても無料にならない)');
+INSERT INTO mtb_constants VALUES ('DELIV_FREE_AMOUNT','0',57,'送料無料購入数量（0の場合は、いくつ買っても無料にならない)');
 INSERT INTO mtb_constants VALUES ('INPUT_DELIV_FEE','1',58,'配送料の設定画面表示(有効:1 無効:0)');
 INSERT INTO mtb_constants VALUES ('OPTION_PRODUCT_DELIV_FEE','0',59,'商品ごとの送料設定(有効:1 無効:0)');
@@ -840,5 +841,5 @@
 INSERT INTO mtb_constants VALUES ('ADMIN_ID','"1"',73,'管理ユーザID(メンテナンス用表示されない。)');
 INSERT INTO mtb_constants VALUES ('CUSTOMER_CONFIRM_MAIL','false',74,'会員登録時に仮会員確認メールを送信するか（true:仮会員、false:本会員）');
-INSERT INTO mtb_constants VALUES ('MELMAGA_SEND','true',75,'メルマガ配信抑制(false:OFF、true:ON)');
+INSERT INTO mtb_constants VALUES ('MELMAGA_SEND','true',75,'メルマガ配信(true:配信する、false:配信しない)');
 INSERT INTO mtb_constants VALUES ('MELMAGA_BATCH_MODE','false',76,'メイルマガジンバッチモード(true:バッチで送信する ※要cron設定、false:リアルタイムで送信する)');
 INSERT INTO mtb_constants VALUES ('LOGIN_FRAME','"login_frame.tpl"',77,'ログイン画面フレーム');
@@ -897,5 +898,5 @@
 INSERT INTO mtb_constants VALUES ('LEVEL_MAX','5',132,'カテゴリの最大階層');
 INSERT INTO mtb_constants VALUES ('CATEGORY_MAX','1000',133,'最大カテゴリ登録数');
-INSERT INTO mtb_constants VALUES ('ADMIN_TITLE','"ECサイト管理ページ"',134,'管理ページタイトル');
+INSERT INTO mtb_constants VALUES ('ADMIN_TITLE','"管理機能"',134,'管理機能タイトル');
 INSERT INTO mtb_constants VALUES ('SELECT_RGB','"#ffffdf"',135,'編集時強調表示色');
 INSERT INTO mtb_constants VALUES ('DISABLED_RGB','"#C9C9C9"',136,'入力項目無効時の表示色');
@@ -916,5 +917,5 @@
 INSERT INTO mtb_constants VALUES ('NO_IMAGE_URL','URL_DIR . "misc/blank.gif"',157,'画像がない場合に表示');
 INSERT INTO mtb_constants VALUES ('NO_IMAGE_DIR','HTML_PATH . "misc/blank.gif"',158,'画像がない場合に表示');
-INSERT INTO mtb_constants VALUES ('URL_SYSTEM_TOP','URL_DIR . "admin/system/index.php"',159,'システム管理トップ');
+INSERT INTO mtb_constants VALUES ('URL_SYSTEM_TOP','URL_DIR . "admin/system/" . DIR_INDEX_URL',159,'システム管理トップ');
 INSERT INTO mtb_constants VALUES ('URL_CLASS_REGIST','URL_DIR . "admin/products/class.php"',160,'規格登録');
 INSERT INTO mtb_constants VALUES ('URL_INPUT_ZIP','URL_DIR . "input_zip.php"',161,'郵便番号入力');
@@ -923,23 +924,18 @@
 INSERT INTO mtb_constants VALUES ('URL_CONTROL_TOP','URL_DIR . "admin/basis/control.php"',164,'サイト管理情報登録');
 INSERT INTO mtb_constants VALUES ('URL_HOME','URL_DIR . "admin/home.php"',165,'ホーム');
-INSERT INTO mtb_constants VALUES ('URL_LOGIN','URL_DIR . "admin/index.php"',166,'ログインページ');
-INSERT INTO mtb_constants VALUES ('URL_SEARCH_TOP','URL_DIR . "admin/products/index.php"',167,'商品検索ページ');
+INSERT INTO mtb_constants VALUES ('URL_LOGIN','URL_DIR . "admin/" . DIR_INDEX_URL',166,'ログインページ');
+INSERT INTO mtb_constants VALUES ('URL_SEARCH_TOP','URL_DIR . "admin/products/" . DIR_INDEX_URL',167,'商品検索ページ');
 INSERT INTO mtb_constants VALUES ('URL_ORDER_EDIT','URL_DIR . "admin/order/edit.php"',168,'注文編集ページ');
-INSERT INTO mtb_constants VALUES ('URL_SEARCH_ORDER','URL_DIR . "admin/order/index.php"',169,'注文編集ページ');
+INSERT INTO mtb_constants VALUES ('URL_SEARCH_ORDER','URL_DIR . "admin/order/" . DIR_INDEX_URL',169,'注文編集ページ');
 INSERT INTO mtb_constants VALUES ('URL_ORDER_MAIL','URL_DIR . "admin/order/mail.php"',170,'注文編集ページ');
 INSERT INTO mtb_constants VALUES ('URL_LOGOUT','URL_DIR . "admin/logout.php"',171,'ログアウトページ');
 INSERT INTO mtb_constants VALUES ('URL_SYSTEM_CSV','URL_DIR . "admin/system/member_csv.php"',172,'システム管理CSV出力ページ');
-INSERT INTO mtb_constants VALUES ('URL_ADMIN_CSS','URL_DIR . "admin/css/"',173,'管理ページ用CSS保管ディレクトリ');
+INSERT INTO mtb_constants VALUES ('URL_ADMIN_CSS','URL_DIR . "admin/css/"',173,'管理機能用CSS保管ディレクトリ');
 INSERT INTO mtb_constants VALUES ('URL_CAMPAIGN_TOP','URL_DIR . "admin/contents/campaign.php"',174,'キャンペーン登録ページ');
 INSERT INTO mtb_constants VALUES ('URL_CAMPAIGN_DESIGN','URL_DIR . "admin/contents/campaign_design.php"',175,'キャンペーンデザイン設定ページ');
 INSERT INTO mtb_constants VALUES ('SUCCESS','0',176,'アクセス成功');
-INSERT INTO mtb_constants VALUES ('LOGIN_ERROR','1',177,'ログイン失敗');
-INSERT INTO mtb_constants VALUES ('ACCESS_ERROR','2',178,'アクセス失敗（タイムアウト等）');
-INSERT INTO mtb_constants VALUES ('AUTH_ERROR','3',179,'アクセス権限違反');
-INSERT INTO mtb_constants VALUES ('INVALID_MOVE_ERRORR','4',180,'不正な遷移エラー');
-INSERT INTO mtb_constants VALUES ('PRODUCTS_LIST_MAX','15',181,'商品一覧表示数');
 INSERT INTO mtb_constants VALUES ('MEMBER_PMAX','10',182,'メンバー管理ページ表示行数');
 INSERT INTO mtb_constants VALUES ('SEARCH_PMAX','10',183,'検索ページ表示行数');
-INSERT INTO mtb_constants VALUES ('NAVI_PMAX','4',184,'ページ番号の最大表示個数');
+INSERT INTO mtb_constants VALUES ('NAVI_PMAX','4',184,'ページ番号の最大表示数量');
 INSERT INTO mtb_constants VALUES ('PRODUCTSUB_MAX','5',185,'商品サブ情報最大数');
 INSERT INTO mtb_constants VALUES ('DELIVTIME_MAX','16',186,'お届け時間の最大表示数');
@@ -967,36 +963,13 @@
 INSERT INTO mtb_constants VALUES ('SEARCH_CATEGORY_LEN','18',208,'検索カテゴリ最大表示文字数(byte)');
 INSERT INTO mtb_constants VALUES ('FILE_NAME_LEN','10',209,'ファイル名表示文字数');
-INSERT INTO mtb_constants VALUES ('SALE_LIMIT_MAX','10',210,'購入制限なしの場合の最大購入個数');
-INSERT INTO mtb_constants VALUES ('SITE_TITLE','"ＥＣ-ＣＵＢＥ  テストサイト"',211,'HTMLタイトル');
+INSERT INTO mtb_constants VALUES ('SALE_LIMIT_MAX','10',210,'購入制限なしの場合の最大購入数量');
 INSERT INTO mtb_constants VALUES ('COOKIE_EXPIRE','365',212,'クッキー保持期限(日)');
-INSERT INTO mtb_constants VALUES ('PRODUCT_NOT_FOUND','1',213,'指定商品ページがない');
-INSERT INTO mtb_constants VALUES ('CART_EMPTY','2',214,'カート内が空');
-INSERT INTO mtb_constants VALUES ('PAGE_ERROR','3',215,'ページ推移エラー');
-INSERT INTO mtb_constants VALUES ('CART_ADD_ERROR','4',216,'購入処理中のカート商品追加エラー');
-INSERT INTO mtb_constants VALUES ('CANCEL_PURCHASE','5',217,'他にも購入手続きが行われた場合');
-INSERT INTO mtb_constants VALUES ('CATEGORY_NOT_FOUND','6',218,'指定カテゴリページがない');
-INSERT INTO mtb_constants VALUES ('SITE_LOGIN_ERROR','7',219,'ログインに失敗');
-INSERT INTO mtb_constants VALUES ('CUSTOMER_ERROR','8',220,'会員専用ページへのアクセスエラー');
-INSERT INTO mtb_constants VALUES ('SOLD_OUT','9',221,'購入時の売り切れエラー');
-INSERT INTO mtb_constants VALUES ('CART_NOT_FOUND','10',222,'カート内商品の読込エラー');
-INSERT INTO mtb_constants VALUES ('LACK_POINT','11',223,'ポイントの不足');
-INSERT INTO mtb_constants VALUES ('TEMP_LOGIN_ERROR','12',224,'仮登録者がログインに失敗');
-INSERT INTO mtb_constants VALUES ('URL_ERROR','13',225,'URLエラー');
-INSERT INTO mtb_constants VALUES ('EXTRACT_ERROR','14',226,'ファイル解凍エラー');
-INSERT INTO mtb_constants VALUES ('FTP_DOWNLOAD_ERROR','15',227,'FTPダウンロードエラー');
-INSERT INTO mtb_constants VALUES ('FTP_LOGIN_ERROR','16',228,'FTPログインエラー');
-INSERT INTO mtb_constants VALUES ('FTP_CONNECT_ERROR','17',229,'FTP接続エラー');
-INSERT INTO mtb_constants VALUES ('CREATE_DB_ERROR','18',230,'DB作成エラー');
-INSERT INTO mtb_constants VALUES ('DB_IMPORT_ERROR','19',231,'DBインポートエラー');
-INSERT INTO mtb_constants VALUES ('FILE_NOT_FOUND','20',232,'設定ファイル存在エラー');
-INSERT INTO mtb_constants VALUES ('WRITE_FILE_ERROR','21',233,'書き込みエラー');
-INSERT INTO mtb_constants VALUES ('FREE_ERROR_MSG','999',234,'フリーメッセージ');
 INSERT INTO mtb_constants VALUES ('SEPA_CATNAVI','" > "',235,'カテゴリ区切り文字');
 INSERT INTO mtb_constants VALUES ('SEPA_CATLIST','" | "',236,'カテゴリ区切り文字');
-INSERT INTO mtb_constants VALUES ('URL_SHOP_TOP','SSL_URL . "shopping/index.php"',237,'会員情報入力');
-INSERT INTO mtb_constants VALUES ('URL_ENTRY_TOP','SSL_URL . "entry/index.php"',238,'会員登録ページTOP');
-INSERT INTO mtb_constants VALUES ('URL_SITE_TOP','URL_DIR . "index.php"',239,'サイトトップ');
-INSERT INTO mtb_constants VALUES ('URL_CART_TOP','URL_DIR . "cart/index.php"',240,'カートトップ');
-INSERT INTO mtb_constants VALUES ('URL_DELIV_TOP','URL_DIR . "shopping/deliv.php"',241,'お届け時間設定');
+INSERT INTO mtb_constants VALUES ('URL_SHOP_TOP','SSL_URL . "shopping/" . DIR_INDEX_URL',237,'会員情報入力');
+INSERT INTO mtb_constants VALUES ('URL_ENTRY_TOP','SSL_URL . "entry/" . DIR_INDEX_URL',238,'会員登録ページTOP');
+INSERT INTO mtb_constants VALUES ('URL_SITE_TOP','URL_DIR . DIR_INDEX_URL',239,'サイトトップ');
+INSERT INTO mtb_constants VALUES ('URL_CART_TOP','URL_DIR . "cart/" . DIR_INDEX_URL',240,'カートトップ');
+INSERT INTO mtb_constants VALUES ('URL_DELIV_TOP','URL_DIR . "shopping/deliv.php"',241,'お届け先設定');
 INSERT INTO mtb_constants VALUES ('URL_MYPAGE_TOP','SSL_URL . "mypage/login.php"',242,'Myページトップ');
 INSERT INTO mtb_constants VALUES ('URL_SHOP_CONFIRM','URL_DIR . "shopping/confirm.php"',243,'購入確認ページ');
@@ -1008,6 +981,4 @@
 INSERT INTO mtb_constants VALUES ('URL_SHOP_MODULE','URL_DIR . "shopping/load_payment_module.php"',249,'モジュール追加用画面');
 INSERT INTO mtb_constants VALUES ('URL_PRODUCTS_TOP','URL_DIR . "products/top.php"',250,'商品トップ');
-INSERT INTO mtb_constants VALUES ('LIST_P_HTML','URL_DIR . "products/list-p"',251,'商品一覧(HTML出力)');
-INSERT INTO mtb_constants VALUES ('LIST_C_HTML','URL_DIR . "products/list.php?mode=search&category_id="',252,'商品一覧(HTML出力)');
 INSERT INTO mtb_constants VALUES ('DETAIL_P_HTML','URL_DIR . "products/detail.php?product_id="',253,'商品詳細(HTML出力)');
 INSERT INTO mtb_constants VALUES ('MYPAGE_DELIVADDR_URL','URL_DIR . "mypage/delivery.php"',254,'マイページお届け先URL');
@@ -1020,5 +991,5 @@
 INSERT INTO mtb_constants VALUES ('ORDER_BACK_ORDER','4',261,'取り寄せ中');
 INSERT INTO mtb_constants VALUES ('ORDER_DELIV','5',262,'発送済み');
-INSERT INTO mtb_constants VALUES ('ODERSTATUS_COMMIT','ORDER_DELIV',263,'受注完了時のステータス番号');
+INSERT INTO mtb_constants VALUES ('ODERSTATUS_COMMIT','ORDER_DELIV',263,'受注ステータス変更の際にポイント等を加算するステータス番号（発送済み）');
 INSERT INTO mtb_constants VALUES ('ADMIN_NEWS_STARTYEAR','2005',264,'新着情報管理画面 開始年(西暦) ');
 INSERT INTO mtb_constants VALUES ('ENTRY_CUSTOMER_TEMP_SUBJECT','"会員仮登録が完了いたしました。"',265,'会員登録');
@@ -1026,10 +997,7 @@
 INSERT INTO mtb_constants VALUES ('ENTRY_LIMIT_HOUR','1',267,'再入会制限時間（単位: 時間)');
 INSERT INTO mtb_constants VALUES ('RECOMMEND_PRODUCT_MAX','6',268,'関連商品表示数');
-INSERT INTO mtb_constants VALUES ('RECOMMEND_NUM','8',269,'オススメ商品表示数');
-INSERT INTO mtb_constants VALUES ('BEST_MAX','5',270,'ベスト商品の最大登録数');
-INSERT INTO mtb_constants VALUES ('BEST_MIN','3',271,'ベスト商品の最小登録数（登録数が満たない場合は表示しない。)');
-INSERT INTO mtb_constants VALUES ('DELIV_DATE_END_MAX','21',272,'お届け可能な日付以降のプルダウン表示最大日数');
+INSERT INTO mtb_constants VALUES ('RECOMMEND_NUM','8',269,'おすすめ商品表示数');
+INSERT INTO mtb_constants VALUES ('DELIV_DATE_END_MAX','21',272,'お届け可能日以降のプルダウン表示最大日数');
 INSERT INTO mtb_constants VALUES ('PURCHASE_CUSTOMER_REGIST','0',273,'購入時強制会員登録(1:有効　0:無効)');
-INSERT INTO mtb_constants VALUES ('RELATED_PRODUCTS_MAX','3',274,'この商品を買った人はこんな商品も買っています　表示件数');
 INSERT INTO mtb_constants VALUES ('CV_PAYMENT_LIMIT','14',275,'支払期限');
 INSERT INTO mtb_constants VALUES ('CAMPAIGN_REGIST_MAX','20',276,'キャンペーン登録最大数');
@@ -1039,5 +1007,5 @@
 INSERT INTO mtb_constants VALUES ('TRACKBACK_STATUS_SPAM','3',280,'トラックバック スパム');
 INSERT INTO mtb_constants VALUES ('TRACKBACK_VIEW_MAX','10',281,'フロント最大表示数');
-INSERT INTO mtb_constants VALUES ('TRACKBACK_TO_URL','SITE_URL . "tb/index.php?pid="',282,'トラックバック先URL');
+INSERT INTO mtb_constants VALUES ('TRACKBACK_TO_URL','SITE_URL . "tb/" . DIR_INDEX_URL . "?pid="',282,'トラックバック先URL');
 INSERT INTO mtb_constants VALUES ('SITE_CONTROL_TRACKBACK','1',283,'サイト管理 トラックバック');
 INSERT INTO mtb_constants VALUES ('SITE_CONTROL_AFFILIATE','2',284,'サイト管理 アフィリエイト');
@@ -1046,26 +1014,30 @@
 INSERT INTO mtb_constants VALUES ('SMTP_HOST','"127.0.0.1"',287,'SMTPサーバー');
 INSERT INTO mtb_constants VALUES ('SMTP_PORT','"25"',288,'SMTPポート');
+INSERT INTO mtb_constants VALUES ('UPDATE_SEND_SITE_INFO','false',289,'アップデート時にサイト情報を送出するか');
 INSERT INTO mtb_constants VALUES ('USE_POINT','true',290,'ポイントを利用するか(true:利用する、false:利用しない) (false は一部対応)');
-INSERT INTO mtb_constants VALUES ('DEFAULT_TEMPLATE_NAME', '"default"', 299,'デフォルトテンプレート名');
-INSERT INTO mtb_constants VALUES ('TEMPLATE_NAME', '"default"', 300,'テンプレート名');
-INSERT INTO mtb_constants VALUES ('SMARTY_TEMPLATES_DIR',' DATA_PATH . "Smarty/templates/"', 301,'SMARTYテンプレート');
-INSERT INTO mtb_constants VALUES ('TPL_DIR','URL_DIR . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 302,'SMARTYテンプレート');
-INSERT INTO mtb_constants VALUES ('TEMPLATE_DIR','SMARTY_TEMPLATES_DIR . TEMPLATE_NAME . "/"', 303,'SMARTYテンプレート');
-INSERT INTO mtb_constants VALUES ('TEMPLATE_ADMIN_DIR','SMARTY_TEMPLATES_DIR . DEFAULT_TEMPLATE_NAME . "/admin/"', 304,'SMARTYテンプレート(管理ページ)');
-INSERT INTO mtb_constants VALUES ('COMPILE_DIR','DATA_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/"',305,'SMARTYコンパイル');
-INSERT INTO mtb_constants VALUES ('COMPILE_ADMIN_DIR','COMPILE_DIR . "admin/"',306,'SMARTYコンパイル(管理ページ)');
-INSERT INTO mtb_constants VALUES ('TEMPLATE_FTP_DIR','USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 307,'SMARTYテンプレート(FTP許可)');
-INSERT INTO mtb_constants VALUES ('COMPILE_FTP_DIR','COMPILE_DIR . USER_DIR', 308,'SMARTYコンパイル(FTP許可)');
-INSERT INTO mtb_constants VALUES ('BLOC_DIR','"bloc/"', 309,'ブロックファイル保存先');
-INSERT INTO mtb_constants VALUES ('BLOC_PATH','TEMPLATE_DIR . BLOC_DIR', 310,'ブロックファイル保存先');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_DIR','"cp/"',311,'キャンペーンファイル保存先');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_URL','URL_DIR . CAMPAIGN_DIR',312,'キャンペーン関連');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_PATH','HTML_PATH . CAMPAIGN_DIR',313,'キャンペーン関連');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_DIR','"campaign/"',314,'キャンペーン関連');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_PATH','TEMPLATE_DIR . CAMPAIGN_TEMPLATE_DIR',315,'キャンペーン関連');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_BLOC_DIR','"bloc/"',316,'キャンペーン関連');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_BLOC_PATH','CAMPAIGN_TEMPLATE_PATH . CAMPAIGN_BLOC_DIR',317,'キャンペーン関連');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_ACTIVE','"active/"',318,'キャンペーン関連');
-INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_END','"end/"',319,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('NOSTOCK_HIDDEN','false',291,'在庫無し商品の非表示(true:非表示、false:表示)');
+INSERT INTO mtb_constants VALUES ('USE_MOBILE','true',292,'モバイルサイトを利用するか(true:利用する、false:利用しない) (false は一部対応)');
+INSERT INTO mtb_constants VALUES ('DEFAULT_TEMPLATE_NAME', '"default"', 300,'デフォルトテンプレート名');
+INSERT INTO mtb_constants VALUES ('TEMPLATE_NAME', '"default"', 301,'テンプレート名');
+INSERT INTO mtb_constants VALUES ('SMARTY_TEMPLATES_DIR',' DATA_PATH . "Smarty/templates/"', 302,'SMARTYテンプレート');
+INSERT INTO mtb_constants VALUES ('TPL_DIR','URL_DIR . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 303,'SMARTYテンプレート');
+INSERT INTO mtb_constants VALUES ('TEMPLATE_DIR','SMARTY_TEMPLATES_DIR . TEMPLATE_NAME . "/"', 304,'SMARTYテンプレート');
+INSERT INTO mtb_constants VALUES ('TEMPLATE_ADMIN_DIR','SMARTY_TEMPLATES_DIR . DEFAULT_TEMPLATE_NAME . "/admin/"', 305,'SMARTYテンプレート(管理機能)');
+INSERT INTO mtb_constants VALUES ('COMPILE_DIR','DATA_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/"',306,'SMARTYコンパイル');
+INSERT INTO mtb_constants VALUES ('COMPILE_ADMIN_DIR','COMPILE_DIR . "admin/"',307,'SMARTYコンパイル(管理機能)');
+INSERT INTO mtb_constants VALUES ('TEMPLATE_FTP_DIR','USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 308,'SMARTYテンプレート(FTP許可)');
+INSERT INTO mtb_constants VALUES ('COMPILE_FTP_DIR','COMPILE_DIR . USER_DIR', 309,'SMARTYコンパイル(FTP許可)');
+INSERT INTO mtb_constants VALUES ('BLOC_DIR','"bloc/"', 310,'ブロックファイル保存先');
+INSERT INTO mtb_constants VALUES ('BLOC_PATH','TEMPLATE_DIR . BLOC_DIR', 311,'ブロックファイル保存先');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_DIR','"cp/"',312,'キャンペーンファイル保存先');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_URL','URL_DIR . CAMPAIGN_DIR',313,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_PATH','HTML_PATH . CAMPAIGN_DIR',314,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_DIR','"campaign/"',315,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_PATH','TEMPLATE_DIR . CAMPAIGN_TEMPLATE_DIR',316,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_BLOC_DIR','"bloc/"',317,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_BLOC_PATH','CAMPAIGN_TEMPLATE_PATH . CAMPAIGN_BLOC_DIR',318,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_ACTIVE','"active/"',319,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('CAMPAIGN_TEMPLATE_END','"end/"',320,'キャンペーン関連');
+INSERT INTO mtb_constants VALUES ('RFC_COMPLIANT_EMAIL_CHECK', 'false', 321, 'EメールアドレスチェックをRFC準拠にするか(true:準拠する、false:準拠しない)');
 INSERT INTO mtb_constants VALUES ('MOBILE_TEMPLATE_DIR', 'TEMPLATE_DIR . "mobile/"', 400,'SMARTYテンプレート(mobile)');
 INSERT INTO mtb_constants VALUES ('MOBILE_COMPILE_DIR', 'COMPILE_DIR . "mobile/"', 401,'SMARTYコンパイル(mobile)');
@@ -1078,7 +1050,7 @@
 INSERT INTO mtb_constants VALUES ('MOBILE_IMAGE_DIR', 'HTML_PATH . "upload/mobile_image"', 408,'携帯電話向け変換画像保存ディレクトリ');
 INSERT INTO mtb_constants VALUES ('MOBILE_IMAGE_URL', 'URL_DIR . "upload/mobile_image"', 409,'携帯電話向け変換画像保存ディレクトリ');
-INSERT INTO mtb_constants VALUES ('MOBILE_URL_SITE_TOP', 'MOBILE_URL_DIR . "index.php"', 410,'モバイルURL');
-INSERT INTO mtb_constants VALUES ('MOBILE_URL_CART_TOP', 'MOBILE_URL_DIR . "cart/index.php"', 411,'カートトップ');
-INSERT INTO mtb_constants VALUES ('MOBILE_URL_SHOP_TOP', 'MOBILE_SSL_URL . "shopping/index.php"', 412,'会員情報入力');
+INSERT INTO mtb_constants VALUES ('MOBILE_URL_SITE_TOP', 'MOBILE_URL_DIR . DIR_INDEX_URL', 410,'モバイルURL');
+INSERT INTO mtb_constants VALUES ('MOBILE_URL_CART_TOP', 'MOBILE_URL_DIR . "cart/" . DIR_INDEX_URL', 411,'カートトップ');
+INSERT INTO mtb_constants VALUES ('MOBILE_URL_SHOP_TOP', 'MOBILE_SSL_URL . "shopping/" . DIR_INDEX_URL', 412,'会員情報入力');
 INSERT INTO mtb_constants VALUES ('MOBILE_URL_SHOP_CONFIRM', 'MOBILE_URL_DIR . "shopping/confirm.php"', 413,'購入確認ページ');
 INSERT INTO mtb_constants VALUES ('MOBILE_URL_SHOP_PAYMENT', 'MOBILE_URL_DIR . "shopping/payment.php"', 414,'お支払い方法選択ページ');
@@ -1087,5 +1059,5 @@
 INSERT INTO mtb_constants VALUES ('MOBILE_URL_SHOP_MODULE', 'MOBILE_URL_DIR . "shopping/load_payment_module.php"', 417,'モジュール追加用画面');
 INSERT INTO mtb_constants VALUES ('SESSION_KEEP_METHOD', '"useCookie"', 418,'セッション維持方法：useCookie|useRequest');
-INSERT INTO mtb_constants VALUES ('SESSION_LIFETIME', '"1800"', 419,'セッションの存続時間 (秒)');
+INSERT INTO mtb_constants VALUES ('SESSION_LIFETIME', '1800', 419,'セッションの存続時間 (秒)');
 INSERT INTO mtb_constants VALUES ('OSTORE_URL', '"http://store.ec-cube.net/"', 500, 'オーナーズストアURL');
 INSERT INTO mtb_constants VALUES ('OSTORE_SSLURL', '"https://store.ec-cube.net/"', 501, 'オーナーズストアURL');
@@ -1111,7 +1083,9 @@
 INSERT INTO mtb_constants VALUES ('OSTORE_E_C_PERMISSION', '"2009"', 521, 'オーナーズストア通信エラーコード');
 INSERT INTO mtb_constants VALUES ('OSTORE_E_C_BATCH_ERR', '"2010"', 522, 'オーナーズストア通信エラーコード');
-INSERT INTO mtb_constants VALUES ('OPTION_FAVOFITE_PRODUCT','1',523,'お気に入り商品登録(有効:1 無効:0)');
-INSERT INTO mtb_constants VALUES ('NOSTOCK_HIDDEN','false',524,'お気に入り商品を表示する際の、在庫なし商品表示・非表示(非表示:true 表示:false)');
-INSERT INTO mtb_constants VALUES ('IMAGE_RENAME','true',525,'画像リネーム設定（商品画像のみ）(true:リネームする、false:リネームしない)');
-
-INSERT INTO dtb_module (module_id,module_code,module_name,update_date,create_date)values(0,0,'patch',now(),now());
+INSERT INTO mtb_constants VALUES ('OPTION_FAVOFITE_PRODUCT', '1', 523, 'お気に入り商品登録(有効:1 無効:0)');
+INSERT INTO mtb_constants VALUES ('IMAGE_RENAME', 'true', 525, '画像リネーム設定（商品画像のみ）(true:リネームする、false:リネームしない)');
+INSERT INTO mtb_constants VALUES ('PLUGIN_DIR', '"plugins/"', 600, 'プラグインディレクトリ');
+INSERT INTO mtb_constants VALUES ('PLUGIN_PATH', 'USER_PATH . PLUGIN_DIR', 601, 'プラグイン保存先');
+INSERT INTO mtb_constants VALUES ('PLUGIN_URL', 'USER_URL . PLUGIN_DIR', 602, 'プラグイン URL');
+
+INSERT INTO dtb_module (module_id,module_code,module_name,update_date,create_date) VALUES (0,0,'patch',now(),now());
Index: tmp/version-2_5-test/html/install/sql/drop_view.sql
===================================================================
--- tmp/version-2_5-test/html/install/sql/drop_view.sql	(revision 18562)
+++ tmp/version-2_5-test/html/install/sql/drop_view.sql	(revision 18609)
@@ -1,6 +1,6 @@
 DROP VIEW vw_category_count;
 DROP VIEW vw_product_class;
+DROP VIEW vw_products_allclass;
 DROP VIEW vw_products_allclass_detail;
-DROP VIEW vw_products_allclass;
 DROP VIEW vw_products_nonclass;
 DROP VIEW vw_cross_products_class;
Index: tmp/version-2_5-test/html/mobile/.htaccess
===================================================================
--- tmp/version-2_5-test/html/mobile/.htaccess	(revision 15079)
+++ tmp/version-2_5-test/html/mobile/.htaccess	(revision 18609)
@@ -3,3 +3,2 @@
 php_value variables_order EGPS
 php_flag session.auto_start 0
-php_flag session.use_trans_sid 1
Index: tmp/version-2_5-test/html/mobile/order/index.php
===================================================================
--- tmp/version-2_5-test/html/mobile/order/index.php	(revision 18609)
+++ tmp/version-2_5-test/html/mobile/order/index.php	(revision 18609)
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2008 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("../require.php");
+require_once(CLASS_EX_PATH . "page_extends/order/LC_Page_Order_Ex.php");
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Order_Ex();
+register_shutdown_function(array($objPage, "destroy"));
+$objPage->mobileInit();
+$objPage->mobileProcess();
+?>
Index: tmp/version-2_5-test/html/mobile/guide/order.php
===================================================================
--- tmp/version-2_5-test/html/mobile/guide/order.php	(revision 18609)
+++ tmp/version-2_5-test/html/mobile/guide/order.php	(revision 18609)
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2007 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("../require.php");
+require_once(CLASS_EX_PATH . "page_extends/guide/LC_Page_Guide_Order_Ex.php");
+
+// }}}
+// {{{ generate page
+
+$objPage = new LC_Page_Guide_Order_Ex();
+register_shutdown_function(array($objPage, "destroy"));
+$objPage->mobileInit();
+$objPage->mobileProcess();
+?>
Index: tmp/version-2_5-test/html/mobile/require.php
===================================================================
--- tmp/version-2_5-test/html/mobile/require.php	(revision 18562)
+++ tmp/version-2_5-test/html/mobile/require.php	(revision 18609)
@@ -1,5 +1,4 @@
 <?php
-/**
- *
+/*
  * This file is part of EC-CUBE
  *
@@ -21,12 +20,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
 
- */
-$mobile_require_php_dir = realpath(dirname( __FILE__));
-require_once($mobile_require_php_dir . "/../define.php");
+// rtrim は PHP バージョン依存対策
+define("HTML_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
 
+require_once HTML_PATH . 'handle_error.php';
+require_once HTML_PATH . 'define.php';
 define('MOBILE_SITE', true);
+require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
 
-require_once($mobile_require_php_dir . "/../" . HTML2DATA_DIR . "require_base.php");
+// モバイルサイトを利用しない設定の場合、落とす。
+if (USE_MOBILE === false) {
+    // XXX PCサイトにリダイレクトする方がスマートか? 若しくはHTTPエラーとすべきか?
+    exit;
+}
 
 // モバイルサイト用の初期処理を実行する。
@@ -38,5 +44,7 @@
 // Moba8対応（Moba8パラメータ引き継ぎ）
 if (function_exists("sfGetMoba8Param") == TRUE) {
-	sfGetMoba8Param($_GET['a8']);
+    sfGetMoba8Param($_GET['a8']);
 }
+
+ob_start();
 ?>
Index: tmp/version-2_5-test/html/error.php
===================================================================
--- tmp/version-2_5-test/html/error.php	(revision 18609)
+++ tmp/version-2_5-test/html/error.php	(revision 18609)
@@ -0,0 +1,38 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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_php_dir = realpath(dirname( __FILE__));
+require_once($require_php_dir . "/define.php");
+require_once($require_php_dir . "/" . HTML2DATA_DIR . "require_safe.php");
+require_once(CLASS_EX_PATH . "page_extends/error/LC_Page_Error_SystemError_Ex.php");
+
+if (isset($_GET['admin'])) {
+    define("ADMIN_FUNCTION", true);
+}
+// }}}
+// {{{ generate page
+$objPage = new LC_Page_Error_SystemError_Ex();
+register_shutdown_function(array($objPage, "destroy"));
+$objPage->init();
+$objPage->process();
+?>
Index: tmp/version-2_5-test/html/define.php
===================================================================
--- tmp/version-2_5-test/html/define.php	(revision 15745)
+++ tmp/version-2_5-test/html/define.php	(revision 18609)
@@ -1,8 +1,17 @@
 <?php
 /** HTMLディレクトリからのDATAディレクトリの相対パス */
-define("HTML2DATA_DIR", "/../data/");
+define("HTML2DATA_DIR", "../data/");
 
-/** DATA ディレクトリから HTML ディレクトリの相対パス */
-define("DATA_DIR2HTML", "/../html/");
+/** DATA ディレクトリから HTML ディレクトリの相対パス(未使用) */
+define("DATA_DIR2HTML", "../html/");
+
+/**
+ * DIR_INDEX_FILE にアクセスするときにファイル名を使用するか
+ *
+ * true: 使用する, false: 使用しない (初期値: IIS は true、それ以外は false)
+ * ※ IIS は、POST 時にファイル名を使用しないと不具合が発生する。(http://support.microsoft.com/kb/247536/ja)
+ */
+define('USE_FILENAME_DIR_INDEX',
+       empty($_SERVER['SERVER_SOFTWARE']) ? false : substr($_SERVER['SERVER_SOFTWARE'], 0, 13) == 'Microsoft-IIS');
 
 /*
Index: tmp/version-2_5-test/html/shopping/load_payment_module.php
===================================================================
--- tmp/version-2_5-test/html/shopping/load_payment_module.php	(revision 18562)
+++ tmp/version-2_5-test/html/shopping/load_payment_module.php	(revision 18609)
@@ -29,5 +29,5 @@
 // 前のページで正しく登録手続きが行われた記録があるか判定
 SC_Utils::sfIsPrePage($objSiteSess);
-
+GC_Utils::gfPrintLog("before");
 // SPSモジュール連携用
 if (file_exists(MODULE_PATH . 'mdl_sps/inc/include.php')
@@ -41,4 +41,5 @@
 // アクセスの正当性の判定
 $uniqid = SC_Utils::sfCheckNormalAccess($objSiteSess, $objCartSess);
+GC_Utils::gfPrintLog("after");
 
 $payment_id = $_SESSION["payment_id"];
Index: tmp/version-2_5-test/html/handle_error.php
===================================================================
--- tmp/version-2_5-test/html/handle_error.php	(revision 18609)
+++ tmp/version-2_5-test/html/handle_error.php	(revision 18609)
@@ -0,0 +1,92 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2009 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.
+ */
+
+// エラー捕捉用の出力バッファリング
+ob_start('_fatal_error_handler');
+
+// エラー画面を表示させるためのエラーハンドラ
+set_error_handler('handle_error');
+
+/**
+ * エラーを捕捉するための関数.
+ *
+ * PHP4 では, try/catch が使用できず, かつ set_error_handler で Fatal Error は
+ * 捕捉できないため, ob_start にこの関数を定義し, Fatal Error が発生した場合
+ * に出力される HTML 出力を捕捉する.
+ * この関数が実行され, エラーが捕捉されると, エラーページへリダイレクトする.
+ *
+ * @param string $buffer 出力バッファリングの内容
+ * @return string|void エラーが捕捉された場合は, エラーページへリダイレクトする;
+ *                     エラーが捕捉されない場合は, 出力バッファリングの内容を返す
+ */
+function &_fatal_error_handler(&$buffer) {
+    if (preg_match('/<b>(Fatal) error<\/b>: +(.+) in <b>(.+)<\/b> on line <b>(\d+)<\/b><br \/>/i', $buffer, $matches)) {
+
+        $admin = "";
+        if (defined('ADMIN_FUNCTION') && ADMIN_FUNCTION) {
+            $admin = "?admin";
+        }
+        header("Location: " . SITE_URL . "error.php" . $admin);
+        exit;
+    }
+    return $buffer;
+}
+
+/**
+ * エラー画面を表示させるための関数.
+ *
+ * この関数は, set_error_handler() 関数に登録するための関数である.
+ * trigger_error にて E_USER_ERROR が生成されると, ob_end_clean() 関数によって
+ * 出力バッファリングが無効にされ, エラーログを出力した後, エラーページへ
+ * リダイレクトする.
+ *
+ * E_USER_ERROR 以外のエラーが生成された場合, この関数は true を返す.
+ *
+ * @param integer $errno エラーコード
+ * @param string $errstr エラーメッセージ
+ * @param string $errfile エラーが発生したファイル名
+ * @param integer $errline エラーが発生した行番号
+ * @return void|boolean E_USER_ERROR が発生した場合は, エラーページへリダイレクト;
+ *                      E_USER_ERROR 以外の場合は true
+ */
+function handle_error($errno, $errstr, $errfile, $errline) {
+    switch ($errno) {
+    case E_USER_ERROR:
+        ob_end_clean();
+        error_log("FATAL Error($errno) $errfile:$errline $errstr");
+
+        $admin = "";
+        if (defined('ADMIN_FUNCTION') && ADMIN_FUNCTION) {
+            $admin = "?admin";
+        }
+        header("Location: " . SITE_URL . "error.php" . $admin);
+        exit(1);
+        break;
+
+    case E_USER_WARNING:
+    case E_USER_NOTICE:
+    default:
+    }
+    return true;
+}
+?>
