Ignore:
Timestamp:
2010/12/10 16:50:53 (16 years ago)
Author:
nanasess
bzr:base-revision:
[email protected]
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/Smarty/templates/admin/design/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Findex.tpl
data/Smarty/templates/admin/design/main_edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fmain_edit.tpl
data/Smarty/templates/admin/design/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fsubnavi.tpl
data/Smarty/templates/sphone/abouts abouts-20101209134535-2vxhi6tsy29bapc5-1
data/Smarty/templates/sphone/abouts/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-1
data/Smarty/templates/sphone/cart cart-20101209134535-2vxhi6tsy29bapc5-2
data/Smarty/templates/sphone/cart/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-2
data/Smarty/templates/sphone/contact contact-20101209134535-2vxhi6tsy29bapc5-3
data/Smarty/templates/sphone/contact/complete.tpl complete.tpl-20101209134550-lsv02w9wikfx9cj3-3
data/Smarty/templates/sphone/contact/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-4
data/Smarty/templates/sphone/contact/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-5
data/Smarty/templates/sphone/detail.tpl 19634@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsphone%2Fdetail.tpl
data/Smarty/templates/sphone/entry entry-20101209134535-2vxhi6tsy29bapc5-4
data/Smarty/templates/sphone/entry/complete.tpl complete.tpl-20101209134550-lsv02w9wikfx9cj3-6
data/Smarty/templates/sphone/entry/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-7
data/Smarty/templates/sphone/entry/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-8
data/Smarty/templates/sphone/entry/kiyaku.tpl kiyaku.tpl-20101209134550-lsv02w9wikfx9cj3-9
data/Smarty/templates/sphone/footer.tpl 19634@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsphone%2Ffooter.tpl
data/Smarty/templates/sphone/forgot forgot-20101209134535-2vxhi6tsy29bapc5-5
data/Smarty/templates/sphone/forgot/complete.tpl complete.tpl-20101209134550-lsv02w9wikfx9cj3-10
data/Smarty/templates/sphone/forgot/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-11
data/Smarty/templates/sphone/forgot/secret.tpl secret.tpl-20101209134550-lsv02w9wikfx9cj3-12
data/Smarty/templates/sphone/mypage mypage-20101209134535-2vxhi6tsy29bapc5-6
data/Smarty/templates/sphone/mypage/change.tpl change.tpl-20101209134550-lsv02w9wikfx9cj3-13
data/Smarty/templates/sphone/mypage/change_complete.tpl change_complete.tpl-20101209134550-lsv02w9wikfx9cj3-14
data/Smarty/templates/sphone/mypage/change_confirm.tpl change_confirm.tpl-20101209134550-lsv02w9wikfx9cj3-15
data/Smarty/templates/sphone/mypage/delivery.tpl delivery.tpl-20101209134550-lsv02w9wikfx9cj3-16
data/Smarty/templates/sphone/mypage/delivery_addr.tpl delivery_addr.tpl-20101209134550-lsv02w9wikfx9cj3-17
data/Smarty/templates/sphone/mypage/error.tpl error.tpl-20101209134550-lsv02w9wikfx9cj3-18
data/Smarty/templates/sphone/mypage/favorite.tpl favorite.tpl-20101209134550-lsv02w9wikfx9cj3-19
data/Smarty/templates/sphone/mypage/history.tpl history.tpl-20101209134550-lsv02w9wikfx9cj3-20
data/Smarty/templates/sphone/mypage/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-21
data/Smarty/templates/sphone/mypage/login.tpl login.tpl-20101209134550-lsv02w9wikfx9cj3-22
data/Smarty/templates/sphone/mypage/mail_view.tpl mail_view.tpl-20101209134550-lsv02w9wikfx9cj3-23
data/Smarty/templates/sphone/mypage/navi.tpl navi.tpl-20101209134550-lsv02w9wikfx9cj3-24
data/Smarty/templates/sphone/mypage/refusal.tpl refusal.tpl-20101209134550-lsv02w9wikfx9cj3-25
data/Smarty/templates/sphone/mypage/refusal_complete.tpl refusal_complete.tpl-20101209134550-lsv02w9wikfx9cj3-26
data/Smarty/templates/sphone/mypage/refusal_confirm.tpl refusal_confirm.tpl-20101209134550-lsv02w9wikfx9cj3-27
data/Smarty/templates/sphone/order order-20101209134535-2vxhi6tsy29bapc5-7
data/Smarty/templates/sphone/order/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-28
data/Smarty/templates/sphone/products products-20101209134535-2vxhi6tsy29bapc5-8
data/Smarty/templates/sphone/products/review.tpl review.tpl-20101209134550-lsv02w9wikfx9cj3-29
data/Smarty/templates/sphone/products/review_complete.tpl review_complete.tpl-20101209134550-lsv02w9wikfx9cj3-30
data/Smarty/templates/sphone/products/review_confirm.tpl review_confirm.tpl-20101209134550-lsv02w9wikfx9cj3-31
data/Smarty/templates/sphone/regist regist-20101209134535-2vxhi6tsy29bapc5-9
data/Smarty/templates/sphone/regist/complete.tpl complete.tpl-20101209134550-lsv02w9wikfx9cj3-32
data/Smarty/templates/sphone/shopping shopping-20101209134535-2vxhi6tsy29bapc5-10
data/Smarty/templates/sphone/shopping/card.tpl card.tpl-20101209134550-lsv02w9wikfx9cj3-33
data/Smarty/templates/sphone/shopping/complete.tpl complete.tpl-20101209134550-lsv02w9wikfx9cj3-34
data/Smarty/templates/sphone/shopping/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-35
data/Smarty/templates/sphone/shopping/convenience.tpl convenience.tpl-20101209134550-lsv02w9wikfx9cj3-36
data/Smarty/templates/sphone/shopping/deliv.tpl deliv.tpl-20101209134550-lsv02w9wikfx9cj3-37
data/Smarty/templates/sphone/shopping/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-38
data/Smarty/templates/sphone/shopping/nonmember_input.tpl nonmember_input.tpl-20101209134550-lsv02w9wikfx9cj3-39
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/Smarty/templates/sphone/site_frame.tpl 19634@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsphone%2Fsite_frame.tpl
data/Smarty/templates/sphone/site_main.tpl 19634@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsphone%2Fsite_main.tpl
data/Smarty/templates/sphone/top.tpl 19634@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsphone%2Ftop.tpl
data/class/SC_Initial.php 16506@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Initial.php
data/class/SC_SmartphoneUserAgent.php 19029@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fclass%2FSC_SmartphoneUserAgent.php
data/class/helper/SC_Helper_PageLayout.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_PageLayout.php
data/class/pages/LC_Page.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page.php
data/class/pages/LC_Page_Index.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page_Index.php
data/class/pages/abouts/LC_Page_Abouts.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fabouts%2FLC_Page_Abouts.php
data/class/pages/admin/design/LC_Page_Admin_Design.php 15680@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design.php
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php 15689@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_CSS.php
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php 15688@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Header.php
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 15682@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_MainEdit.php
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 16430@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Template.php
data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php 16677@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Up_Down.php
data/class/pages/contact/LC_Page_Contact.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcontact%2FLC_Page_Contact.php
data/class/pages/contact/LC_Page_Contact_Complete.php 15084@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcontact%2FLC_Page_Contact_Complete.php
data/class/pages/entry/LC_Page_Entry.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fentry%2FLC_Page_Entry.php
data/class/pages/entry/LC_Page_Entry_Complete.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fentry%2FLC_Page_Entry_Complete.php
data/class/pages/entry/LC_Page_Entry_Kiyaku.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fentry%2FLC_Page_Entry_Kiyaku.php
data/class/pages/guide/LC_Page_Guide.php 16162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide.php
data/class/pages/guide/LC_Page_Guide_About.php 16162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide_About.php
data/class/pages/guide/LC_Page_Guide_Charge.php 16162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide_Charge.php
data/class/pages/guide/LC_Page_Guide_Kiyaku.php 16162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide_Kiyaku.php
data/class/pages/guide/LC_Page_Guide_Order.php 17107@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide_Order.php
data/class/pages/guide/LC_Page_Guide_Privacy.php 16162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide_Privacy.php
data/class/pages/guide/LC_Page_Guide_Usage.php 16162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide_Usage.php
data/class/pages/mypage/LC_Page_Mypage.php 16066@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage.php
data/class/pages/mypage/LC_Page_Mypage_Change.php 16070@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Change.php
data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php 16237@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_ChangeComplete.php
data/class/pages/mypage/LC_Page_Mypage_Delivery.php 16092@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Delivery.php
data/class/pages/mypage/LC_Page_Mypage_Favorite.php 17162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Favorite.php
data/class/pages/mypage/LC_Page_Mypage_History.php 16102@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_History.php
data/class/pages/mypage/LC_Page_Mypage_Refusal.php 16107@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Refusal.php
data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php 16117@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_RefusalComplete.php
data/class/pages/order/LC_Page_Order.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Forder%2FLC_Page_Order.php
data/class/pages/preview/LC_Page_Preview.php 16432@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fpreview%2FLC_Page_Preview.php
data/class/pages/products/LC_Page_Products_CategoryList.php 16166@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_CategoryList.php
data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
data/class/pages/regist/LC_Page_Regist_Complete.php 15215@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fregist%2FLC_Page_Regist_Complete.php
data/class/pages/unsupported/LC_Page_Unsupported.php 16149@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Funsupported%2FLC_Page_Unsupported.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Frequire.php
html/sphone/abouts abouts-20101209134535-2vxhi6tsy29bapc5-11
html/sphone/abouts/index.php index.php-20101209134550-lsv02w9wikfx9cj3-41
html/sphone/cart cart-20101209134535-2vxhi6tsy29bapc5-12
html/sphone/cart/index.php index.php-20101209134550-lsv02w9wikfx9cj3-42
html/sphone/contact contact-20101209134535-2vxhi6tsy29bapc5-13
html/sphone/contact/complete.php complete.php-20101209134550-lsv02w9wikfx9cj3-43
html/sphone/contact/index.php index.php-20101209134550-lsv02w9wikfx9cj3-44
html/sphone/entry entry-20101209134535-2vxhi6tsy29bapc5-14
html/sphone/entry/complete.php complete.php-20101209134550-lsv02w9wikfx9cj3-45
html/sphone/entry/index.php index.php-20101209134550-lsv02w9wikfx9cj3-46
html/sphone/entry/kiyaku.php kiyaku.php-20101209134550-lsv02w9wikfx9cj3-47
html/sphone/forgot forgot-20101209134535-2vxhi6tsy29bapc5-15
html/sphone/forgot/index.php index.php-20101209134550-lsv02w9wikfx9cj3-48
html/sphone/frontparts frontparts-20101209134535-2vxhi6tsy29bapc5-16
html/sphone/frontparts/bloc bloc-20101209134550-lsv02w9wikfx9cj3-49
html/sphone/frontparts/bloc/best5.php best5.php-20101210054657-dge3r6w1sxwmm4rb-1
html/sphone/frontparts/bloc/calendar.php calendar.php-20101210054657-dge3r6w1sxwmm4rb-2
html/sphone/frontparts/bloc/cart.php cart.php-20101210054657-dge3r6w1sxwmm4rb-3
html/sphone/frontparts/bloc/category.php category.php-20101210054657-dge3r6w1sxwmm4rb-4
html/sphone/frontparts/bloc/login.php login.php-20101210054657-dge3r6w1sxwmm4rb-5
html/sphone/frontparts/bloc/news.php news.php-20101210054657-dge3r6w1sxwmm4rb-6
html/sphone/frontparts/bloc/search_products.php search_products.php-20101210054657-dge3r6w1sxwmm4rb-7
html/sphone/frontparts/login_check.php login_check.php-20101209134550-lsv02w9wikfx9cj3-50
html/sphone/index.php index.php-20101209134535-2vxhi6tsy29bapc5-17
html/sphone/mypage mypage-20101209134535-2vxhi6tsy29bapc5-18
html/sphone/mypage/change.php change.php-20101209134550-lsv02w9wikfx9cj3-51
html/sphone/mypage/change_complete.php change_complete.php-20101209134550-lsv02w9wikfx9cj3-52
html/sphone/mypage/delivery.php delivery.php-20101209134550-lsv02w9wikfx9cj3-53
html/sphone/mypage/delivery_addr.php delivery_addr.php-20101209134550-lsv02w9wikfx9cj3-54
html/sphone/mypage/download.php download.php-20101209134550-lsv02w9wikfx9cj3-55
html/sphone/mypage/favorite.php favorite.php-20101209134550-lsv02w9wikfx9cj3-56
html/sphone/mypage/history.php history.php-20101209134550-lsv02w9wikfx9cj3-57
html/sphone/mypage/index.php index.php-20101209134550-lsv02w9wikfx9cj3-58
html/sphone/mypage/login.php login.php-20101209134550-lsv02w9wikfx9cj3-59
html/sphone/mypage/login_check.php login_check.php-20101209134550-lsv02w9wikfx9cj3-60
html/sphone/mypage/mail_view.php mail_view.php-20101209134550-lsv02w9wikfx9cj3-61
html/sphone/mypage/order.php order.php-20101209134550-lsv02w9wikfx9cj3-62
html/sphone/mypage/refusal.php refusal.php-20101209134550-lsv02w9wikfx9cj3-63
html/sphone/mypage/refusal_complete.php refusal_complete.php-20101209134550-lsv02w9wikfx9cj3-64
html/sphone/order order-20101209134535-2vxhi6tsy29bapc5-19
html/sphone/order/index.php index.php-20101209134550-lsv02w9wikfx9cj3-65
html/sphone/products products-20101209134535-2vxhi6tsy29bapc5-20
html/sphone/products/detail.php detail.php-20101209134550-lsv02w9wikfx9cj3-66
html/sphone/products/list.php list.php-20101209134550-lsv02w9wikfx9cj3-67
html/sphone/products/review.php review.php-20101209134550-lsv02w9wikfx9cj3-68
html/sphone/products/review_complete.php review_complete.php-20101209134550-lsv02w9wikfx9cj3-69
html/sphone/regist regist-20101209134535-2vxhi6tsy29bapc5-21
html/sphone/regist/complete.php complete.php-20101209134550-lsv02w9wikfx9cj3-70
html/sphone/regist/index.php index.php-20101209134550-lsv02w9wikfx9cj3-71
html/sphone/require.php require.php-20101209134535-2vxhi6tsy29bapc5-22
html/sphone/shopping shopping-20101209134535-2vxhi6tsy29bapc5-23
html/sphone/shopping/complete.php complete.php-20101209134550-lsv02w9wikfx9cj3-72
html/sphone/shopping/confirm.php confirm.php-20101209134550-lsv02w9wikfx9cj3-73
html/sphone/shopping/deliv.php deliv.php-20101209134550-lsv02w9wikfx9cj3-74
html/sphone/shopping/index.php index.php-20101209134550-lsv02w9wikfx9cj3-75
html/sphone/shopping/load_payment_module.php load_payment_module.-20101209134550-lsv02w9wikfx9cj3-76
html/sphone/shopping/payment.php payment.php-20101209134550-lsv02w9wikfx9cj3-77
bzr:mapping-version:
v4
bzr:merge:

