Ignore:
Timestamp:
2009/07/08 16:39:57 (17 years ago)
Author:
kajiwara
Message:

2.4.1 正式版をコミット。コミット内容詳細はこちら（http://svn.ec-cube.net/open_trac/query?status=closed&milestone=EC-CUBE2.4.1）

Location:
branches/version-2/html/install
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2/html/install/index.php

    r18176 r18177  
    2626 
    2727define("INSTALL_LOG", "./temp/install.log"); 
     28define("INSTALL_INFO_URL", "http://www.ec-cube.net/install_info/index.php"); 
    2829ini_set("max_execution_time", 300); 
    2930 
    … …  
    305306    } 
    306307    $req->clearPostData(); 
    307  
    308308    break; 
    309309case 'return_step0': 
    … …  
    328328    break; 
    329329} 
    330  
    331330//フォーム用のパラメータを返す 
    332331$objPage->arrForm = $objWebParam->getFormParamList(); 
    … …  
    390389        ".." . HTML2DATA_DIR . "Smarty/", 
    391390        ".." . HTML2DATA_DIR . "logs/", 
    392         ".." . HTML2DATA_DIR . "downloads/" 
     391        ".." . HTML2DATA_DIR . "downloads/", 
     392        ".." . HTML2DATA_DIR . "upload/" 
    393393    ); 
    394394 
    … …  
    467467            mkdir($path); 
    468468        } 
     469        $path = ".." . HTML2DATA_DIR . "upload/csv"; 
     470        if(!file_exists($path)) { 
     471            mkdir($path); 
     472        } 
    469473        $mess.= ">> ○：アクセス権限は正常です。<br>"; 
    470474    } 
    … …  
    609613    } 
    610614    $objPage->tpl_sslurl = $secure_url; 
     615    //EC-CUBEオフィシャルサイトからのお知らせURL 
     616    $objPage->install_info_url = INSTALL_INFO_URL; 
    611617    return $objPage; 
    612618} 
    … …  
    10181024    if($objDb->sfTabaleExists('dtb_csv', $dsn)) { 
    10191025        lfInsertCSVData(1,'category_id','カテゴリID',53,'now()','now()', $dsn); 
    1020         lfInsertCSVData(4,'order_id','注文ID',1,'now()','now()', $dsn); 
     1026        lfInsertCSVData(4,'order_id','注文番号',1,'now()','now()', $dsn); 
    10211027        lfInsertCSVData(4,'campaign_id','キャンペーンID',2,'now()','now()', $dsn); 
    10221028        lfInsertCSVData(4,'customer_id','顧客ID',3,'now()','now()', $dsn); 

  • branches/version-2/html/install/sql/column_comment.sql

    r18176 r18177  
    314314INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_news','update_date','更新日時'); 
    315315INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_news','del_flg ','0:既定、1:削除'); 
    316 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','best_id','注文ID'); 
     316INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','best_id','注文番号'); 
    317317INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','category_id','カテゴリID'); 
    318318INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','rank','順位'); 
    … …  
    325325INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_best_products','del_flg ','0:既定、1:削除'); 
    326326INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mail_history','send_id','送信ID'); 
    327 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mail_history','order_id','注文ID'); 
     327INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mail_history','order_id','注文番号'); 
    328328INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mail_history','send_date','送信日時'); 
    329329INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_mail_history','template_id','メールテンプレートID'); 
    … …  
    376376INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_customer_mail_temp','update_date','更新日'); 
    377377INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_customer_mail_temp','create_data','作成日'); 
    378 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','order_id','注文ID'); 
     378INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','order_id','注文番号'); 
    379379INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','order_temp_id','注文一時ID'); 
    380380INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','customer_id','顧客ID(非会員の場合は、0)'); 
    … …  
    527527INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','tel02','電話番号2'); 
    528528INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','tel03','電話番号3'); 
    529 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','order_id','注文ID'); 
     529INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','order_id','注文番号'); 
    530530INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','product_id','商品ID'); 
    531531INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_detail','classcategory_id1','規格分類ID1'); 

  • branches/version-2/html/install/sql/insert_data.sql

    r18176 r18177  
    132132insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'create_date','登録日',26,now(),now()); 
    133133insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(2,'update_date','更新日',27,now(),now()); 
    134 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_id','注文ID',1,now(),now()); 
     134insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_id','注文番号',1,now(),now()); 
    135135insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'customer_id','顧客ID',2,now(),now()); 
    136136insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'message','要望等',3,now(),now()); 
    … …  
    185185insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'create_date','注文日時',52,now(),now()); 
    186186insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'update_date','更新日時',53,now(),now()); 
    187 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_id','注文ID',1,now(),now()); 
     187insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_id','注文番号',1,now(),now()); 
    188188insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'campaign_id','キャンペーンID',2,now(),now()); 
    189189insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'customer_id','顧客ID',3,now(),now()); 
    … …  
    757757INSERT INTO mtb_mobile_domain VALUES (4, 'vodafone.ne.jp', 3); 
    758758INSERT INTO mtb_mobile_domain VALUES (5, 'pdx.ne.jp', 4); 
     759INSERT INTO mtb_mobile_domain VALUES (6, 'disney.ne.jp', 5); 
    759760INSERT INTO mtb_ownersstore_err VALUES ('1000', '不明なエラーが発生しました。', 0); 
    760761INSERT INTO mtb_ownersstore_err VALUES ('1001', '不正なパラメータが送信されました。', 1); 
    … …  
    912913INSERT INTO mtb_constants VALUES ('IMAGE_TEMP_URL_RSS','SITE_URL . "upload/temp_image/"',154,'RSS用画像一時保存URL'); 
    913914INSERT INTO mtb_constants VALUES ('IMAGE_SAVE_URL_RSS','SITE_URL . "upload/save_image/"',155,'RSS用画像保存先URL'); 
    914 INSERT INTO mtb_constants VALUES ('CSV_TEMP_DIR','HTML_PATH . "upload/csv/"',156,'エンコードCSVの一時保存先'); 
     915INSERT INTO mtb_constants VALUES ('CSV_TEMP_DIR','DATA_PATH . "upload/csv/"',156,'エンコードCSVの一時保存先'); 
    915916INSERT INTO mtb_constants VALUES ('NO_IMAGE_URL','URL_DIR . "misc/blank.gif"',157,'画像がない場合に表示'); 
    916917INSERT INTO mtb_constants VALUES ('NO_IMAGE_DIR','HTML_PATH . "misc/blank.gif"',158,'画像がない場合に表示'); 
    … …  
    10191020INSERT INTO mtb_constants VALUES ('ORDER_BACK_ORDER','4',261,'取り寄せ中'); 
    10201021INSERT INTO mtb_constants VALUES ('ORDER_DELIV','5',262,'発送済み'); 
    1021 INSERT INTO mtb_constants VALUES ('ODERSTATUS_COMMIT','ORDER_DELIV',263,'受注ステータス変更の際にポイント等を加算するステータス番号（発送済み）'); 
     1022INSERT INTO mtb_constants VALUES ('ODERSTATUS_COMMIT','ORDER_DELIV',263,'受注完了時のステータス番号'); 
    10221023INSERT INTO mtb_constants VALUES ('ADMIN_NEWS_STARTYEAR','2005',264,'新着情報管理画面 開始年(西暦) '); 
    10231024INSERT INTO mtb_constants VALUES ('ENTRY_CUSTOMER_TEMP_SUBJECT','"会員仮登録が完了いたしました。"',265,'会員登録'); 
    … …  
    10461047INSERT INTO mtb_constants VALUES ('SMTP_PORT','"25"',288,'SMTPポート'); 
    10471048INSERT INTO mtb_constants VALUES ('USE_POINT','true',290,'ポイントを利用するか(true:利用する、false:利用しない) (false は一部対応)'); 
    1048 INSERT INTO mtb_constants VALUES ('DEFAULT_TEMPLATE_NAME', '"default"', 300,'デフォルトテンプレート名'); 
    1049 INSERT INTO mtb_constants VALUES ('TEMPLATE_NAME', '"default"', 301,'テンプレート名'); 
     1049INSERT INTO mtb_constants VALUES ('DEFAULT_TEMPLATE_NAME', '"default"', 299,'デフォルトテンプレート名'); 
     1050INSERT INTO mtb_constants VALUES ('TEMPLATE_NAME', '"default"', 300,'テンプレート名'); 
    10501051INSERT INTO mtb_constants VALUES ('SMARTY_TEMPLATES_DIR',' DATA_PATH . "Smarty/templates/"', 301,'SMARTYテンプレート'); 
    10511052INSERT INTO mtb_constants VALUES ('TPL_DIR','URL_DIR . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 302,'SMARTYテンプレート'); 

  • branches/version-2/html/install/templates/complete.tpl

    r18176 r18177  
    2828<!--{/foreach}--> 
    2929 
    30 <tr><td height="80"></td></tr> 
     30<tr><td height="30"></td></tr> 
    3131<tr> 
    3232    <td align="center" class="fs12"> 
    … …  
    4141    </td> 
    4242</tr> 
    43 <tr><td height="80"></td></tr> 
     43<tr><td height="30"></td></tr> 
    4444 
    4545</table> 

  • branches/version-2/html/install/templates/install_frame.tpl

    r18176 r18177  
    3434</head> 
    3535 
    36 <body bgcolor="#ffffff" text="#000000" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="preLoadImg('<!--{$smarty.const.URL_DIR}-->');<!--{$tpl_onload}-->"> 
     36<body bgcolor="#ffffff" text="#000000" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> 
    3737<noscript> 
    3838<link rel="stylesheet" href="../<!--{$default_dir}-->/css/common.css" type="text/css" > 
    … …  
    9292                    <tr><td height="40"></td></tr> 
    9393                </table> 
     94                <!--{if strlen($install_info_url) != 0}--> 
     95                <table width="562" border="0" cellspacing="0" cellpadding="0" summary=" "> 
     96                    <tr> 
     97                        <td align="center"> 
     98                            <iframe src="<!--{$install_info_url}-->" width="562" height="460" frameborder="no" scrolling="no"> 
     99                                                         こちらはEC-CUBEからのお知らせです。この部分は iframe対応ブラウザでご覧下さい。 
     100                            </iframe> 
     101                        </td> 
     102                    </tr> 
     103                    <tr><td height="20"></td></tr> 
     104                </table> 
     105                <!--{/if}--> 
    94106                </td> 
    95107            </tr> 
Note: See TracChangeset for help on using the changeset viewer.