Index: /branches/comu-ver2/html/campaign/application.php
===================================================================
--- /branches/comu-ver2/html/campaign/application.php	(revision 16582)
+++ /branches/comu-ver2/html/campaign/application.php	(revision 17581)
@@ -23,5 +23,5 @@
 
 // {{{ requires
-require_once("../../require.php");
+require_once("../require.php");
 require_once(CLASS_EX_PATH . "page_extends/campaign/LC_Page_CampaignApplication_Ex.php");
 
Index: /branches/comu-ver2/html/campaign/index.php
===================================================================
--- /branches/comu-ver2/html/campaign/index.php	(revision 16582)
+++ /branches/comu-ver2/html/campaign/index.php	(revision 17581)
@@ -23,5 +23,5 @@
 
 // {{{ requires
-require_once("../../require.php");
+require_once("../require.php");
 require_once(CLASS_EX_PATH . "page_extends/campaign/LC_Page_Campaign_Ex.php");
 
Index: /branches/comu-ver2/html/campaign/complete.php
===================================================================
--- /branches/comu-ver2/html/campaign/complete.php	(revision 16582)
+++ /branches/comu-ver2/html/campaign/complete.php	(revision 17581)
@@ -23,5 +23,5 @@
 
 // {{{ requires
-require_once("../../require.php");
+require_once("../require.php");
 require_once(CLASS_EX_PATH . "page_extends/campaign/LC_Page_CampaignComplete_Ex.php");
 
Index: /branches/comu-ver2/html/campaign/entry.php
===================================================================
--- /branches/comu-ver2/html/campaign/entry.php	(revision 16582)
+++ /branches/comu-ver2/html/campaign/entry.php	(revision 17581)
@@ -23,5 +23,5 @@
 
 // {{{ requires
-require_once("../../require.php");
+require_once("../require.php");
 require_once(CLASS_EX_PATH . "page_extends/campaign/LC_Page_CampaignEntry_Ex.php");
 
Index: /branches/comu-ver2/data/Smarty/templates/default/mobile/entry/index.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/mobile/entry/index.tpl	(revision 16582)
+++ /branches/comu-ver2/data/Smarty/templates/default/mobile/entry/index.tpl	(revision 17581)
@@ -43,5 +43,5 @@
 	<font color="#FF0000"><!--{$arrErr.password}--></font>
 	<!--{assign var="size" value="`$smarty.const.PASSWORD_LEN2+2`"}-->
-	<input type="text" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" size="<!--{$size}-->"><br>
+	<input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" size="<!--{$size}-->"><br>
 
 	【パスワード確認用の質問】<font color="#FF0000">※</font><br>
Index: /branches/comu-ver2/data/Smarty/templates/default/mypage/change_confirm.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 17519)
+++ /branches/comu-ver2/data/Smarty/templates/default/mypage/change_confirm.tpl	(revision 17581)
@@ -114,3 +114,4 @@
     </form>
   </div>
+</div>
 <!--▲CONTENTS-->
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/products/product.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/products/product.tpl	(revision 17573)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/products/product.tpl	(revision 17581)
@@ -58,4 +58,5 @@
 <input type="hidden" name="image_key" value="" />
 <input type="hidden" name="product_id" value="<!--{$arrForm.product_id}-->" />
+<input type="hidden" name="product_class_id" value="<!--{$arrForm.product_class_id}-->" />
 <input type="hidden" name="copy_product_id" value="<!--{$arrForm.copy_product_id}-->" />
 <input type="hidden" name="anchor_key" value="" />
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/products/product_class.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/products/product_class.tpl	(revision 17444)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/products/product_class.tpl	(revision 17581)
@@ -112,4 +112,5 @@
         <input type="hidden" name="name1:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].name1}-->" />
         <input type="hidden" name="name2:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].name2}-->" />
+        <input type="hidden" name="product_class_id:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].product_class_id}-->" />
         <input type="checkbox" name="check:<!--{$smarty.section.cnt.iteration}-->" value="1" <!--{if $arrForm[$key] == 1}-->checked="checked"<!--{/if}-->>
       </td>