[email protected]
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
2442
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/design/index.tpl [email protected]
data/Smarty/templates/admin/design/main_edit.tpl [email protected]
data/Smarty/templates/admin/design/subnavi.tpl [email protected]
data/Smarty/templates/sphone/abouts [email protected]
data/Smarty/templates/sphone/abouts/index.tpl [email protected]
data/Smarty/templates/sphone/cart [email protected]
data/Smarty/templates/sphone/cart/index.tpl [email protected]
data/Smarty/templates/sphone/contact [email protected]
data/Smarty/templates/sphone/contact/complete.tpl [email protected]
data/Smarty/templates/sphone/contact/confirm.tpl [email protected]
data/Smarty/templates/sphone/contact/index.tpl [email protected]
data/Smarty/templates/sphone/detail.tpl [email protected]
data/Smarty/templates/sphone/entry [email protected]
data/Smarty/templates/sphone/entry/complete.tpl [email protected]
data/Smarty/templates/sphone/entry/confirm.tpl [email protected]
data/Smarty/templates/sphone/entry/index.tpl [email protected]
data/Smarty/templates/sphone/entry/kiyaku.tpl [email protected]
data/Smarty/templates/sphone/footer.tpl [email protected]
data/Smarty/templates/sphone/forgot [email protected]
data/Smarty/templates/sphone/forgot/complete.tpl [email protected]
data/Smarty/templates/sphone/forgot/index.tpl [email protected]
data/Smarty/templates/sphone/forgot/secret.tpl [email protected]
data/Smarty/templates/sphone/mypage [email protected]
data/Smarty/templates/sphone/mypage/change.tpl [email protected]
data/Smarty/templates/sphone/mypage/change_complete.tpl [email protected]
data/Smarty/templates/sphone/mypage/change_confirm.tpl [email protected]
data/Smarty/templates/sphone/mypage/delivery.tpl [email protected]
data/Smarty/templates/sphone/mypage/delivery_addr.tpl [email protected]
data/Smarty/templates/sphone/mypage/error.tpl [email protected]
data/Smarty/templates/sphone/mypage/favorite.tpl [email protected]
data/Smarty/templates/sphone/mypage/history.tpl [email protected]
data/Smarty/templates/sphone/mypage/index.tpl [email protected]
data/Smarty/templates/sphone/mypage/login.tpl [email protected]
data/Smarty/templates/sphone/mypage/mail_view.tpl [email protected]
data/Smarty/templates/sphone/mypage/navi.tpl [email protected]
data/Smarty/templates/sphone/mypage/refusal.tpl [email protected]
data/Smarty/templates/sphone/mypage/refusal_complete.tpl [email protected]
data/Smarty/templates/sphone/mypage/refusal_confirm.tpl [email protected]
data/Smarty/templates/sphone/order [email protected]
data/Smarty/templates/sphone/order/index.tpl [email protected]
data/Smarty/templates/sphone/products [email protected]
data/Smarty/templates/sphone/products/review.tpl [email protected]
data/Smarty/templates/sphone/products/review_complete.tpl [email protected]
data/Smarty/templates/sphone/products/review_confirm.tpl [email protected]
data/Smarty/templates/sphone/regist [email protected]
data/Smarty/templates/sphone/regist/complete.tpl [email protected]
data/Smarty/templates/sphone/shopping [email protected]
data/Smarty/templates/sphone/shopping/card.tpl [email protected]
data/Smarty/templates/sphone/shopping/complete.tpl [email protected]
data/Smarty/templates/sphone/shopping/confirm.tpl [email protected]
data/Smarty/templates/sphone/shopping/convenience.tpl [email protected]
data/Smarty/templates/sphone/shopping/deliv.tpl [email protected]
data/Smarty/templates/sphone/shopping/index.tpl [email protected]
data/Smarty/templates/sphone/shopping/nonmember_input.tpl [email protected]
data/Smarty/templates/sphone/shopping/payment.tpl [email protected]
data/Smarty/templates/sphone/site_frame.tpl [email protected]
data/Smarty/templates/sphone/site_main.tpl [email protected]
data/Smarty/templates/sphone/top.tpl [email protected]
data/class/SC_Initial.php [email protected]
data/class/SC_SmartphoneUserAgent.php [email protected]
data/class/helper/SC_Helper_PageLayout.php [email protected]
data/class/pages/LC_Page.php [email protected]
data/class/pages/LC_Page_Index.php [email protected]
data/class/pages/abouts/LC_Page_Abouts.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php [email protected]
data/class/pages/contact/LC_Page_Contact.php [email protected]
data/class/pages/contact/LC_Page_Contact_Complete.php [email protected]
data/class/pages/entry/LC_Page_Entry.php [email protected]
data/class/pages/entry/LC_Page_Entry_Complete.php [email protected]
data/class/pages/entry/LC_Page_Entry_Kiyaku.php [email protected]
data/class/pages/guide/LC_Page_Guide.php [email protected]
data/class/pages/guide/LC_Page_Guide_About.php [email protected]
data/class/pages/guide/LC_Page_Guide_Charge.php [email protected]
data/class/pages/guide/LC_Page_Guide_Kiyaku.php [email protected]
data/class/pages/guide/LC_Page_Guide_Order.php [email protected]
data/class/pages/guide/LC_Page_Guide_Privacy.php [email protected]
data/class/pages/guide/LC_Page_Guide_Usage.php [email protected]
data/class/pages/mypage/LC_Page_Mypage.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_Change.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_Delivery.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_Favorite.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_History.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_Refusal.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php [email protected]
data/class/pages/order/LC_Page_Order.php [email protected]
data/class/pages/preview/LC_Page_Preview.php [email protected]
data/class/pages/products/LC_Page_Products_CategoryList.php [email protected]
data/class/pages/products/LC_Page_Products_Detail.php [email protected]
data/class/pages/products/LC_Page_Products_List.php [email protected]
data/class/pages/regist/LC_Page_Regist_Complete.php [email protected]
data/class/pages/unsupported/LC_Page_Unsupported.php [email protected]
data/mtb_constants_init.php [email protected]
html/install/index.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]
html/install/sql/insert_data.sql [email protected]
html/require.php [email protected]
html/sphone/abouts [email protected]
html/sphone/abouts/index.php [email protected]
html/sphone/cart [email protected]
html/sphone/cart/index.php [email protected]
html/sphone/contact [email protected]
html/sphone/contact/complete.php [email protected]
html/sphone/contact/index.php [email protected]
html/sphone/entry [email protected]
html/sphone/entry/complete.php [email protected]
html/sphone/entry/index.php [email protected]
html/sphone/entry/kiyaku.php [email protected]
html/sphone/forgot [email protected]
html/sphone/forgot/index.php [email protected]
html/sphone/frontparts [email protected]
html/sphone/frontparts/bloc [email protected]
html/sphone/frontparts/bloc/best5.php [email protected]
html/sphone/frontparts/bloc/calendar.php [email protected]
html/sphone/frontparts/bloc/cart.php [email protected]
html/sphone/frontparts/bloc/category.php [email protected]
html/sphone/frontparts/bloc/login.php [email protected]
html/sphone/frontparts/bloc/news.php [email protected]
html/sphone/frontparts/bloc/search_products.php [email protected]
html/sphone/frontparts/login_check.php [email protected]
html/sphone/index.php [email protected]
html/sphone/mypage [email protected]
html/sphone/mypage/change.php [email protected]
html/sphone/mypage/change_complete.php [email protected]
html/sphone/mypage/delivery.php [email protected]
html/sphone/mypage/delivery_addr.php [email protected]
html/sphone/mypage/download.php [email protected]
html/sphone/mypage/favorite.php [email protected]
html/sphone/mypage/history.php [email protected]
html/sphone/mypage/index.php [email protected]
html/sphone/mypage/login.php [email protected]
html/sphone/mypage/login_check.php [email protected]
html/sphone/mypage/mail_view.php [email protected]
html/sphone/mypage/order.php [email protected]
html/sphone/mypage/refusal.php [email protected]
html/sphone/mypage/refusal_complete.php [email protected]
html/sphone/order [email protected]
html/sphone/order/index.php [email protected]
html/sphone/products [email protected]
html/sphone/products/detail.php [email protected]
html/sphone/products/list.php [email protected]
html/sphone/products/review.php [email protected]
html/sphone/products/review_complete.php [email protected]
html/sphone/regist [email protected]
html/sphone/regist/complete.php [email protected]
html/sphone/regist/index.php [email protected]
html/sphone/require.php [email protected]
html/sphone/shopping [email protected]
html/sphone/shopping/complete.php [email protected]
html/sphone/shopping/confirm.php [email protected]
html/sphone/shopping/deliv.php [email protected]
html/sphone/shopping/index.php [email protected]
html/sphone/shopping/load_payment_module.php [email protected]
html/sphone/shopping/payment.php [email protected]
bzr:timestamp:
2010-12-10 16:50:40.213999987 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2010-12-10T07:50:40.214000Z
Message:
  • #748(モバイルのデザイン管理機能)
    • dtb_pagelayout, dtb_bloc, dtb_blocposition のデータを追加
    • dtb_blocposition.filename を削除
    • dtb_bloc.filename を device_type_id と filename のユニークキーへ変更
  • #787(スマートフォン対応)
    • data/install.php のモバイル関連の定数を data/class/SC_Initial.php へ移動
    • テンプレート, PHPファイル追加
  • #832 SC_Helper_PageLayout#sfGetPageLayout()) の呼び出しを1ヶ所に集約
  • #820 フラグ, マスタIDの値を定数にする
    • mtb_target の値を定数化
