Index: temp/branches/mobile/data/include/mobile_image_map_softbank.csv =================================================================== --- temp/branches/mobile/data/include/mobile_image_map_softbank.csv (revision 11457) +++ temp/branches/mobile/data/include/mobile_image_map_softbank.csv (revision 11457) @@ -0,0 +1,146 @@ +705P,705P,300000,Y,240,240,jpg,15000,Y +705SC,705SC,300000,Y,230,230,jpg,15000,Y +706SC,706SC,300000,Y,230,230,jpg,15000,Y +707SC,707SC,300000,Y,230,230,jpg,15000,Y +810SH,810SH,300000,Y,480,480,jpg,15000,Y +810T,810T,300000,Y,240,240,jpg,15000,Y +811SH,811SH,300000,Y,480,480,jpg,15000,Y +811T,811T,300000,Y,240,240,jpg,15000,Y +910SH,910SH,300000,Y,480,480,jpg,15000,Y +910T,910T,300000,Y,240,240,jpg,15000,Y +911SH,911SH,300000,Y,234,232,jpg,15000,Y +J-D03,J-D03,6000,N,120,120,jpg,5000,N +J-D04,J-D04,6000,N,120,120,jpg,5000,N +J-D05,J-D05,6000,N,132,132,jpg,5000,N +J-D06,J-D06,6000,N,132,132,jpg,5000,N +J-D07,J-D07,6000,N,128,128,jpg,5000,N +J-D08,J-D08,6000,N,132,132,jpg,5000,N +J-D31,J-D31,6000,N,120,120,jpg,5000,N +J-DN02,J-DN02,6000,N,116,112,png,5000,N +J-DN02_a,J-DN02_a,6000,N,116,112,png,5000,N +J-DN02_b,J-DN02_b,6000,N,116,112,png,5000,N +J-DN03,J-DN03,6000,N,120,120,jpg,5000,N +J-DN03_a,J-DN03_a,6000,N,120,120,jpg,5000,N +J-K03,J-K03,6000,N,120,120,jpg,5000,N +J-K04,J-K04,6000,N,120,120,jpg,5000,N +J-K05,J-K05,6000,N,120,120,jpg,5000,N +J-K51,J-K51,12000,Y,128,128,jpg,10000,Y +J-N03,J-N03,6000,N,120,120,jpg,5000,N +J-N03II,J-N03B,6000,N,120,120,jpg,5000,N +J-N04,J-N04,6000,N,120,120,jpg,5000,N +J-N05,J-N05,6000,N,160,160,jpg,5000,N +J-N51,J-N51,12000,Y,160,160,jpg,10000,Y +J-NM01,J-NM01,6000,N,120,120,jpg,5000,N +J-NM01_a,J-NM01_a,6000,N,120,120,jpg,5000,N +J-NM01_b,J-NM01_b,6000,N,120,120,jpg,5000,N +J-NM02,J-NM02,6000,N,120,120,jpg,5000,N +J-P02,J-P02,6000,N,96,96,png,5000,N +J-P02_a,J-P02_a,6000,N,96,96,png,5000,N +J-P03,J-P03,6000,N,96,96,png,5000,N +J-P51,J-P51,12000,Y,120,120,jpg,10000,Y +J-PE03,J-PE03,6000,N,120,120,jpg,5000,N +J-PE03_a,J-PE03_a,6000,N,120,120,jpg,5000,N +J-PE03_b,J-PE03_b,6000,N,120,120,jpg,5000,N +J-PE03_c,J-PE03_c,6000,N,120,120,jpg,5000,N +J-PE03II,J-PE03B,6000,N,120,120,jpg,5000,N +J-PE03II(J-PE03B_a),J-PE03B_a,6000,N,120,120,jpg,5000,N +J-SA02,J-SA02,6000,N,96,96,png,5000,N +J-SA03,J-SA03,6000,N,120,120,jpg,5000,N +J-SA03_a,J-SA03_a,6000,N,120,120,jpg,5000,N +J-SA03_b,J-SA03_b,6000,N,120,120,jpg,5000,N +J-SA04,J-SA04,6000,N,120,120,jpg,5000,N +J-SA04_a,J-SA04_a,6000,N,120,120,jpg,5000,N +J-SA05,J-SA05,6000,N,120,120,jpg,5000,N +J-SA06,J-SA06,6000,N,132,132,jpg,5000,N +J-SA51,J-SA51,12000,Y,132,132,jpg,10000,Y +J-SA51_a,J-SA51_a,12000,Y,132,132,jpg,10000,Y +J-SH02,J-SH02,6000,N,96,96,png,5000,N +J-SH02_a,J-SH02_a,6000,N,96,96,png,5000,N +J-SH03,J-SH03,6000,N,96,96,png,5000,N +J-SH03_a,J-SH03_a,6000,N,96,96,png,5000,N +J-SH04,J-SH04,6000,N,96,96,jpg,5000,N +J-SH04_a,J-SH04_a,6000,N,96,96,jpg,5000,N +J-SH04_b,J-SH04_b,6000,N,96,96,jpg,5000,N +J-SH04_c,J-SH04_c,6000,N,96,96,jpg,5000,N +J-SH04B,J-SH04B,6000,N,96,96,jpg,5000,N +J-SH04B_a,J-SH04B_a,6000,N,96,96,jpg,5000,N +J-SH05,J-SH05,6000,N,120,120,jpg,5000,N +J-SH05_a,J-SH05_a,6000,N,120,120,jpg,5000,N +J-SH06,J-SH06,6000,N,96,96,jpg,5000,N +J-SH07,J-SH07,6000,N,120,120,jpg,5000,N +J-SH08,J-SH08,6000,N,120,120,jpg,5000,N +J-SH09,J-SH09,6000,N,120,120,jpg,5000,N +J-SH09_a,J-SH09_a,6000,N,120,120,jpg,5000,N +J-SH010,J-SH10,6000,N,240,240,jpg,5000,N +J-SH010_a,J-SH10_a,6000,N,240,240,jpg,5000,N +J-SH51,J-SH51,12000,Y,120,120,jpg,10000,Y +J-SH51_a,J-SH51_a,12000,Y,120,120,jpg,10000,Y +J-SH52,J-SH52,12000,Y,120,120,jpg,10000,Y +J-SH53,J-SH53,12000,Y,240,240,jpg,10000,Y +J-SH53_a,J-SH53_a,12000,Y,240,240,jpg,10000,Y +J-T04,J-T04,6000,N,96,96,png,5000,N +J-T04_a,J-T04_a,6000,N,96,96,png,5000,N +J-T05,J-T05,6000,N,120,120,jpg,5000,N +J-T06,J-T06,6000,N,120,120,jpg,5000,N +J-T06_a,J-T06_a,6000,N,120,120,jpg,5000,N +J-T07,J-T07,6000,N,144,144,jpg,5000,N +J-T08,J-T08,6000,N,222,222,jpg,5000,N +J-T09,J-T09,6000,N,144,144,jpg,5000,N +J-T010,J-T10,6000,N,240,240,jpg,5000,N +J-T51,J-T51,12000,Y,144,144,jpg,10000,Y +V702sMO,MOT-C980,300000,Y,176,176,jpg,15000,Y +V702MO,MOT-V980,300000,Y,176,176,jpg,15000,Y +V102D,V102D,6000,N,128,128,jpg,5000,N +V201SH,V201SH,6000,N,240,240,jpg,5000,N +V301D,V301D,6000,N,132,132,jpg,5000,N +V301D_n,V301D_n,6000,N,132,132,jpg,5000,N +V301SH,V301SH,6000,N,240,240,jpg,5000,N +V301T,V301T,6000,N,222,216,jpg,5000,N +V302SH,V302SH,6000,N,240,240,jpg,5000,N +V302T,V302T,6000,N,144,144,jpg,5000,N +V303T(KOTO),V303T,6000,N,222,216,jpg,5000,N +V304T,V304T,6000,N,221,216,jpg,5000,N +V401D,V401D,6000,N,240,240,jpg,5000,N +V401SA,V401SA,6000,N,240,240,jpg,5000,N +V401SH,V401SH,6000,N,240,240,jpg,5000,N +V401T,V401T,6000,N,240,240,jpg,5000,N +V402SH,V402SH,6000,N,240,240,jpg,5000,N +V403SH,V403SH,6000,N,240,240,jpg,5000,N +V501SH,V501SH,30000,Y,240,240,jpg,10000,Y +V501T,V501T,30000,Y,240,240,jpg,10000,Y +V502T,V502T,30000,Y,240,240,jpg,10000,Y +V601N,V601N,12000,Y,160,160,jpg,10000,Y +V601SH,V601SH,12000,Y,240,240,jpg,10000,Y +V601T,V601T,30000,Y,240,240,jpg,10000,Y +V602SH,V602SH,30000,Y,240,240,jpg,10000,Y +V602T,V602T,30000,Y,240,240,jpg,10000,Y +V603SH,V603SH,30000,Y,240,240,jpg,10000,Y +V603T,V603T,30000,Y,240,240,jpg,10000,Y +V604SH,V604SH,30000,Y,240,240,jpg,10000,Y +V604T,V604T,30000,Y,240,240,jpg,10000,Y +V702NK,V702NK,300000,Y,176,176,jpg,15000,Y +V702NKII(V702NK2),V702NK2,300000,Y,176,176,jpg,15000,Y +V703N,V703N,300000,Y,240,240,jpg,15000,Y +V703SH,V703SH,300000,Y,240,240,jpg,15000,Y +V703SHf,V703SHf,300000,Y,240,240,jpg,15000,Y +V705SH,V705SH,300000,Y,240,240,jpg,15000,Y +V705T,V705T,300000,Y,240,240,jpg,15000,Y +V801SA,V801SA,200000,Y,240,240,jpg,18000,Y +V801SA_a,V801SA_a,200000,Y,240,240,jpg,18000,Y +V801SH,V801SH,200000,Y,240,240,jpg,18000,Y +V802N,V802N,300000,Y,240,240,jpg,15000,Y +V802SE,V802SE,300000,Y,176,176,jpg,15000,Y +V802SH,V802SH,300000,Y,240,240,jpg,15000,Y +V803T,V803T,300000,Y,240,240,jpg,15000,Y +V804N,V804N,300000,Y,240,240,jpg,15000,Y +V804NK,V804NK,300000,Y,240,240,jpg,15000,Y +V804SH,V804SH,300000,Y,240,240,jpg,15000,Y +V804SS,V804SS,300000,Y,240,240,jpg,15000,Y +V902SH,V902SH,300000,Y,240,240,jpg,15000,Y +V902T,V902T,300000,Y,240,240,jpg,15000,Y +V903SH,V903SH,300000,Y,240,240,jpg,15000,Y +V903T,V903T,300000,Y,240,240,jpg,15000,Y +V904SH,V904SH,300000,Y,240,240,jpg,15000,Y +V904T,V904T,300000,Y,240,240,jpg,15000,Y +V905SH,V905SH,300000,Y,240,240,jpg,15000,Y + Index: temp/branches/mobile/data/include/mobile_image_map_ezweb.csv =================================================================== --- temp/branches/mobile/data/include/mobile_image_map_ezweb.csv (revision 11457) +++ temp/branches/mobile/data/include/mobile_image_map_ezweb.csv (revision 11457) @@ -0,0 +1,194 @@ +C303CA,CA11,1400,Y,120,120,bmp,1300,N +C311CA,CA12,1400,Y,120,120,bmp,1300,N +C409CA,CA13,7500,Y,120,120,png,6000,Y +C452CA,CA14,7500,Y,120,120,png,6000,Y +A3012CA,CA21,9000,Y,125,120,jpg,8000,Y +A5302CA,CA22,9000,Y,125,120,jpg,20000,Y +A5401CA A5401CA II(A5401CA),CA23,9000,Y,123,120,jpg,20000,Y +A5403CA,CA24,9000,Y,230,224,jpg,20000,Y +A5406CA,CA25,9000,Y,230,224,jpg,20000,Y +A5407CA,CA26,9000,Y,230,224,jpg,20000,Y +A5512CA,CA27,9000,Y,230,224,jpg,20000,Y +A5513CA(G'zOne TYPE-R),CA28,9000,Y,230,224,jpg,20000,Y +W21CA W21CA II(W21CA),CA31,9000,Y,123,120,jpg,20000,Y +W31CA,CA32,9000,Y,230,224,jpg,20000,Y +W41CA,CA33,9000,Y,230,224,jpg,20000,Y +W42CA,CA34,9000,Y,232,232,jpg,20000,Y +W43CA,CA35,9000,Y,232,232,jpg,20000,Y +C202DE,DN01,1400,Y,108,104,bmp,1300,N +C402DE,DN11,7500,Y,120,120,png,6000,Y +C201H(C201H_A),HI01,1400,Y,120,120,bmp,1300,N +C201H(C201H_A),HI02,1400,Y,120,120,bmp,1300,N +C302H,HI11,1400,Y,120,120,bmp,1300,N +C309H,HI12,7500,Y,120,120,png,6000,N +C407H,HI13,7500,Y,120,120,png,6000,Y +C451H,HI14,7500,Y,120,120,png,6000,Y +C3001H,HI21,9000,Y,120,120,jpg,8000,Y +A5303H,HI23,9000,Y,125,120,jpg,20000,Y +A5303H II(A5303H2),HI24,9000,Y,125,120,jpg,20000,Y +W11H,HI31,9000,Y,233,232,jpg,20000,Y +W21H,HI32,9000,Y,123,120,jpg,20000,Y +W22H,HI33,9000,Y,230,224,jpg,20000,Y +W31H(PENCK),HI34,9000,Y,230,224,jpg,20000,Y +W32H,HI35,9000,Y,230,224,jpg,20000,Y +W41H,HI36,9000,Y,230,224,jpg,20000,Y +W42H,HI37,9000,Y,232,232,jpg,20000,Y +W43H,HI38,9000,Y,232,232,jpg,20000,Y +C307K,KC11,1400,Y,121,120,bmp,1300,N +C313K,KC12,1400,Y,120,120,png,1300,N +C414K,KC13,7500,Y,120,120,jpg,6000,Y +A1012K A1012K II(A1012K),KC14,7500,Y,120,120,jpg,6000,Y +A1013K,KC15,7500,Y,120,120,jpg,6000,Y +C3002K,KC21,9000,Y,128,128,jpg,7000,Y +A5305K,KC22,9000,Y,125,120,jpg,20000,Y +A1401K,KC23,9000,Y,126,120,jpg,20000,Y +A5502K(A5502K_A),KC24,9000,Y,234,232,jpg,20000,Y +A5502K(A5502K_B),KC25,9000,Y,234,232,jpg,20000,Y +A1403KB01K(A1403K),KC26,9000,Y,234,232,jpg,20000,Y +A5515K,KC27,9000,Y,234,232,jpg,20000,Y +A5521K,KC28,9000,Y,234,232,jpg,20000,Y +W11K,KC31,9000,Y,233,232,jpg,20000,Y +W21K,KC32,9000,Y,234,232,jpg,20000,Y +W31K W31K II(W31K),KC33,9000,Y,234,232,jpg,20000,Y +W32K,KC34,9000,Y,234,232,jpg,20000,Y +W41K,KC35,9000,Y,232,232,jpg,20000,Y +W42K,KC36,9000,Y,232,232,jpg,20000,Y +W43K,KC37,9000,Y,232,232,jpg,20000,Y +W44K,KC38,9000,Y,232,232,jpg,20000,Y +D303K,KCC1,1400121,120,bmp,1300,N +D304K,KCC2,1400121,120,bmp,1300,N +702G,KCI1,1400121,120,bmp,1300,N +703G,KCI2,1400121,120,bmp,1300,N +TK01,KCT1,1400,Y,121,120,bmp,1300,Y +TK02,KCT2,1400,Y,121,120,bmp,1300,Y +TK0K,KCT3,1400,Y,121,120,bmp,1300,Y +TK03,KCT4,7500,Y,96,96,png,6000,Y +TK04,KCT5,7500,Y,96,96,png,6000,Y +TK05,KCT6,7500,Y,96,96,png,6000,Y +TK11,KCT7,7500,Y,96,96,png,6000,Y +TK12,KCT8,7500,Y,120,120,png,6000,Y +TK21,KCT9,7500,Y,120,120,jpg,6000,Y +TK22,KCTA,7500,Y,120,120,jpg,6000,Y +TK23,KCTB,7500,Y,120,120,png,6000,Y +TK31,KCTC,7500,Y,120,120,jpg,6000,Y +TK40,KCTD,7500,Y,120,120,jpg,6000,Y +TK51,KCTE,7500,Y,120,120,jpg,6000,Y +TK41,KCU1,9000,Y,114,112,jpg,8000,Y +C308P(C308P_A),MA11,1400,Y,122,120,bmp,1300,N +C308P(C308P_B),MA12,1400,Y,122,120,bmp,1300,N +C408P,MA13,7500,Y,115,112,png,6000,Y +C3003P,MA21,9000,Y,132,132,jpg,8000,Y +D305P(D305P_A),MAC1,1400122,120,bmp,1300,N +D305P(D305P_B),MAC2,1400122,120,bmp,1300,N +704G(704G_A),MAI1,1400122,120,bmp,1300,N +D704G(704G_B),MAI2,1400122,120,bmp,1300,N +TP01(TP01_A),MAT1,1400,Y,122,120,bmp,1300,Y +TP01(TP01_B),MAT2,1400,Y,122,120,bmp,1300,Y +TP11,MAT3,7500,Y,96,96,png,6000,Y +TD11,MIT1,7500,Y,120,120,png,6000,Y +A1405PT,PT21,9000,Y,240,240,jpg,20000,Y +A1406PT,PT22,9000,Y,240,240,jpg,20000,Y +A3011SA,SA21,9000,Y,126,120,jpg,8000,Y +A3015SA,SA22,9000,Y,126,120,jpg,8000,Y +A1302SA,SA24,9000,Y,132,132,jpg,20000,Y +A1303SA,SA25,9000,Y,132,132,jpg,20000,Y +A5503SA,SA26,9000,Y,225,224,jpg,20000,Y +A5505SA,SA27,9000,Y,225,224,jpg,20000,Y +A1305SA,SA28,9000,Y,124,120,jpg,20000,Y +A5522SA,SA29,9000,Y,235,232,jpg,20000,Y +W21SA,SA31,9000,Y,225,224,jpg,20000,Y +W22SA,SA32,9000,Y,230,224,jpg,20000,Y +W31SA W31SA II(W31SA),SA33,9000,Y,230,224,jpg,20000,Y +W32SA,SA34,9000,Y,228,224,jpg,20000,Y +W33SA,SA35,9000,Y,228,224,jpg,20000,Y +W41SA,SA36,9000,Y,228,224,jpg,20000,Y +E02SA,SA37,9000,Y,228 ,224 ,jpg,20000,Y +W43SA,SA38,9000,Y,228,224,jpg,20000,Y +W41SH,SH31,9000,Y,229,224,jpg,20000,Y +C305S,SN11,1400,Y,120,120,bmp,1300,N +C404S(C404S_A),SN12,7500,Y,120,120,png,6000,Y +C406S,SN13,7500,Y,120,120,png,6000,Y +C404S(C404S_B),SN14,7500,Y,120,120,png,6000,Y +C413S(C413S_B),SN15,7500,Y,120,120,png,6000,Y +C413S(C413S_A),SN16,7500,Y,120,120,png,6000,Y +C1002S,SN17,7500,Y,120,120,png,6000,Y +A3014S,SN21,9000,Y,120,120,jpg,8000,Y +A1101S,SN22,9000,Y,120,120,jpg,8000,Y +A1301S,SN23,9000,Y,120,120,jpg,20000,Y +A5402S,SN24,9000,Y,120,120,jpg,20000,Y +A5404S,SN25,9000,Y,240,240,jpg,20000,Y +A1402S,SN26,9000,Y,228,224,jpg,20000,Y +A1402S II(A1402S2_A),SN27,9000,Y,228,224,jpg,20000,Y +A1402S II ¥«¥á¥é̵¤·(A1402S2_B),SN28,9000,Y,228,224,jpg,20000,Y +A1404S A1404S II(A1404S),SN29,9000,Y,228,224,jpg,20000,Y +W21S,SN31,9000,Y,228,224,jpg,20000,Y +W31S,SN32,9000,Y,228,224,jpg,20000,Y +W32S,SN33,9000,Y,228,224,jpg,20000,Y +W41S,SN34,9000,Y,228,224,jpg,20000,Y +W32S,SN35,9000,Y,228,224,jpg,20000,Y +W42S,SN36,9000,Y,228,224,jpg,20000,Y +W43S,SN37,9000,Y,228,224,jpg,20000,Y +D306S,SNC1,1400120,120,bmp,1300,N +705G,SNI1,1400120,120,bmp,1300,N +C403ST,ST11,7500,Y,120,120,png,6000,Y +C411ST,ST12,7500,Y,120,120,png,6000,Y +A1011ST,ST13,7500,Y,120,120,jpg,6000,Y +A1014ST,ST14,7500,Y,120,120,jpg,6000,Y +A5306ST,ST21,9000,Y,125,120,jpg,20000,Y +A5307ST(INFOBAR),ST22,9000,Y,125,120,jpg,20000,Y +A5405SA,ST23,9000,Y,127,120,jpg,20000,Y +A5507SA,ST24,9000,Y,235,232,jpg,20000,Y +A5508SA(talby),ST25,9000,Y,235,232,jpg,20000,Y +A5510SA(Sweets),ST26,9000,Y,235,232,jpg,20000,Y +A5514SA,ST27,9000,Y,235,232,jpg,20000,Y +A5518SA,ST28,9000,Y,235,232,jpg,20000,Y +A5519SA(Sweets pure),ST29,9000,Y,235,232,jpg,20000,Y +A5520SA,ST2A,9000,Y,235,232,jpg,20000,Y +W42SA,ST31,9000,Y,235,232,jpg,20000,Y +C304SA,SY11,1400,Y,128,128,bmp,1300,N +C401SA,SY12,7500,Y,120,120,png,6000,Y +C405SA,SY13,1400,Y,120,120,png,1300,Y +C412SA,SY14,7500,Y,120,120,png,6000,Y +C1001SA,SY15,7500,Y,120,120,png,6000,Y +D301SA,SYC1,1400128,128,bmp,1300,N +TS01,SYT1,1400,Y,128,128,bmp,1300,Y +TS02,SYT2,7500,Y,96,96,png,6000,Y +TS11,SYT3,7500,Y,120,120,jpg,6000,Y +TS31,SYT4,7500,Y,120,120,jpg,6000,Y +TS41,SYT5,7500,Y,132,132,jpg,6000,Y +C301T,TS11,1400,Y,120,120,bmp,1300,N +C310T,TS12,7500,Y,96,96,png,6000,N +C410T,TS13,7500,Y,96,96,png,6000,Y +C415T,TS14,7500,Y,96,96,png,6000,Y +C5001T,TS21,9000,Y,144,144,jpg,20000,Y +A3013T,TS22,9000,Y,144,144,jpg,7740,Y +A5301T,TS23,9000,Y,144,144,jpg,20000,Y +A5304T,TS24,9000,Y,144,144,jpg,20000,Y +A1304T A1304T II(A1304T),TS25,9000,Y,144,144,jpg,20000,Y +A5501T,TS26,9000,Y,240,240,jpg,20000,Y +A5504T,TS27,9000,Y,229,224,jpg,20000,Y +A5506T,TS28,9000,Y,229,224,jpg,20000,Y +A5509T,TS29,9000,Y,229,224,jpg,20000,Y +A5511T,TS2A,9000,Y,229,224,jpg,20000,Y +A5516T,TS2B,9000,Y,229,224,jpg,20000,Y +A5517T,TS2C,9000,Y,229,224,jpg,20000,Y +W21T,TS31,9000,Y,229,224,jpg,20000,Y +W31T,TS32,9000,Y,229,224,jpg,20000,Y +W32T,TS33,9000,Y,229,224,jpg,20000,Y +W41T,TS34,9000,Y,229,224,jpg,20000,Y +W42T(neon),TS35,9000,Y,229,224,jpg,20000,Y +W43T,TS36,9000,Y,229,224,jpg,20000,Y +W44T,TS37,9000,Y,229,224,jpg,20000,Y +W45T,TS38,9000,Y,229,224,jpg,20000,Y +D302T,TSC1,1400120,120,bmp,1300,N +701G,TSI1,1400120,120,bmp,1300,N +TT01,TST1,1400,Y,120,120,bmp,1300,Y +TT02,TST2,1400,Y,120,120,bmp,1300,Y +TT03,TST3,7500,Y,120,120,png,6000,Y +TT11,TST4,7500,Y,120,120,jpg,6000,Y +TT21,TST5,7500,Y,140,140,jpg,6000,Y +TT22,TST6,7500,Y,140,140,jpg,6000,Y +TT31,TST7,7500,Y,140,140,jpg,6000,Y +TT32,TST8,7500,Y,140,140,jpg,6000,Y +TT51,TST9,7500,Y,120,120,jpg,6000,Y + Index: temp/branches/mobile/data/include/mobile.inc =================================================================== --- temp/branches/mobile/data/include/mobile.inc (revision 11418) +++ temp/branches/mobile/data/include/mobile.inc (revision 11457) @@ -190,6 +190,7 @@ * 2. ÆâÉô¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤«¤é Shift JIS ¤ËÊÑ´¹¤¹¤ë¡£ * 3. Á´³Ñ¥«¥¿¥«¥Ê¤òȾ³Ñ¥«¥¿¥«¥Ê¤ËÊÑ´¹¤¹¤ë¡£ - * 4. ³¨Ê¸»ú¥¿¥°¤ò³¨Ê¸»ú¥³¡¼¥É¤ËÊÑ´¹¤¹¤ë¡£ - * 5. ½ÐÎÏ + * 4. ²èÁüÍѤΥ¿¥°¤òÄ´À°¤¹¤ë¡£ + * 5. ³¨Ê¸»ú¥¿¥°¤ò³¨Ê¸»ú¥³¡¼¥É¤ËÊÑ´¹¤¹¤ë¡£ + * 6. ½ÐÎÏ * * @return void @@ -205,5 +206,5 @@ ob_start(array('GC_MobileEmoji', 'handler')); - // üËö¤Ë¹ç¤ï¤»¤Æ²èÁü¥µ¥¤¥º¤òÊÑ´¹¤¹¤ë¡£ + // üËö¤Ë¹ç¤ï¤»¤Æ²èÁü¥µ¥¤¥º¤òÊÑ´¹¤¹¤ë¡£ ob_start(array('GC_MobileImage', 'handler')); Index: temp/branches/mobile/data/include/mobile_image_map_docomo.csv =================================================================== --- temp/branches/mobile/data/include/mobile_image_map_docomo.csv (revision 11457) +++ temp/branches/mobile/data/include/mobile_image_map_docomo.csv (revision 11457) @@ -0,0 +1,225 @@ +D209i(D209i_B),D209i,5000,N,96,96,gif,3000,N +D209i(D209i_A),D209i/c10,10000,N,96,96,gif,8000,N +D2101V,D2101V,100000,Y,120,120,jpg,20000,Y +D210i,D210i,10000,N,96,96,gif,8000,N +D211i,D211i,10000,Y,100,100,gif,8000,Y +D251i,D251i,10000,Y,132,132,jpg,8000,Y +D251iS,D251iS,10000,Y,132,132,jpg,8000,Y +D252i,D252i,10000,Y,176,176,jpg,8000,Y +D253i,D253i,10000,Y,176,176,jpg,8000,Y +D253iWM(MusicPORTER),D253iWM,10000,Y,220,216,jpg,8000,Y +D501i,D501i,5000,N,96,96,gif,3000,N +D502i(D502i_B),D502i,5000,N,96,96,gif,3000,N +D502i(D502i_A),D502i/c10,10000,N,96,96,gif,5000,N +D503i,D503i,10000,Y,132,132,gif,8000,Y +D503iS,D503iS,10000,Y,132,132,gif,8000,Y +D504i,D504i,10000,Y,132,132,jpg,8000,Y +D505i,D505i,20000,Y,240,240,jpg,18000,Y +D505iS,D505iS,20000,Y,240,240,jpg,18000,Y +D506i,D506i,20000,Y,240,240,jpg,18000,Y +D701i,D701i,100000,Y,230,224,jpg,20000,Y +D701iWM(Music Porter II),D701iWM,100000,Y,230,224,jpg,20000,Y +D702i,D702i,100000,Y,230,224,jpg,20000,Y +D702iBCL,D702iBCL,100000,Y,230,224,jpg,20000,Y +D702iF,D702iF,100000,Y,230,224,jpg,20000,Y +D851iWM(Music Porter X),D851iWM,100000,Y,230,224,jpg,20000,Y +D900i,D900i,100000,Y,240,240,jpg,20000,Y +D901i,D901i,100000,Y,230,224,jpg,20000,Y +D901iS,D901iS,100000,Y,230,224,jpg,20000,Y +D902i,D902i,100000,Y,230,224,jpg,20000,Y +D902iS,D902iS,100000,Y,230,224,jpg,20000,Y +D903i,D903i,100000,Y,230,224,jpg,20000,Y +ER209i(ER209i_B),ER209i,5000,N,120,120,gif,3000,N +ER209i(ER209i_A),ER209i/c15,15000,N,120,120,gif,8000,N +F2051,F2051,100000,Y,176,176,jpg,20000,Y +F209i(F209i_B),F209i,5000,N,96,96,gif,3000,N +F209i(F209i_A),F209i/c10,10000,N,96,96,gif,8000,N +F2102V,F2102V,100000,Y,176,176,jpg,20000,Y +F210i,F210i,10000,N,96,96,gif,8000,N +F211i,F211i,10000,Y,96,96,gif,8000,Y +F212i,F212i,10000,Y,132,132,jpg,8000,Y +F251i,F251i,10000,Y,132,132,jpg,8000,Y +F501i,F501i,5000,N,112,112,gif,3000,N +F502i(F502i_B),F502i,5000,N,96,96,gif,3000,N +F502i(F502i_A),F502i/c10,10000,N,96,96,gif,8000,N +F502it(F502it_B),F502it,5000,N,96,96,gif,3000,N +F502it(F502it_A),F502it/c10,10000,N,96,96,gif,8000,N +F503i,F503i,10000,Y,120,120,gif,8000,Y +F503iS,F503iS,10000,Y,120,120,gif,8000,Y +F504i,F504i,10000,Y,132,132,jpg,8000,Y +F504iS,F504iS,10000,Y,132,132,jpg,8000,Y +F505i,F505i,20000,Y,240,240,jpg,18000,Y +F505iGPS,F505iGPS,20000,Y,240,240,jpg,18000,Y +F506i,F506i,20000,Y,240,240,jpg,18000,Y +F661i,F661i,10000,Y,132,132,jpg,8000,Y +F671i,F671i,10000,N,120,120,gif,8000,N +F671iS,F671iS,10000,Y,160,160,jpg,8000,Y +F672i,F672i,10000,Y,160,160,jpg,8000,Y +F700i,F700i,100000,Y,230,224,jpg,20000,Y +F700iS,F700iS,100000,Y,230,224,jpg,20000,Y +F702iD,F702iD,100000,Y,230,224,jpg,20000,Y +F880iES(FOMA¤é¤¯¤é¤¯¥Û¥ó),F880iES,100000,Y,240,240,jpg,20000,Y +F881iES(FOMA¤é¤¯¤é¤¯¥Û¥óII),F881iES,100000,Y,240,240,jpg,20000,Y +F882iES,F882iES,100000,Y,240,240,jpg,20000,Y +F900i,F900i,100000,Y,230,224,jpg,20000,Y +F900iC,F900iC,100000,Y,230,224,jpg,20000,Y +F900iT,F900iT,100000,Y,230,224,jpg,20000,Y +F901iC,F901iC,100000,Y,230,224,jpg,20000,Y +F901iS,F901iS,100000,Y,230,224,jpg,20000,Y +F902i,F902i,100000,Y,230,224,jpg,20000,Y +F902iS,F902iS,100000,Y,230,224,jpg,20000,Y +F903i,F903i,100000,Y,230,224,jpg,20000,Y +ISIM101,ISIM101,-,-,240,240,jpg,20000,N +ISIM60,ISIM60,-,-,176,176,jpg,20000,N +ISIM70,ISIM70,-,-,240,240,jpg,20000,N +KO209i,KO209i,5000,N,96,96,gif,3000,N +KO210i(KO210i_B),KO210i,5000,N,96,96,gif,3000,N +KO210i(KO210i_A),KO210i/c10,10000,N,96,96,gif,8000,N +L600i,L600i,100000,Y,176,176,jpg,20000,Y +L601i (SIMPURE L1),L601i,100000,Y,176,176,jpg,20000,Y +SH2101V,MST_v_SH2101V,100000,Y,240,240,jpg,20000,Y +N2001,N2001,10000,Y,118,112,jpg,8000,Y +N2002,N2002,100000,Y,118,112,jpg,20000,Y +N2051,N2051,100000,Y,176,176,jpg,20000,Y +N209i(N209i_B),N209i,5000,N,108,108,gif,3000,N +N209i(N209i_A),N209i/c08,8000,N,108,108,gif,6000,N +N2102V,N2102V,100000,Y,176,176,jpg,20000,Y +N210i(N210i_B),N210i,5000,N,118,112,gif,3000,N +N210i(N210i_A),N210i/c10,10000,N,118,112,gif,8000,N +N211i,N211i,10000,Y,118,112,jpg,8000,Y +N211iS,N211iS,10000,Y,118,112,jpg,8000,Y +N251i,N251i,10000,Y,132,132,jpg,8000,Y +N251iS,N251iS,10000,Y,132,132,jpg,8000,Y +N252i,N252i,10000,Y,132,132,jpg,8000,Y +N253i,N253i,10000,Y,160,160,jpg,8000,Y +N2701(N2701_B),N2701,100000,Y,176,176,jpg,20000,Y +N2701(N2701_A),N2701/c10,10000,Y,176,176,jpg,8000,Y +N501i,N501i,5000,N,118,112,gif,3000,N +N502i(N502i_B),N502i,5000,N,118,112,gif,3000,N +N502i(N502i_A),N502i/c08,8000,N,118,112,gif,6000,N +N502it(N502it_B),N502it,5000,N,118,112,gif,3000,N +N502it(N502it_A),N502it/c10,10000,N,118,112,gif,8000,N +N503i,N503i,10000,Y,118,112,jpg,8000,Y +N503iS,N503iS,10000,Y,118,112,jpg,8000,Y +N504i,N504i,10000,Y,160,160,jpg,8000,Y +N504iS,N504iS,10000,Y,160,160,jpg,8000,Y +N505i,N505i,20000,Y,240,240,jpg,18000,Y +N505iS,N505iS,20000,Y,240,240,jpg,18000,Y +N506i,N506i,20000,Y,240,240,jpg,18000,Y +N506iS,N506iS,20000,Y,240,240,jpg,18000,Y +N506iSII(N506iS2),N506iS2,20000,Y,240,240,jpg,18000,Y +N600i,N600i,100000,Y,176,176,jpg,20000,Y +N601i,N601i,100000,Y,240,240,jpg,20000,Y +N700i,N700i,100000,Y,240,240,jpg,20000,Y +N701i,N701i,100000,Y,240,240,jpg,20000,Y +N701iECO,N701iECO,100000,Y,240,240,jpg,20000,Y +N702iD,N702iD,100000,Y,240,240,jpg,20000,Y +N702iS,N702iS,100000,Y,240,240,jpg,20000,Y +N821i(N821i_B),N821i,5000,N,118,112,gif,3000,N +N821i(N821i_A),N821i/c08,8000,N,118,112,gif,6000,N +N900i,N900i,100000,Y,240,240,jpg,20000,Y +N900iG,N900iG,100000,Y,240,240,jpg,20000,Y +N900iL,N900iL,100000,Y,240,240,jpg,20000,Y +N900iS,N900iS,100000,Y,240,240,jpg,20000,Y +N901iC,N901iC,100000,Y,240,240,jpg,20000,Y +N901iS,N901iS,100000,Y,240,240,jpg,20000,Y +N902i,N902i,100000,Y,240,240,jpg,20000,Y +N902iS,N902iS,100000,Y,240,240,jpg,20000,Y +N902iX(HIGH SPEED),N902iX,100000,Y,240,240,jpg,20000,Y +N903i,N903i,100000,Y,240,240,jpg,20000,Y +NM502i(NM502i_B),NM502i,5000,N,111,104,gif,3000,N +NM502i(NM502i_A),NM502i/c10,10000,N,111,104,gif,8000,N +NM850iG,NM850iG,100000,Y,176,176,jpg,20000,Y +P2002,P2002,100000,Y,118,112,jpg,20000,Y +P209i(P209i_B),P209i,5000,N,96,96,gif,3000,N +P209i(P209i_A),P209i/c10,10000,N,96,96,gif,8000,N +P209iS(P209iS_B),P209is,5000,N,96,96,gif,3000,N +P209iS(P209iS_A),P209is/c10,10000,N,96,96,gif,8000,N +P2101V,P2101V,100000,Y,163,160,jpg,20000,Y +P2102V,P2102V,100000,Y,176,176,jpg,20000,Y +P210i(P210i_B),P210i,5000,N,96,96,gif,3000,N +P210i(P210i_A),P210i/c10,10000,N,96,96,gif,8000,N +P211i,P211i,10000,Y,120,120,jpg,8000,Y +P211iS,P211iS,10000,Y,120,120,jpg,8000,Y +P213i(prosolid),P213i,10000,Y,132,132,jpg,8000,Y +P251iS,P251iS,10000,Y,132,132,jpg,8000,Y +P252i,P252i,10000,Y,132,132,jpg,8000,Y +P252iS,P252iS,10000,Y,132,132,jpg,8000,Y +P253i,P253i,10000,Y,132,132,jpg,8000,Y +P253iS(Lechiffon),P253iS,10000,Y,132,132,jpg,8000,Y +P501i,P501i,5000,N,96,96,gif,3000,N +P502i(P502i_B),P502i,5000,N,96,96,gif,3000,N +P502i(P502i_A),P502i/c10,10000,N,96,96,gif,8000,N +P503i,P503i,10000,Y,120,120,jpg,8000,Y +P503iS,P503iS,10000,Y,120,120,jpg,8000,Y +P504i,P504i,10000,Y,132,132,jpg,8000,Y +P504iS,P504iS,10000,Y,132,132,jpg,8000,Y +P505i,P505i,20000,Y,240,240,jpg,18000,Y +P505iS,P505iS,20000,Y,240,240,jpg,18000,Y +P506iC,P506iC,20000,Y,240,240,jpg,18000,Y +P651ps(P651ps_B),P651ps,500096,96,gif,3000,N +P651ps(P651ps_A),P651ps/c10,1000096,96,gif,3000,N +P700i,P700i,100000,Y,240,240,jpg,20000,Y +P701iD,P701iD,100000,Y,240,240,jpg,20000,Y +P702i,P702i,100000,Y,240,240,jpg,20000,Y +P702iD,P702iD,100000,Y,240,240,jpg,20000,Y +P821i(P821i_B),P821i,5000,N,118,112,gif,3000,N +P821i(P821i_A),P821i/c08,8000,N,118,112,gif,6000,N +P851i(prosolidII),P851i,100000,Y,240,240,jpg,20000,Y +P900i,P900i,100000,Y,240,240,jpg,20000,Y +P900iV,P900iV,100000,Y,240,240,jpg,20000,Y +P901i,P901i,100000,Y,240,240,jpg,20000,Y +P901iS,P901iS,100000,Y,240,240,jpg,20000,Y +P901iTV,P901iTV,100000,Y,240,240,jpg,20000,Y +P902i,P902i,100000,Y,240,240,jpg,20000,Y +P902iS,P902iS,100000,Y,240,240,jpg,20000,Y +P903i,P903i,100000,Y,240,240,jpg,20000,Y +R209i,R209i,5000,N,96,96,gif,3000,N +R211i,R211i,10000,Y,96,96,jpg,8000,Y +R691i,R691i,5000,N,96,96,gif,3000,N +R692i,R692i,10000,Y,96,96,jpg,8000,Y +SA700iS,SA700iS,100000,Y,240,240,jpg,20000,Y +SA702i,SA702i,100000,Y,240,240,jpg,20000,Y +SA800i,SA800i,100000,Y,240,240,jpg,20000,Y +SH251i,SH251i,10000,N,120,120,jpg,8000,N +SH251iS,SH251iS,10000,N,176,176,jpg,8000,N +SH252i,SH252i,20000,Y,240,240,jpg,18000,Y +SH505i,SH505i,20000,Y,240,240,jpg,18000,Y +SH505i,SH505i2,20000,Y,240,240,jpg,18000,Y +SH505iS,SH505iS,20000,Y,240,240,jpg,18000,Y +SH506iC,SH506iC,20000,Y,240,240,jpg,18000,Y +SH700i,SH700i,100000,Y,230,230,jpg,20000,Y +SH700iS,SH700iS,100000,Y,240,240,jpg,20000,Y +SH702iD,SH702iD,100000,Y,240,240,jpg,20000,Y +SH702iS,SH702iS,100000,Y,240,240,jpg,20000,Y +SH821i(SH821i_B),SH821i,5000,N,96,96,gif,3000,N +SH821i(SH821i_A),SH821i/c10,10000,N,96,96,gif,8000,N +SH851i(DOLCE),SH851i,100000,Y,240,240,jpg,20000,Y +SH900i,SH900i,100000,Y,240,240,jpg,20000,Y +SH901iC,SH901iC,100000,Y,240,240,jpg,20000,Y +SH901iS,SH901iS,100000,Y,240,240,jpg,20000,Y +SH902i,SH902i,100000,Y,240,240,jpg,20000,Y +SH902iS,SH902iS,100000,Y,240,240,jpg,20000,Y +SH902iSL,SH902iSL,100000,Y,240,240,jpg,20000,Y +SH903i,SH903i,100000,Y,240,240,jpg,20000,Y +SO210i,SO210i,10000,N,120,120,gif,8000,N +SO211i,SO211i,10000,Y,120,120,jpg,8000,Y +SO212i,SO212i,10000,Y,120,120,jpg,8000,Y +SO213i(premini),SO213i,10000,Y,120,120,jpg,8000,Y +SO213iS(premini-S),SO213iS,10000,Y,120,120,jpg,8000,Y +SO213iWR(RADIDEN),SO213iWR,10000,Y,120,120,jpg,8000,Y +SO502i,SO502i,5000,N,120,120,gif,3000,N +SO502iWM,SO502iWM,10000,N,120,120,gif,8000,N +SO503i,SO503i,10000,Y,120,120,gif,8000,Y +SO503iS,SO503iS,10000,Y,120,120,gif,8000,Y +SO504i,SO504i,10000,Y,120,120,jpg,8000,Y +SO505i,SO505i,20000,Y,256,256,jpg,18000,Y +SO505iS,SO505iS,20000,Y,240,240,jpg,18000,Y +SO506i(premini-II),SO506i,20000,Y,240,240,jpg,18000,Y +SO506iC,SO506iC,20000,Y,240,240,jpg,18000,Y +SO506iS(premini-IIS),SO506iS,20000,Y,240,240,jpg,18000,Y +SO702i,SO702i,100000,Y,240,240,jpg,20000,Y +SO902i,SO902i,100000,Y,240,240,jpg,20000,Y +SO902iWP+,SO902iWP+,100000,Y,240,240,jpg,20000,Y +SO903i,SO903i,100000,Y,240,240,jpg,20000,Y +T2101V,T2101V,100000,Y,176,176,jpg,20000,Y Index: temp/branches/mobile/data/include/image_converter.inc =================================================================== --- temp/branches/mobile/data/include/image_converter.inc (revision 11449) +++ temp/branches/mobile/data/include/image_converter.inc (revision 11457) @@ -1,137 +1,131 @@ outputImageDir = realpath(realpath(dirname( __FILE__))); - $this->outputImageType = 'jpeg'; - $this->outputImageWidth = 100; - $this->outputImageHeight = NULL; - //$this->outputImageFileSize = NULL; - } + // ¥³¥ó¥¹¥È¥é¥¯¥¿ + function ImageConverter() { + $this->outputImageDir = realpath(realpath(dirname( __FILE__))); + $this->outputImageType = 'jpeg'; + $this->outputImageWidth = 100; + $this->outputImageHeight = NULL; + //$this->outputImageFileSize = NULL; + } - // ÊÑ´¹¼Â¹Ô - function execute($inputImagePath) { - // Á°½èÍý - $filestat = @stat($inputImagePath); - $imagesize = getimagesize($inputImagePath); - $inputImageWidth = $imagesize[0]; - $inputImageHeight = $imagesize[1]; - $inputImageType = $imagesize[2]; - $outputImageName = base64_encode($inputImagePath . '_' . $this->outputImageWidth . '_' . $filestat['mtime']) . '.' . $this->outputImageType; - $outputImagePath = $this->outputImageDir . '/' . $outputImageName; + // ÊÑ´¹¼Â¹Ô + function execute($inputImagePath) { + // Á°½èÍý + $filestat = @stat($inputImagePath); + $imagesize = getimagesize($inputImagePath); + $inputImageWidth = $imagesize[0]; + $inputImageHeight = $imagesize[1]; + $inputImageType = $imagesize[2]; + $outputImageName = base64_encode($inputImagePath . '_' . $this->outputImageWidth . '_' . $filestat['mtime']) . '.' . $this->outputImageType; + $outputImagePath = $this->outputImageDir . '/' . $outputImageName; - // ÊÑ´¹¸å¤Î²èÁü¤Î¹â¤µ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ÊÑ´¹¸å¤Î²èÁü¤Î²£Éý¤«¤éµá¤á¤ë - if (is_null($this->outputImageHeight)) { - $this->outputImageHeight = $inputImageHeight * ($this->outputImageWidth / $inputImageWidth); - } + // ÊÑ´¹¸å¤Î²èÁü¤Î¹â¤µ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ÊÑ´¹¸å¤Î²èÁü¤Î²£Éý¤«¤éµá¤á¤ë + if (is_null($this->outputImageHeight)) { + $this->outputImageHeight = $inputImageHeight * ($this->outputImageWidth / $inputImageWidth); + } - // ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤«³Îǧ¤·¡¢Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Î¤ßºîÀ®¤¹¤ë - if (file_exists($outputImagePath)) { - $info['convert'] = FALSE; - } else { - // ¸µ¥Õ¥¡¥¤¥ëºîÀ® - switch($inputImageType) - { - case 1: - // gif - $tempImage = imagecreatefromgif ($inputImagePath); - break; - case 2: - // jpeg - $tempImage = imagecreatefromjpeg($inputImagePath); - break; - case 3: - // png - $tempImage = imagecreatefrompng($inputImagePath); - break; - case 6: - // bmp - $tempImage = imagecreatefromwbmp($inputImagePath); - break; - } + // ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤«³Îǧ¤·¡¢Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Î¤ßºîÀ®¤¹¤ë + if (file_exists($outputImagePath)) { + $info['convert'] = FALSE; + } else { + // ¸µ¥Õ¥¡¥¤¥ëºîÀ® + switch($inputImageType) { + case 1: + // gif + $tempImage = imagecreatefromgif($inputImagePath); + break; + case 2: + // jpeg + $tempImage = imagecreatefromjpeg($inputImagePath); + break; + case 3: + // png + $tempImage = imagecreatefrompng($inputImagePath); + break; + case 6: + // bmp + $tempImage = imagecreatefromwbmp($inputImagePath); + break; + } - if (!$tempImage) { - return false; - } + if (!$tempImage) { + return false; + } - // ¶õ¥Õ¥¡¥¤¥ëºîÀ® - $outputImage = ImageCreateTruecolor($this->outputImageWidth, $this->outputImageHeight); - ImageCopyResampled($outputImage, $tempImage, 0, 0, 0, 0, $this->outputImageWidth, $this->outputImageHeight, $inputImageWidth, $inputImageHeight); + // ¶õ¥Õ¥¡¥¤¥ëºîÀ® + $outputImage = ImageCreateTruecolor($this->outputImageWidth, $this->outputImageHeight); + ImageCopyResampled($outputImage, $tempImage, 0, 0, 0, 0, $this->outputImageWidth, $this->outputImageHeight, $inputImageWidth, $inputImageHeight); - // ¥Õ¥¡¥¤¥ë½ÐÎÏ - switch($this->outputImageType) - { - case 1: - case 'gif': - imagegif($outputImage, $outputImagePath); - break; - default: - case 2: - case 'jpg': - case 'jpeg': - imagejpeg($outputImage, $outputImagePath); - break; - case 3: - case 'png': - imagepng($outputImage, $outputImagePath); - break; - case 6: - case 'bmp': - imagewbmp($outputImage, $outputImagePath); - break; - } + // ¥Õ¥¡¥¤¥ë½ÐÎÏ + switch($this->outputImageType) { + case 1: + case 'gif': + imagegif($outputImage, $outputImagePath); + break; + default: + case 2: + case 'jpg': + case 'jpeg': + imagejpeg($outputImage, $outputImagePath); + break; + case 3: + case 'png': + imagepng($outputImage, $outputImagePath); + break; + case 6: + case 'bmp': + imagewbmp($outputImage, $outputImagePath); + break; + } - // ¥á¥â¥ê³«Êü - imagedestroy($tempImage); - imagedestroy($outputImage); + // ¥á¥â¥ê³«Êü + imagedestroy($tempImage); + imagedestroy($outputImage); - $info['convert'] = TRUE; - } + $info['convert'] = TRUE; + } - // return - /* - $info['inputImageWidth'] = $inputImageWidth; - $info['inputImageHeight'] = $inputImageHeight; - $info['inputImageType'] = $inputImageType; - $info['inputImagePath'] = $inputImagePath; - $info['outputImageWidth'] = $this->outputImageWidth; - $info['outputImageHeight'] = $this->outputImageHeight; - $info['outputImageType'] = $this->outputImageType; - */ - $info['outputImagePath'] = $outputImagePath; - $info['outputImageName'] = $outputImageName; - return $info; + /* + $info['inputImageWidth'] = $inputImageWidth; + $info['inputImageHeight'] = $inputImageHeight; + $info['inputImageType'] = $inputImageType; + $info['inputImagePath'] = $inputImagePath; + $info['outputImageWidth'] = $this->outputImageWidth; + $info['outputImageHeight'] = $this->outputImageHeight; + $info['outputImageType'] = $this->outputImageType; + */ + $info['outputImagePath'] = $outputImagePath; + $info['outputImageName'] = $outputImageName; + return $info; - } + } - // Setter - function setOutputDir($outputDir) { $this->outputImageDir = $outputDir; } - function setImageType($imageType) { $this->outputImageType = $imageType; } - function setImageWidth($imageWidth) { $this->outputImageWidth = $imageWidth; } - // function setImageHeight($imageHeight) { $this->outputImageHeight = $imageHeight; } + // Setter + function setOutputDir($outputDir) { $this->outputImageDir = $outputDir; } + function setImageType($imageType) { $this->outputImageType = $imageType; } + function setImageWidth($imageWidth) { $this->outputImageWidth = $imageWidth; } + // function setImageHeight($imageHeight) { $this->outputImageHeight = $imageHeight; } - // Getter - function getOutputDir() { return $this->outputDir; } - function getImageType() { return $this->outputImageType; } - function getImageWidth() { return $this->outputImageWidth; } - function getImageHeight() { return $this->outputImageHeight; } + // Getter + function getOutputDir() { return $this->outputDir; } + function getImageType() { return $this->outputImageType; } + function getImageWidth() { return $this->outputImageWidth; } + function getImageHeight() { return $this->outputImageHeight; } - /* - * PrivateMethod - **/ - function beforeExecute() { - } + /* + * PrivateMethod + */ + function beforeExecute() { + } } ?> Index: temp/branches/mobile/data/include/mobile_image_map_ezweb.inc =================================================================== --- temp/branches/mobile/data/include/mobile_image_map_ezweb.inc (revision 11418) +++ (revision ) @@ -1,194 +1,0 @@ -C303CA,CA11,1400,Y,120,120,bmp,1300,N -C311CA,CA12,1400,Y,120,120,bmp,1300,N -C409CA,CA13,7500,Y,120,120,png,6000,Y -C452CA,CA14,7500,Y,120,120,png,6000,Y -A3012CA,CA21,9000,Y,125,120,jpg,8000,Y -A5302CA,CA22,9000,Y,125,120,jpg,20000,Y -A5401CA A5401CA II(A5401CA),CA23,9000,Y,123,120,jpg,20000,Y -A5403CA,CA24,9000,Y,230,224,jpg,20000,Y -A5406CA,CA25,9000,Y,230,224,jpg,20000,Y -A5407CA,CA26,9000,Y,230,224,jpg,20000,Y -A5512CA,CA27,9000,Y,230,224,jpg,20000,Y -A5513CA(G'zOne TYPE-R),CA28,9000,Y,230,224,jpg,20000,Y -W21CA W21CA II(W21CA),CA31,9000,Y,123,120,jpg,20000,Y -W31CA,CA32,9000,Y,230,224,jpg,20000,Y -W41CA,CA33,9000,Y,230,224,jpg,20000,Y -W42CA,CA34,9000,Y,232,232,jpg,20000,Y -W43CA,CA35,9000,Y,232,232,jpg,20000,Y -C202DE,DN01,1400,Y,108,104,bmp,1300,N -C402DE,DN11,7500,Y,120,120,png,6000,Y -C201H(C201H_A),HI01,1400,Y,120,120,bmp,1300,N -C201H(C201H_A),HI02,1400,Y,120,120,bmp,1300,N -C302H,HI11,1400,Y,120,120,bmp,1300,N -C309H,HI12,7500,Y,120,120,png,6000,N -C407H,HI13,7500,Y,120,120,png,6000,Y -C451H,HI14,7500,Y,120,120,png,6000,Y -C3001H,HI21,9000,Y,120,120,jpg,8000,Y -A5303H,HI23,9000,Y,125,120,jpg,20000,Y -A5303H II(A5303H2),HI24,9000,Y,125,120,jpg,20000,Y -W11H,HI31,9000,Y,233,232,jpg,20000,Y -W21H,HI32,9000,Y,123,120,jpg,20000,Y -W22H,HI33,9000,Y,230,224,jpg,20000,Y -W31H(PENCK),HI34,9000,Y,230,224,jpg,20000,Y -W32H,HI35,9000,Y,230,224,jpg,20000,Y -W41H,HI36,9000,Y,230,224,jpg,20000,Y -W42H,HI37,9000,Y,232,232,jpg,20000,Y -W43H,HI38,9000,Y,232,232,jpg,20000,Y -C307K,KC11,1400,Y,121,120,bmp,1300,N -C313K,KC12,1400,Y,120,120,png,1300,N -C414K,KC13,7500,Y,120,120,jpg,6000,Y -A1012K A1012K II(A1012K),KC14,7500,Y,120,120,jpg,6000,Y -A1013K,KC15,7500,Y,120,120,jpg,6000,Y -C3002K,KC21,9000,Y,128,128,jpg,7000,Y -A5305K,KC22,9000,Y,125,120,jpg,20000,Y -A1401K,KC23,9000,Y,126,120,jpg,20000,Y -A5502K(A5502K_A),KC24,9000,Y,234,232,jpg,20000,Y -A5502K(A5502K_B),KC25,9000,Y,234,232,jpg,20000,Y -A1403KB01K(A1403K),KC26,9000,Y,234,232,jpg,20000,Y -A5515K,KC27,9000,Y,234,232,jpg,20000,Y -A5521K,KC28,9000,Y,234,232,jpg,20000,Y -W11K,KC31,9000,Y,233,232,jpg,20000,Y -W21K,KC32,9000,Y,234,232,jpg,20000,Y -W31K W31K II(W31K),KC33,9000,Y,234,232,jpg,20000,Y -W32K,KC34,9000,Y,234,232,jpg,20000,Y -W41K,KC35,9000,Y,232,232,jpg,20000,Y -W42K,KC36,9000,Y,232,232,jpg,20000,Y -W43K,KC37,9000,Y,232,232,jpg,20000,Y -W44K,KC38,9000,Y,232,232,jpg,20000,Y -D303K,KCC1,1400121,120,bmp,1300,N -D304K,KCC2,1400121,120,bmp,1300,N -702G,KCI1,1400121,120,bmp,1300,N -703G,KCI2,1400121,120,bmp,1300,N -TK01,KCT1,1400,Y,121,120,bmp,1300,Y -TK02,KCT2,1400,Y,121,120,bmp,1300,Y -TK0K,KCT3,1400,Y,121,120,bmp,1300,Y -TK03,KCT4,7500,Y,96,96,png,6000,Y -TK04,KCT5,7500,Y,96,96,png,6000,Y -TK05,KCT6,7500,Y,96,96,png,6000,Y -TK11,KCT7,7500,Y,96,96,png,6000,Y -TK12,KCT8,7500,Y,120,120,png,6000,Y -TK21,KCT9,7500,Y,120,120,jpg,6000,Y -TK22,KCTA,7500,Y,120,120,jpg,6000,Y -TK23,KCTB,7500,Y,120,120,png,6000,Y -TK31,KCTC,7500,Y,120,120,jpg,6000,Y -TK40,KCTD,7500,Y,120,120,jpg,6000,Y -TK51,KCTE,7500,Y,120,120,jpg,6000,Y -TK41,KCU1,9000,Y,114,112,jpg,8000,Y -C308P(C308P_A),MA11,1400,Y,122,120,bmp,1300,N -C308P(C308P_B),MA12,1400,Y,122,120,bmp,1300,N -C408P,MA13,7500,Y,115,112,png,6000,Y -C3003P,MA21,9000,Y,132,132,jpg,8000,Y -D305P(D305P_A),MAC1,1400122,120,bmp,1300,N -D305P(D305P_B),MAC2,1400122,120,bmp,1300,N -704G(704G_A),MAI1,1400122,120,bmp,1300,N -D704G(704G_B),MAI2,1400122,120,bmp,1300,N -TP01(TP01_A),MAT1,1400,Y,122,120,bmp,1300,Y -TP01(TP01_B),MAT2,1400,Y,122,120,bmp,1300,Y -TP11,MAT3,7500,Y,96,96,png,6000,Y -TD11,MIT1,7500,Y,120,120,png,6000,Y -A1405PT,PT21,9000,Y,240,240,jpg,20000,Y -A1406PT,PT22,9000,Y,240,240,jpg,20000,Y -A3011SA,SA21,9000,Y,126,120,jpg,8000,Y -A3015SA,SA22,9000,Y,126,120,jpg,8000,Y -A1302SA,SA24,9000,Y,132,132,jpg,20000,Y -A1303SA,SA25,9000,Y,132,132,jpg,20000,Y -A5503SA,SA26,9000,Y,225,224,jpg,20000,Y -A5505SA,SA27,9000,Y,225,224,jpg,20000,Y -A1305SA,SA28,9000,Y,124,120,jpg,20000,Y -A5522SA,SA29,9000,Y,235,232,jpg,20000,Y -W21SA,SA31,9000,Y,225,224,jpg,20000,Y -W22SA,SA32,9000,Y,230,224,jpg,20000,Y -W31SA W31SA II(W31SA),SA33,9000,Y,230,224,jpg,20000,Y -W32SA,SA34,9000,Y,228,224,jpg,20000,Y -W33SA,SA35,9000,Y,228,224,jpg,20000,Y -W41SA,SA36,9000,Y,228,224,jpg,20000,Y -E02SA,SA37,9000,Y,228 ,224 ,jpg,20000,Y -W43SA,SA38,9000,Y,228,224,jpg,20000,Y -W41SH,SH31,9000,Y,229,224,jpg,20000,Y -C305S,SN11,1400,Y,120,120,bmp,1300,N -C404S(C404S_A),SN12,7500,Y,120,120,png,6000,Y -C406S,SN13,7500,Y,120,120,png,6000,Y -C404S(C404S_B),SN14,7500,Y,120,120,png,6000,Y -C413S(C413S_B),SN15,7500,Y,120,120,png,6000,Y -C413S(C413S_A),SN16,7500,Y,120,120,png,6000,Y -C1002S,SN17,7500,Y,120,120,png,6000,Y -A3014S,SN21,9000,Y,120,120,jpg,8000,Y -A1101S,SN22,9000,Y,120,120,jpg,8000,Y -A1301S,SN23,9000,Y,120,120,jpg,20000,Y -A5402S,SN24,9000,Y,120,120,jpg,20000,Y -A5404S,SN25,9000,Y,240,240,jpg,20000,Y -A1402S,SN26,9000,Y,228,224,jpg,20000,Y -A1402S II(A1402S2_A),SN27,9000,Y,228,224,jpg,20000,Y -A1402S II ¥«¥á¥é̵¤·(A1402S2_B),SN28,9000,Y,228,224,jpg,20000,Y -A1404S A1404S II(A1404S),SN29,9000,Y,228,224,jpg,20000,Y -W21S,SN31,9000,Y,228,224,jpg,20000,Y -W31S,SN32,9000,Y,228,224,jpg,20000,Y -W32S,SN33,9000,Y,228,224,jpg,20000,Y -W41S,SN34,9000,Y,228,224,jpg,20000,Y -W32S,SN35,9000,Y,228,224,jpg,20000,Y -W42S,SN36,9000,Y,228,224,jpg,20000,Y -W43S,SN37,9000,Y,228,224,jpg,20000,Y -D306S,SNC1,1400120,120,bmp,1300,N -705G,SNI1,1400120,120,bmp,1300,N -C403ST,ST11,7500,Y,120,120,png,6000,Y -C411ST,ST12,7500,Y,120,120,png,6000,Y -A1011ST,ST13,7500,Y,120,120,jpg,6000,Y -A1014ST,ST14,7500,Y,120,120,jpg,6000,Y -A5306ST,ST21,9000,Y,125,120,jpg,20000,Y -A5307ST(INFOBAR),ST22,9000,Y,125,120,jpg,20000,Y -A5405SA,ST23,9000,Y,127,120,jpg,20000,Y -A5507SA,ST24,9000,Y,235,232,jpg,20000,Y -A5508SA(talby),ST25,9000,Y,235,232,jpg,20000,Y -A5510SA(Sweets),ST26,9000,Y,235,232,jpg,20000,Y -A5514SA,ST27,9000,Y,235,232,jpg,20000,Y -A5518SA,ST28,9000,Y,235,232,jpg,20000,Y -A5519SA(Sweets pure),ST29,9000,Y,235,232,jpg,20000,Y -A5520SA,ST2A,9000,Y,235,232,jpg,20000,Y -W42SA,ST31,9000,Y,235,232,jpg,20000,Y -C304SA,SY11,1400,Y,128,128,bmp,1300,N -C401SA,SY12,7500,Y,120,120,png,6000,Y -C405SA,SY13,1400,Y,120,120,png,1300,Y -C412SA,SY14,7500,Y,120,120,png,6000,Y -C1001SA,SY15,7500,Y,120,120,png,6000,Y -D301SA,SYC1,1400128,128,bmp,1300,N -TS01,SYT1,1400,Y,128,128,bmp,1300,Y -TS02,SYT2,7500,Y,96,96,png,6000,Y -TS11,SYT3,7500,Y,120,120,jpg,6000,Y -TS31,SYT4,7500,Y,120,120,jpg,6000,Y -TS41,SYT5,7500,Y,132,132,jpg,6000,Y -C301T,TS11,1400,Y,120,120,bmp,1300,N -C310T,TS12,7500,Y,96,96,png,6000,N -C410T,TS13,7500,Y,96,96,png,6000,Y -C415T,TS14,7500,Y,96,96,png,6000,Y -C5001T,TS21,9000,Y,144,144,jpg,20000,Y -A3013T,TS22,9000,Y,144,144,jpg,7740,Y -A5301T,TS23,9000,Y,144,144,jpg,20000,Y -A5304T,TS24,9000,Y,144,144,jpg,20000,Y -A1304T A1304T II(A1304T),TS25,9000,Y,144,144,jpg,20000,Y -A5501T,TS26,9000,Y,240,240,jpg,20000,Y -A5504T,TS27,9000,Y,229,224,jpg,20000,Y -A5506T,TS28,9000,Y,229,224,jpg,20000,Y -A5509T,TS29,9000,Y,229,224,jpg,20000,Y -A5511T,TS2A,9000,Y,229,224,jpg,20000,Y -A5516T,TS2B,9000,Y,229,224,jpg,20000,Y -A5517T,TS2C,9000,Y,229,224,jpg,20000,Y -W21T,TS31,9000,Y,229,224,jpg,20000,Y -W31T,TS32,9000,Y,229,224,jpg,20000,Y -W32T,TS33,9000,Y,229,224,jpg,20000,Y -W41T,TS34,9000,Y,229,224,jpg,20000,Y -W42T(neon),TS35,9000,Y,229,224,jpg,20000,Y -W43T,TS36,9000,Y,229,224,jpg,20000,Y -W44T,TS37,9000,Y,229,224,jpg,20000,Y -W45T,TS38,9000,Y,229,224,jpg,20000,Y -D302T,TSC1,1400120,120,bmp,1300,N -701G,TSI1,1400120,120,bmp,1300,N -TT01,TST1,1400,Y,120,120,bmp,1300,Y -TT02,TST2,1400,Y,120,120,bmp,1300,Y -TT03,TST3,7500,Y,120,120,png,6000,Y -TT11,TST4,7500,Y,120,120,jpg,6000,Y -TT21,TST5,7500,Y,140,140,jpg,6000,Y -TT22,TST6,7500,Y,140,140,jpg,6000,Y -TT31,TST7,7500,Y,140,140,jpg,6000,Y -TT32,TST8,7500,Y,140,140,jpg,6000,Y -TT51,TST9,7500,Y,120,120,jpg,6000,Y - Index: temp/branches/mobile/data/include/mobile_image_map_docomo.inc =================================================================== --- temp/branches/mobile/data/include/mobile_image_map_docomo.inc (revision 11418) +++ (revision ) @@ -1,225 +1,0 @@ -D209i(D209i_B),D209i,5000,N,96,96,gif,3000,N -D209i(D209i_A),D209i/c10,10000,N,96,96,gif,8000,N -D2101V,D2101V,100000,Y,120,120,jpg,20000,Y -D210i,D210i,10000,N,96,96,gif,8000,N -D211i,D211i,10000,Y,100,100,gif,8000,Y -D251i,D251i,10000,Y,132,132,jpg,8000,Y -D251iS,D251iS,10000,Y,132,132,jpg,8000,Y -D252i,D252i,10000,Y,176,176,jpg,8000,Y -D253i,D253i,10000,Y,176,176,jpg,8000,Y -D253iWM(MusicPORTER),D253iWM,10000,Y,220,216,jpg,8000,Y -D501i,D501i,5000,N,96,96,gif,3000,N -D502i(D502i_B),D502i,5000,N,96,96,gif,3000,N -D502i(D502i_A),D502i/c10,10000,N,96,96,gif,5000,N -D503i,D503i,10000,Y,132,132,gif,8000,Y -D503iS,D503iS,10000,Y,132,132,gif,8000,Y -D504i,D504i,10000,Y,132,132,jpg,8000,Y -D505i,D505i,20000,Y,240,240,jpg,18000,Y -D505iS,D505iS,20000,Y,240,240,jpg,18000,Y -D506i,D506i,20000,Y,240,240,jpg,18000,Y -D701i,D701i,100000,Y,230,224,jpg,20000,Y -D701iWM(Music Porter II),D701iWM,100000,Y,230,224,jpg,20000,Y -D702i,D702i,100000,Y,230,224,jpg,20000,Y -D702iBCL,D702iBCL,100000,Y,230,224,jpg,20000,Y -D702iF,D702iF,100000,Y,230,224,jpg,20000,Y -D851iWM(Music Porter X),D851iWM,100000,Y,230,224,jpg,20000,Y -D900i,D900i,100000,Y,240,240,jpg,20000,Y -D901i,D901i,100000,Y,230,224,jpg,20000,Y -D901iS,D901iS,100000,Y,230,224,jpg,20000,Y -D902i,D902i,100000,Y,230,224,jpg,20000,Y -D902iS,D902iS,100000,Y,230,224,jpg,20000,Y -D903i,D903i,100000,Y,230,224,jpg,20000,Y -ER209i(ER209i_B),ER209i,5000,N,120,120,gif,3000,N -ER209i(ER209i_A),ER209i/c15,15000,N,120,120,gif,8000,N -F2051,F2051,100000,Y,176,176,jpg,20000,Y -F209i(F209i_B),F209i,5000,N,96,96,gif,3000,N -F209i(F209i_A),F209i/c10,10000,N,96,96,gif,8000,N -F2102V,F2102V,100000,Y,176,176,jpg,20000,Y -F210i,F210i,10000,N,96,96,gif,8000,N -F211i,F211i,10000,Y,96,96,gif,8000,Y -F212i,F212i,10000,Y,132,132,jpg,8000,Y -F251i,F251i,10000,Y,132,132,jpg,8000,Y -F501i,F501i,5000,N,112,112,gif,3000,N -F502i(F502i_B),F502i,5000,N,96,96,gif,3000,N -F502i(F502i_A),F502i/c10,10000,N,96,96,gif,8000,N -F502it(F502it_B),F502it,5000,N,96,96,gif,3000,N -F502it(F502it_A),F502it/c10,10000,N,96,96,gif,8000,N -F503i,F503i,10000,Y,120,120,gif,8000,Y -F503iS,F503iS,10000,Y,120,120,gif,8000,Y -F504i,F504i,10000,Y,132,132,jpg,8000,Y -F504iS,F504iS,10000,Y,132,132,jpg,8000,Y -F505i,F505i,20000,Y,240,240,jpg,18000,Y -F505iGPS,F505iGPS,20000,Y,240,240,jpg,18000,Y -F506i,F506i,20000,Y,240,240,jpg,18000,Y -F661i,F661i,10000,Y,132,132,jpg,8000,Y -F671i,F671i,10000,N,120,120,gif,8000,N -F671iS,F671iS,10000,Y,160,160,jpg,8000,Y -F672i,F672i,10000,Y,160,160,jpg,8000,Y -F700i,F700i,100000,Y,230,224,jpg,20000,Y -F700iS,F700iS,100000,Y,230,224,jpg,20000,Y -F702iD,F702iD,100000,Y,230,224,jpg,20000,Y -F880iES(FOMA¤é¤¯¤é¤¯¥Û¥ó),F880iES,100000,Y,240,240,jpg,20000,Y -F881iES(FOMA¤é¤¯¤é¤¯¥Û¥óII),F881iES,100000,Y,240,240,jpg,20000,Y -F882iES,F882iES,100000,Y,240,240,jpg,20000,Y -F900i,F900i,100000,Y,230,224,jpg,20000,Y -F900iC,F900iC,100000,Y,230,224,jpg,20000,Y -F900iT,F900iT,100000,Y,230,224,jpg,20000,Y -F901iC,F901iC,100000,Y,230,224,jpg,20000,Y -F901iS,F901iS,100000,Y,230,224,jpg,20000,Y -F902i,F902i,100000,Y,230,224,jpg,20000,Y -F902iS,F902iS,100000,Y,230,224,jpg,20000,Y -F903i,F903i,100000,Y,230,224,jpg,20000,Y -ISIM101,ISIM101,-,-,240,240,jpg,20000,N -ISIM60,ISIM60,-,-,176,176,jpg,20000,N -ISIM70,ISIM70,-,-,240,240,jpg,20000,N -KO209i,KO209i,5000,N,96,96,gif,3000,N -KO210i(KO210i_B),KO210i,5000,N,96,96,gif,3000,N -KO210i(KO210i_A),KO210i/c10,10000,N,96,96,gif,8000,N -L600i,L600i,100000,Y,176,176,jpg,20000,Y -L601i (SIMPURE L1),L601i,100000,Y,176,176,jpg,20000,Y -SH2101V,MST_v_SH2101V,100000,Y,240,240,jpg,20000,Y -N2001,N2001,10000,Y,118,112,jpg,8000,Y -N2002,N2002,100000,Y,118,112,jpg,20000,Y -N2051,N2051,100000,Y,176,176,jpg,20000,Y -N209i(N209i_B),N209i,5000,N,108,108,gif,3000,N -N209i(N209i_A),N209i/c08,8000,N,108,108,gif,6000,N -N2102V,N2102V,100000,Y,176,176,jpg,20000,Y -N210i(N210i_B),N210i,5000,N,118,112,gif,3000,N -N210i(N210i_A),N210i/c10,10000,N,118,112,gif,8000,N -N211i,N211i,10000,Y,118,112,jpg,8000,Y -N211iS,N211iS,10000,Y,118,112,jpg,8000,Y -N251i,N251i,10000,Y,132,132,jpg,8000,Y -N251iS,N251iS,10000,Y,132,132,jpg,8000,Y -N252i,N252i,10000,Y,132,132,jpg,8000,Y -N253i,N253i,10000,Y,160,160,jpg,8000,Y -N2701(N2701_B),N2701,100000,Y,176,176,jpg,20000,Y -N2701(N2701_A),N2701/c10,10000,Y,176,176,jpg,8000,Y -N501i,N501i,5000,N,118,112,gif,3000,N -N502i(N502i_B),N502i,5000,N,118,112,gif,3000,N -N502i(N502i_A),N502i/c08,8000,N,118,112,gif,6000,N -N502it(N502it_B),N502it,5000,N,118,112,gif,3000,N -N502it(N502it_A),N502it/c10,10000,N,118,112,gif,8000,N -N503i,N503i,10000,Y,118,112,jpg,8000,Y -N503iS,N503iS,10000,Y,118,112,jpg,8000,Y -N504i,N504i,10000,Y,160,160,jpg,8000,Y -N504iS,N504iS,10000,Y,160,160,jpg,8000,Y -N505i,N505i,20000,Y,240,240,jpg,18000,Y -N505iS,N505iS,20000,Y,240,240,jpg,18000,Y -N506i,N506i,20000,Y,240,240,jpg,18000,Y -N506iS,N506iS,20000,Y,240,240,jpg,18000,Y -N506iSII(N506iS2),N506iS2,20000,Y,240,240,jpg,18000,Y -N600i,N600i,100000,Y,176,176,jpg,20000,Y -N601i,N601i,100000,Y,240,240,jpg,20000,Y -N700i,N700i,100000,Y,240,240,jpg,20000,Y -N701i,N701i,100000,Y,240,240,jpg,20000,Y -N701iECO,N701iECO,100000,Y,240,240,jpg,20000,Y -N702iD,N702iD,100000,Y,240,240,jpg,20000,Y -N702iS,N702iS,100000,Y,240,240,jpg,20000,Y -N821i(N821i_B),N821i,5000,N,118,112,gif,3000,N -N821i(N821i_A),N821i/c08,8000,N,118,112,gif,6000,N -N900i,N900i,100000,Y,240,240,jpg,20000,Y -N900iG,N900iG,100000,Y,240,240,jpg,20000,Y -N900iL,N900iL,100000,Y,240,240,jpg,20000,Y -N900iS,N900iS,100000,Y,240,240,jpg,20000,Y -N901iC,N901iC,100000,Y,240,240,jpg,20000,Y -N901iS,N901iS,100000,Y,240,240,jpg,20000,Y -N902i,N902i,100000,Y,240,240,jpg,20000,Y -N902iS,N902iS,100000,Y,240,240,jpg,20000,Y -N902iX(HIGH SPEED),N902iX,100000,Y,240,240,jpg,20000,Y -N903i,N903i,100000,Y,240,240,jpg,20000,Y -NM502i(NM502i_B),NM502i,5000,N,111,104,gif,3000,N -NM502i(NM502i_A),NM502i/c10,10000,N,111,104,gif,8000,N -NM850iG,NM850iG,100000,Y,176,176,jpg,20000,Y -P2002,P2002,100000,Y,118,112,jpg,20000,Y -P209i(P209i_B),P209i,5000,N,96,96,gif,3000,N -P209i(P209i_A),P209i/c10,10000,N,96,96,gif,8000,N -P209iS(P209iS_B),P209is,5000,N,96,96,gif,3000,N -P209iS(P209iS_A),P209is/c10,10000,N,96,96,gif,8000,N -P2101V,P2101V,100000,Y,163,160,jpg,20000,Y -P2102V,P2102V,100000,Y,176,176,jpg,20000,Y -P210i(P210i_B),P210i,5000,N,96,96,gif,3000,N -P210i(P210i_A),P210i/c10,10000,N,96,96,gif,8000,N -P211i,P211i,10000,Y,120,120,jpg,8000,Y -P211iS,P211iS,10000,Y,120,120,jpg,8000,Y -P213i(prosolid),P213i,10000,Y,132,132,jpg,8000,Y -P251iS,P251iS,10000,Y,132,132,jpg,8000,Y -P252i,P252i,10000,Y,132,132,jpg,8000,Y -P252iS,P252iS,10000,Y,132,132,jpg,8000,Y -P253i,P253i,10000,Y,132,132,jpg,8000,Y -P253iS(Lechiffon),P253iS,10000,Y,132,132,jpg,8000,Y -P501i,P501i,5000,N,96,96,gif,3000,N -P502i(P502i_B),P502i,5000,N,96,96,gif,3000,N -P502i(P502i_A),P502i/c10,10000,N,96,96,gif,8000,N -P503i,P503i,10000,Y,120,120,jpg,8000,Y -P503iS,P503iS,10000,Y,120,120,jpg,8000,Y -P504i,P504i,10000,Y,132,132,jpg,8000,Y -P504iS,P504iS,10000,Y,132,132,jpg,8000,Y -P505i,P505i,20000,Y,240,240,jpg,18000,Y -P505iS,P505iS,20000,Y,240,240,jpg,18000,Y -P506iC,P506iC,20000,Y,240,240,jpg,18000,Y -P651ps(P651ps_B),P651ps,500096,96,gif,3000,N -P651ps(P651ps_A),P651ps/c10,1000096,96,gif,3000,N -P700i,P700i,100000,Y,240,240,jpg,20000,Y -P701iD,P701iD,100000,Y,240,240,jpg,20000,Y -P702i,P702i,100000,Y,240,240,jpg,20000,Y -P702iD,P702iD,100000,Y,240,240,jpg,20000,Y -P821i(P821i_B),P821i,5000,N,118,112,gif,3000,N -P821i(P821i_A),P821i/c08,8000,N,118,112,gif,6000,N -P851i(prosolidII),P851i,100000,Y,240,240,jpg,20000,Y -P900i,P900i,100000,Y,240,240,jpg,20000,Y -P900iV,P900iV,100000,Y,240,240,jpg,20000,Y -P901i,P901i,100000,Y,240,240,jpg,20000,Y -P901iS,P901iS,100000,Y,240,240,jpg,20000,Y -P901iTV,P901iTV,100000,Y,240,240,jpg,20000,Y -P902i,P902i,100000,Y,240,240,jpg,20000,Y -P902iS,P902iS,100000,Y,240,240,jpg,20000,Y -P903i,P903i,100000,Y,240,240,jpg,20000,Y -R209i,R209i,5000,N,96,96,gif,3000,N -R211i,R211i,10000,Y,96,96,jpg,8000,Y -R691i,R691i,5000,N,96,96,gif,3000,N -R692i,R692i,10000,Y,96,96,jpg,8000,Y -SA700iS,SA700iS,100000,Y,240,240,jpg,20000,Y -SA702i,SA702i,100000,Y,240,240,jpg,20000,Y -SA800i,SA800i,100000,Y,240,240,jpg,20000,Y -SH251i,SH251i,10000,N,120,120,jpg,8000,N -SH251iS,SH251iS,10000,N,176,176,jpg,8000,N -SH252i,SH252i,20000,Y,240,240,jpg,18000,Y -SH505i,SH505i,20000,Y,240,240,jpg,18000,Y -SH505i,SH505i2,20000,Y,240,240,jpg,18000,Y -SH505iS,SH505iS,20000,Y,240,240,jpg,18000,Y -SH506iC,SH506iC,20000,Y,240,240,jpg,18000,Y -SH700i,SH700i,100000,Y,230,230,jpg,20000,Y -SH700iS,SH700iS,100000,Y,240,240,jpg,20000,Y -SH702iD,SH702iD,100000,Y,240,240,jpg,20000,Y -SH702iS,SH702iS,100000,Y,240,240,jpg,20000,Y -SH821i(SH821i_B),SH821i,5000,N,96,96,gif,3000,N -SH821i(SH821i_A),SH821i/c10,10000,N,96,96,gif,8000,N -SH851i(DOLCE),SH851i,100000,Y,240,240,jpg,20000,Y -SH900i,SH900i,100000,Y,240,240,jpg,20000,Y -SH901iC,SH901iC,100000,Y,240,240,jpg,20000,Y -SH901iS,SH901iS,100000,Y,240,240,jpg,20000,Y -SH902i,SH902i,100000,Y,240,240,jpg,20000,Y -SH902iS,SH902iS,100000,Y,240,240,jpg,20000,Y -SH902iSL,SH902iSL,100000,Y,240,240,jpg,20000,Y -SH903i,SH903i,100000,Y,240,240,jpg,20000,Y -SO210i,SO210i,10000,N,120,120,gif,8000,N -SO211i,SO211i,10000,Y,120,120,jpg,8000,Y -SO212i,SO212i,10000,Y,120,120,jpg,8000,Y -SO213i(premini),SO213i,10000,Y,120,120,jpg,8000,Y -SO213iS(premini-S),SO213iS,10000,Y,120,120,jpg,8000,Y -SO213iWR(RADIDEN),SO213iWR,10000,Y,120,120,jpg,8000,Y -SO502i,SO502i,5000,N,120,120,gif,3000,N -SO502iWM,SO502iWM,10000,N,120,120,gif,8000,N -SO503i,SO503i,10000,Y,120,120,gif,8000,Y -SO503iS,SO503iS,10000,Y,120,120,gif,8000,Y -SO504i,SO504i,10000,Y,120,120,jpg,8000,Y -SO505i,SO505i,20000,Y,256,256,jpg,18000,Y -SO505iS,SO505iS,20000,Y,240,240,jpg,18000,Y -SO506i(premini-II),SO506i,20000,Y,240,240,jpg,18000,Y -SO506iC,SO506iC,20000,Y,240,240,jpg,18000,Y -SO506iS(premini-IIS),SO506iS,20000,Y,240,240,jpg,18000,Y -SO702i,SO702i,100000,Y,240,240,jpg,20000,Y -SO902i,SO902i,100000,Y,240,240,jpg,20000,Y -SO902iWP+,SO902iWP+,100000,Y,240,240,jpg,20000,Y -SO903i,SO903i,100000,Y,240,240,jpg,20000,Y -T2101V,T2101V,100000,Y,176,176,jpg,20000,Y Index: temp/branches/mobile/data/include/mobile_image_map_softbank.inc =================================================================== --- temp/branches/mobile/data/include/mobile_image_map_softbank.inc (revision 11418) +++ (revision ) @@ -1,146 +1,0 @@ -705P,705P,300000,Y,240,240,jpg,15000,Y -705SC,705SC,300000,Y,230,230,jpg,15000,Y -706SC,706SC,300000,Y,230,230,jpg,15000,Y -707SC,707SC,300000,Y,230,230,jpg,15000,Y -810SH,810SH,300000,Y,480,480,jpg,15000,Y -810T,810T,300000,Y,240,240,jpg,15000,Y -811SH,811SH,300000,Y,480,480,jpg,15000,Y -811T,811T,300000,Y,240,240,jpg,15000,Y -910SH,910SH,300000,Y,480,480,jpg,15000,Y -910T,910T,300000,Y,240,240,jpg,15000,Y -911SH,911SH,300000,Y,234,232,jpg,15000,Y -J-D03,J-D03,6000,N,120,120,jpg,5000,N -J-D04,J-D04,6000,N,120,120,jpg,5000,N -J-D05,J-D05,6000,N,132,132,jpg,5000,N -J-D06,J-D06,6000,N,132,132,jpg,5000,N -J-D07,J-D07,6000,N,128,128,jpg,5000,N -J-D08,J-D08,6000,N,132,132,jpg,5000,N -J-D31,J-D31,6000,N,120,120,jpg,5000,N -J-DN02,J-DN02,6000,N,116,112,png,5000,N -J-DN02_a,J-DN02_a,6000,N,116,112,png,5000,N -J-DN02_b,J-DN02_b,6000,N,116,112,png,5000,N -J-DN03,J-DN03,6000,N,120,120,jpg,5000,N -J-DN03_a,J-DN03_a,6000,N,120,120,jpg,5000,N -J-K03,J-K03,6000,N,120,120,jpg,5000,N -J-K04,J-K04,6000,N,120,120,jpg,5000,N -J-K05,J-K05,6000,N,120,120,jpg,5000,N -J-K51,J-K51,12000,Y,128,128,jpg,10000,Y -J-N03,J-N03,6000,N,120,120,jpg,5000,N -J-N03II,J-N03B,6000,N,120,120,jpg,5000,N -J-N04,J-N04,6000,N,120,120,jpg,5000,N -J-N05,J-N05,6000,N,160,160,jpg,5000,N -J-N51,J-N51,12000,Y,160,160,jpg,10000,Y -J-NM01,J-NM01,6000,N,120,120,jpg,5000,N -J-NM01_a,J-NM01_a,6000,N,120,120,jpg,5000,N -J-NM01_b,J-NM01_b,6000,N,120,120,jpg,5000,N -J-NM02,J-NM02,6000,N,120,120,jpg,5000,N -J-P02,J-P02,6000,N,96,96,png,5000,N -J-P02_a,J-P02_a,6000,N,96,96,png,5000,N -J-P03,J-P03,6000,N,96,96,png,5000,N -J-P51,J-P51,12000,Y,120,120,jpg,10000,Y -J-PE03,J-PE03,6000,N,120,120,jpg,5000,N -J-PE03_a,J-PE03_a,6000,N,120,120,jpg,5000,N -J-PE03_b,J-PE03_b,6000,N,120,120,jpg,5000,N -J-PE03_c,J-PE03_c,6000,N,120,120,jpg,5000,N -J-PE03II,J-PE03B,6000,N,120,120,jpg,5000,N -J-PE03II(J-PE03B_a),J-PE03B_a,6000,N,120,120,jpg,5000,N -J-SA02,J-SA02,6000,N,96,96,png,5000,N -J-SA03,J-SA03,6000,N,120,120,jpg,5000,N -J-SA03_a,J-SA03_a,6000,N,120,120,jpg,5000,N -J-SA03_b,J-SA03_b,6000,N,120,120,jpg,5000,N -J-SA04,J-SA04,6000,N,120,120,jpg,5000,N -J-SA04_a,J-SA04_a,6000,N,120,120,jpg,5000,N -J-SA05,J-SA05,6000,N,120,120,jpg,5000,N -J-SA06,J-SA06,6000,N,132,132,jpg,5000,N -J-SA51,J-SA51,12000,Y,132,132,jpg,10000,Y -J-SA51_a,J-SA51_a,12000,Y,132,132,jpg,10000,Y -J-SH02,J-SH02,6000,N,96,96,png,5000,N -J-SH02_a,J-SH02_a,6000,N,96,96,png,5000,N -J-SH03,J-SH03,6000,N,96,96,png,5000,N -J-SH03_a,J-SH03_a,6000,N,96,96,png,5000,N -J-SH04,J-SH04,6000,N,96,96,jpg,5000,N -J-SH04_a,J-SH04_a,6000,N,96,96,jpg,5000,N -J-SH04_b,J-SH04_b,6000,N,96,96,jpg,5000,N -J-SH04_c,J-SH04_c,6000,N,96,96,jpg,5000,N -J-SH04B,J-SH04B,6000,N,96,96,jpg,5000,N -J-SH04B_a,J-SH04B_a,6000,N,96,96,jpg,5000,N -J-SH05,J-SH05,6000,N,120,120,jpg,5000,N -J-SH05_a,J-SH05_a,6000,N,120,120,jpg,5000,N -J-SH06,J-SH06,6000,N,96,96,jpg,5000,N -J-SH07,J-SH07,6000,N,120,120,jpg,5000,N -J-SH08,J-SH08,6000,N,120,120,jpg,5000,N -J-SH09,J-SH09,6000,N,120,120,jpg,5000,N -J-SH09_a,J-SH09_a,6000,N,120,120,jpg,5000,N -J-SH010,J-SH10,6000,N,240,240,jpg,5000,N -J-SH010_a,J-SH10_a,6000,N,240,240,jpg,5000,N -J-SH51,J-SH51,12000,Y,120,120,jpg,10000,Y -J-SH51_a,J-SH51_a,12000,Y,120,120,jpg,10000,Y -J-SH52,J-SH52,12000,Y,120,120,jpg,10000,Y -J-SH53,J-SH53,12000,Y,240,240,jpg,10000,Y -J-SH53_a,J-SH53_a,12000,Y,240,240,jpg,10000,Y -J-T04,J-T04,6000,N,96,96,png,5000,N -J-T04_a,J-T04_a,6000,N,96,96,png,5000,N -J-T05,J-T05,6000,N,120,120,jpg,5000,N -J-T06,J-T06,6000,N,120,120,jpg,5000,N -J-T06_a,J-T06_a,6000,N,120,120,jpg,5000,N -J-T07,J-T07,6000,N,144,144,jpg,5000,N -J-T08,J-T08,6000,N,222,222,jpg,5000,N -J-T09,J-T09,6000,N,144,144,jpg,5000,N -J-T010,J-T10,6000,N,240,240,jpg,5000,N -J-T51,J-T51,12000,Y,144,144,jpg,10000,Y -V702sMO,MOT-C980,300000,Y,176,176,jpg,15000,Y -V702MO,MOT-V980,300000,Y,176,176,jpg,15000,Y -V102D,V102D,6000,N,128,128,jpg,5000,N -V201SH,V201SH,6000,N,240,240,jpg,5000,N -V301D,V301D,6000,N,132,132,jpg,5000,N -V301D_n,V301D_n,6000,N,132,132,jpg,5000,N -V301SH,V301SH,6000,N,240,240,jpg,5000,N -V301T,V301T,6000,N,222,216,jpg,5000,N -V302SH,V302SH,6000,N,240,240,jpg,5000,N -V302T,V302T,6000,N,144,144,jpg,5000,N -V303T(KOTO),V303T,6000,N,222,216,jpg,5000,N -V304T,V304T,6000,N,221,216,jpg,5000,N -V401D,V401D,6000,N,240,240,jpg,5000,N -V401SA,V401SA,6000,N,240,240,jpg,5000,N -V401SH,V401SH,6000,N,240,240,jpg,5000,N -V401T,V401T,6000,N,240,240,jpg,5000,N -V402SH,V402SH,6000,N,240,240,jpg,5000,N -V403SH,V403SH,6000,N,240,240,jpg,5000,N -V501SH,V501SH,30000,Y,240,240,jpg,10000,Y -V501T,V501T,30000,Y,240,240,jpg,10000,Y -V502T,V502T,30000,Y,240,240,jpg,10000,Y -V601N,V601N,12000,Y,160,160,jpg,10000,Y -V601SH,V601SH,12000,Y,240,240,jpg,10000,Y -V601T,V601T,30000,Y,240,240,jpg,10000,Y -V602SH,V602SH,30000,Y,240,240,jpg,10000,Y -V602T,V602T,30000,Y,240,240,jpg,10000,Y -V603SH,V603SH,30000,Y,240,240,jpg,10000,Y -V603T,V603T,30000,Y,240,240,jpg,10000,Y -V604SH,V604SH,30000,Y,240,240,jpg,10000,Y -V604T,V604T,30000,Y,240,240,jpg,10000,Y -V702NK,V702NK,300000,Y,176,176,jpg,15000,Y -V702NKII(V702NK2),V702NK2,300000,Y,176,176,jpg,15000,Y -V703N,V703N,300000,Y,240,240,jpg,15000,Y -V703SH,V703SH,300000,Y,240,240,jpg,15000,Y -V703SHf,V703SHf,300000,Y,240,240,jpg,15000,Y -V705SH,V705SH,300000,Y,240,240,jpg,15000,Y -V705T,V705T,300000,Y,240,240,jpg,15000,Y -V801SA,V801SA,200000,Y,240,240,jpg,18000,Y -V801SA_a,V801SA_a,200000,Y,240,240,jpg,18000,Y -V801SH,V801SH,200000,Y,240,240,jpg,18000,Y -V802N,V802N,300000,Y,240,240,jpg,15000,Y -V802SE,V802SE,300000,Y,176,176,jpg,15000,Y -V802SH,V802SH,300000,Y,240,240,jpg,15000,Y -V803T,V803T,300000,Y,240,240,jpg,15000,Y -V804N,V804N,300000,Y,240,240,jpg,15000,Y -V804NK,V804NK,300000,Y,240,240,jpg,15000,Y -V804SH,V804SH,300000,Y,240,240,jpg,15000,Y -V804SS,V804SS,300000,Y,240,240,jpg,15000,Y -V902SH,V902SH,300000,Y,240,240,jpg,15000,Y -V902T,V902T,300000,Y,240,240,jpg,15000,Y -V903SH,V903SH,300000,Y,240,240,jpg,15000,Y -V903T,V903T,300000,Y,240,240,jpg,15000,Y -V904SH,V904SH,300000,Y,240,240,jpg,15000,Y -V904T,V904T,300000,Y,240,240,jpg,15000,Y -V905SH,V905SH,300000,Y,240,240,jpg,15000,Y - Index: temp/branches/mobile/data/class/GC_MobileImage.php =================================================================== --- temp/branches/mobile/data/class/GC_MobileImage.php (revision 11453) +++ temp/branches/mobile/data/class/GC_MobileImage.php (revision 11457) @@ -2,12 +2,11 @@ /** * üËö¤Î²èÌ̲òÁüÅ٤ˤ¢¤ï¤»¤Æ²èÁü¤òÊÑ´¹¤¹¤ë - * */ -define("INC_PATH", realpath(dirname( __FILE__)) . "/../include"); -require_once(INC_PATH . "/image_converter.inc"); +define("MOBILE_IMAGE_INC_PATH", realpath(dirname( __FILE__)) . "/../include"); +require_once(MOBILE_IMAGE_INC_PATH . "/image_converter.inc"); /** - * ·ÈÂÓüËö¤Î¥¯¥é¥¹ + * ²èÁüÊÑ´¹¥¯¥é¥¹ */ class GC_MobileImage { @@ -25,14 +24,13 @@ $model = GC_MobileUserAgent::getModel(); - // ·ÈÂÓÅÅÏäξì¹ç¤Î¤ß½èÍý¤ò¹Ô¤¦ + // ·ÈÂÓÅÅÏäξì¹ç¤Î¤ß½èÍý¤ò¹Ô¤¦ if ($carrier !== FALSE) { - // HTMLÃæ¤ÎIMG¥¿¥°¤ò¼èÆÀ¤¹¤ë + // HTMLÃæ¤ÎIMG¥¿¥°¤ò¼èÆÀ¤¹¤ë $pattern = '/"]+)[\'"]\s*\/*>/i'; preg_match_all($pattern, $buffer, $images); - // üËö¤Î¾ðÊó¤ò¼èÆÀ¤¹¤ë - $fp = @fopen(INC_PATH . "/mobile_image_map_$carrier.inc", "r"); - flock($fp, LOCK_SH); + // üËö¤Î¾ðÊó¤ò¼èÆÀ¤¹¤ë + $fp = fopen(MOBILE_IMAGE_INC_PATH . "/mobile_image_map_$carrier.csv", "r"); while (($data = fgetcsv($fp, 1000, ",")) !== FALSE) { if ($data[1] == $model) { @@ -41,8 +39,7 @@ } } - flock($fp, LOCK_UN); fclose($fp); - // ²èÁüÊÑ´¹¤Î¾ðÊó¤ò¥»¥Ã¥È¤¹¤ë + // ²èÁüÊÑ´¹¤Î¾ðÊó¤ò¥»¥Ã¥È¤¹¤ë $imageConverter = New ImageConverter(); $imageConverter->setOutputDir(MOBILE_IMAGE_DIR); @@ -50,8 +47,12 @@ $imageConverter->setImageWidth($imageWidth); - // HTMLÃæ¤ÎIMG¥¿¥°¤òÊÑ´¹¸å¤Î¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ËÃÖ´¹¤¹¤ë + // HTMLÃæ¤ÎIMG¥¿¥°¤òÊÑ´¹¸å¤Î¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ËÃÖ´¹¤¹¤ë foreach ($images[1] as $key => $value) { $converted = $imageConverter->execute(preg_replace('|^' . PC_URL_DIR . '|', PC_HTML_PATH, $value)); - $buffer = str_replace($value, MOBILE_IMAGE_URL . '/' . $converted['outputImageName'], $buffer); + if (isset($converted['outputImageName'])) { + $buffer = str_replace($value, MOBILE_IMAGE_URL . '/' . $converted['outputImageName'], $buffer); + } else { + $buffer = str_replace($images[0][$key], '', $buffer); + } } } Index: temp/branches/mobile/data/class/SC_Customer.php =================================================================== --- temp/branches/mobile/data/class/SC_Customer.php (revision 11415) +++ temp/branches/mobile/data/class/SC_Customer.php (revision 11457) @@ -133,4 +133,29 @@ $this->customer_data['mobile_phone_id'] = $_SESSION['mobile']['phone_id']; + } + + /** + * email ¤«¤é email_mobile ¤Ø·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤ò¥³¥Ô¡¼¤¹¤ë¡£ + * + * @return void + */ + function updateEmailMobile() { + // ¤¹¤Ç¤Ë email_mobile ¤ËÃͤ¬Æþ¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï²¿¤â¤·¤Ê¤¤¡£ + if ($this->customer_data['email_mobile'] != '') { + return; + } + + // email ¤¬·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ï²¿¤â¤·¤Ê¤¤¡£ + if (!gfIsMobileMailAddress($this->customer_data['email'])) { + return; + } + + // email ¤«¤é email_mobile ¤Ø¥³¥Ô¡¼¤¹¤ë¡£ + $objQuery = new SC_Query; + $sqlval = array('email_mobile' => $this->customer_data['email']); + $where = 'customer_id = ? AND del_flg = 0 AND status = 2'; + $objQuery->update('dtb_customer', $sqlval, $where, array($this->customer_data['customer_id'])); + + $this->customer_data['email_mobile'] = $this->customer_data['email']; } Index: temp/branches/mobile/data/conf/mobile.conf =================================================================== --- temp/branches/mobile/data/conf/mobile.conf (revision 11418) +++ temp/branches/mobile/data/conf/mobile.conf (revision 11457) @@ -62,6 +62,7 @@ * ·ÈÂÓÅÅÏøþ¤±ÊÑ´¹²èÁüÊݸ¥Ç¥£¥ì¥¯¥È¥ê */ -define ('MOBILE_IMAGE_DIR', PC_HTML_PATH . 'mobile/converted_images'); -define ('MOBILE_IMAGE_URL', PC_URL_DIR . 'mobile/converted_images'); +define('MOBILE_IMAGE_DIR', HTML_PATH . 'converted_images'); +define('MOBILE_IMAGE_URL', URL_DIR . 'converted_images'); + //-------------------------------------------------------------------------------------------------------- Index: temp/branches/mobile/html/install/index.php =================================================================== --- temp/branches/mobile/html/install/index.php (revision 11418) +++ temp/branches/mobile/html/install/index.php (revision 11457) @@ -331,5 +331,5 @@ "../user_data", "../upload", - "../mobile/converted_images", + "../mobile/converted_images", "../../data/Smarty/templates_c", "../../data/downloads", @@ -812,4 +812,6 @@ // ¥«¥é¥à¤ÎÄɲáʴû¤Ë¥«¥é¥à¤¬Â¸ºß¤¹¤ë¾ì¹ç¤ÏºîÀ®¤·¤Ê¤¤¡Ë function lfAddColumn($dsn) { + global $objDBParam; + // ¼õÃí¥Æ¡¼¥Ö¥ë sfColumnExists("dtb_order", "memo01", "text", $dsn, true); @@ -853,4 +855,22 @@ sfColumnExists("dtb_payment", "memo09", "text", $dsn, true); sfColumnExists("dtb_payment", "memo10", "text", $dsn, true); + + // ¸ÜµÒ + if (!sfColumnExists("dtb_customer", "mobile_phone_id", "", $dsn)) { + sfColumnExists("dtb_customer", "mobile_phone_id", "text", $dsn, true); + $objQuery = new SC_Query($dsn); + if ($objDBParam->getValue('db_type') == 'mysql') { + $objQuery->query("CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id(64))"); + } else { + $objQuery->query("CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id)"); + } + } + + // ¸ÜµÒ¥á¡¼¥ë + if ($objDBParam->getValue('db_type') == 'mysql') { + sfColumnExists("dtb_customer_mail", "secret_key", "varchar(50) unique", $dsn, true); + } else { + sfColumnExists("dtb_customer_mail", "secret_key", "text unique", $dsn, true); + } } Index: temp/branches/mobile/html/mobile/shopping/deliv.php =================================================================== --- temp/branches/mobile/html/mobile/shopping/deliv.php (revision 11415) +++ temp/branches/mobile/html/mobile/shopping/deliv.php (revision 11457) @@ -92,4 +92,7 @@ // ¥í¥°¥¤¥ó¤¬À®¸ù¤·¤¿¾ì¹ç¤Ï·ÈÂÓüËöID¤òÊݸ¤¹¤ë¡£ $objCustomer->updateMobilePhoneId(); + + // ·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤ò¥³¥Ô¡¼¤¹¤ë¡£ + $objCustomer->updateEmailMobile(); // ·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç Index: temp/branches/mobile/html/mobile/mypage/index.php =================================================================== --- temp/branches/mobile/html/mobile/mypage/index.php (revision 11418) +++ temp/branches/mobile/html/mobile/mypage/index.php (revision 11457) @@ -48,4 +48,7 @@ $objCustomer->updateMobilePhoneId(); + // ·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤ò¥³¥Ô¡¼¤¹¤ë¡£ + $objCustomer->updateEmailMobile(); + // ·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç if (!$objCustomer->hasValue('email_mobile')) {