Index: /branches/comu-ver2/data/class/SC_Initial.php
===================================================================
--- /branches/comu-ver2/data/class/SC_Initial.php	(revision 17569)
+++ /branches/comu-ver2/data/class/SC_Initial.php	(revision 17581)
@@ -39,5 +39,5 @@
         /** EC-CUBEのバージョン */
         // XXX SVNのリビジョンを付加できたら良いと思う。(方法が分からない。)
-        define('ECCUBE_VERSION', "2.2.0-comu");
+        define('ECCUBE_VERSION', "2.3.0-comu");
     }
 
Index: /branches/comu-ver2/data/class/SC_Query.php
===================================================================
--- /branches/comu-ver2/data/class/SC_Query.php	(revision 17556)
+++ /branches/comu-ver2/data/class/SC_Query.php	(revision 17581)
@@ -248,5 +248,5 @@
             // 先頭に~があるとプレースホルダーしない。
             } else if(ereg("^~", $val)) {
-                $strval .= ereg_replace("^~", "", $val);
+                $strval .= ereg_replace("^~", "", $val).",";
             } else {
                 $strval .= '?,';
@@ -267,5 +267,4 @@
         $strval = ereg_replace(",$","",$strval);
         $sqlin = "INSERT INTO $table(" . $strcol. ") VALUES (" . $strval . ")";
-
         // INSERT文の実行
         $ret = $this->conn->query($sqlin, $arrval);
Index: /branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
===================================================================
--- /branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	(revision 17579)
+++ /branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	(revision 17581)
@@ -237,5 +237,4 @@
         // サブ情報表示・非表示のチェックに使用する。
         $this->sub_find = $sub_find;
-
         $objView->assignobj($this);
         $objView->display(MAIN_FRAME);
@@ -331,5 +330,8 @@
                                                       "product_id = ?",
                                                       array($product_id));
-
+        //編集時に規格IDが変わってしまうのを防ぐために規格が登録されていなければ規格IDを取得する
+        if( $this->lfCheckNonClass($_POST['product_id']) ){
+            $arrRet[0]['product_class_id'] = SC_Utils::sfGetProductClassId($product_id,"0","0");
+        }
         return $arrRet[0];
     }
@@ -482,5 +484,5 @@
 
         // 規格登録
-        SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id);
+        SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id , $arrList['product_class_id'] );
 
         // 関連商品登録
Index: /branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- /branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 17579)
+++ /branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 17581)
@@ -134,5 +134,4 @@
                 $this->arrClassCat = $this->lfGetClassCatListEdit($_POST['product_id']);
             }
-
             $this->lfProductClassPage();   // 規格登録ページ
             break;
@@ -148,5 +147,4 @@
                 $this->arrClassCat = $this->lfGetClassCatListDisp($_POST['select_class_id1'], $_POST['select_class_id2']);
             }
-
             $this->lfProductClassPage();   // 規格登録ページ
             break;
@@ -230,9 +228,16 @@
         $this->arrForm['product_name'] = $product_name;
     }