Location:
branches/version-2_5-dev/data/class/pages/admin/design
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php

    r19711 r19713  
    2424// {{{ requires 
    2525require_once(CLASS_PATH . "pages/admin/LC_Page_Admin.php"); 
    26  
    27 /** ターゲットID 未使用 */ 
    28 define('TARGET_ID_UNUSED', 0); 
    2926 
    3027/** 
    … …  
    5350        $this->tpl_mainno = "design"; 
    5451        $this->tpl_subtitle = 'レイアウト編集'; 
     52        $masterData = new SC_DB_MasterData_Ex(); 
     53        $this->arrTarget = $masterData->getMasterData("mtb_target"); 
    5554    } 
    5655 
    … …  
    6867     * Page のアクション. 
    6968     * 
     69     * TODO パラメータの数値チェック 
     70     * 
    7071     * @return void 
    7172     */ 
    7273    function action() { 
    73         $objSess = new SC_Session(); 
    7474        $objLayout = new SC_Helper_PageLayout_Ex(); 
     75        $objQuery =& SC_Query::getSingletonInstance(); 
    7576 
    7677        // 認証可否の判定 
    … …  
    7980 
    8081        // ページIDを取得 
    81         if (isset($_GET['page_id'])) { 
    82             $page_id = $_GET['page_id']; 
    83         }else if (isset($_POST['page_id'])){ 
    84             $page_id = $_POST['page_id']; 
     82        if (isset($_REQUEST['page_id']) && is_numeric($_REQUEST['page_id'])) { 
     83            $page_id = $_REQUEST['page_id']; 
     84        } else { 
     85            $page_id = 1; 
     86        } 
     87        // 端末種別IDを取得 
     88        if (isset($_REQUEST['device_type_id']) 
     89            && is_numeric($_REQUEST['device_type_id'])) { 
     90            $device_type_id = $_REQUEST['device_type_id']; 
     91        } else { 
     92            $device_type_id = DEVICE_TYPE_PC; 
     93        } 
     94 
     95        // 編集可能ページを取得 
     96        $this->arrEditPage = $objLayout->lfGetPageData("page_id <> 0 AND device_type_id = ?", array($device_type_id)); 
     97 
     98        // レイアウト情報を取得 
     99        $arrBlocPos = $objLayout->lfGetNaviData($page_id, $device_type_id); 
     100 
     101        // データの存在チェックを行う 
     102        $arrPageData = $objLayout->lfGetPageData("page_id = ? AND device_type_id = ?", array($page_id, $device_type_id)); 
     103 
     104        if (count($arrPageData) <= 0) { 
     105            $this->exists_page = 0; 
    85106        }else{ 
    86             $page_id = 1; 
    87         } 
    88  
    89         // 編集可能ページを取得 
    90         $this->arrEditPage = $objLayout->lfgetPageData(); 
    91  
    92         // ブロック配置用データを取得 
    93         $sel   = ", pos.target_id, pos.bloc_id, pos.bloc_row ,pos.anywhere"; 
    94         $from  = ", dtb_blocposition AS pos"; 
    95         $where = " where "; 
    96         $where .= "( pos.anywhere = 1 OR (lay.device_type_id = ? AND lay.page_id = ? AND "; 
    97         $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id "; 
    98         //        $where .= "((lay.page_id = ? AND "; 
    99         //        $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id "; 
    100  
    101         $arrData = array($_GET['device_type_id'], $page_id); 
    102         $arrBlocPos = $this->lfgetLayoutData($sel, $from, $where, $arrData ); 
    103  
    104         // データの存在チェックを行う 
    105         $arrPageData = $objLayout->lfgetPageData("page_id = ?", array($page_id)); 
    106         if (count($arrPageData) <= 0) { 
    107             $exists_page = 0; 
    108         }else{ 
    109             $exists_page = 1; 
    110         } 
    111         $this->exists_page = $exists_page; 
     107            $this->exists_page = 1; 
     108        } 
    112109 
    113110        // メッセージ表示 
    … …  
    117114 
    118115        // ブロックを取得 
    119         $arrBloc = $this->lfgetBlocData(); 
     116        $arrBloc = $objQuery->select("*", "dtb_bloc", "device_type_id = ?", array($device_type_id)); 
    120117 
    121118        if (!isset($_POST['mode'])) $_POST['mode'] = ""; 
    122119 
     120        switch ($_POST['mode']) { 
    123121        // 新規ブロック作成 
    124         if ($_POST['mode'] == 'new_bloc') { 
     122        case 'new_bloc': 
    125123            $this->objDisplay->redirect($this->getLocation("./bloc.php")); 
    126124            exit; 
    127         } 
     125            break; 
    128126 
    129127        // 新規ページ作成 
    130         if ($_POST['mode'] == 'new_page') { 
     128        case 'new_page': 
    131129            $this->objDisplay->redirect($this->getLocation("./main_edit.php")); 
    132130            exit; 
    133         } 
    134  
    135         // データ登録処理 
    136         if ($_POST['mode'] == 'confirm' or $_POST['mode'] == 'preview') { 
     131            break; 
     132 
     133        case 'confirm': 
     134        case 'preview': 
    137135            $page_id = $_POST['page_id']; 
    138136            if ($_POST['mode'] == 'preview') { 
    139137                $page_id = '0'; 
    140138            } 
    141             $masterData = new SC_DB_MasterData_Ex(); 
    142             $arrTarget = $masterData->getMasterData("mtb_target"); 
    143139 
    144140            // 更新用にデータを整える 
    145141            $arrUpdBlocData = array(); 
    146             $arrTargetFlip = array_flip($arrTarget); 
    147  
    148             $upd_cnt = 1; 
    149             $arrUpdData[$upd_cnt]['page_id'] = $page_id; 
     142 
     143            // delete実行 
     144            $arrRet = $objQuery->delete("dtb_blocposition", 
     145                                        "page_id = ? AND device_type_id = ?", 
     146                                        array($page_id, $device_type_id)); 
     147 
     148            $arrTargetFlip = array_flip($this->arrTarget); 
    150149 
    151150            // POSTのデータを使いやすいように修正 
    152             for($upd_cnt = 1; $upd_cnt <= $_POST['bloc_cnt']; $upd_cnt++){ 
     151            for ($upd_cnt = 1; $upd_cnt <= $_POST['bloc_cnt']; $upd_cnt++) { 
    153152                if (!isset($_POST['id_'.$upd_cnt])) { 
    154153                    break; 
    155154                } 
    156                 $arrUpdBlocData[$upd_cnt]['name']       = $_POST['name_'.$upd_cnt];                         // ブロック名称 
    157                 $arrUpdBlocData[$upd_cnt]['id']         = $_POST['id_'.$upd_cnt];                           // ブロックID 
    158                 $arrUpdBlocData[$upd_cnt]['target_id']  = $arrTargetFlip[$_POST['target_id_'.$upd_cnt]];    // ターゲットID 
    159                 $arrUpdBlocData[$upd_cnt]['top']        = $_POST['top_'.$upd_cnt];                          // TOP座標 
    160                 $arrUpdBlocData[$upd_cnt]['anywhere']   = $_POST['anywhere_'.$upd_cnt];                     // 全ページ適用か 
    161                 $arrUpdBlocData[$upd_cnt]['update_url'] = $_SERVER['HTTP_REFERER'];                         // 更新URL 
    162  
    163             } 
    164  
    165             // データの更新を行う 
    166             $objQuery = new SC_Query();     // DB操作オブジェクト 
    167             $arrRet = array();              // データ取得用 
    168  
    169             // delete実行 
    170             $del_sql = ""; 
    171             $del_sql .= "DELETE FROM dtb_blocposition WHERE page_id = ? "; 
    172             $arrRet = $objQuery->query($del_sql,array($page_id)); 
     155 
     156                // ブロック名称 
     157                $arrUpdBlocData[$upd_cnt]['name']       = $_POST['name_'.$upd_cnt]; 
     158                // ブロックID 
     159                $arrUpdBlocData[$upd_cnt]['id']         = $_POST['id_'.$upd_cnt]; 
     160                // ターゲットID 
     161                $arrUpdBlocData[$upd_cnt]['target_id']  = $arrTargetFlip[$_POST['target_id_'.$upd_cnt]]; 
     162                // TOP座標 
     163                $arrUpdBlocData[$upd_cnt]['top']        = $_POST['top_'.$upd_cnt]; 
     164                // 全ページ適用か 
     165                $arrUpdBlocData[$upd_cnt]['anywhere']   = $_POST['anywhere_'.$upd_cnt]; 
     166                // 更新URL 
     167                $arrUpdBlocData[$upd_cnt]['update_url'] = $_SERVER['HTTP_REFERER']; 
     168            } 
     169 
    173170 
    174171            // ブロックの順序を取得し、更新を行う 
    175             foreach($arrUpdBlocData as $key => $val){ 
     172            foreach ($arrUpdBlocData as $key => $val) { 
    176173                if ($arrUpdBlocData[$key]['target_id'] == TARGET_ID_UNUSED) { 
    177174                    continue; 
    … …  
    179176 
    180177                // ブロックの順序を取得 
    181                 $bloc_row = $this->lfGetRowID($arrUpdBlocData, $val); 
    182                 $arrUpdBlocData[$key]['bloc_row'] = $bloc_row; 
    183                 $arrUpdBlocData[$key]['page_id']    =  $page_id;    // ページID 
    184  
    185                 // insert文生成 
    186                 $ins_sql = ""; 
    187                 $ins_sql .= "INSERT INTO dtb_blocposition "; 
    188                 $ins_sql .= " values ( "; 
    189                 $ins_sql .= "   ?  ";           // ページID 
    190                 $ins_sql .= "   ,? ";           // ターゲットID 
    191                 $ins_sql .= "   ,? ";           // ブロックID 
    192                 $ins_sql .= "   ,? ";           // ブロックの並び順序 
    193                 $ins_sql .= "   ,(SELECT filename FROM dtb_bloc WHERE bloc_id = ?) ";           // ファイル名称 
    194                 $ins_sql .= "   ,? ";           // 全ページフラグ 
    195                 $ins_sql .= "   )  "; 
     178                $arrUpdBlocData[$key]['bloc_row'] = $this->lfGetRowID($arrUpdBlocData, $val); 
    196179 
    197180                // insertデータ生成 
    198                 $arrInsData = array($page_id, 
    199                     $arrUpdBlocData[$key]['target_id'], 
    200                     $arrUpdBlocData[$key]['id'], 
    201                     $arrUpdBlocData[$key]['bloc_row'], 
    202                     $arrUpdBlocData[$key]['id'], 
    203                     $arrUpdBlocData[$key]['anywhere'] ? 1 : 0 
    204                 ); 
    205                 $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id'])); 
    206  
    207                 if($arrUpdBlocData[$key]['anywhere'] == 1){ 
    208                     $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id'])); 
    209                     if($count != 0){ 
     181                $arrInsData = array('device_type_id' => $device_type_id, 
     182                                    'page_id' => $page_id, 
     183                                    'target_id' => $arrUpdBlocData[$key]['target_id'], 
     184                                    'bloc_id' => $arrUpdBlocData[$key]['id'], 
     185                                    'bloc_row' => $arrUpdBlocData[$key]['bloc_row'], 
     186                                    'anywhere' => $arrUpdBlocData[$key]['anywhere'] ? 1 : 0); 
     187                $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ? AND device_type_id = ?", 
     188                                           array($arrUpdBlocData[$key]['id'], $device_type_id)); 
     189 
     190                if ($arrUpdBlocData[$key]['anywhere'] == 1) { 
     191                    $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ? AND device_type_id = ?", 
     192                                               array($arrUpdBlocData[$key]['id'], $device_type_id)); 
     193                    if ($count != 0) { 
    210194                        continue; 
    211                     }else{ 
    212195                    } 
    213                 }else{ 
    214                     if($count > 0){ 
    215                         $objQuery->query("DELETE FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id'])); 
     196                } else { 
     197                    if ($count > 0) { 
     198                        $objQuery->query("DELETE FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ? AND device_type_id = ?", 
     199                                         array($arrUpdBlocData[$key]['id'], $device_type_id)); 
    216200                    } 
    217201                } 
    218202                // SQL実行 
    219                 $arrRet = $objQuery->query($ins_sql,$arrInsData); 
     203                $arrRet = $objQuery->insert("dtb_blocposition", $arrInsData); 
    220204            } 
    221205 
    … …  
    233217                exit; 
    234218 
    235             }else{ 
     219            } else { 
    236220                $this->objDisplay->redirect($this->getLocation(DIR_INDEX_URL, 
    237                 array("page_id" => $page_id, 
    238                                                   "msg" => "on"))); 
     221                                                               array("device_type_id" => $device_type_id, "page_id" => $page_id, "msg" => "on"))); 
    239222                exit; 
    240223 
    241224            } 
    242         } 
    243  
    244         // データ削除処理 ベースデータでなければファイルを削除 
    245         if ($_POST['mode'] == 'delete' and  !$objLayout->lfCheckBaseData($page_id)) { 
    246             $objLayout->lfDelPageData($page_id); 
    247             $this->objDisplay->redirect($this->getLocation(DIR_INDEX_URL)); 
    248             exit; 
     225        break; 
     226 
     227        // データ削除処理 
     228        case 'delete': 
     229            //ベースデータでなければファイルを削除 
     230            if (!$objLayout->lfCheckBaseData($page_id, $device_type_id)) { 
     231                $objLayout->lfDelPageData($page_id, $device_type_id); 
     232                $this->objDisplay->redirect($this->getLocation(DIR_INDEX_URL)); 
     233                exit; 
     234            } 
     235        break; 
     236 
     237        default: 
    249238        } 
    250239 
    … …  
    257246                $tpl_arrBloc = $this->lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt); 
    258247                $cnt++; 
    259             }else{ 
    260             } 
    261         } 
    262  
     248            } 
     249        } 
    263250        // 未使用のブロックデータを追加 
    264251        foreach($arrBloc as $key => $val){ 
    … …  
    267254                $tpl_arrBloc = $this->lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt); 
    268255                $cnt++; 
    269             }else{ 
    270256            } 
    271257        } 
    … …  
    276262 
    277263        // ページ名称を取得 
    278         $arrPageData = $objLayout->lfgetPageData(' page_id = ?', array($page_id)); 
     264        $arrPageData = $objLayout->lfGetPageData('page_id = ? AND device_type_id = ?', array($page_id, $device_type_id)); 
    279265        $this->arrPageData = $arrPageData[0]; 
    280266 
    … …  
    301287 
    302288    /** 
    303      * 編集可能なページ情報を取得する. 
    304      * 
    305      * @param string $sel Select句文 
    306      * @param string $where Where句文 
    307      * @param array $arrVa Where句の絞込条件値 
    308      * @return array ページレイアウト情報の配列 
    309      */ 
    310     function lfgetLayoutData($sel = '' , $from = '', $where = '', $arrVal = ''){ 
    311         $objQuery = new SC_Query();     // DB操作オブジェクト 
    312         $sql = "";                      // データ取得SQL生成用 
    313         $arrRet = array();              // データ取得用 
    314  
    315         // SQL生成 
    316  
    317         $sql = ""; 
    318         $sql .= " select "; 
    319         $sql .= "     lay.page_id "; 
    320         $sql .= "     ,lay.page_name "; 
    321         $sql .= "     ,lay.url "; 
    322         $sql .= "     ,lay.author "; 
    323         $sql .= "     ,lay.description "; 
    324         $sql .= "     ,lay.keyword "; 
    325         $sql .= "     ,lay.update_url "; 
    326         $sql .= "     ,lay.create_date "; 
    327         $sql .= "     ,lay.update_date "; 
    328  
    329         // Select句の指定があれば追加 
    330         if ($sel != '') { 
    331             $sql .= $sel; 
    332         } 
    333  
    334         $sql .= " from dtb_pagelayout AS lay "; 
    335         // From句の指定があれば追加 
    336         if ($from != '') { 
    337             $sql .= $from; 
    338         } 
    339  
    340         // where句の指定があれば追加 
    341         if ($where != '') { 
    342             $sql .= $where; 
    343         }else{ 
    344             $sql .= " ORDER BY lay.page_id "; 
    345         } 
    346  
    347         $arrRet = $objQuery->getAll($sql, $arrVal); 
    348  
    349         return $arrRet; 
    350     } 
    351  
    352     /** 
    353      * ブロック情報を取得する. 
    354      * 
    355      * @param string $where Where句文 
    356      * @param array $arrVal Where句の絞込条件値 
    357      * @return array ブロック情報の配列 
    358      */ 
    359     function lfgetBlocData($where = '', $arrVal = ''){ 
    360         $objQuery = new SC_Query();     // DB操作オブジェクト 
    361         $sql = "";                      // データ取得SQL生成用 
    362         $arrRet = array();              // データ取得用 
    363  
    364         // SQL生成 
    365         $sql = ""; 
    366         $sql .= " SELECT "; 
    367         $sql .= "   bloc_id"; 
    368         $sql .= "   ,bloc_name"; 
    369         $sql .= "   ,tpl_path"; 
    370         $sql .= "   ,filename"; 
    371         $sql .= "   ,update_date"; 
    372         $sql .= " FROM "; 
    373         $sql .= "   dtb_bloc"; 
    374  
    375         // where句の指定があれば追加 
    376         if ($where != '') { 
    377             $sql .= " WHERE " . $where; 
    378         } 
    379  
    380         $sql .= " ORDER BY  bloc_id"; 
    381  
    382         $arrRet = $objQuery->getAll($sql, $arrVal); 
    383  
    384         return $arrRet; 
    385     } 
    386  
    387     /** 
    388289     * ブロック情報の配列を生成する. 
    389290     * 
    390291     * @param array $arrBloc Bloc情報 
    391292     * @param array $tpl_arrBloc データをセットする配列 
     293     * @param array $val DBから取得したブロック情報 
    392294     * @param integer $cnt 配列番号 
    393295     * @return array データをセットした配列 
    394296     */ 
    395297    function lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt) { 
    396         $masterData = new SC_DB_MasterData_Ex(); 
    397         $arrTarget = $masterData->getMasterData("mtb_target"); 
    398  
    399         $tpl_arrBloc[$cnt]['target_id'] = $arrTarget[$val['target_id']]; 
     298 
     299        $tpl_arrBloc[$cnt]['target_id'] = $this->arrTarget[$val['target_id']]; 
    400300        $tpl_arrBloc[$cnt]['bloc_id'] = $val['bloc_id']; 
    401301        $tpl_arrBloc[$cnt]['bloc_row'] = 
    … …  
    457357    /** 
    458358     * プレビューするデータを DB に保存する. 
     359     * 
     360     * FIXME 
    459361     * 
    460362     * @param array $arrPageData ページ情報の配列 
    … …  
    500402        // 更新データの取得 
    501403        $sql = "select page_id,page_name, header_chk, footer_chk from dtb_pagelayout where page_id = ? OR page_id = (SELECT page_id FROM dtb_blocposition WHERE anywhere = 1)" ; 
    502          
     404 
    503405        $ret = $objQuery->getAll($sql, array($arrPageData[0]['page_id'])); 
    504406 
    … …  
    523425        ,$filename 
    524426//      ,$ret[0]['anywhere'] 
    525           
     427 
    526428        ); 
    527429 

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php

    r19711 r19713  
    6666     * Page のアクション. 
    6767     * 
     68     * FIXME テンプレートパスの取得方法を要修正 
     69     * 
    6870     * @return void 
    6971     */ 
    … …  
    7173        $this->objLayout = new SC_Helper_PageLayout_Ex(); 
    7274        $package_path = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/"; 
    73          
     75 
    7476        // 認証可否の判定 
    7577        $objSess = new SC_Session(); 
    7678        SC_Utils_Ex::sfIsSuccess($objSess); 
    7779 
     80        // ページIDを取得 
     81        if (isset($_REQUEST['bloc_id']) && is_numeric($_REQUEST['bloc_id'])) { 
     82            $bloc_id = $_REQUEST['bloc_id']; 
     83        } else { 
     84            $bloc_id = 1; 
     85        } 
     86        $this->bloc_id = $bloc_id; 
     87 
     88        // 端末種別IDを取得 
     89        if (isset($_REQUEST['device_type_id']) 
     90            && is_numeric($_REQUEST['device_type_id'])) { 
     91            $device_type_id = $_REQUEST['device_type_id']; 
     92        } else { 
     93            $device_type_id = DEVICE_TYPE_PC; 
     94        } 
     95 
    7896        // ブロック一覧を取得 
    79         $this->arrBlocList = $this->lfgetBlocData(); 
    80  
    81         // ブロックIDを取得 
    82         if (isset($_POST['bloc_id'])) { 
    83             $bloc_id = $_POST['bloc_id']; 
    84         }else if (isset($_GET['bloc_id'])) { 
    85             $bloc_id = $_GET['bloc_id']; 
    86         }else{ 
    87             $bloc_id = ''; 
    88         } 
    89         $this->bloc_id = $bloc_id; 
     97        $this->arrBlocList = $this->lfgetBlocData("device_type_id = ?", array($device_type_id)); 
    9098 
    9199        // bloc_id が指定されている場合にはブロックデータの取得 
    92100        if ($bloc_id != '') { 
    93             $arrBlocData = $this->lfgetBlocData(" bloc_id = ? " , array($bloc_id)); 
     101            $arrBlocData = $this->lfGetBlocData("bloc_id = ? AND device_type_id = ?", 
     102                                                array($bloc_id, $device_type_id)); 
    94103 
    95104            // ユーザー作成ブロックが存在する場合 
    … …  
    101110                $arrBlocData[0]['tpl_path'] = TEMPLATE_DIR . $arrBlocData[0]['tpl_path']; 
    102111            } 
    103              
     112 
    104113            // テンプレートファイルの読み込み 
    105114            $arrBlocData[0]['tpl_data'] = file_get_contents($arrBlocData[0]['tpl_path']); 
    … …  
    114123 
    115124        if (!isset($_POST['mode'])) $_POST['mode'] = ""; 
    116                  
     125 
    117126        switch($_POST['mode']) { 
    118127        case 'preview': 
    119128            // プレビューファイル作成 
    120129            $prev_path = USER_INC_PATH . 'preview/bloc_preview.tpl'; 
    121             // ディレクトリの作成             
    122             SC_Utils::sfMakeDir($prev_path);             
     130            // ディレクトリの作成 
     131            SC_Utils::sfMakeDir($prev_path); 
    123132            $fp = fopen($prev_path,"w"); 
    124133            fwrite($fp, $_POST['bloc_html']); // FIXME いきなり POST はちょっと... 
    … …  
    132141            $this->arrBlocData['filename'] = $_POST['filename']; 
    133142            $this->text_row = $_POST['html_area_row']; 
    134             break; 
     143            break; 
    135144        case 'confirm': 
    136             $this->preview = "off"; 
     145            $this->preview = "off"; 
    137146            // エラーチェック 
    138147            $this->arrErr = $this->lfErrorCheck($_POST); 
    … …  
    148157                    unlink($old_bloc_path); 
    149158                } 
    150                  
     159 
    151160                // ファイル作成 
    152161                $new_bloc_path = $package_path . BLOC_DIR . $_POST['filename'] . ".tpl"; 
    153                 // ディレクトリの作成             
    154                 SC_Utils::sfMakeDir($new_bloc_path); 
     162                // ディレクトリの作成 
     163                SC_Utils::sfMakeDir($new_bloc_path); 
    155164                $fp = fopen($new_bloc_path,"w"); 
    156165                fwrite($fp, $_POST['bloc_html']); // FIXME いきなり POST はちょっと... 
    157166                fclose($fp); 
    158167 
    159                 $arrBlocData = $this->lfgetBlocData(" filename = ? " , array($_POST['filename'])); 
     168                $arrBlocData = $this->lfGetBlocData("filename = ? AND device_type_id = ?", 
     169                                                    array($_POST['filename'], $device_type_id)); 
    160170 
    161171                $bloc_id = $arrBlocData[0]['bloc_id']; 
    162172                $this->objDisplay->redirect($this->getLocation("./bloc.php", 
    163173                                            array("bloc_id" => $bloc_id, 
     174                                                  "device_type_id" => $device_type_id, 
    164175                                                  "msg" => "on"))); 
    165176                exit; 
    … …  
    168179                $this->arrBlocData = $_POST; 
    169180            } 
    170             break; 
     181            break; 
    171182        case 'delete': 
    172             $this->preview = "off"; 
    173             // DBへデータを更新する 
     183            $this->preview = "off"; 
     184            // DBへデータを更新する 
    174185            $objQuery = new SC_Query();     // DB操作オブジェクト 
    175186            $sql = "";                      // データ更新SQL生成用 
    … …  
    183194            if ($_POST['bloc_id'] !== '') { 
    184195                // SQL生成 
    185                 $sql = " DELETE FROM dtb_bloc WHERE bloc_id = ?"; 
     196                $sql = " DELETE FROM dtb_bloc WHERE bloc_id = ? AND device_type_id = ?"; 
    186197                // SQL実行 
    187                 $ret = $objQuery->query($sql,array($_POST['bloc_id'])); 
     198                $ret = $objQuery->query($sql,array($_POST['bloc_id'], $device_type_id)); 
    188199 
    189200                // ページに配置されているデータも削除する 
    190                 $sql = "DELETE FROM dtb_blocposition WHERE bloc_id = ?"; 
     201                $sql = "DELETE FROM dtb_blocposition WHERE bloc_id = ? AND device_type_id = ?"; 
    191202                // SQL実行 
    192                 $ret = $objQuery->query($sql,array($_POST['bloc_id'])); 
     203                $ret = $objQuery->query($sql,array($_POST['bloc_id'], $device_type_id)); 
    193204 
    194205                // ファイルの削除 
    … …  
    198209                } 
    199210            } 
    200             $this->objDisplay->redirect($this->getLocation("./bloc.php")); 
     211            $this->objDisplay->redirect($this->getLocation("./bloc.php", 
     212                                                           array("device_type_id" => $device_type_id))); 
    201213            exit; 
    202             break; 
     214            break; 
    203215        default: 
    204             if(isset($_POST['mode'])) { 
    205                GC_Utils::gfPrintLog("MODEエラー：".$_POST['mode']); 
    206             } 
    207             break; 
    208         }         
     216            if(isset($_POST['mode'])) { 
     217               GC_Utils::gfPrintLog("MODEエラー：".$_POST['mode']); 
     218            } 
     219            break; 
     220        } 
    209221    } 
    210222 
    … …  
    225237     * @return array ブロック情報 
    226238     */ 
    227     function lfgetBlocData($where = '', $arrVal = ''){ 
    228         $objQuery = new SC_Query();     // DB操作オブジェクト 
    229         $sql = "";                      // データ取得SQL生成用 
    230         $arrRet = array();              // データ取得用 
    231  
    232         // SQL生成 
    233         $sql = " SELECT "; 
    234         $sql .= "   bloc_id"; 
    235         $sql .= "   ,bloc_name"; 
    236         $sql .= "   ,tpl_path"; 
    237         $sql .= "   ,filename"; 
    238         $sql .= "   ,create_date"; 
    239         $sql .= "   ,update_date"; 
    240         $sql .= "   ,php_path"; 
    241         $sql .= "   ,del_flg"; 
    242         $sql .= " FROM "; 
    243         $sql .= "   dtb_bloc"; 
    244  
    245         // where句の指定があれば追加 
    246         if ($where != '') { 
    247             $sql .= " WHERE " . $where; 
    248         } 
    249  
    250         $sql .= " ORDER BY  bloc_id"; 
    251  
    252         $arrRet = $objQuery->getAll($sql, $arrVal); 
    253  
    254         return $arrRet; 
     239    function lfgetBlocData($where = '', $arrVal = array()){ 
     240        $objQuery =& SC_Query::getSingletonInstance(); 
     241        $objQuery->setOrder("bloc_id"); 
     242        return $objQuery->select("*", "dtb_bloc", $where, $arrVal); 
    255243    } 
    256244 
    … …  
    262250     */ 
    263251    function lfEntryBlocData($arrData){ 
    264         $objQuery = new SC_Query();     // DB操作オブジェクト 
    265         $sql = "";                      // データ更新SQL生成用 
    266         $ret = "";                      // データ更新結果格納用 
    267         $arrUpdData = array();          // 更新データ生成用 
    268         $arrChk = array();              // 排他チェック用 
     252        $objQuery = new SC_Query();     // DB操作オブジェクト 
     253        $sql = "";                      // データ更新SQL生成用 
     254        $ret = "";                      // データ更新結果格納用 
     255        $arrUpdData = array();          // 更新データ生成用 
     256        $arrChk = array();              // 排他チェック用 
    269257 
    270258        // 更新データ生成 
    … …  
    273261        // データが存在しているかチェックを行う 
    274262        if($arrData['bloc_id'] !== ''){ 
    275             $arrChk = $this->lfgetBlocData("bloc_id = ?", array($arrData['bloc_id'])); 
    276         } 
    277  
    278  
    279         } 
     263            $arrChk = $this->lfgetBlocData("bloc_id = ? AND device_type_id = ?", 
     264                                           array($arrData['bloc_id'], $arrData['device_type_id'])); 
     265        } 
     266 
    280267        // bloc_id が空 若しくは データが存在していない場合にはINSERTを行う 
    281268        if ($arrData['bloc_id'] === '' or !isset($arrChk[0])) { 
    282269            // SQL生成 
     270            // FIXME device_type_id ごとの連番にする 
    283271            $arrUpdData['bloc_id'] = $objQuery->nextVal('dtb_bloc_bloc_id'); 
    284272            $arrUpdData['create_date'] = "now()"; 
    285273            $ret = $objQuery->insert('dtb_bloc', $arrUpdData); 
    286274        } else { 
    287             $ret = $objQuery->update('dtb_bloc', $arrUpdData, 'bloc_id = ?', array($arrData['bloc_id'])); 
     275            $ret = $objQuery->update('dtb_bloc', $arrUpdData, 'bloc_id = ? AND device_type_id = ?', 
     276                                     array($arrData['bloc_id'], $arrData['device_type_id'])); 
    288277        } 
    289278        return $ret; 

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php

    r19670 r19713  
    6565    /** 
    6666     * Page のアクション. 
     67     * 
     68     * FIXME css ファイルの取得方法を要修正 
    6769     * 
    6870     * @return void 

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php

    r19670 r19713  
    6565    /** 
    6666     * Page のアクション. 
     67     * 
     68     * FIXME テンプレートの取得方法を要修正 
    6769     * 
    6870     * @return void 

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php

    r19670 r19713  
    7676        SC_Utils_Ex::sfIsSuccess($objSess); 
    7777 
     78        // ページIDを取得 
     79        if (isset($_REQUEST['page_id']) && is_numeric($_REQUEST['page_id'])) { 
     80            $page_id = $_REQUEST['page_id']; 
     81        } else { 
     82            $page_id = 1; 
     83        } 
     84 
     85        $this->page_id = $page_id; 
     86 
     87        // 端末種別IDを取得 
     88        if (isset($_REQUEST['device_type_id']) 
     89            && is_numeric($_REQUEST['device_type_id'])) { 
     90            $device_type_id = $_REQUEST['device_type_id']; 
     91        } else { 
     92            $device_type_id = DEVICE_TYPE_PC; 
     93        } 
     94 
    7895        // ページ一覧を取得 
    79         $this->arrPageList = $this->objLayout->lfgetPageData(); 
    80          
    81         // ブロックIDを取得 
    82         if (isset($_POST['page_id'])) { 
    83             $page_id = $_POST['page_id']; 
    84         }else if (isset($_GET['page_id'])){ 
    85             $page_id = $_GET['page_id']; 
    86         }else{ 
    87             $page_id = ''; 
    88         } 
    89  
    90         $this->page_id = $page_id; 
     96        $this->arrPageList = $this->objLayout->lfgetPageData("page_id <> 0 AND device_type_id = ?", 
     97                                                             array($device_type_id)); 
    9198 
    9299        // メッセージ表示 
    … …  
    101108 
    102109        if (!isset($_POST['mode'])) $_POST['mode'] = ""; 
    103          
    104         // プレビュー処理 
    105         if ($_POST['mode'] == 'preview') { 
    106             $this->lfPreviewPageData($page_id); 
    107             exit; 
    108         } 
    109  
    110         // データ登録処理 
    111         if ($_POST['mode'] == 'confirm') { 
     110 
     111        switch ($_POST['mode']) { 
     112            case 'preview': 
     113                $this->lfPreviewPageData($page_id); 
     114                exit; 
     115                break; 
     116 
     117        case 'delete': 
     118            if (!$this->objLayout->lfCheckBaseData($page_id)) { 
     119                $this->lfDeletePageData($page_id); 
     120                exit; 
     121            } 
     122            break; 
     123 
     124        case 'confirm': 
    112125            $this->lfConfirmPageData($page_id); 
    113         } 
    114  
    115         // データ削除処理 ベースデータでなければファイルを削除 
    116         if ($_POST['mode'] == 'delete' and !$this->objLayout->lfCheckBaseData($page_id)) { 
    117             $this->lfDeletePageData($page_id); 
    118             exit; 
     126        default: 
    119127        } 
    120128    } 
    … …  
    133141     * 
    134142     * @param integer $page_id ページID 
     143     * @param integer $device_type_id 端末種別ID 
    135144     * @param object $objView ビューオブジェクト 
    136145     * @return void 
    137146     */ 
    138     function lfGetPageData($page_id, $objView){ 
    139         $arrPageData = $this->objLayout->lfgetPageData(" page_id = ? " , array($page_id)); 
     147    function lfGetPageData($page_id, $device_type_id, $objView){ 
     148        $arrPageData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?", 
     149                                                       array($page_id, $device_type_id)); 
    140150 
    141151        if (strlen($arrPageData[0]['filename']) == 0) { 
    … …  
    147157        } 
    148158 
     159        // FIXME 
    149160        // テンプレートファイルが存在していれば読み込む 
    150161        $tpl_file =  USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . $arrPageData[0]['filename'] . ".tpl"; 
    … …  
    170181     * 
    171182     * @param integer $page_id ページID 
    172      * @return void 
    173      */ 
    174     function lfPreviewPageData($page_id){ 
     183     * @param integer $device_type_id 端末種別ID 
     184     * @return void 
     185     */ 
     186    function lfPreviewPageData($page_id, $device_type_id) { 
    175187 
    176188        $page_id_old = $page_id; 
    … …  
    184196        $tmpPost['tpl_dir'] = USER_PATH . "templates/preview/"; 
    185197         
    186         $arrPreData = $this->objLayout->lfgetPageData("page_id = ?" , array($page_id)); 
     198        $arrPreData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?", 
     199                                                      array($page_id, $device_type_id)); 
    187200         
    188201        // tplファイルの削除 (XXX: 処理の意図が不明。存在していると都合が悪いファイル?) 
    … …  
    234247     * 
    235248     * @param integer $page_id ページID 
    236      * @return void 
    237      */ 
    238     function lfConfirmPageData($page_id){ 
     249     * @param integer $device_type_id 端末種別ID 
     250     * @return void 
     251     */ 
     252    function lfConfirmPageData($page_id, $device_type_id) { 
    239253        // エラーチェック 
    240254        $this->arrErr = $this->lfErrorCheck($_POST); 
    … …  
    246260 
    247261            // ベースデータでなければファイルを削除し、PHPファイルを作成する 
    248             if (!$this->objLayout->lfCheckBaseData($page_id)) { 
     262            if (!$this->objLayout->lfCheckBaseData($page_id, $device_type_id)) { 
    249263                // PHPファイル作成 
    250264                $this->lfCreatePHPFile($_POST['url']); 
    251265            } 
    252266 
     267            // FIXME 
    253268            // TPLファイル作成 
    254269            $cre_tpl = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . basename($_POST['url']) . '.tpl'; 
    … …  
    258273            if ($page_id == '') { 
    259274                // ページIDを取得する 
    260                 $arrPageData = $this->objLayout->lfgetPageData(" url = ? AND page_id <> 0" , array(USER_DIR . $_POST['url'] . '.php')); 
     275                $arrPageData = $this->objLayout->lfGetPageData("url = ? AND page_id <> 0" , array(USER_DIR . $_POST['url'] . '.php')); 
    261276                $page_id = $arrPageData[0]['page_id']; 
    262277            } 
    263278            $this->objDisplay->redirect($this->getLocation("./main_edit.php", 
    264279                                    array("page_id" => $page_id, 
     280                                          "device_type_id" => $device_type_id, 
    265281                                          "msg"     => "on"))); 
    266282            exit; 
    … …  
    281297     * @return void 
    282298     */ 
    283     function lfEntryPageData($arrData){ 
     299    function lfEntryPageData($arrData, $device_type_id){ 
    284300        $objQuery = new SC_Query(); 
    285301        $arrChk = array();          // 排他チェック用 
    … …  
    290306        // データが存在しているかチェックを行う 
    291307        if($arrData['page_id'] !== ''){ 
    292             $arrChk = $this->objLayout->lfgetPageData("page_id = ?", array($arrData['page_id'])); 
     308            $arrChk = $this->objLayout->lfgetPageData("page_id = ? AND device_type_id = ?", 
     309                                                      array($arrData['page_id'], $device_type_id)); 
    293310        } 
    294311 
    295312        // page_id が空 若しくは データが存在していない場合にはINSERTを行う 
    296313        if ($arrData['page_id'] === '' or !isset($arrChk[0])) { 
     314            // FIXME device_type_id ごとの連番にする 
    297315            $sqlval['page_id'] = $objQuery->nextVal('dtb_pagelayout_page_id'); 
     316            $sqlval['device_type_id'] = $device_type_id; 
    298317            $sqlval['create_date'] = 'now()'; 
    299318            $objQuery->insert('dtb_pagelayout', $sqlval); 
    … …  
    301320        // データが存在してる場合にはアップデートを行う 
    302321        else { 
    303             $objQuery->update('dtb_pagelayout', $sqlval, 'page_id = ?', array($arrData['page_id'])); 
     322            $objQuery->update('dtb_pagelayout', $sqlval, 'page_id = ? AND device_type_id = ?', 
     323                              array($arrData['page_id'], $device_type_id)); 
    304324        } 
    305325    } 
    … …  
    342362     * @return void 
    343363     */ 
    344     function lfDeletePageData($page_id){ 
    345         $this->objLayout->lfDelPageData($_POST['page_id']); 
    346         $this->objDisplay->redirect($this->getLocation("./main_edit.php")); 
     364    function lfDeletePageData($page_id, $device_type_id){ 
     365        $this->objLayout->lfDelPageData($page_id, $device_type_id); 
     366        $this->objDisplay->redirect($this->getLocation("./main_edit.php", 
     367                                                       array("device_type_id" => $device_type_id))); 
    347368    } 
    348369 
    … …  
    357378        $objErr->doFunc(array("名称", "page_name", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    358379        $objErr->doFunc(array("URL", "url", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    359          
     380 
    360381        // URLチェック 
    361382        $okUrl = true; 
    … …  
    371392            $objErr->arrErr['url'] = "※ URLを正しく入力してください。<br />"; 
    372393        } 
    373          
     394 
    374395        // 同一のURLが存在している場合にはエラー 
    375396        $params = array(); 

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php

    r19670 r19713  
    8585    /** 
    8686     * Page のアクション. 
     87     * 
     88     * FIXME ロジックを見直し 
    8789     * 
    8890     * @return void 

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php

    r19670 r19713  
    6868    /** 
    6969     * Page のアクション. 
     70     * 
     71     * FIXME ロジックを見直し 
    7072     * 
    7173     * @return void 
Note: See TracChangeset for help on using the changeset viewer.