-
+    
+    /**
+     * デフォルトの表示
+     *
+     * @param object $objQuery
+     * @param integer $product_id 製品のID
+     * @param integer $max 表示される最大値
+     */
     function lfSetDefaultClassCat($objQuery, $product_id, $max) {
 
         // デフォルト値の読込
-        $col = "product_code, price01, price02, stock, stock_unlimited";
+        $col = "product_class_id, product_code, price01, price02, stock, stock_unlimited";
         $arrRet = $objQuery->select($col, "dtb_products_class", "product_id = ? AND classcategory_id1 = 0 AND classcategory_id2 = 0", array($product_id));;
 
@@ -240,4 +245,5 @@
             $no = 1;
             for($cnt = 0; $cnt < $max; $cnt++) {
+                $this->arrForm["product_class_id:".$no] = $arrRet[0]['product_class_id'];
                 $this->arrForm["product_code:".$no] = $arrRet[0]['product_code'];
                 $this->arrForm['stock:'.$no] = $arrRet[0]['stock'];
@@ -266,5 +272,5 @@
             $sql.= "WHERE class_id1 = ? AND class_id2 = 0 ORDER BY rank1 DESC;";
             $arrRet = $objQuery->getall($sql, array($class_id1));
-
+            
         }
 
@@ -312,10 +318,9 @@
         // デフォルト値を設定
         $this->lfSetDefaultClassCat($objQuery, $product_id, $max);
-
         $no = 1;
-
         for($cnt = 0; $cnt < $max; $cnt++) {
             $this->arrForm["classcategory_id1:".$no] = $arrList[$cnt]['classcategory_id1'];
             $this->arrForm["classcategory_id2:".$no] = $arrList[$cnt]['classcategory_id2'];
+            $this->arrForm["product_class_id:".$no] = $arrList[$cnt]['product_class_id'];
             if($arrList[$cnt]['product_id'] != "") {
                 $this->arrForm["product_code:".$no] = $arrList[$cnt]['product_code'];
@@ -356,4 +361,7 @@
                 $sqlval['classcategory_id1'] = $arrList["classcategory_id1:".$cnt];
                 $sqlval['classcategory_id2'] = $arrList["classcategory_id2:".$cnt];
+                if( strlen($arrList["product_class_id:".$cnt]) > 0 ){
+                    $sqlval['product_class_id'] = $arrList["product_class_id:".$cnt];
+                }
                 $sqlval['product_code'] = $arrList["product_code:".$cnt];
                 $sqlval['stock'] = $arrList["stock:".$cnt];
Index: /branches/comu-ver2/data/class/SC_MobileUserAgent.php
===================================================================
--- /branches/comu-ver2/data/class/SC_MobileUserAgent.php	(revision 16582)
+++ /branches/comu-ver2/data/class/SC_MobileUserAgent.php	(revision 17581)
@@ -128,5 +128,5 @@
         // 携帯端末だと認識されたが、User-Agent の形式が未知の場合
         if (Net_UserAgent_Mobile::isError($objAgent)) {
-            gfPrintLog($objAgent->toString());
+            GC_Utils_Ex::gfPrintLog($objAgent->toString());
             return false;
         }
Index: /branches/comu-ver2/data/class/util/SC_Utils.php
===================================================================
--- /branches/comu-ver2/data/class/util/SC_Utils.php	(revision 17579)
+++ /branches/comu-ver2/data/class/util/SC_Utils.php	(revision 17581)
@@ -756,5 +756,5 @@
 
     /* 規格の登録 */
-    function sfInsertProductClass($objQuery, $arrList, $product_id) {
+    function sfInsertProductClass($objQuery, $arrList, $product_id , $product_class_id = "") {
         // すでに規格登録があるかどうかをチェックする。
         $where = "product_id = ? AND classcategory_id1 <> 0 AND classcategory_id1 <> 0";
@@ -772,4 +772,7 @@
 
             $sqlval['product_id'] = $product_id;
+            if(strlen($product_class_id ) > 0 ){
+                $sqlval['product_class_id'] = $product_class_id;
+            }
             $sqlval['classcategory_id1'] = '0';
             $sqlval['classcategory_id2'] = '0';
Index: /branches/comu-ver2/data/class/session/SC_SessionFactory.php
===================================================================
--- /branches/comu-ver2/data/class/session/SC_SessionFactory.php	(revision 17137)
+++ /branches/comu-ver2/data/class/session/SC_SessionFactory.php	(revision 17581)
@@ -73,4 +73,10 @@
         // クッキーを使用する
         case 'useCookie':
+            // モバイルの場合はSC_SessionFactory_UseRequestを使用する
+            if (defined('MOBILE_SITE')) {
+                $session = new SC_SessionFactory_UseRequest;
+                $session->setState('mobile');
+                break;
+            }
         default:
             $session = new SC_SessionFactory_UseCookie;
Index: /branches/comu-ver2/release.sh
===================================================================
--- /branches/comu-ver2/release.sh	(revision 17152)
+++ /branches/comu-ver2/release.sh	(revision 17581)
@@ -4,7 +4,7 @@
 TMP_DIR=/tmp
 SVN_REPO=file:///home/svn/open
-SVN_PATH=$SVN_REPO/branches/version-2
+SVN_PATH=$SVN_REPO/branches/comu-ver2
 SVN_TAGS=$SVN_REPO/tags
-ECCUBE_VERSION=2.1.1-beta
+ECCUBE_VERSION=2.3.0-commu
 WRK_DIR=eccube-$ECCUBE_VERSION