[Svn-src-all:3882] [version-2_12-dev 22796] #2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

2013年 5月 2日 (木) 18:11:38 JST

Subversion committed to /home/svn/open 22796
http://svn.ec-cube.net/open_trac/changeset/22796
$B(#(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!($(B
$B("99?7<T!!(B:  h_yoshimoto                                  $B("(B
$B("99?7F|;~(B:  2013-05-02 18:11:36 +0900 ($BLZ(B, 02  5$B7n(B 2013)$B("(B
$B(&(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(%(B

Log:
--------------------------------------------------------
#2236 2.12.3$B%j%j!<%90J9_$N(B2.12-dev$B$X$N%3%_%C%H:9$7La$7(B

Changed:                      [U:$B=$@5!$(BA:$BDI2C!$(BD:$B:o=|(B]
--------------------------------------------------------
U   branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl
D   branches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl
D   branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
D   branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl
A   branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl
U   branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl
U   branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
U   branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl
U   branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl
U   branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl
U   branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl
U   branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
D   branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl
U   branches/version-2_12-dev/data/class/SC_AdminView.php
U   branches/version-2_12-dev/data/class/SC_Batch.php
D   branches/version-2_12-dev/data/class/SC_Cache.php
U   branches/version-2_12-dev/data/class/SC_CartSession.php
U   branches/version-2_12-dev/data/class/SC_CheckError.php
U   branches/version-2_12-dev/data/class/SC_ClassAutoloader.php
U   branches/version-2_12-dev/data/class/SC_Cookie.php
U   branches/version-2_12-dev/data/class/SC_Customer.php
U   branches/version-2_12-dev/data/class/SC_CustomerList.php
U   branches/version-2_12-dev/data/class/SC_Date.php
U   branches/version-2_12-dev/data/class/SC_Display.php
U   branches/version-2_12-dev/data/class/SC_FormParam.php
U   branches/version-2_12-dev/data/class/SC_Fpdf.php
U   branches/version-2_12-dev/data/class/SC_Image.php
U   branches/version-2_12-dev/data/class/SC_Initial.php
U   branches/version-2_12-dev/data/class/SC_InstallView.php
U   branches/version-2_12-dev/data/class/SC_MobileEmoji.php
U   branches/version-2_12-dev/data/class/SC_MobileImage.php
U   branches/version-2_12-dev/data/class/SC_MobileUserAgent.php
U   branches/version-2_12-dev/data/class/SC_MobileView.php
U   branches/version-2_12-dev/data/class/SC_PageNavi.php
U   branches/version-2_12-dev/data/class/SC_Product.php
U   branches/version-2_12-dev/data/class/SC_Query.php
U   branches/version-2_12-dev/data/class/SC_Response.php
U   branches/version-2_12-dev/data/class/SC_SelectSql.php
U   branches/version-2_12-dev/data/class/SC_SendMail.php
U   branches/version-2_12-dev/data/class/SC_Session.php
U   branches/version-2_12-dev/data/class/SC_SessionFactory.php
U   branches/version-2_12-dev/data/class/SC_SiteSession.php
U   branches/version-2_12-dev/data/class/SC_SiteView.php
U   branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php
U   branches/version-2_12-dev/data/class/SC_SmartphoneView.php
U   branches/version-2_12-dev/data/class/SC_UploadFile.php
U   branches/version-2_12-dev/data/class/SC_View.php
U   branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php
U   branches/version-2_12-dev/data/class/api/SC_Api_Operation.php
U   branches/version-2_12-dev/data/class/api/SC_Api_Utils.php
U   branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php
U   branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php
U   branches/version-2_12-dev/data/class/api/operations/CartAdd.php
U   branches/version-2_12-dev/data/class/api/operations/CartClear.php
U   branches/version-2_12-dev/data/class/api/operations/CartCreate.php
U   branches/version-2_12-dev/data/class/api/operations/CartGet.php
U   branches/version-2_12-dev/data/class/api/operations/CartModify.php
U   branches/version-2_12-dev/data/class/api/operations/Default.php
U   branches/version-2_12-dev/data/class/api/operations/GetVersion.php
U   branches/version-2_12-dev/data/class/api/operations/ItemLookup.php
U   branches/version-2_12-dev/data/class/api/operations/ItemSearch.php
U   branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php
U   branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php
U   branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php
U   branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
U   branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
U   branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php
U   branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php
U   branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php
U   branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Bloc.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Category.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Delivery.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Holiday.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Kiyaku.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Mailtemplate.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Maker.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_News.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
D   branches/version-2_12-dev/data/class/helper/SC_Helper_Recommend.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php
U   branches/version-2_12-dev/data/class/pages/LC_Page.php
U   branches/version-2_12-dev/data/class/pages/LC_Page_Index.php
U   branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php
U   branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php
U   branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php
U   branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php
U   branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php
U   branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php
U   branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php
U   branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
U   branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
U   branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
U   branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php
U   branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php
U   branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
U   branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php
U   branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
U   branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php
U   branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
U   branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
U   branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php
U   branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
U   branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
U   branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
U   branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
U   branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
U   branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U   branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php
U   branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
U   branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php
U   branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php
U   branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
U   branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
U   branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
U   branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php
U   branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php
U   branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php
U   branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
U   branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php
U   branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
U   branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php
U   branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php
U   branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php
U   branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php
U   branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php
U   branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php
U   branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php
U   branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php
U   branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
U   branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php
U   branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
U   branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php
U   branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php
U   branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php
U   branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php
U   branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
U   branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
U   branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php
U   branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php
U   branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php
U   branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php
U   branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php
U   branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
U   branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php
U   branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php
U   branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php
U   branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php
U   branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php
U   branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php
U   branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php
U   branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php
U   branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php
U   branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php
U   branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php
U   branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php
U   branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
U   branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php
U   branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
U   branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
U   branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php
U   branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php
U   branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php
U   branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php
U   branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php
U   branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php
U   branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php
U   branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php
U   branches/version-2_12-dev/data/class/util/GC_Utils.php
U   branches/version-2_12-dev/data/class/util/SC_Utils.php
U   branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php
D   branches/version-2_12-dev/data/class_extends/SC_Cache_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php
U   branches/version-2_12-dev/data/class_extends/SC_View_Ex.php
U   branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php
U   branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php
U   branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php
U   branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php
U   branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php
U   branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php
U   branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php
U   branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php
U   branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php
U   branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php
U   branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php
U   branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php
U   branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Bloc_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Category_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Delivery_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Holiday_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Kiyaku_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mailtemplate_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Maker_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_News_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php
D   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Recommend_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php
U   branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php
U   branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php
U   branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php
U   branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php
U   branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php
U   branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php
U   branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php
U   branches/version-2_12-dev/data/include/image_converter.inc
D   branches/version-2_12-dev/data/module/Cache/
U   branches/version-2_12-dev/data/smarty_extends/block.marquee.php
U   branches/version-2_12-dev/data/smarty_extends/function.from_to.php
U   branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php
U   branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php
U   branches/version-2_12-dev/data/smarty_extends/modifier.h.php
U   branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php
U   branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php
U   branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php
U   branches/version-2_12-dev/data/smarty_extends/modifier.u.php
U   branches/version-2_12-dev/html/install/index.php
U   branches/version-2_12-dev/html/install/sql/create_table_mysql.sql
U   branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql
U   branches/version-2_12-dev/html/install/sql/insert_data.sql
U   branches/version-2_12-dev/html/js/site.js
U   branches/version-2_12-dev/html/test/upgrade/index.php
U   branches/version-2_12-dev/html/upgrade/index.php
U   branches/version-2_12-dev/html/user_data/__default.php
U   branches/version-2_12-dev/html/user_data/packages/admin/css/admin_contents.css
U   branches/version-2_12-dev/html/user_data/packages/admin/css/reset.css
U   branches/version-2_12-dev/html/user_data/packages/admin/js/admin.js
U   branches/version-2_12-dev/html/user_data/packages/default/css/reset.css
U   branches/version-2_12-dev/html/user_data/packages/default/css/table.css
U   branches/version-2_12-dev/html/user_data/packages/default/img/common/bg_header.gif
A   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_news.jpg
D   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_news.png
A   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_recommend.jpg
D   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_recommend.png
A   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_recommend.jpg
D   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_recommend.png
A   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_voice.jpg
D   branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_voice.png
U   branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css
U   branches/version-2_12-dev/html/user_data/packages/sphone/css/mypage.css
U   branches/version-2_12-dev/html/user_data/packages/sphone/js/btn.js
U   branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js
U   branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js
U   branches/version-2_12-dev/html/user_data/packages/sphone/js/favorite.js
U   branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js
U   branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.facebox/facebox.css
U   branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch
U   branches/version-2_12-dev/templates/mobile_class.php
U   branches/version-2_12-dev/templates/page_class.php
U   branches/version-2_12-dev/templates/page_class_extends.php
U   branches/version-2_12-dev/templates/templates.xml
U   branches/version-2_12-dev/test/TestSuite.php
U   branches/version-2_12-dev/test/api_test.php
U   branches/version-2_12-dev/test/class/SC_DbConn_Test.php
U   branches/version-2_12-dev/test/class/SC_Query_Test.php
U   branches/version-2_12-dev/test/class/db/DB_AllTests.php
U   branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php
U   branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php
U   branches/version-2_12-dev/test/class/helper/Helper_AllTests.php
U   branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php
U   branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php
U   branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php
U   branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php
U   branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php
U   branches/version-2_12-dev/test/class/page/LC_Page_Test.php
U   branches/version-2_12-dev/test/class/page/Page_AllTests.php
U   branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php
U   branches/version-2_12-dev/test/class/util/SC_Utils_Test.php
U   branches/version-2_12-dev/test/class/util/Util_AllTests.php
U   branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php
U   branches/version-2_12-dev/test/createEcCubeData-v25.php
U   branches/version-2_12-dev/tests/class/Common_TestCase.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php
U   branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php
U   branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php
U   branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php
D   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php
A   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php
A   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php
A   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php
A   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php
A   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php
D   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php
U   branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php
U   branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php
U   branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php
U   branches/version-2_12-dev/tests/class/test/util/Test_Utils.php
U   branches/version-2_12-dev/tests/class/test/util/User_Utils.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php
A   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php
U   branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl
===================================================================

--- branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -125,8 +125,8 @@
     <td>
         <!--{assign var=key1 value="search_buy_times_from"}-->
         <!--{assign var=key2 value="search_buy_times_to"}-->
-    <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span><br />
+    <!--{if $arrErr.buy_times_from || $arrErr.buy_times_to}-->
+        <span class="attention"><!--{$arrErr.buy_times_from}--><!--{$arrErr.buy_times_to}--></span><br />
     <!--{/if}-->
     <input type="text" name="<!--{$key1}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key1].value|h}-->" size="6" class="box6" <!--{if $arrErr[$key1] || $arrErr[$key2]}--><!--{sfSetErrorStyle}--><!--{/if}--> /> $B2s(B $B!A(B
     <input type="text" name="<!--{$key2}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key2].value|h}-->" size="6" class="box6" <!--{if $arrErr[$key1] || $arrErr[$key2]}--><!--{sfSetErrorStyle}--><!--{/if}--> /> $B2s(B</td>
@@ -220,7 +220,7 @@
     <td>
         <!--{assign var=key value="search_buy_product_code"}-->
         <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" >
     </td>
 </tr>
 <tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -140,7 +140,6 @@
             </tr>
         <!--{/if}-->
         <!--{/section}-->
-        </tr>
     </table>
     <!--{/if}-->
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,7 +33,7 @@
             <th>$B%?%$%H%k(B<span class="attention"> *</span></th>
             <td>
                 <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
-                <input type="text" name="title" value="<!--{$arrForm.title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+                <input type="text" name="title" value="<!--{$arrForm.title|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
                 <span class="attention"> ($B>e8B(B<!--{$smarty.const.SMTEXT_LEN}-->$BJ8;z(B)</span>
             </td>
         </tr>
@@ -47,11 +47,11 @@
                 <!--{/if}-->
                 <select name="month" style="<!--{$arrErr.month|sfGetErrorColor}-->">
                     <option value="">--</option>
-                    <!--{html_options options=$arrMonth selected=$arrForm.month.value}-->
+                    <!--{html_options options=$arrMonth selected=$arrForm.month}-->
                 </select>$B7n(B
                 <select name="day" style="<!--{$arrErr.day|sfGetErrorColor}-->">
                     <option value="">--</option>
-                    <!--{html_options options=$arrDay selected=$arrForm.day.value}-->
+                    <!--{html_options options=$arrDay selected=$arrForm.day}-->
                 </select>$BF|(B
                 <br />
                 <span class="attention">$B?6BX5YF|$O<+F0 ＠ _Dj$5$l$J$$$N$G!"?6BX$(@h$NF|IU$r ＠ _Dj$7$F$/$@$5$$!#(B</span>
@@ -99,10 +99,10 @@
             </td>
             <td class="center">
                 <!--{if $smarty.section.cnt.iteration != 1}-->
-                <a href="?" onclick="fnModeSubmit('up', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">$B>e$X(B</a>
+                <a href="?" onclick="fnModeSubmit('up', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />$B>e$X(B</a>
                 <!--{/if}-->
                 <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
-                <a href="?" onclick="fnModeSubmit('down', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">$B2<$X(B</a>
+                <a href="?" onclick="fnModeSubmit('down', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />$B2<$X(B</a>
                 <!--{/if}-->
             </td>
         </tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -110,7 +110,7 @@
 //]]></script>
 <form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
 <!--{* $B"'EPO?%F!<%V%k$3$3$+$i(B *}-->
 <div id="basis" class="contents-main">
 
@@ -322,7 +322,7 @@
 
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', ''); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', ''); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a></li>
         </ul>
     </div>
 </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,7 +33,7 @@
             <td>
                 <span class="attention"><!--{$arrErr.kiyaku_title}--></span>
                 <span class="attention"><!--{$arrErr.name}--></span>
-                <input type="text" name="kiyaku_title" value="<!--{$arrForm.kiyaku_title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="<!--{if $arrErr.kiyaku_title != "" || $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60"/>
+                <input type="text" name="kiyaku_title" value="<!--{$arrForm.kiyaku_title|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="<!--{if $arrErr.kiyaku_title != "" || $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60"/>
                 <span class="attention"> ($B>e8B(B<!--{$smarty.const.SMTEXT_LEN}-->$BJ8;z(B)</span>
             </td>
         </tr>
@@ -41,7 +41,7 @@
             <th>$B5,LsFbMF(B<span class="attention"> *</span></th>
             <td>
             <span class="attention"><!--{$arrErr.kiyaku_text}--></span>
-            <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{"\n"}--><!--{$arrForm.kiyaku_text.value|h}--></textarea>
+            <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{"\n"}--><!--{$arrForm.kiyaku_text|h}--></textarea>
             <span class="attention"> ($B>e8B(B<!--{$smarty.const.MLTEXT_LEN}-->$BJ8;z(B)</span>
             </td>
         </tr>
@@ -69,7 +69,7 @@
                 <td><!--{* $B5,3JL>(B *}--><!--{$arrKiyaku[cnt].kiyaku_title|h}--></td>
                 <td align="center">
                     <!--{if $tpl_kiyaku_id != $arrKiyaku[cnt].kiyaku_id}-->
-                    <a href="?" onclick="fnModeSubmit('pre_edit', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">$BJT=8(B</a>
+                    <a href="?" onclick="fnSetFormSubmit('form1', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">$BJT=8(B</a>
                     <!--{else}-->
                     $BJT=8Cf(B
                     <!--{/if}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -86,7 +86,7 @@
             <div>
                 <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','header','cnt_header'); return false;"><span>$BJ8;z?t%+%&%s%H(B</span></a>
                 $B:#$^$G$KF~NO$7$?$N$O(B
-                <input type="text" name="cnt_header" size="4" class="box4" readonly="readonly" style="text-align:right" />
+                <input type="text" name="cnt_header" size="4" class="box4" readonly = true style="text-align:right" />
                 $BJ8;z$G$9!#(B
             </div>
             </td>
@@ -106,7 +106,7 @@
             <div>
                 <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','footer','cnt_footer'); return false;"><span>$BJ8;z?t%+%&%s%H(B</span></a>
                 $B:#$^$G$KF~NO$7$?$N$O(B
-                <input type="text" name="cnt_footer" size="4" class="box4" readonly="readonly" style="text-align:right" />
+                <input type="text" name="cnt_footer" size="4" class="box4" readonly = true style="text-align:right" />
                 $BJ8;z$G$9!#(B
             </div>
             </td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,7 +24,7 @@
 
 <form name="form1" id="form1" method="post" action="?" onSubmit="return window.confirm('$BEPO?$7$F$b59$7$$$G$9$+(B');">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="mode" value="confirm">
 <input type="hidden" name="device_type_id" value="" />
 <input type="hidden" name="page_id" value="" />
 <div id="basis" class="contents-main">

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -128,7 +128,7 @@
             <td>
                 <!--{assign var=key value="law_email"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
+                <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> ($B>e8B(B<!--{$arrForm[$key].length}-->$BJ8;z(B)</span>
             </td>
         </tr>
         <tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,7 +28,7 @@
     </style>
     <form name="form1" id="form1" method="get" action="?" onsubmit="return false;">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-        <input type="hidden" name="mode" value="" />
+        <input type="hidden" name="mode" value="">
         <p>$BJ]B8$5$l$F$$$kM9JXHV9f(BCSV$B$N99?7F|;~(B: <!--{$tpl_csv_datetime|h}--></p>
         <p>$BM9JXHV9f(BCSV$B$K$O(B <!--{$tpl_line|h}--> $B9T$N%G!<%?$,$"$j$^$9!#(B</p>
         <p>$BM9JXHV9f(BDB$B$K$O(B <!--{$tpl_count_mtb_zip|h}--> $B9T$N%G!<%?$,$"$j$^$9!#(B</p>
@@ -52,7 +52,7 @@
         <div class="basis-zip-item">
             <h2>DB$B<jF0EPO?(B</h2>
             <p>$B;XDj$7$?9T?t$+$iM9JXHV9f$rEPO?$7$^$9!#%?%$%`%"%&%H$7$?>l9g!"D>A0$^$GEPO?$5$l$^$9!#(B</p>
-            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', ''); return false;"><span class="btn-next">$B<jF0EPO?(B</span></a>$B!!3+;O9T(B: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8" /><span class="attention"><!--{$arrErr.startRowNum}--></span></p>
+            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', ''); return false;"><span class="btn-next">$B<jF0EPO?(B</span></a>$B!!3+;O9T(B: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8"><span class="attention"><!--{$arrErr.startRowNum}--></span></p>
         </div>
 
         <div class="basis-zip-item">

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -65,7 +65,7 @@
     <span class="attention"><!--{$arrErr.tpl_subno_csv}--></span>
     <div class="ms2side__area">
         <span class="attention"><!--{$arrErr.output_list}--></span>
-        <select multiple="multiple" name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
+        <select multiple name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
             <!--{html_options options=$arrOptions selected=$arrSelected}-->
         </select>
     </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -62,14 +62,14 @@
                 <th>$B%U%!%$%k$N%"%C%W%m!<%I(B</th>
                 <td>
                     <!--{if $arrErr.upload_file}--><span class="attention"><!--{$arrErr.upload_file}--></span><!--{/if}-->
-                    <input type="file" name="upload_file" size="40" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> /><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">$B%"%C%W%m!<%I(B</a>
+                    <input type="file" name="upload_file" size="40" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">$B%"%C%W%m!<%I(B</a>
                 </td>
             </tr>
             <tr>
                 <th>$B%U%)%k%@:n ＠ .(B</th>
                 <td>
                     <!--{if $arrErr.create_file}--><span class="attention"><!--{$arrErr.create_file}--></span><!--{/if}-->
-                    <input type="text" name="create_file" value="" style="width:336px;<!--{if $arrErr.create_file}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" /><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('create','',''); return false;">$B:n ＠ .(B</a>
+                    <input type="text" name="create_file" value="" style="width:336px;<!--{if $arrErr.create_file}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('create','',''); return false;">$B:n ＠ .(B</a>
                 </td>
             </tr>
         </table>
@@ -100,9 +100,9 @@
                 <tr id="<!--{$id}-->" style="">
                     <td class="file-name" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$arrFileList[cnt].file_path|h}-->', <!--{if $arrFileList[cnt].is_dir|h}-->true<!--{else}-->false<!--{/if}-->, '<!--{$tpl_now_dir|h}-->', false)">
                         <!--{if $arrFileList[cnt].is_dir}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B" />
+                            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B">
                         <!--{else}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/contents/file.gif" />
+                            <img src="<!--{$TPL_URLPATH}-->img/contents/file.gif">
                         <!--{/if}-->
                         <!--{$arrFileList[cnt].file_name|h}-->
                     </td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,11 +22,98 @@
  */
 *}-->
 
+<script type="text/javascript">
+<!--
+
+function func_regist(url) {
+    res = confirm('$B$3$NFbMF$G(B<!--{if $edit_mode eq "on"}-->$BJT=8(B<!--{else}-->$BEPO?(B<!--{/if}-->$B$7$F$b59$7$$$G$9$+!)(B');
+    if(res == true) {
+        document.form1.mode.value = 'regist';
+        document.form1.submit();
+        return false;
+    }
+    return false;
+}
+
+function func_edit(news_id) {
+    document.form1.mode.value = "search";
+    document.form1.news_id.value = news_id;
+    document.form1.submit();
+}
+
+function func_del(news_id) {
+    res = confirm('$B$3$N?7Ce>pJs$r:o=|$7$F$b59$7$$$G$9$+!)(B');
+    if(res == true) {
+        document.form1.mode.value = "delete";
+        document.form1.news_id.value = news_id;
+        document.form1.submit();
+    }
+    return false;
+}
+
+function func_rankMove(term,news_id) {
+    document.form1.mode.value = "move";
+    document.form1.news_id.value = news_id;
+    document.form1.term.value = term;
+    document.form1.submit();
+}
+
+function moving(news_id,rank, max_rank) {
+
+    var val;
+    var ml;
+    var len;
+
+    ml = document.move;
+    len = document.move.elements.length;
+    j = 0;
+    for( var i = 0 ; i < len ; i++) {
+            if ( ml.elements[i].name == 'position' && ml.elements[i].value != "" ) {
+            val = ml.elements[i].value;
+            j ++;
+            }
+    }
+
+    if ( j > 1) {
+        alert( '$B0\F0=g0L$O#1$D$@$1F~NO$7$F$/$@$5$$!#(B' );
+        return false;
+    } else if( ! val ) {
+        alert( '$B0\F0=g0L$rF~NO$7$F$/$@$5$$!#(B' );
+        return false;
+    } else if( val.length > 4){
+        alert( '$B0\F0=g0L$O(B4$B7e0JFb$GF~NO$7$F$/$@$5$$!#(B' );
+        return false;
+    } else if( val.match(/[0-9]+/g) != val){
+        alert( '$B0\F0=g0L$O?t;z$GF~NO$7$F$/$@$5$$!#(B' );
+        return false;
+    } else if( val == rank ){
+        alert( '$B0\F0$5$;$kHV9f$,=EJ#$7$F$$$^$9!#(B' );
+        return false;
+    } else if( val == 0 ){
+        alert( '$B0\F0=g0L$O(B0$B0J>e$GF~NO$7$F$/$@$5$$!#(B' );
+        return false;
+    } else if( val > max_rank ){
+        alert( '$BF~NO$5$l$?=g0L$O!"EPO??t$N:GBgCM$rD6$($F$$$^$9!#(B' );
+        return false;
+    } else {
+        ml.moveposition.value = val;
+        ml.rank.value = rank;
+        ml.news_id.value = news_id;
+        ml.submit();
+        return false;
+    }
+}
+
+//-->
+</script>
+
+
 <div id="admin-contents" class="contents-main">
 <form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="" />
-<input type="hidden" name="news_id" value="<!--{$arrForm.news_id.value|h}-->" />
+<input type="hidden" name="news_id" value="<!--{$arrForm.news_id|h}-->" />
+<input type="hidden" name="term" value="" />
     <!--{* $B"'EPO?%F!<%V%k$3$3$+$i(B *}-->
     <table>
         <tr>
@@ -35,15 +122,15 @@
                 <!--{if $arrErr.year || $arrErr.month || $arrErr.day}--><span class="attention"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></span><!--{/if}-->
                 <select name="year" <!--{if $arrErr.year || $arrErr.month || $arrErr.day }-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">----</option>
-                    <!--{html_options options=$arrYear selected=$arrForm.year.value}-->
+                    <!--{html_options options=$arrYear selected=$arrForm.year}-->
                 </select>$BG/(B
                 <select name="month" <!--{if $arrErr.year || $arrErr.month || $arrErr.day}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">--</option>
-                    <!--{html_options options=$arrMonth selected=$arrForm.month.value}-->
+                    <!--{html_options options=$arrMonth selected=$arrForm.month}-->
                 </select>$B7n(B
                 <select name="day" <!--{if $arrErr.year || $arrErr.month || $arrErr.day}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">--</option>
-                    <!--{html_options options=$arrDay selected=$arrForm.day.value}-->
+                    <!--{html_options options=$arrDay selected=$arrForm.day}-->
                 </select>$BF|(B
             </td>
         </tr>
@@ -51,7 +138,7 @@
             <th>$B%?%$%H%k(B<span class="attention"> *</span></th>
             <td>
                 <!--{if $arrErr.news_title}--><span class="attention"><!--{$arrErr.news_title}--></span><!--{/if}-->
-                <textarea name="news_title" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" <!--{if $arrErr.news_title}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><!--{"\n"}--><!--{$arrForm.news_title.value|h}--></textarea><br />
+                <textarea name="news_title" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" <!--{if $arrErr.news_title}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><!--{"\n"}--><!--{$arrForm.news_title|h}--></textarea><br />
                 <span class="attention"> ($B>e8B(B<!--{$smarty.const.MTEXT_LEN}-->$BJ8;z(B)</span>
             </td>
         </tr>
@@ -59,19 +146,19 @@
             <th>URL</th>
             <td>
                 <span class="attention"><!--{$arrErr.news_url}--></span>
-                <input type="text" name="news_url" size="60" class="box60"    value="<!--{$arrForm.news_url.value|h}-->" <!--{if $arrErr.news_url}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> maxlength="<!--{$smarty.const.URL_LEN}-->" />
+                <input type="text" name="news_url" size="60" class="box60"    value="<!--{$arrForm.news_url|h}-->" <!--{if $arrErr.news_url}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> maxlength="<!--{$smarty.const.URL_LEN}-->" />
                 <span class="attention"> ($B>e8B(B<!--{$smarty.const.URL_LEN}-->$BJ8;z(B)</span>
             </td>
         </tr>
         <tr>
             <th>$B%j%s%/(B</th>
-            <td><label><input type="checkbox" name="link_method" value="2" <!--{if $arrForm.link_method.value eq 2}--> checked <!--{/if}--> /> $BJL%&%#%s%I%&$G3+$/(B</label></td>
+            <td><label><input type="checkbox" name="link_method" value="2" <!--{if $arrForm.link_method eq 2}--> checked <!--{/if}--> /> $BJL%&%#%s%I%&$G3+$/(B</label></td>
         </tr>
         <tr>
             <th>$BK\J8:n ＠ .(B</th>
             <td>
                 <!--{if $arrErr.news_comment}--><span class="attention"><!--{$arrErr.news_comment}--></span><!--{/if}-->
-                <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment.value|h}--></textarea><br />
+                <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment|h}--></textarea><br />
                 <span class="attention"> ($B>e8B(B3000$BJ8;z(B)</span>
             </td>
         </tr>
@@ -80,7 +167,7 @@
 
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', ''); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="return func_regist();"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a></li>
         </ul>
     </div>
 </form>
@@ -93,6 +180,7 @@
     <form name="move" id="move" method="post" action="?">
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
     <input type="hidden" name="mode" value="moveRankSet" />
+    <input type="hidden" name="term" value="setposition" />
     <input type="hidden" name="news_id" value="" />
     <input type="hidden" name="moveposition" value="" />
     <input type="hidden" name="rank" value="" />
@@ -125,22 +213,17 @@
             </td>
             <td>
                 <!--{if $arrNews[data].news_id != $tpl_news_id}-->
-                <a href="#" onclick="fnFormModeSubmit('move','pre_edit','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">$BJT=8(B</a>
+                <a href="#" onclick="return func_edit('<!--{$arrNews[data].news_id|h}-->');">$BJT=8(B</a>
                 <!--{else}-->
                 $BJT=8Cf(B
                 <!--{/if}-->
             </td>
-            <td><a href="#" onclick="fnFormModeSubmit('move','delete','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">$B:o=|(B</a></td>
+            <td><a href="#" onclick="return func_del('<!--{$arrNews[data].news_id|h}-->');">$B:o=|(B</a></td>
             <td>
-                <!--{if count($arrNews) != 1}-->
-                <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />$BHVL\$X(B<a href="?" onclick="fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">$B0\F0(B</a><br />
-                <!--{/if}-->
-                <!--{if $smarty.section.data.iteration != 1}-->
-                <a href="?" onclick="fnFormModeSubmit('move','up','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">$B>e$X(B</a>
-                <!--{/if}-->
-                <!--{if !$smarty.section.data.last}-->
-                <a href="?" onclick="fnFormModeSubmit('move','down','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">$B2<$X(B</a>
-                <!--{/if}-->
+            <!--{if count($arrNews) != 1}-->
+            <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />$BHVL\$X(B<a href="?" onclick="fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">$B0\F0(B</a><br />
+            <!--{/if}-->
+            <!--{if $arrNews[data].rank ne $max_rank}--><a href="#" onclick="return func_rankMove('up', '<!--{$arrNews[data].news_id|h}-->', '<!--{$max_rank|h}-->');">$B>e$X(B</a><!--{/if}-->$B!!(B<!--{if $arrNews[data].rank ne 1}--><a href="#" onclick="return func_rankMove('down', '<!--{$arrNews[data].news_id|h}-->', '<!--{$max_rank|h}-->');">$B2<$X(B</a><!--{/if}-->
             </td>
         </tr>
         <!--{sectionelse}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -20,9 +20,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+*}-->
 
- *}-->
-
 <script type="text/javascript">
 <!--
 function lfnCheckSubmit( fm ){
@@ -75,7 +74,7 @@
     
     if ( flag ){
         document.form1["mode"].value = mode;
-        document.form1["best_id"].value = data;
+        document.form1["rank"].value = data;
         document.form1.submit();
     }
 }
@@ -83,41 +82,38 @@
 //-->
 </script>
 
+        <!--{section name=cnt loop=$tpl_disp_max}-->
+
 <div id="admin-contents" class="contents-main">
-    <!--{section name=cnt loop=$tpl_disp_max}-->
-    <div class="recommend-product <!--{if $arrItems[$smarty.section.cnt.iteration].status == "2"}-->hidden<!--{/if}-->">
-        <table class="list center recommend-table">
-            <col width="13%" />
-            <col width="73%" />
-            <col width="7%" />
-            <col width="7%" />
-            <tr>
-                <th>$B=g0L(B</th>
-                <th>$B>&IJ(B/$B%3%a%s%H(B</th>
-                <th>$BJT=8(B</th>
-                <th>$B:o=|(B</th>
-                <th>$BJB$SBX$((B</th>
-            </tr>
+    <table class="list center" id="recommend-table">
+        <col width="13%" />
+        <col width="73%" />
+        <col width="7%" />
+        <col width="7%" />
+        <tr>
+            <th>$B=g0L(B</th>
+            <th>$B>&IJ(B/$B%3%a%s%H(B</th>
+            <th>$BJT=8(B</th>
+            <th>$B:o=|(B</th>
+            <th>$BJB$SBX$((B</th>
+        </tr>
 
-            <tr>
-                <td>$B$*$9$9$a>&IJ(B(<!--{$smarty.section.cnt.iteration}-->)</td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <td>
-                            <div class="clearfix table-wrap">
-                                <div class="table-img">
-                                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                                        <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrItems[$smarty.section.cnt.iteration].main_list_image|sfNoImageMainList|h}-->" alt="<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->" width="100" height="100" />
-                                    <!--{/if}-->
-                                </div>
-                                <div class="table-detail">
-                                    <div class="detail-name">
-                                        $B>&IJL>!'(B <!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->
-                                    </div>
+        <tr>
+            <td>$B$*$9$9$a>&IJ(B(<!--{$smarty.section.cnt.iteration}-->)</td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <td>
+                        <div id="table-wrap" class="clearfix">
+                            <div class="table-img">
+                                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                                    <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrItems[$smarty.section.cnt.iteration].main_list_image|sfNoImageMainList|h}-->" alt="<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->" width="100" height="100" />
+                                <!--{/if}-->
+                            </div>
+                            <div class="table-detail">
+                                <div class="detail-name">$B>&IJL>!'(B <!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></div>
                                     <div class="detail-form">
                                         <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
                                             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                                             <input type="hidden" name="mode" value="regist" />
-                                            <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
                                             <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
                                             <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
                                             <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
@@ -127,51 +123,54 @@
                                     </div>
                                 </div>
                             </div>
-                        </td>
-                    <!--{else}-->
-                        <td class="AlignLeft">
-                            <a class="btn-action-m" href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank"><span class="btn-next">$B>&IJ$rA*Br$9$k(B</span></a>
-                            <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
-                                <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-                                <input type="hidden" name="mode" value="regist" />
-                                <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
-                                <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
-                                <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
-                                <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
-                            </form>
-                        </td>
-                    <!--{/if}-->
-                <td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank">
-                            $BJT=8(B
-                        </a>
-                    <!--{else}-->
-                        - -
-                    <!--{/if}-->
-                </td>
-                <td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                            <a href="javascript:;" onclick="return fnInsertValAndSubmit( document.form<!--{$smarty.section.cnt.iteration}-->, 'mode', 'delete', '$B:o=|$7$^$9!#59$7$$$G$9$+(B' )">$B:o=|(B</a>
-                    <!--{else}-->
-                        - -
-                    <!--{/if}-->
-                </td>
-                <td>
-                    <!--{* $B0\F0(B *}-->
-                    <!--{if $smarty.section.cnt.iteration != 1 && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">$B>e$X(B</a><br />&nbsp;
-                    <!--{/if}-->
-                    <!--{if $smarty.section.cnt.iteration != $tpl_disp_max && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">$B2<$X(B</a>
-                    <!--{/if}-->
-                </td>
-            </tr>
-        </table>
-        <div class="btn-area">
-            <a class="btn-action" href="javascript:;" onclick="lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a>
-        </div>
-    </div>
+                        </div>
+                    </td>
+                <!--{else}-->
+                    <td class="AlignLeft">
+                        <a class="btn-action-m" href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank"><span class="btn-next">$B>&IJ$rA*Br$9$k(B</span></a>
+                        <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
+                            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+                            <input type="hidden" name="mode" value="regist" />
+                            <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
+                            <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
+                            <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
+                        </form>
+                    </td>
+                <!--{/if}-->
+            <td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank">
+                        $BJT=8(B</a>
+                <!--{else}-->
+                    - -
+                <!--{/if}-->
+            </td>
+            <td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                        <a href="javascript:;" onClick="return fnInsertValAndSubmit( document.form<!--{$smarty.section.cnt.iteration}-->, 'mode', 'delete', '$B:o=|$7$^$9!#59$7$$$G$9$+(B' )">$B:o=|(B</a>
+                <!--{else}-->
+                    - -
+                <!--{/if}-->
+            </td>
+            <td>
+                <!--{* $B0\F0(B *}-->
+                <!--{if $smarty.section.cnt.iteration != 1 && $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">$B>e$X(B</a><br>&nbsp;
+                <!--{/if}-->
+                <!--{if $smarty.section.cnt.iteration != $tpl_disp_max && $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">$B2<$X(B</a>
+                <!--{/if}-->
+            </td>
+        </tr>
+
+        <tr><td colspan="4" class="no-border-w" height="20"></td></tr>
+        <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+        <tr><td colspan="4" class="no-border">
+        <a class="btn-action" href="javascript:;" onclick="lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a>
+        </td>
+        </tr>
+        <!--{/if}-->
     <!--$B"%$*$9$9$a>&IJ(B<!--{$smarty.section.cnt.iteration}-->-->
     <!--{/section}-->
+    </table>
 </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -65,16 +65,6 @@
             <th>$B>&IJL>(B</th>
             <td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
         </tr>
-        <tr>
-            <th>$B>&IJ%9%F!<%?%9(B</th>
-            <td>
-                <input type="hidden" name="search_status" value="1" />
-                <label>
-                    <input type="checkbox" name="search_status" value="" <!--{if $arrForm.search_status === ""}-->checked<!--{/if}--> />
-                    $BHs8x3+$N>&IJ$r4^$`(B
-                </label>
-            </td>
-        </tr>
     </table>
     <div class="btn-area">
         <ul>
@@ -86,7 +76,7 @@
     <p><!--{$tpl_linemax}-->$B7o$,3:Ev$7$^$7$?!#(B</p>
     <!--{$tpl_strnavi}-->
 
-    <table id="recommend-search-results" class="list">
+    <table class="list">
         <col width="15%" />
         <col width="12.5%" />
         <col width="60%" />
@@ -100,7 +90,7 @@
 
         <!--{foreach name=loop from=$arrProducts item=arr}-->
         <!--$B"'>&IJ(B<!--{$smarty.foreach.loop.iteration}-->-->
-        <tr class="<!--{if $arr.status == "2"}-->hidden<!--{/if}-->">
+        <tr>
             <td class="center">
                 <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arr.main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="" />
             </td>
@@ -115,7 +105,7 @@
                 <!--{/if}-->
             </td>
             <td><!--{$arr.name|h}--></td>
-            <td class="center"><a href="" onclick="return func_submit(<!--{$arr.product_id}-->)">$B7hDj(B</a></td>
+            <td class="center"><a href="" onClick="return func_submit(<!--{$arr.product_id}-->)">$B7hDj(B</a></td>
         </tr>
         <!--$B"%>&IJ(B<!--{$smarty.foreach.loop.iteration}-->-->    
         <!--{/foreach}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -26,7 +26,7 @@
 <li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-contents-index"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/<!--{$smarty.const.DIR_INDEX_PATH}-->"><span>$B?7Ce>pJs4IM}(B</span></a></li>
 <li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/recommend.php"><span>$B$*$9$9$a>&IJ4IM}(B</span></a></li>
 <li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/file_manager.php"><span>$B%U%!%$%k4IM}(B</span></a></li>
-<li class="on_level2 <!--{if $tpl_subno == 'csv'}--> on<!--{/if}--> " id="navi-contents-csv"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV$B=PNO9`L\@_Dj(B</span></a>
+<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> class="on_level2" id="navi-contents-csv"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV$B=PNO9`L\@_Dj(B</span></a>
     <ul id="navi-csv-sub" class="level2">
     <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=product"><span>$B>&IJ4IM}(B</span></a></li>
     <li<!--{if $tpl_subno_csv == 'customer'}--> class="on"<!--{/if}--> id="navi-csv-customer"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=customer"><span>$B2q0w4IM}(B</span></a></li>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -102,7 +102,7 @@
                 <th>$BM9JXHV9f(B<span class="attention"> *</span></th>
                 <td>
                     <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
-                    $B")(B <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                    $B")(B <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" maxlength="3" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" maxlength="4" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
                     <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;">$B=;=jF~NO(B</a>
                 </td>
             </tr>
@@ -240,8 +240,8 @@
         </div>
 
         <input type="hidden" name="order_id" value="" />
-        <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
-        <input type="hidden" name="edit_customer_id" value="<!--{$edit_customer_id}-->" />
+        <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->">
+        <input type="hidden" name="edit_customer_id" value="<!--{$edit_customer_id}-->" >
 
         <h2>$B9XF~MzNr0lMw(B</h2>
         <!--{if $tpl_linemax > 0}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -136,7 +136,7 @@
             <tr>
                 <td class="center" rowspan="2"><!--{if $row.status eq 1}-->$B2>(B<!--{else}-->$BK\(B<!--{/if}--></td>
                 <td><!--{$row.customer_id|h}--></td>
-                <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br />(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
+                <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br>(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
                 <td class="center" rowspan="2"><!--{$arrSex[$row.sex]|h}--></td>
                 <td><!--{$row.tel01|h}-->-<!--{$row.tel02|h}-->-<!--{$row.tel03|h}--></td>
                 <td class="center" rowspan="2"><span class="icon_edit"><a href="#" onclick="return fnEdit('<!--{$row.customer_id|h}-->');">$BJT=8(B</a></span></td>
@@ -144,7 +144,7 @@
             </tr>
             <tr>
                 <td><!--{assign var=pref value=$row.pref}--><!--{$arrPref[$pref]}--></td>
-                <td><!--{mailto address=$row.email encode="javascript"}--><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|h}-->');">$B2>EPO?%a!<%k:FAw(B</a><!--{/if}--></td>
+                <td><!--{mailto address=$row.email encode="javascript"}--></a><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|h}-->');">$B2>EPO?%a!<%k:FAw(B</a><!--{/if}--></td>
             </tr>
         <!--{/foreach}-->
     </table>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -103,7 +103,7 @@
             </td>
             <td><!--{$arrCustomer[cnt].name01|h}--><!--{$arrCustomer[cnt].name02|h}-->(<!--{$arrCustomer[cnt].kana01|h}--><!--{$arrCustomer[cnt].kana02|h}-->)</td>
             <td><!--{$arrCustomer[cnt].tel01|h}-->-<!--{$arrCustomer[cnt].tel02|h}-->-<!--{$arrCustomer[cnt].tel03|h}--></td>
-            <td align="center"><a href="" onclick="return func_submit(<!--{$arrCustomer[cnt].customer_id|h}-->)">$B7hDj(B</a></td>
+            <td align="center"><a href="" onClick="return func_submit(<!--{$arrCustomer[cnt].customer_id|h}-->)">$B7hDj(B</a></td>
         </tr>
         <!--$B"%2q0w(B<!--{$smarty.section.cnt.iteration}-->-->
         <!--{sectionelse}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -51,7 +51,7 @@
             <th>CSS$BFbMF(B</th>
             <td>
                 <!--{assign var=key value="css_data"}-->
-                <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows="<!--{$area_row}-->" align="left" style="width: 650px;"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+                <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows=<!--{$area_row}--> align="left" style="width: 650px;"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
                 <input type="hidden" name="area_row" value="<!--{$area_row}-->" />
                 <div class="btn">
                     <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#css', 50, 30); return false;">$B3HBg(B</a>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -59,7 +59,7 @@
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
     <input type="hidden" name="mode" value="" />
     <input type="hidden" name="division" value="footer" />
-    <input type="hidden" name="footer_row" value="<!--{$footer_row}-->" />
+    <input type="hidden" name="footer_row" value=<!--{$footer_row}--> />
     <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 
         <textarea id="footer-area" class="top" name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{"\n"}--><!--{$footer_data|h|smarty:nodefaults}--></textarea>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -81,7 +81,7 @@
                 <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" value="1" <!--{if $arrForm.header_chk.value == "1"}-->checked="checked"<!--{/if}--> />$B6&DL$N%X%C%@!<$r;HMQ$9$k(B</label>&nbsp;
                 <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" value="1" <!--{if $arrForm.footer_chk.value == "1"}-->checked="checked"<!--{/if}--> />$B6&DL$N%U%C%?!<$r;HMQ$9$k(B</label>
                 <div>
-                    <textarea id="tpl_data" class="top" name="tpl_data" rows="<!--{$text_row}-->" style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
+                    <textarea id="tpl_data" class="top" name="tpl_data" rows=<!--{$text_row}--> style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
                     <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /><br />
                     <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#tpl_data', 50, 13); return false;"><span>$B3HBg(B</span></a>
                 </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -71,8 +71,8 @@
             <td><input type="radio" name="template_code" value="<!--{$tplcode|h}-->" <!--{if $tplcode == $tpl_select}-->checked="checked"<!--{/if}--> /></td>
             <td class="left"><!--{$tpl.template_name|h}--></td>
             <td class="left">data/Smarty/templates/<!--{$tplcode|h}-->/</td>
-            <td><span class="icon_confirm"><a href="javascript:;" onclick="fnFormModeSubmit('form2', 'download','template_code','<!--{$tplcode}-->');return false;">$B%@%&%s%m!<%I(B</a></span></td>
-            <td><span class="icon_delete"><a href="javascript:;" onclick="fnFormModeSubmit('form2', 'delete','template_code','<!--{$tplcode}-->');return false;">$B:o=|(B</a></span></td>
+            <td><span class="icon_confirm"><a href="javascript:;" onClick="fnFormModeSubmit('form2', 'download','template_code','<!--{$tplcode}-->');return false;">$B%@%&%s%m!<%I(B</a></span></td>
+            <td><span class="icon_delete"><a href="javascript:;" onClick="fnFormModeSubmit('form2', 'delete','template_code','<!--{$tplcode}-->');return false;">$B:o=|(B</a></span></td>
         </tr>
         <!--{/foreach}-->
     </table>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -57,7 +57,7 @@
             <th>$B%F%s%W%l!<%H%3!<%I(B</th>
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
             </td>
         </tr>
         <!--{assign var=key value="template_name"}-->
@@ -65,7 +65,7 @@
             <th>$B%F%s%W%l!<%HL>(B</th>
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
             </td>
         </tr>
         <!--{assign var=key value="template_file"}-->
@@ -75,7 +75,7 @@
             </th>
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> />
+                <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
             </td>
         </tr>
     </table>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -56,7 +56,7 @@
         </tr>
         <!--{if $arrForm.mail_method.value ne 2}-->
             <tr>
-                <td colspan="2"><a href="javascript:;" onclick="winSubmitMail('','form2','preview',650,700); return false;">HTML$B$G3NG'(B</a>
+                <td colspan="2"><a href="javascript:;" onClick="winSubmitMail('','form2','preview',650,700); return false;">HTML$B$G3NG'(B</a>
             </tr>
         <!--{/if}-->
         <tr>
@@ -68,7 +68,7 @@
     <div class="btn-area">
         <ul>
             <li><a class="btn-action" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' ); return false;"><span class="btn-prev">$B%F%s%W%l!<%H ＠ _Dj2hLL$XLa$k(B</span></a></li>
-            <li><a class="btn-action" href="javascript:;" name="subm03" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;"><span class="btn-next">$BG[?.$9$k(B</span></a></li>
+            <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;"><span class="btn-next">$BG[?.$9$k(B</span></a></li>
         </ul>
     </div>
 </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -140,10 +140,8 @@
             </td>
                 <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
                 <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
-                <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
-                <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
-                <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> $B1_(B($B ＠ GN((B<!--{$tax_rate|number_format}-->%)</td>
-                <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->$B1_(B</td>
+                <td class="right"><!--{$price|sfCalcIncTax|number_format}--> $B1_(B</td>
+                <td class="right"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->$B1_(B</td>
         </tr>
         <!--{/section}-->
         <tr>
@@ -220,7 +218,7 @@
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->
-                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->$B1_(B
+                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax|number_format}-->$B1_(B
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_quantity"}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -38,7 +38,7 @@
         // $B$*FO$1 ＠ hL>$N(Binput$B%?%0$N(Bname$B$r<hF@(B
         var shipping_data = $('input[name^=shipping_name01]').attr('name'); 
         var shipping_slt  = shipping_data.split("shipping_name01");
-
+        
         var shipping_key = "[0]";
         if(shipping_slt.length > 1) {
             shipping_key = shipping_slt[1];
@@ -81,12 +81,6 @@
         return false;
     }
 
-    $(document).ready(function() {
-        if(<!--{$arrForm.shipping_quantity.value}--> > 1){
-            $("input[name^='quantity[']").attr("disabled","disabled");
-        }
-    });
-
 //-->
 </script>
 <form name="form1" id="form1" method="post" action="?">
@@ -97,7 +91,6 @@
 <input type="hidden" name="anchor_key" value="" />
 <input type="hidden" id="add_product_id" name="add_product_id" value="" />
 <input type="hidden" id="add_product_class_id" name="add_product_class_id" value="" />
-<input type="hidden" id="select_shipping_id" name="select_shipping_id" value="" />
 <input type="hidden" id="edit_product_id" name="edit_product_id" value="" />
 <input type="hidden" id="edit_product_class_id" name="edit_product_class_id" value="" />
 <input type="hidden" id="no" name="no" value="" />
@@ -119,7 +112,7 @@
         <!--{if $tpl_mode != 'add'}-->
         <tr>
             <th>$BD"I<=PNO(B</th>
-            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value|h}-->','pdf_input','615','650'); return false;">$BD"I<=PNO(B</a></td>
+            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value|h}-->','pdf','615','650'); return false;">$BD"I<=PNO(B</a></td>
         </tr>
         <!--{/if}-->
         <tr>
@@ -280,16 +273,14 @@
     <h2 id="order_products">
         $B<uCm>&IJ>pJs(B
         <a class="btn-normal" href="javascript:;" name="recalculate" onclick="fnModeSubmit('recalculate','anchor_key','order_products');">$B7W;;7k2L$N3NG'(B</a>
-        <!--{if $arrForm.shipping_quantity.value <= 1}-->
-        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$top_shipping_id}-->', 'search', '615', '500'); return false;">$B>&IJ$NDI2C(B</a>
-        <!--{/if}-->
+        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->', 'search', '615', '500'); return false;">$B>&IJ$NDI2C(B</a>
     </h2>
 
     <!--{if $arrErr.product_id}-->
         <span class="attention">$B"((B $B>&IJ$,A*Br$5$l$F$$$^$;$s!#(B</span>
     <!--{/if}-->
 
-    <table class="list order-edit-products">
+    <table class="list" id="order-edit-products">
         <tr>
             <th class="id">$B>&IJ%3!<%I(B</th>
             <th class="name">$B>&IJL>(B/$B5,3J(B1/$B5,3J(B2</th>
@@ -311,18 +302,14 @@
                 <input type="hidden" name="classcategory_name1[<!--{$product_index}-->]" value="<!--{$arrForm.classcategory_name1.value[$product_index]|h}-->" id="classcategory_name1_<!--{$product_index}-->" />
                 <input type="hidden" name="classcategory_name2[<!--{$product_index}-->]" value="<!--{$arrForm.classcategory_name2.value[$product_index]|h}-->" id="classcategory_name2_<!--{$product_index}-->" />
                 <br />
-                <!--{if $arrForm.shipping_quantity.value <= 1}-->
-                    <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$product_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$top_shipping_id}-->', 'search', '615', '500'); return false;">$BJQ99(B</a>
-                    <!--{if count($arrForm.quantity.value) > 1}-->
-                        <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$product_index}-->); fnSetFormVal('form1', 'select_shipping_id', '<!--{$top_shipping_id}-->'); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">$B:o=|(B</a>
-                    <!--{/if}-->
+                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$product_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->', 'search', '615', '500'); return false;">$BJQ99(B</a>
+                <!--{if count($arrForm.quantity.value) > 1}-->
+                    <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$product_index}-->); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">$B:o=|(B</a>
                 <!--{/if}-->
             <input type="hidden" name="product_type_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_type_id.value[$product_index]|h}-->" id="product_type_id_<!--{$product_index}-->" />
             <input type="hidden" name="product_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_id.value[$product_index]|h}-->" id="product_id_<!--{$product_index}-->" />
             <input type="hidden" name="product_class_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_class_id.value[$product_index]|h}-->" id="product_class_id_<!--{$product_index}-->" />
             <input type="hidden" name="point_rate[<!--{$product_index}-->]" value="<!--{$arrForm.point_rate.value[$product_index]|h}-->" id="point_rate_<!--{$product_index}-->" />
-            <input type="hidden" name="tax_rate[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rate.value[$product_index]|h}-->" id="tax_rate_<!--{$product_index}-->" />
-            <input type="hidden" name="tax_rule[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rule.value[$product_index]|h}-->" id="tax_rule_<!--{$product_index}-->" />
             </td>
             <td align="center">
                 <!--{assign var=key value="price"}-->
@@ -336,10 +323,8 @@
             </td>
             <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
             <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
-            <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
-            <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
-            <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> $B1_(B($B ＠ GN((B<!--{$tax_rate|number_format}-->%)</td>
-            <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->$B1_(B</td>
+            <td class="right"><!--{$price|sfCalcIncTax|number_format}--> $B1_(B</td>
+            <td class="right"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->$B1_(B</td>
         </tr>
         <!--{/section}-->
         <tr>
@@ -402,8 +387,6 @@
             <tr>
                 <th colspan="5" class="column right">$B$*CB ＠ 8F|%]%$%s%H(B</th>
                 <td class="right">
-                    <!--{assign var=key value="birth_point"}-->
-                    <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->"/>
                     <!--{$arrForm.birth_point.value|number_format}-->
                     pt
                 </td>
@@ -439,13 +422,11 @@
         <!--{assign var=key value="shipping_id"}-->
         <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key]|default:"0"|h}-->" id="<!--{$key}-->_<!--{$shipping_index}-->" />
         <!--{if $arrForm.shipping_quantity.value > 1}-->
-            <h2>$BFO$1 ＠ h>&IJ>pJs(B&nbsp;<a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->&shipping_id=<!--{$shipping_index}-->', 'search', '615', '500'); return false;">$B>&IJ$NDI2C(B</a>
-            </h2>
             <!--{assign var=product_quantity value="shipping_product_quantity"}-->
             <input type="hidden" name="<!--{$product_quantity}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$product_quantity]|h}-->" />
 
             <!--{if count($arrShipping.shipment_product_class_id) > 0}-->
-                <table class="list order-edit-products">
+                <table class="list" id="order-edit-products">
                     <tr>
                         <th class="id">$B>&IJ%3!<%I(B</th>
                         <th class="name">$B>&IJL>(B/$B5,3J(B1/$B5,3J(B2</th>
@@ -471,47 +452,21 @@
                                 <input type="hidden" name="<!--{$key2}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key2][$item_index]|h}-->" />
                                 <input type="hidden" name="<!--{$key3}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key3][$item_index]|h}-->" />
                                 <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default:"($B$J$7(B)"|h}-->/<!--{$arrShipping[$key3][$item_index]|default:"($B$J$7(B)"|h}-->
-                                <br />
-                                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$item_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$shipping_index}-->', 'search', '615', '500'); return false;">$BJQ99(B</a>
-                                <!--{if count($arrForm.quantity.value) > 1}-->
-                                <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$item_index}-->);fnSetFormVal('form1', 'select_shipping_id', <!--{$shipping_index}-->); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">$B:o=|(B</a>
-                                <!--{/if}-->
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->
-                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->$B1_(B
+                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax|number_format}-->$B1_(B
                                 <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_quantity"}-->
-                                <span class="attention"><!--{$arrErr[$key][$shipping_index][$item_index]}--></span>
-                                <input type="text" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" />
+                                <!--{$arrShipping[$key][$item_index]|h}-->
+                                <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
                             </td>
                         </tr>
                     <!--{/section}-->
                 </table>
             <!--{/if}-->
-        <!--{else}-->
-            <!-- $BG[Aw ＠ h$,#1$D$G$b!"(Bshipment_item$B$r99?7$9$k$?$a$KI,MW(B -->
-            <!--{assign var=product_quantity value="shipping_product_quantity"}-->
-            <input type="hidden" name="<!--{$product_quantity}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$product_quantity]|h}-->" />
-            <!--{section name=item loop=$arrShipping.shipment_product_class_id|@count}-->
-                <!--{assign var=item_index value="`$smarty.section.item.index`"}-->
-                        <!--{assign var=key value="shipment_product_class_id"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_product_code"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key1 value="shipment_product_name"}-->
-                        <!--{assign var=key2 value="shipment_classcategory_name1"}-->
-                        <!--{assign var=key3 value="shipment_classcategory_name2"}-->
-                        <input type="hidden" name="<!--{$key1}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key1][$item_index]|h}-->" />
-                        <input type="hidden" name="<!--{$key2}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key2][$item_index]|h}-->" />
-                        <input type="hidden" name="<!--{$key3}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key3][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_price"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_quantity"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-            <!--{/section}-->
         <!--{/if}-->
 
         <table class="form">
@@ -594,7 +549,7 @@
                     <!--{assign var=key value="time_id"}-->
                     <span class="attention"><!--{$arrErr[$key][$shipping_index]}--></span>
                     <select name="<!--{$key}-->[<!--{$shipping_index}-->]" style="<!--{$arrErr[$key][$shipping_index]|sfGetErrorColor}-->">
-                        <option value="">$B;XDjL5$7(B</option>
+                        <option value="" selected="0">$B;XDjL5$7(B</option>
                         <!--{html_options options=$arrDelivTime selected=$arrShipping[$key]}-->
                     </select>
                 </td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -389,17 +389,17 @@
             <td class="center"><!--{$arrResults[cnt].commit_date|sfDispDBDate|default:"$BL$H/Aw(B"}--></td>
             <td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
             <td class="center">
-                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">$B0l3g=PNO(B</label><br />
-                <a href="./" onclick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','620','650'); return false;"><span class="icon_class">$B8DJL=PNO(B</span></a>
+                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">$B0l3g=PNO(B</label><br>
+                <a href="./" onClick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','620','650'); return false;"><span class="icon_class">$B8DJL=PNO(B</span></a>
             </td>
             <td class="center"><a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_EDIT_URLPATH}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_edit">$BJT=8(B</span></a></td>
             <td class="center">
                 <!--{if $arrResults[cnt].order_email|strlen >= 1}-->
-                    <input type="checkbox" name="mail_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="mail_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="mail_order_id_<!--{$arrResults[cnt].order_id}-->">$B0l3gDLCN(B</label><br />
+                    <input type="checkbox" name="mail_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="mail_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="mail_order_id_<!--{$arrResults[cnt].order_id}-->">$B0l3gDLCN(B</label><br>
                     <a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_MAIL_URLPATH}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_mail">$B8DJLDLCN(B</span></a>
                 <!--{/if}-->
             </td>
-            <td class="center"><a href="?" onclick="fnModeSubmit('delete', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">$B:o=|(B</span></a></td>
+            <td class="center"><a href="?" onclick="fnModeSubmit('delete_order', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">$B:o=|(B</span></a></td>
         </tr>
         <!--{/section}-->
         <!--{/if}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -41,7 +41,7 @@
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="confirm" />
 <!--{foreach from=$arrForm.order_id item=order_id}-->
-    <input type="hidden" name="order_id[]" value="<!--{$order_id|h}-->" />
+    <input type="hidden" name="order_id[]" value="<!--{$order_id|h}-->">
 <!--{/foreach}-->
 
 <h2><!--$B%3%s%F%s%D%?%$%H%k(B-->$BD"I<$N:n ＠ .(B</h2>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -36,36 +36,22 @@
 
         var class1_id = document.getElementById(class1).value;
         var class2_id = document.getElementById(class2).value;
-
         var product_class_id = document.getElementById("product_class_id" + product_id).value;
         var opner_product_id = 'add_product_id';
         var opner_product_class_id = 'add_product_class_id';
         var tpl_no = '<!--{$tpl_no}-->';
-        var shipping_id = '<!--{$shipping_id}-->';
 
         if (tpl_no != '') {
             opner_product_id = 'edit_product_id';
             opner_product_class_id = 'edit_product_class_id';
             fm1.getElementById("no").value = escape('<!--{$tpl_no}-->');
         }
-        if (shipping_id != '') {
-            fm1.getElementById("select_shipping_id").value = escape('<!--{$shipping_id}-->');
-        }
         if (document.getElementById(class1).type == 'select-one' && class1_id == '__unselected') {
             err_text = class_name1 + "$B$rA*Br$7$F$/$@$5$$!#(B\n";
         }
         if (document.getElementById(class2).type == 'select-one' && class2_id == '') {
             err_text = err_text + class_name2 + "$B$rA*Br$7$F$/$@$5$$!#(B\n";
         }
-
-        if(!class1_id){
-            err_text = productsClassCategories[product_id]['__unselected2']['#0']['stock_find'] ? '' : '$BB~:#IJ ＠ Z$lCf$G$9(B';
-        }else if(class1_id && !class2_id){
-            err_text = productsClassCategories[product_id][class1_id]['#0']['stock_find'] ? '' : '$BB~:#IJ ＠ Z$lCf$G$9(B';
-        }else{
-            err_text = productsClassCategories[product_id][class1_id]['#' + class2_id]['stock_find'] ? '' : '$BB~:#IJ ＠ Z$lCf$G$9(B';
-        }
-
         if (err_text != '') {
             alert(err_text);
             return false;
@@ -139,7 +125,6 @@
 <input name="mode" type="hidden" value="search" />
 <input name="anchor_key" type="hidden" value="" />
 <input name="search_pageno" type="hidden" value="" />
-<input name="shipping_id" type="hidden" value="<!--{$shipping_id}-->" />
 <input name="no" type="hidden" value="<!--{$tpl_no|h}-->" />
 <table class="form">
     <col width="20%" />
@@ -190,6 +175,7 @@
         <!--{section name=cnt loop=$arrProducts}-->
             <!--{assign var=id value=$arrProducts[cnt].product_id}-->
             <form name="product_form<!--{$id|h}-->" action="?" onsubmit="return false;">
+                <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                 <!--$B"'>&IJ(B<!--{$smarty.section.cnt.iteration}-->-->
                 <!--{assign var=status value="`$arrProducts[cnt].status`"}-->
                 <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
@@ -197,7 +183,6 @@
                         <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
                     </td>
                     <td>
-                        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                         <!--{assign var=codemin value=`$arrProducts[cnt].product_code_min`}-->
                         <!--{assign var=codemax value=`$arrProducts[cnt].product_code_max`}-->
                         <!--{* $B>&IJ%3!<%I(B *}-->
@@ -208,44 +193,42 @@
                         <!--{/if}-->
                     </td>
                     <td>
-                    <!--{$arrProducts[cnt].name|h}-->
-                    <!--{assign var=class1 value=classcategory_id`$id`_1}-->
-                    <!--{assign var=class2 value=classcategory_id`$id`_2}-->
-                    <!--{if $tpl_classcat_find1[$id]}-->
-                    <dl>
-                        <dt><!--{$tpl_class_name1[$id]|h}-->$B!'(B</dt>
-                        <dd>
-                            <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"    onchange="fnSetClassCategories(this.form);">
-                                <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
-                            </select>
-                            <!--{if $arrErr[$class1] != ""}-->
-                            <br /><span class="attention">$B"((B <!--{$tpl_class_name1[$id]}-->$B$rF~NO$7$F2<$5$$!#(B</span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-                    <!--{else}-->
-                    <input type="hidden" name="<!--{$class1}-->" id="<!--{$class1}-->" value="" />
-                    <!--{/if}-->
+                        <!--{$arrProducts[cnt].name|h}-->
 
-                    <!--{if $tpl_classcat_find2[$id]}-->
-                    <dl>
-                        <dt><!--{$tpl_class_name2[$id]|h}-->$B!'(B</dt>
-                        <dd>
-                            <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->" onchange="fnCheckStock(this.form);"></select>
-                            <!--{if $arrErr[$class2] != ""}-->
-                            <br /><span class="attention">$B"((B <!--{$tpl_class_name2[$id]}-->$B$rF~NO$7$F2<$5$$!#(B</span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-                    <!--{else}-->
-                    <input type="hidden" name="<!--{$class2}-->" id="<!--{$class2}-->" value="" />
-                    <!--{/if}-->
-                    <!--{if !$tpl_stock_find[$id]}-->
-                        <div class="attention">$BB~:#IJ ＠ Z$lCf$G$9!#(B</div>
-                    <!--{/if}-->
-                    <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
-                    <input type="hidden" name="product_class_id<!--{$id|h}-->" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
-                    <input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
+                        <!--{assign var=class1 value=classcategory_id`$id`_1}-->
+                        <!--{assign var=class2 value=classcategory_id`$id`_2}-->
+                        <!--{if $tpl_classcat_find1[$id]}-->
+                        <dl>
+                            <dt><!--{$tpl_class_name1[$id]|h}-->$B!'(B</dt>
+                            <dd>
+                                <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"    onchange="fnSetClassCategories(this.form);">
+                                    <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
+                                </select>
+                                <!--{if $arrErr[$class1] != ""}-->
+                                <br /><span class="attention">$B"((B <!--{$tpl_class_name1[$id]}-->$B$rF~NO$7$F2<$5$$!#(B</span>
+                                <!--{/if}-->
+                            </dd>
+                        </dl>
+                        <!--{else}-->
+                        <input type="hidden" name="<!--{$class1}-->" id="<!--{$class1}-->" value="" />
+                        <!--{/if}-->
+
+                        <!--{if $tpl_classcat_find2[$id]}-->
+                        <dl>
+                            <dt><!--{$tpl_class_name2[$id]|h}-->$B!'(B</dt>
+                            <dd>
+                                <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->" onchange="fnCheckStock(this.form);"></select>
+                                <!--{if $arrErr[$class2] != ""}-->
+                                <br /><span class="attention">$B"((B <!--{$tpl_class_name2[$id]}-->$B$rF~NO$7$F2<$5$$!#(B</span>
+                                <!--{/if}-->
+                            </dd>
+                        </dl>
+                        <!--{else}-->
+                        <input type="hidden" name="<!--{$class2}-->" id="<!--{$class2}-->" value="" />
+                        <!--{/if}-->
+                        <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
+                        <input type="hidden" name="product_class_id<!--{$id|h}-->" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
+                        <input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
                     </td>
                     <td class="center"><a href="javascript:;" onclick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->'); return false;">$B7hDj(B</a></td>
                 </tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,11 +22,11 @@
  */
 *}-->
 
-<form name="form1" id="form1" method="post" action="?" >
+<form name="form1" id="form1" method="POST" action="?" >
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="" />
 <input type="hidden" name="status" value="<!--{if $arrForm.status == ""}-->1<!--{else}--><!--{$arrForm.status}--><!--{/if}-->" />
-<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
+<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" >
 <input type="hidden" name="order_id" value="" />
 <div id="order" class="contents-main">
     <h2>$BCj=P>r7o(B</h2>
@@ -57,7 +57,7 @@
             </select>
             <a class="btn-normal" href="javascript:;" onclick="fnSelectCheckSubmit(); return false;"><span>$B0\F0(B</span></a>
         </div>
-        <span class="attention">$B"((B <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->$B$KJQ99;~$K$O!":_8K?t$r<jF0$GLa$7$F$/$@$5$$!#(B</span><br />
+        <span class="attention">$B"((B <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->$B$b$7$/$O!":o=|$KJQ99;~$K$O!":_8K?t$r<jF0$GLa$7$F$/$@$5$$!#(B</span><br />
 
         <p class="remark">
             <!--{$tpl_linemax}-->$B7o$,3:Ev$7$^$7$?!#(B
@@ -88,7 +88,7 @@
             <!--{section name=cnt loop=$arrStatus}-->
             <!--{assign var=status value="`$arrStatus[cnt].status`"}-->
             <tr style="background:<!--{$arrORDERSTATUS_COLOR[$status]}-->;">
-                <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" /></td>
+                <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" ></td>
                 <td><!--{$arrORDERSTATUS[$status]}--></td>
                 <td><a href="#" onclick="fnOpenWindow('./disp.php?order_id=<!--{$arrStatus[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrStatus[cnt].order_id}--></a></td>
                 <td><!--{$arrStatus[cnt].create_date|sfDispDBDate:false}--></td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -132,7 +132,7 @@
             <td>
                 <!--{assign var=key value="plugin_file"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="file" name="<!--{ $key }-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" />
+                <input type="file" name="<!--{ $key }-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->">
                 <a class="btn-action" href="javascript:;" onclick="install(); return false;"><span class="btn-next">$B%$%s%9%H!<%k(B</span></a>
             </td>
         </tr>
@@ -156,7 +156,7 @@
                 <!--$B%m%4(B-->
                 <td class="center plugin_img">
                     <!--{if $plugin.plugin_site_url != '' }-->
-                        <a href="?" onclick="win03('<!--{$plugin.plugin_site_url|h}-->','plugin_site_url','620','760'); return false;"><img src="<!--{$plugin.logo}-->" width="65" height="65" /></a>&nbsp;
+                        <a href="?" onclick="win03('<!--{$plugin.plugin_site_url|h}-->','plugin_site_url','620','760'); return false;"><img src="<!--{$plugin.logo}-->" width="65" height="65"/></a>&nbsp;
                     <!--{else}-->
                         <img src="<!--{$plugin.logo}-->" width="65" height="65"/>
                     <!--{/if}-->
@@ -202,9 +202,9 @@
                                 <a  href="javascript:;" name="uninstall" onclick="uninstall(<!--{$plugin.plugin_id}-->, '<!--{$plugin.plugin_code}-->'); return false;">$B:o=|(B</a>&nbsp;|&nbsp;
                             <!-- $BM-8z(B/$BL58z(B -->
                                 <!--{if $plugin.enable == $smarty.const.PLUGIN_ENABLE_TRUE}-->
-                                    <label><input id="plugin_enable" type="checkbox" name="disable" value="<!--{$plugin.plugin_id}-->" checked="checked" />$BM-8z(B</label><br/>
+                                    <label><input id="plugin_enable" type="checkbox" name="disable" value="<!--{$plugin.plugin_id}-->" id="login_memory" checked="checked">$BM-8z(B</input></label><br/>
                                 <!--{else}-->
-                                    <label><input id="plugin_enable" type="checkbox" name="enable" value="<!--{$plugin.plugin_id}-->" />$BM-8z$K$9$k(B</label><br/>
+                                    <label><input id="plugin_enable" type="checkbox" name="enable" value="<!--{$plugin.plugin_id}-->" id="login_memory">$BM-8z$K$9$k(B</input></label><br/>
                                 <!--{/if}-->
 
                                 <!-- $B%"%C%W%G!<%H%j%s%/2!2<;~$KI=<($9$k(B. -->
@@ -217,7 +217,7 @@
                 <!--$BM%@h=g0L(B-->
                 <td class="center">
                     <span class="attention"><!--{$arrErr.priority[$plugin.plugin_id]}--></span>
-                    <input type="text" class="center" name="priority_<!--{$plugin.plugin_code}--> priority" value="<!--{$plugin.priority|h}-->" size="1" />
+                    <input type="text" class="center" name="priority_<!--{$plugin.plugin_code}-->" value="<!--{$plugin.priority|h}-->" size="1" class="priority" />
                     <a class="btn-action" href="javascript:;" onclick="update_priority(<!--{$plugin.plugin_id}-->, '<!--{$plugin.plugin_code}-->'); return false;"><span class="btn-next">$BJQ99(B</span></a><br/>
                     <span><!--{$plugin.priority_message}--></span>
                 </td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,9 +33,9 @@
 <form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="edit" />
-<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id|h}-->" />
-<input type="hidden" name="category_id" value="<!--{$arrForm.category_id|h}-->" />
-<input type="hidden" name="keySet" value="" />
+<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id|h}-->">
+<input type="hidden" name="category_id" value="<!--{$arrForm.category_id|h}-->">
+<input type="hidden" name="keySet" value="">
 <div id="products" class="contents-main">
     <div class="btn">
         <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('csv','',''); return false;">CSV $B%@%&%s%m!<%I(B</a>
@@ -44,12 +44,46 @@
 
     <!--{* $B"'2hLL:8(B *}-->
     <div id="products-category-left">
-        <ul>
-            <li>
-                <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B" />&nbsp;$B%[!<%`(B</a>
-                <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/category_tree_fork.tpl" children=$arrTree treeID="f0" display=1}-->
-            </li>
-        </ul>
+        <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B">&nbsp;$B%[!<%`(B</a><br />
+        <!--{section name=cnt loop=$arrTree}-->
+            <!--{assign var=level value="`$arrTree[cnt].level`}-->
+
+            <!--{* $B>e$N3,AXI=<($N;~$K(Bdiv$B$rJD$8$k(B *}-->
+            <!--{assign var=close_cnt value="`$before_level-$level+1`"}-->
+            <!--{if $close_cnt > 0}-->
+                <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{* $B%9%Z!<%97+$jJV$7(B *}-->
+            <!--{section name=n loop=$level}-->$B!!!!(B<!--{/section}-->
+
+            <!--{* $B%+%F%4%jL>I=<((B *}-->
+            <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+            <!--{if $arrTree[cnt].level != $smarty.const.LEVEL_MAX}-->
+                <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false;">
+                <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+                    <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="$B%U%)%k%@(B">
+                <!--{else}-->
+                    <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B">
+                <!--{/if}-->
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
+            <!--{else}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B">
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
+            <!--{/if}-->
+
+            <!--{if $arrTree[cnt].display == true}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->">
+            <!--{else}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+            <!--{/if}-->
+
+            <!--{if $smarty.section.cnt.last}-->
+                <!--{section name=n loop=$level}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+        <!--{/section}-->
     </div>
     <!--{* $B"%2hLL:8(B *}-->
 

$B:o=|(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,50 +0,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}-->">
-        <!--{* $B%+%F%4%jL>I=<((B *}-->
-        <!--{assign var=disp_name value="`$child.category_id`.`$child.category_name`"}-->
-        <!--{if $child.level != $smarty.const.LEVEL_MAX}-->
-            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$child.category_id}-->); return false;">
-            <!--{if $arrForm.parent_category_id == $child.category_id}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="$B%U%)%k%@(B" />
-            <!--{else}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B" />
-            <!--{/if}-->
-            <!--{$disp_name|sfCutString:10:false|h}--></a>
-        <!--{else}-->
-            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B" />
-            <!--{$disp_name|sfCutString:10:false|h}-->
-        <!--{/if}-->
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/category_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
\ No newline at end of file

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -75,7 +75,7 @@
                     <!--{/if}-->
                 </td>
                 <td align="center">
-                    <a href="?" onclick="if(window.confirm('$BJ,N`L>$r:o=|$9$k$H!"$=$NJ,N`$rMxMQ$7$F$$$k>&IJ5,3J$,L58z$K$J$j$^$9!#(B\n$B ＠ 09g@-$NLdBj$rGD0.$7!"%P%C%/%"%C%W$r9T$C$F$+$i:o=|$9$k$3$H$r?d>)CW$7$^$9!#(B')){ fnModeSubmit('delete','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); } return false;">$B:o=|(B</a>
+                    <a href="?" onclick="fnModeSubmit('delete','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); return false;">$B:o=|(B</a>
                 </td>
                 <td align="center">
                     <!--{if $smarty.section.cnt.iteration != 1}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -96,7 +96,7 @@
                 </td>
             </tr>
             <tr>
-                <th>$B%@%&%s%m!<%I>&IJMQ(B<br />$B%U%!%$%k(B</th>
+                <th>$B%@%&%s%m!<%I>&IJMQ(B<BR />$B%U%!%$%k(B</th>
                 <td>
                     <!--{if $arrForm.down_realfilename != ""}-->
                         <!--{$arrForm.down_realfilename|h}-->
@@ -270,7 +270,7 @@
                 <tr>
                     <th>$B4XO">&IJ(B(<!--{$smarty.section.cnt.iteration}-->)<br />
                         <!--{if $arrRecommend[$recommend_no].product_id|strlen >= 1}-->
-                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
+                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->">
                         <!--{/if}-->
                     </th>
                     <td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -37,7 +37,7 @@
             disp_id = 'disp_cat'+i;
             $('#' + disp_id).css("display", "none");
 
-            $('#' + inner_id).html('    URL <a href="#" onclick="lfnDispChange();"> &gt;&gt; $B%+%F%4%jI=<((B<\/a>');
+            $('#' + inner_id).html('    URL <a href="#" onClick="lfnDispChange();"> &gt;&gt; $B%+%F%4%jI=<((B<\/a>');
         }
     }else{
         for (i = 1; i <= cnt; i++) {
@@ -47,7 +47,7 @@
             disp_id = 'disp_cat'+i;
             $('#' + disp_id).css("display", "");
 
-            $('#' + inner_id).html('    $B%+%F%4%j(B <a href="#" onclick="lfnDispChange();"> &gt;&gt; URL$BI=<((B<\/a>');
+            $('#' + inner_id).html('    $B%+%F%4%j(B <a href="#" onClick="lfnDispChange();"> &gt;&gt; URL$BI=<((B<\/a>');
         }
     }
 
@@ -234,7 +234,7 @@
                 <th rowspan="2">$BJ#@=(B</th>
             </tr>
             <tr>
-                <th nowrap="nowrap"><a href="#" onclick="lfnDispChange(); return false;">$B%+%F%4%j(B $B"N(B URL</a></th>
+                <th nowrap><a href="#" onClick="lfnDispChange(); return false;">$B%+%F%4%j(B $B"N(B URL</a></th>
             </tr>
 
             <!--{section name=cnt loop=$arrProducts}-->
@@ -243,7 +243,7 @@
                 <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
                     <td class="id" rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
                     <td class="thumbnail" rowspan="2">
-                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" />            </td>
+                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65">            </td>
                     <td rowspan="2"><!--{$arrProducts[cnt].product_code_min|h}-->
                         <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}-->
                             <br />$B!A(B <!--{$arrProducts[cnt].product_code_max|h}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,7 +34,7 @@
                 <td>
                     <!--{if $arrErr.maker_id}--><span class="attention"><!--{$arrErr.maker_id}--></span><br /><!--{/if}-->
                     <!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><!--{/if}-->
-                    <input type="text" name="name" value="<!--{$arrForm.name.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+                    <input type="text" name="name" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
                     <span class="attention"> ($B>e8B(B<!--{$smarty.const.SMTEXT_LEN}-->$BJ8;z(B)</span>
                 </td>
             </tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -71,7 +71,7 @@
 <!--{/foreach}-->
 <input type="hidden" name="mode" value="edit" />
 <input type="hidden" name="image_key" value="" />
-<input type="hidden" name="down_key" value="" />
+<input type="hidden" name="down_key" value="">
 <input type="hidden" name="product_id" value="<!--{$arrForm.product_id|h}-->" />
 <input type="hidden" name="product_class_id" value="<!--{$arrForm.product_class_id|h}-->" />
 <input type="hidden" name="copy_product_id" value="<!--{$arrForm.copy_product_id|h}-->" />
@@ -104,7 +104,7 @@
                 <table class="layout">
                     <tr>
                         <td>
-                            <select name="category_id[]" id="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> height: 120px; min-width: 200px;" onchange="" size="10" multiple="multiple">
+                            <select name="category_id[]" id="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> height: 120px; min-width: 200px;" onchange="" size="10" multiple>
                             </select>
                         </td>
                         <td style="padding: 15px;">
@@ -112,7 +112,7 @@
                             <a class="btn-normal" href="javascript:;" name="un_select" onclick="fnMoveSelect('category_id','category_id_unselect'); return false;">&nbsp;&nbsp;$B:o=|(B&nbsp;-&gt;&nbsp;&nbsp;</a>
                         </td>
                         <td>
-                            <select name="category_id_unselect[]" id="category_id_unselect" onchange="" size="10" style="height: 120px; min-width: 200px;" multiple="multiple">
+                            <select name="category_id_unselect[]" id="category_id_unselect" onchange="" size="10" style="height: 120px; min-width: 200px;" multiple>
                                 <!--{html_options values=$arrCatVal output=$arrCatOut selected=$arrForm.category_id}-->
                             </select>
                         </td>
@@ -155,7 +155,7 @@
                 <span class="attention"><!--{$arrErr[$key]}--><!--{$arrErr.down_realfilename}--></span>
                     <!--{if $arrForm.down_realfilename != ""}-->
                         <!--{$arrForm.down_realfilename|h}--><input type="hidden" name="down_realfilename" value="<!--{$arrForm.down_realfilename|h}-->">
-                        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[$B%U%!%$%k$N<h$j>C$7(B]</a><br />
+                        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[$B%U%!%$%k$N<h$j>C$7(B]</a><br>
                     <!--{/if}-->
                     <input type="file" name="down_file" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
                     <a class="btn-normal" href="javascript:;" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_down', 'down_key', '<!--{$key}-->'); return false;">$B%"%C%W%m!<%I(B</a><br />$BEPO?2DG=3HD%;R!'(B<!--{$smarty.const.DOWNLOAD_EXTENSION}-->$B!!(B($B%Q%i%a!<%?!<(B DOWNLOAD_EXTENSION)

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -193,16 +193,16 @@
         <col width="8%" />
         <col width="8%" />
         <tr>
-            <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br />$BEPO?(B</label></th>
-            <th>$B5,3J(B1<br />(<!--{$arrClass[$class_id1]|default:"$BL$A*Br(B"|h}-->)</th>
-            <th>$B5,3J(B2<br />(<!--{$arrClass[$class_id2]|default:"$BL$A*Br(B"|h}-->)</th>
+            <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br>$BEPO?(B</label></th>
+            <th>$B5,3J(B1<br>(<!--{$arrClass[$class_id1]|default:"$BL$A*Br(B"|h}-->)</th>
+            <th>$B5,3J(B2<br>(<!--{$arrClass[$class_id2]|default:"$BL$A*Br(B"|h}-->)</th>
             <th>$B>&IJ%3!<%I(B</th>
             <th>$B:_8K?t(B<span class="attention">*</span></th>
             <th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->($B1_(B)</th>
             <th><!--{$smarty.const.SALE_PRICE_TITLE}-->($B1_(B)<span class="attention">*</span></th>
             <th>$B>&IJ<oJL(B<span class="attention">*</span></th>
-            <th>$B%@%&%s%m!<%I(B<br />$B%U%!%$%kL>(B<span class="red"><br />$B>e8B(B<!--{$smarty.const.STEXT_LEN}-->$BJ8;z(B</span></th>
-            <th>$B%@%&%s%m!<%I>&IJMQ(B<br />$B%U%!%$%k(B</th>
+            <th>$B%@%&%s%m!<%I(B<br>$B%U%!%$%kL>(B<span class="red"><br>$B>e8B(B<!--{$smarty.const.STEXT_LEN}-->$BJ8;z(B</span></th>
+            <th>$B%@%&%s%m!<%I>&IJMQ(B<br>$B%U%!%$%k(B</th>
         </tr>
         <!--{section name=cnt loop=$arrForm.total.value}-->
             <!--{assign var=index value=$smarty.section.cnt.index}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -42,12 +42,39 @@
 
     <!--{* $B"'2hLL:8(B *}-->
     <div id="products-rank-left">
-        <ul>
-            <li>
-                <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B" />&nbsp;$B%[!<%`(B</a>
-                <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/product_rank_tree_fork.tpl" children=$arrTree treeID="f0" display=1}-->
-            </li>
-        </ul>
+        <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B">&nbsp;$B%[!<%`(B</a><br />
+        <!--{section name=cnt loop=$arrTree}-->
+            <!--{assign var=level value="`$arrTree[cnt].level`}-->
+
+            <!--{* $B>e$N3,AXI=<($N;~$K(Bdiv$B$rJD$8$k(B *}-->
+            <!--{assign var=close_cnt value="`$before_level-$level+1`}-->
+            <!--{if $close_cnt > 0}-->
+                <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{* $B%9%Z!<%97+$jJV$7(B *}-->
+            <!--{section name=n loop=$level}-->$B!!!!(B<!--{/section}-->
+
+            <!--{* $B%+%F%4%jL>I=<((B *}-->
+            <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false">
+            <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="$B%U%)%k%@(B">
+            <!--{else}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B">
+            <!--{/if}-->
+            <!--{$disp_name|sfCutString:10:false|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+            <br />
+            <!--{if $arrTree[cnt].display == true}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->">
+            <!--{else}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+            <!--{/if}-->
+            <!--{if $smarty.section.cnt.last}-->
+                <!--{section name=n loop=$level}--></div><!--{/section}-->
+            <!--{/if}-->
+            <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+        <!--{/section}-->
     </div>
     <!--{* $B"%2hLL:8(B *}-->
 

$B:o=|(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,50 +0,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}-->">
-        <!--{* $B%+%F%4%jL>I=<((B *}-->
-        <!--{assign var=disp_name value="`$child.category_id`.`$child.category_name`"}-->
-        <!--{if $child.level != $smarty.const.LEVEL_MAX}-->
-            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$child.category_id}-->); return false;">
-            <!--{if $arrForm.parent_category_id == $child.category_id}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="$B%U%)%k%@(B" />
-            <!--{else}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B" />
-            <!--{/if}-->
-            <!--{$disp_name|sfCutString:10:false|h}--></a>
-        <!--{else}-->
-            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="$B%U%)%k%@(B" />
-            <!--{$disp_name|sfCutString:10:false|h}-->
-        <!--{/if}-->
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/product_rank_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
\ No newline at end of file

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -37,34 +37,34 @@
         <tr>
             <th>$B>&IJL>(B</th>
             <td><!--{$arrForm.name|h}-->
-            <input type="hidden" name="name" value="<!--{$arrForm.name|h}-->" />
+            <input type="hidden" name="name" value="<!--{$arrForm.name|h}-->">
             </td>
         </tr>
         <tr>
             <th>$BEj9FF|(B</th>
             <td><!--{$arrForm.create_date|sfDispDBDate}-->
-            <input type="hidden" name="create_date" value="<!--{$arrForm.create_date|h}-->" />
+            <input type="hidden" name="create_date" value="<!--{$arrForm.create_date|h}-->">
             </td>
         </tr>
         <tr>
             <th>$B%l%S%e!<I=<((B</th>
             <td>
                 <!--{if $arrErr.status}--><span class="attention"><!--{$arrErr.status}--></span><!--{/if}-->
-                <input type="radio" name="status" value="2" <!--{if $arrForm.status eq 2}-->checked="checked"<!--{/if}--> />$BHsI=<((B<!--{if $arrForm.status eq 2 && !$tpl_status_change}--><!--{else}--><input type="radio" name="status" value="1" <!--{if $arrForm.status eq 1}-->checked="checked"<!--{/if}--> />$BI=<((B<!--{/if}-->
+                <input type="radio" name="status" value="2" <!--{if $arrForm.status eq 2}-->checked<!--{/if}-->>$BHsI=<((B<!--{if $arrForm.status eq 2 && !$tpl_status_change}--><!--{else}--><input type="radio" name="status" value="1" <!--{if $arrForm.status eq 1}-->checked<!--{/if}-->>$BI=<((B<!--{/if}-->
             </td>
         </tr>
         <tr>
             <th>$BEj9F<TL>(B <span class="attention">*</span></th>
             <td>
                 <!--{if $arrErr.reviewer_name}--><span class="attention"><!--{$arrErr.reviewer_name}--></span><!--{/if}-->
-                <input type="text" class="box60" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size=30>
             </td>
         </tr>
         <tr>
             <th>$BEj9F<T(BURL</th>
             <td>
                 <!--{if $arrErr.reviewer_url}--><span class="attention"><!--{$arrErr.reviewer_url}--></span><!--{/if}-->
-                <input type="text" class="box60" name="reviewer_url" maxlength="<!--{$smarty.const.URL_LEN}-->" value="<!--{$arrForm.reviewer_url|h}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="reviewer_url" maxlength="<!--{$smarty.const.URL_LEN}-->" value="<!--{$arrForm.reviewer_url|h}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size=30>
             </td>
         </tr>
         <tr>
@@ -88,7 +88,7 @@
             <th>$B%?%$%H%k(B <span class="attention">*</span></th>
             <td>
                 <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
-                <input type="text" class="box60" name="title" value="<!--{$arrForm.title|h}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="title" value="<!--{$arrForm.title|h}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size=30><span class="attention">
             </td>
         </tr>
         <tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,7 +22,7 @@
  */
 *}-->
 
-<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data"">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="csv_upload" />
 <div id="products" class="contents-main">
@@ -47,7 +47,7 @@
                 <!--{if $arrErr.csv_file}-->
                     <span class="attention"><!--{$arrErr.csv_file}--></span>
                 <!--{/if}-->
-                <input type="file" name="csv_file" size="40" /><span class="attention">(1$B9TL\%?%$%H%k9T(B)($B:GBg%"%C%W%m!<%I%5%$%:(B:<!--{$max_upload_csv_size}-->)</span>
+                <input type="file" name="csv_file" size="40" /><span class="attention">(1$B9TL\%?%$%H%k9T(B)</span>
             </td>
         </tr>
         <tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -47,15 +47,14 @@
             <th>CSV$B%U%!%$%k(B</th>
             <td>
                 <!--{if $arrErr.csv_file}--><span class="attention"><!--{$arrErr.csv_file}--></span><!--{/if}-->
-                <input type="file" name="csv_file" size="60" class="box60" /><span class="attention"> (1$B9TL\%?%$%H%k9T(B)
-                ($B:GBg%"%C%W%m!<%I%5%$%:(B:<!--{$max_upload_csv_size}-->)</span>
+                <input type="file" name="csv_file" size="60" class="box60" /><span class="attention"> (1$B9TL\%?%$%H%k9T(B)</span>
             </td>
         </tr>
         <tr>
             <th>$BEPO?>pJs(B</th>
             <td>
                 <!--{foreach name=title key=key item=item from=$arrTitle}-->
-                <!--{$smarty.foreach.title.iteration}-->$B9`L\!'(B<!--{$item}--><br />
+                <!--{$smarty.foreach.title.iteration}-->$B9`L\!'(B<!--{$item}--><br>
                 <!--{/foreach}-->
             </td>
         </tr>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,7 +22,7 @@
  */
 *}-->
 
-<script type="text/javascript">
+<script>
     function fnRestore(list_name) {
         if (window.confirm('$B%j%9%H%"$7$^$9$+(B?')) {
             document.body.style.cursor = 'wait';
@@ -100,7 +100,7 @@
         <h2>$B<B9T7k2L(B</h2>
         <div class="message">
             <!--{if $tpl_restore_err == false}-->
-                <div class="btn"><a class="btn-normal" href="javascript:;" name="restore_config" onclick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$tpl_restore_name|h}-->'; submit(); return false;"><span>$B%(%i!<$rL5;k$7$F%j%9%H%"$9$k(B</span></a></div>
+                <div class="btn"><a class="btn-normal" href="javascript:;" name="restore_config" onClick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$tpl_restore_name|h}-->'; submit(); return false;"><span>$B%(%i!<$rL5;k$7$F%j%9%H%"$9$k(B</span></a></div>
             <!--{/if}-->
             <!--{$tpl_restore_msg|h}-->
         </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,65 +1,63 @@
-<!--{*
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-*}-->
-
-<form name="index_form" method="post" action="?">
-    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-    <input type="hidden" name="mode" value="confirm" />
-    <div class="btn">
-        <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('index_form', 'confirm', '', '');"><span class="btn-next">$BJQ99$9$k(B</span></a>
-    </div>
-    <table class="list">
-        <col width="5%" />
-        <col width="5%" />
-        <col width="25%" />
-        <col width="25%" />
-        <col width="40%" />
-        <tr>
-            <th colspan="2">$B%$%s%G%C%/%9(B</th>
-            <th rowspan="2">$B%F!<%V%kL>(B</th>
-            <th rowspan="2">$B%+%i%`L>(B</th>
-            <th rowspan="2">$B ＠ bL@(B</th>
-        </tr>
-        <tr>
-            <th>ON</th>
-            <th>OFF</th>
-        </tr>
-
-        <!--{section name=cnt loop=$arrForm}-->
-            <tr>
-                <td class="center">
-                    <input type="hidden" name="table_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].table_name}-->" />
-                    <input type="hidden" name="column_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].column_name}-->" />
-                    <input type="hidden" name="indexflag[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].indexflag}-->" />
-                    <input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="1" <!--{if $arrForm[cnt].indexflag == "1"}-->checked="checked"<!--{/if}--> />
-                </td>
-                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="" <!--{if $arrForm[cnt].indexflag != "1"}-->checked="checked"<!--{/if}--> /></td>
-                <th class="column"><!--{$arrForm[cnt].table_name}--></th>
-                <th class="column"><!--{$arrForm[cnt].column_name}--></th>
-                <td><!--{$arrForm[cnt].recommend_comment}--></td>
-            </tr>
-        <!--{/section}-->
-    </table>
-
-    <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('index_form', 'confirm', '', ''); return false;"><span class="btn-next">$BJQ99$9$k(B</span></a>
-</form>
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+
+<form name="index_form" method="post" action="?">
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="mode" value="confirm" />
+    <div class="btn">
+        <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('index_form', 'confirm', '', '');"><span class="btn-next">$BJQ99$9$k(B</span></a>
+    </div>
+    <table class="list">
+        <col width="5%" />
+        <col width="5%" />
+        <col width="25%" />
+        <col width="25%" />
+        <col width="40%" />
+        <tr>
+            <th colspan="2">$B%$%s%G%C%/%9(B</th>
+            <th rowspan="2">$B%F!<%V%kL>(B</th>
+            <th rowspan="2">$B%+%i%`L>(B</th>
+            <th rowspan="2">$B ＠ bL@(B</th>
+        </tr>
+        <tr>
+            <th>ON</th>
+            <th>OFF</th>
+        </tr>
+
+        <!--{section name=cnt loop=$arrForm}-->
+            <tr>
+                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="1" <!--{if $arrForm[cnt].indexflag == "1"}-->checked<!--{/if}--> /></td>
+                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="" <!--{if $arrForm[cnt].indexflag != "1"}-->checked<!--{/if}--> /></td>
+                <th class="column"><!--{$arrForm[cnt].table_name}--></th>
+                <th class="column"><!--{$arrForm[cnt].column_name}--></th>
+                <td><!--{$arrForm[cnt].recommend_comment}--></td>
+            </tr>
+            <input type="hidden" name="table_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].table_name}-->" />
+            <input type="hidden" name="column_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].column_name}-->" />
+            <input type="hidden" name="indexflag[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].indexflag}-->" />
+        <!--{/section}-->
+    </table>
+
+    <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('index_form', 'confirm', '', ''); return false;"><span class="btn-next">$BJQ99$9$k(B</span></a>
+</form>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,9 +31,6 @@
         <!--$B"%%Z!<%8Aw$j(B-->
     </div>
 
-    <div class="btn">
-        <a class="btn-action" href="javascript:;" onclick="win02('./input.php','input','620','450'); return false;"><span class="btn-next">$B%a%s%P!<$r?75,F~NO(B</span></a>
-    </div>
     <!--$B"'%a%s%P!<0lMw$3$3$+$i(B-->
     <table class="list">
         <col width="15%" />
@@ -43,6 +40,9 @@
         <col width="7.5%" />
         <col width="7.5%" />
         <col width="20%" />
+        <div class="btn">
+            <a class="btn-action" href="javascript:;" onclick="win02('./input.php','input','620','450'); return false;"><span class="btn-next">$B%a%s%P!<$r?75,F~NO(B</span></a>
+        </div>
         <tr>
             <th>$B8"8B(B</th>
             <th>$BL>A0(B</th>
@@ -58,8 +58,8 @@
             <td><!--{$list_data[data].name|h}--></td>
             <td><!--{$list_data[data].department|h}--></td>
             <!--{assign var="work" value=$list_data[data].work}--><td><!--{$arrWORK[$work]|h}--></td>
-            <td align="center"><a href="#" onclick="win02('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','620','450'); return false;">$BJT=8(B</a></td>
-            <td align="center"><!--{if $workmax > 1}--><a href="#" onclick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">$B:o=|(B</a><!--{else}-->-<!--{/if}--></td>
+            <td align="center"><a href="#" onClick="win02('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','620','450'); return false;">$BJT=8(B</a></td>
+            <td align="center"><!--{if $workmax > 1}--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">$B:o=|(B</a><!--{else}-->-<!--{/if}--></td>
             <td align="center">
             <!--{$tpl_nomove}-->
             <!--{if !($smarty.section.data.first && $tpl_disppage eq 1)}--><a href="./rank.php?id=<!--{$list_data[data].member_id}-->&amp;move=up&amp;pageno=<!--{$tpl_disppage}-->">$B>e$X(B</a><!--{/if}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,12 +30,12 @@
 //-->
 </script>
 
-<form name="form1" id="form1" method="post" action="">
+<form name="form1" id="form1" method="post" action="" onsubmit="return fnRegistMember();">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="<!--{$tpl_mode|h}-->" />
-<input type="hidden" name="member_id" value="<!--{$tpl_member_id|h}-->" />
-<input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->" />
-<input type="hidden" name="old_login_id" value="<!--{$tpl_old_login_id|h}-->" />
+<input type="hidden" name="mode" value="<!--{$tpl_mode|h}-->">
+<input type="hidden" name="member_id" value="<!--{$tpl_member_id|h}-->">
+<input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->">
+<input type="hidden" name="old_login_id" value="<!--{$tpl_old_login_id|h}-->">
 
 <h2>$B%a%s%P!<EPO?(B/$BJT=8(B</h2>
 
@@ -94,8 +94,8 @@
         <td>
             <!--{if $arrErr.work}--><span class="attention"><!--{$arrErr.work}--></span><!--{/if}-->
             <!--{assign var=key value="work"}-->
-            <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1"><!--{$arrWORK.1}--></label>
-            <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0"><!--{$arrWORK.0}--></label>
+            <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1">$B2TF/(B</label>
+            <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0">$BHs2TF/(B</label>
             <span class="attention">$B"(I,?\F~NO(B</span>
         </td>
     </tr>
@@ -103,7 +103,7 @@
 
 <div class="btn-area">
     <ul>
-        <li><a class="btn-action" href="javascript:;" onclick="if (!fnConfirm()) return false; fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', ''); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a></li>
+        <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', ''); return false;"><span class="btn-next">$B$3$NFbMF$GEPO?$9$k(B</span></a></li>
     </ul>
 </div>
 </form>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,7 +28,7 @@
         <tr>
             <th>
             <!--{$info.title|h}-->
-            </th>
+            </td>
             <td>
             <!--{$info.value|h|nl2br}-->
             </td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -20,13 +20,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
 
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.js"></script>
+<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.css" media="screen" />
 <script type="text/javascript">//<![CDATA[
     $(document).ready(function() {
         $('a.expansion').facebox({
-            loadingImage : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/loading.gif',
-            closeImage   : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/closelabel.png'
+            loadingImage : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/loading.gif',
+            closeImage   : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/closelabel.png'
         });
     });
 //]]></script>
@@ -35,159 +35,168 @@
     <div id="undercolumn_cart">
         <h2 class="title"><!--{$tpl_title|h}--></h2>
 
-        <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
-            <!--$B!z%]%$%s%H0FFb!z(B-->
-            <!--{if $smarty.const.USE_POINT !== false}-->
-                <div class="point_announce">
-                    <!--{if $tpl_login}-->
-                        <span class="user_name"><!--{$tpl_name|h}--> $BMM(B</span>$B$N!"8=:_$N=j;}%]%$%s%H$O!V(B<span class="point"><!--{$tpl_user_point|number_format|default:0|h}--> pt</span>$B!W$G$9!#(B<br />
-                    <!--{else}-->
-                        $B%]%$%s%H@)EY$r$4MxMQ$K$J$i$l$k>l9g$O!"2q0wEPO?8e%m%0%$%s$7$F$/$@$5$$$^$9$h$&$*4j$$CW$7$^$9!#(B<br />
-                    <!--{/if}-->
-                    $B%]%$%s%H$O>&IJ9XF~;~$K(B<span class="price">1pt$B!a(B<!--{$smarty.const.POINT_VALUE|h}-->$B1_(B</span>$B$H$7$F;HMQ$9$k$3$H$,$G$-$^$9!#(B<br />
-                </div>
-            <!--{/if}-->
+    <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
+        <!--$B!z%]%$%s%H0FFb!z(B-->
+        <!--{if $smarty.const.USE_POINT !== false}-->
+            <div class="point_announce">
+                <!--{if $tpl_login}-->
+                    <span class="user_name"><!--{$tpl_name|h}--> $BMM(B</span>$B$N!"8=:_$N=j;}%]%$%s%H$O!V(B<span class="point"><!--{$tpl_user_point|number_format|default:0}--> pt</span>$B!W$G$9!#(B<br />
+                <!--{else}-->
+                    $B%]%$%s%H@)EY$r$4MxMQ$K$J$i$l$k>l9g$O!"2q0wEPO?8e%m%0%$%s$7$F$/$@$5$$$^$9$h$&$*4j$$CW$7$^$9!#(B<br />
+                <!--{/if}-->
+                $B%]%$%s%H$O>&IJ9XF~;~$K(B<span class="price">1pt$B!a(B<!--{$smarty.const.POINT_VALUE}-->$B1_(B</span>$B$H$7$F;HMQ$9$k$3$H$,$G$-$^$9!#(B<br />
+            </div>
         <!--{/if}-->
+    <!--{/if}-->
 
-        <p class="totalmoney_area">
-            <!--{* $B%+%4$NCf$K>&IJ$,$"$k>l9g$K$N$_I=<((B *}-->
-            <!--{if count($cartKeys) > 1}-->
-                <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]|h}--><!--{if !$smarty.foreach.cartKey.last}-->$B!"(B<!--{/if}--><!--{/foreach}-->$B$OF1;~9XF~$G$-$^$;$s!#(B<br />
-                    $B$*<j?t$G$9$,!"8DJL$K9XF~<jB3$-$r$*4j$$CW$7$^$9!#(B
-                </span>
-            <!--{/if}-->
+    <p class="totalmoney_area">
+        <!--{* $B%+%4$NCf$K>&IJ$,$"$k>l9g$K$N$_I=<((B *}-->
+        <!--{if count($cartKeys) > 1}-->
+            <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]}--><!--{if !$smarty.foreach.cartKey.last}-->$B!"(B<!--{/if}--><!--{/foreach}-->$B$OF1;~9XF~$G$-$^$;$s!#(B<br />
+                        $B$*<j?t$G$9$,!"8DJL$K9XF~<jB3$-$r$*4j$$CW$7$^$9!#(B
+            </span>
+        <!--{/if}-->
 
-            <!--{if strlen($tpl_error) != 0}-->
-                <p class="attention"><!--{$tpl_error|h}--></p>
-            <!--{/if}-->
+        <!--{if strlen($tpl_error) != 0}-->
+            <p class="attention"><!--{$tpl_error|h}--></p>
+        <!--{/if}-->
 
-            <!--{if strlen($tpl_message) != 0}-->
-                <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
-            <!--{/if}-->
-        </p>
+        <!--{if strlen($tpl_message) != 0}-->
+            <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
+        <!--{/if}-->
+    </p>
 
-        <!--{if count($cartItems) > 0}-->
-            <!--{foreach from=$cartKeys item=key}-->
-                <div class="form_area">
-                    <form name="form<!--{$key|h}-->" id="form<!--{$key|h}-->" method="post" action="?">
-                        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME|h}-->" value="<!--{$transactionid|h}-->" />
-                        <input type="hidden" name="mode" value="confirm" />
-                        <input type="hidden" name="cart_no" value="" />
-                        <input type="hidden" name="cartKey" value="<!--{$key|h}-->" />
-                        <input type="hidden" name="category_id" value="<!--{$tpl_category_id|h}-->" />
-                        <input type="hidden" name="product_id" value="<!--{$tpl_product_id|h}-->" />
-                        <!--{if count($cartKeys) > 1}-->
-                            <h3><!--{$arrProductType[$key]|h}--></h3>
-                            <!--{assign var=purchasing_goods_name value=$arrProductType[$key]}-->
-                        <!--{else}-->
-                            <!--{assign var=purchasing_goods_name value="$B%+%4$NCf$N>&IJ(B"}-->
+    <!--{if count($cartItems) > 0}-->
+    <!--{foreach from=$cartKeys item=key}-->
+    <div class="form_area">
+        <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="?">
+            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+            <input type="hidden" name="mode" value="confirm" />
+            <input type="hidden" name="cart_no" value="" />
+            <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+            <input type="hidden" name="category_id" value="<!--{$tpl_category_id|h}-->" />
+            <!--{if count($cartKeys) > 1}-->
+            <h3><!--{$arrProductType[$key]}--></h3>
+                <p>
+                    <!--{$arrProductType[$key]}-->$B$N9g7W6b3[$O!V(B<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->$B1_(B</span>$B!W$G$9!#(B
+                    <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $arrInfo.free_rule > 0}-->
+                            <!--{if !$arrData[$key].is_deliv_free}-->
+                                $B$"$H!V(B<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->$B1_(B</span>$B!W$GAwNAL5NA$G$9!*!*(B
+                            <!--{else}-->
+
+                                $B8=:_!"!V(B<span class="attention">$BAwNAL5NA(B</span>$B!W$G$9!*!*(B
+                            <!--{/if}-->
                         <!--{/if}-->
-                        <p>
-                            <!--{$purchasing_goods_name|h}-->$B$N9g7W6b3[$O!V(B<span class="price"><!--{$tpl_total_inctax[$key]|number_format|h}-->$B1_(B</span>$B!W$G$9!#(B
-                            <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                                <!--{if $arrInfo.free_rule > 0}-->
-                                    <!--{if !$arrData[$key].is_deliv_free}-->
-                                        $B$"$H!V(B<span class="price"><!--{$tpl_deliv_free[$key]|number_format|h}-->$B1_(B</span>$B!W$GAwNAL5NA$G$9!*!*(B
-                                    <!--{else}-->
-                                        $B8=:_!"!V(B<span class="attention">$BAwNAL5NA(B</span>$B!W$G$9!*!*(B
-                                    <!--{/if}-->
-                                <!--{/if}-->
+                    <!--{/if}-->
+                </p>
+            <!--{else}-->
+                <p>
+                    $B$*Gc$$>e$2>&IJ$N9g7W6b3[$O!V(B<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->$B1_(B</span>$B!W$G$9!#(B
+                    <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $arrInfo.free_rule > 0}-->
+                            <!--{if !$arrData[$key].is_deliv_free}-->
+                                $B$"$H!V(B<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->$B1_(B</span>$B!W$GAwNAL5NA$G$9!*!*(B
+                            <!--{else}-->
+                                $B8=:_!"!V(B<span class="attention">$BAwNAL5NA(B</span>$B!W$G$9!*!*(B
                             <!--{/if}-->
-                        </p>
+                        <!--{/if}-->
+                    <!--{/if}-->
+                </p>
+            <!--{/if}-->
 
-                        <table summary="$B>&IJ>pJs(B">
-                            <col width="10%" />
-                            <col width="15%" />
-                            <col width="30%" />
-                            <col width="15%" />
-                            <col width="15%" />
-                            <col width="15%" />
-                            <tr>
-                                <th class="alignC">$B:o=|(B</th>
-                                <th class="alignC">$B>&IJ<L??(B</th>
-                                <th class="alignC">$B>&IJL>(B</th>
-                                <th class="alignC">$BC12A(B</th>
-                                <th class="alignC">$B?tNL(B</th>
-                                <th class="alignC">$B>.7W(B</th>
-                            </tr>
-                            <!--{foreach from=$cartItems[$key] item=item}-->
-                                <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR|h}-->;<!--{/if}-->">
-                                    <td class="alignC"><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->', 'delete', 'cart_no', '<!--{$item.cart_no|h}-->'); return false;">$B:o=|(B</a>
-                                    </td>
-                                    <td class="alignC">
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}-->
-                                        <a class="expansion" target="_blank" href="<!--{$smarty.const.IMAGE_SAVE_URLPATH|h}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->">
-                                    <!--{/if}-->
-                                    <img src="<!--{$smarty.const.ROOT_URLPATH|h}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" />
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}-->
-                                        </a>
-                                    <!--{/if}-->
-                                    </td>
-                                    <td><!--{* $B>&IJL>(B *}--><strong><!--{$item.productsClass.name|h}--></strong>
-                                        <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                            <div><!--{$item.productsClass.class_name1|h}-->$B!'(B<!--{$item.productsClass.classcategory_name1|h}--></div>
-                                        <!--{/if}-->
-                                        <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                            <div><!--{$item.productsClass.class_name2|h}-->$B!'(B<!--{$item.productsClass.classcategory_name2|h}--></div>
-                                        <!--{/if}-->
-                                    </td>
-                                    <td class="alignR">
-                                        <!--{$item.price|sfCalcIncTax|number_format|h}-->$B1_(B
-                                    </td>
-                                    <td class="alignC"><!--{$item.quantity|h}-->
-                                        <ul id="quantity_level">
-                                            <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->','up','cart_no','<!--{$item.cart_no|h}-->'); return false"><img src="<!--{$TPL_URLPATH|h}-->img/button/btn_plus.jpg" width="16" height="16" alt="$B!\(B" /></a></li>
-                                            <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->','down','cart_no','<!--{$item.cart_no|h}-->'); return false"><img src="<!--{$TPL_URLPATH|h}-->img/button/btn_minus.jpg" width="16" height="16" alt="-" /></a></li>
-                                        </ul>
-                                    </td>
-                                    <td class="alignR"><!--{$item.total_inctax|number_format|h}-->$B1_(B</td>
-                                </tr>
-                            <!--{/foreach}-->
-                            <tr>
-                                <th colspan="5" class="alignR">$B>.7W(B</th>
-                                <td class="alignR"><!--{$tpl_total_inctax[$key]|number_format|h}-->$B1_(B</td>
-                            </tr>
-                            <tr>
-                                <th colspan="5" class="alignR">$B9g7W(B</th>
-                                <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format|h}-->$B1_(B</span></td>
-                            </tr>
-                            <!--{if $smarty.const.USE_POINT !== false}-->
-                                <!--{if $arrData[$key].birth_point > 0}-->
-                                    <tr>
-                                        <th colspan="5" class="alignR">$B$*CB ＠ 87n%]%$%s%H(B</th>
-                                        <td class="alignR"><!--{$arrData[$key].birth_point|number_format|h}-->pt</td>
-                                    </tr>
+            <table summary="$B>&IJ>pJs(B">
+                <col width="10%" />
+                <col width="15%" />
+                <col width="30%" />
+                <col width="15%" />
+                <col width="15%" />
+                <col width="15%" />
+                <tr>
+                    <th class="alignC">$B:o=|(B</th>
+                    <th class="alignC">$B>&IJ<L??(B</th>
+                    <th class="alignC">$B>&IJL>(B</th>
+                    <th class="alignC">$BC12A(B</th>
+                    <th class="alignC">$B?tNL(B</th>
+                    <th class="alignC">$B>.7W(B</th>
+                </tr>
+                <!--{foreach from=$cartItems[$key] item=item}-->
+                    <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                        <td class="alignC"><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->', 'delete', 'cart_no', '<!--{$item.cart_no}-->'); return false;">$B:o=|(B</a>
+                        </td>
+                        <td class="alignC">
+                        <a class="expansion" target="_blank"
+                                <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->"
                                 <!--{/if}-->
-                                <tr>
-                                    <th colspan="5" class="alignR">$B:#2s2C;;%]%$%s%H(B</th>
-                                    <td class="alignR"><!--{$arrData[$key].add_point|number_format|h}-->pt</td>
-                                </tr>
+                                >
+                                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" />
+                            </a>
+                        </td>
+                        <td><!--{* $B>&IJL>(B *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
+                            <!--{if $item.productsClass.classcategory_name1 != ""}-->
+                                <!--{$item.productsClass.class_name1}-->$B!'(B<!--{$item.productsClass.classcategory_name1}--><br />
                             <!--{/if}-->
-                        </table>
+                            <!--{if $item.productsClass.classcategory_name2 != ""}-->
+                                <!--{$item.productsClass.class_name2}-->$B!'(B<!--{$item.productsClass.classcategory_name2}-->
+                            <!--{/if}-->
+                        </td>
+                        <td class="alignR">
+                            <!--{$item.price|sfCalcIncTax|number_format}-->$B1_(B
+                        </td>
+                        <td class="alignC"><!--{$item.quantity}-->
+                            <ul id="quantity_level">
+                                <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','up','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.jpg" width="16" height="16" alt="$B!\(B" /></a></li>
+                                <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','down','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.jpg" width="16" height="16" alt="-" /></a></li>
+                            </ul>
+                        </td>
+                        <td class="alignR"><!--{$item.total_inctax|number_format}-->$B1_(B</td>
+                    </tr>
+                <!--{/foreach}-->
+                <tr>
+                    <th colspan="5" class="alignR">$B>.7W(B</th>
+                    <td class="alignR"><!--{$tpl_total_inctax[$key]|number_format}-->$B1_(B</td>
+                </tr>
+                <tr>
+                    <th colspan="5" class="alignR">$B9g7W(B</th>
+                    <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format}-->$B1_(B</span></td>
+                </tr>
+                <!--{if $smarty.const.USE_POINT !== false}-->
+                    <!--{if $arrData[$key].birth_point > 0}-->
+                        <tr>
+                            <th colspan="5" class="alignR">$B$*CB ＠ 87n%]%$%s%H(B</th>
+                            <td class="alignR"><!--{$arrData[$key].birth_point|number_format}-->pt</td>
+                        </tr>
+                    <!--{/if}-->
+                    <tr>
+                        <th colspan="5" class="alignR">$B:#2s2C;;%]%$%s%H(B</th>
+                        <td class="alignR"><!--{$arrData[$key].add_point|number_format}-->pt</td>
+                    </tr>
+                <!--{/if}-->
+            </table>
+                <!--{if strlen($tpl_error) == 0}-->
+                    <p class="alignC">$B>e5-FbMF$G$h$m$7$1$l$P!V9XF~<jB3$-$X!W%\%?%s$r%/%j%C%/$7$F$/$@$5$$!#(B</p>
+                <!--{/if}-->
+            <div class="btn_area">
+                <ul>
+                    <li>
+                        <!--{if $tpl_prev_url != ""}-->
+                            <a href="<!--{$tpl_prev_url|h}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg','back<!--{$key}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg','back<!--{$key}-->');">
+                                <img src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="$BLa$k(B" name="back<!--{$key}-->" /></a>
+                        <!--{/if}-->
+                    </li>
+                    <li>
                         <!--{if strlen($tpl_error) == 0}-->
-                            <p class="alignC">$B>e5-FbMF$G$h$m$7$1$l$P!V9XF~<jB3$-$X!W%\%?%s$r%/%j%C%/$7$F$/$@$5$$!#(B</p>
+                            <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+                            <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_buystep_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_buystep.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_buystep.jpg" alt="$B9XF~<jB3$-$X(B" name="confirm" />
                         <!--{/if}-->
-                        <div class="btn_area">
-                            <ul>
-                                <li>
-                                    <!--{if $tpl_prev_url != ""}-->
-                                        <a href="<!--{$tpl_prev_url|h}-->" onmouseover="chgImg('<!--{$TPL_URLPATH|h}-->img/button/btn_back_on.jpg','back<!--{$key|h}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH|h}-->img/button/btn_back.jpg','back<!--{$key|h}-->');">
-                                            <img src="<!--{$TPL_URLPATH|h}-->img/button/btn_back.jpg" alt="$BLa$k(B" name="back<!--{$key|h}-->" /></a>
-                                    <!--{/if}-->
-                                </li>
-                                <li>
-                                    <!--{if strlen($tpl_error) == 0}-->
-                                        <input type="hidden" name="cartKey" value="<!--{$key|h}-->" />
-                                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH|h}-->img/button/btn_buystep_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH|h}-->img/button/btn_buystep.jpg',this)" src="<!--{$TPL_URLPATH|h}-->img/button/btn_buystep.jpg" alt="$B9XF~<jB3$-$X(B" name="confirm" />
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                        </div>
-                    </form>
-                </div>
-            <!--{/foreach}-->
-        <!--{else}-->
-            <p class="empty"><span class="attention">$B"((B $B8=:_%+!<%HFb$K>&IJ$O$4$6$$$^$;$s!#(B</span></p>
-        <!--{/if}-->
+                    </li>
+                </ul>
+            </div>
+        </form>
+        </div>
+    <!--{/foreach}-->
+    <!--{else}-->
+        <p class="empty"><span class="attention">$B"((B $B8=:_%+!<%HFb$K>&IJ$O$4$6$$$^$;$s!#(B</span></p>
+    <!--{/if}-->
     </div>
 </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -37,11 +37,11 @@
             <col width="30%" />
             <col width="70%" />
             <tr>
-                <th>$B$*L>A0(B</th>
+                <th>$B$*L>A0(B<span class="attention">$B"((B</span></th>
                 <td><!--{$arrForm.name01.value|h}-->$B!!(B<!--{$arrForm.name02.value|h}--></td>
             </tr>
             <tr>
-                <th>$B$*L>A0(B($B%U%j%,%J(B)</th>
+                <th>$B$*L>A0(B($B%U%j%,%J(B)<span class="attention">$B"((B</span></th>
                 <td><!--{$arrForm.kana01.value|h}-->$B!!(B<!--{$arrForm.kana02.value|h}--></td>
             </tr>
             <tr>
@@ -65,11 +65,11 @@
                 </td>
             </tr>
             <tr>
-                <th>$B%a!<%k%"%I%l%9(B</th>
+                <th>$B%a!<%k%"%I%l%9(B<span class="attention">$B"((B</span></th>
                 <td><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></td>
             </tr>
             <tr>
-                <th>$B$*Ld$$9g$o$;FbMF(B</th>
+                <th>$B$*Ld$$9g$o$;FbMF(B<span class="attention">$B"((B</span></th>
                 <td><!--{$arrForm.contents.value|h|nl2br}--></td>
             </tr>
         </table>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -25,12 +25,52 @@
         $('#category_area li.level1:last').css('border-bottom', 'none');
     });
 //]]></script>
-
 <div class="block_outer">
     <div id="category_area">
         <div class="block_body">
             <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_category.gif" alt="$B>&IJ%+%F%4%j(B" /></h2>
-            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$arrTree treeID="categorytreelist" display=1}-->
+            <!--{strip}-->
+                <ul id="categorytree">
+                    <!--{assign var=preLev value=1}-->
+                    <!--{assign var=firstdone value=0}-->
+                    <!--{section name=cnt loop=$arrTree}-->
+                        <!--{* $BI=<(%U%i%0$,(BTRUE$B$J$iI=<((B *}-->
+                        <!--{if $arrTree[cnt].display == 1}-->
+                            <!--{assign var=level value=`$arrTree[cnt].level`}-->
+                            <!--{assign var=levdiff value=`$level-$preLev`}-->
+                                <!--{if $levdiff > 0}-->
+                                    <ul>
+                                <!--{elseif $levdiff == 0 && $firstdone == 1}-->
+                                    </li>
+                                <!--{elseif $levdiff < 0}-->
+                                    <!--{section name=d loop=`$levdiff*-1`}-->
+                                            </li>
+                                        </ul>
+                                    <!--{/section}-->
+                                    </li>
+                                <!--{/if}-->
+                            <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
+                                <p>
+                                    <a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+                                </p>
+                            <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
+                            <!--{assign var=preLev value=`$level`}-->
+                        <!--{/if}-->
+                        <!--{* $B%;%/%7%g%s$N:G8e$KJD$8%?%0$rDI2C(B *}-->
+                        <!--{if $smarty.section.cnt.last}-->
+                            <!--{if $preLev-1 > 0}-->
+                                <!--{section name=d loop=`$preLev-1`}-->
+                                    </li>
+                                </ul>
+                                <!--{/section}-->
+                                </li>
+                            <!--{else}-->
+                                </li>
+                            <!--{/if}-->
+                        <!--{/if}-->
+                    <!--{/section}-->
+                </ul>
+            <!--{/strip}-->
         </div>
     </div>
 </div>

$B:o=|(B: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,37 +0,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}--><!--{if in_array($child.category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
-        <p><a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></p>
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
\ No newline at end of file

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,11 +22,11 @@
 
 <div class="block_outer">
     <div id="news_area">
-    <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_news.png" alt="$B?7Ce>pJs(B" /><span class="rss"><a href="<!--{$smarty.const.ROOT_URLPATH}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_rss.jpg" alt="RSS" /></a></span></h2>
+    <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_news.jpg" alt="$B?7Ce>pJs(B" /><span class="rss"><a href="<!--{$smarty.const.ROOT_URLPATH}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_rss.jpg" alt="RSS" /></a></span></h2>
         <div class="block_body">
             <div class="news_contents">
             <!--{section name=data loop=$arrNews}-->
-            <!--{assign var="date_array" value="-"|explode:$arrNews[data].cast_news_date}-->
+            <!--{assign var="date_array" value="-"|explode:$arrNews[data].news_date_disp}-->
             <dl class="newslist">
                 <dt><!--{$date_array[0]}-->$BG/(B<!--{$date_array[1]}-->$B7n(B<!--{$date_array[2]}-->$BF|(B</dt>
                 <dt>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,7 +23,7 @@
 <!--{if count($arrBestProducts) > 0}-->
     <div class="block_outer clearfix">
         <div id="recommend_area">
-            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.png" alt="*" class="title_icon" /></h2>
+            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.jpg" alt="*" class="title_icon" /></h2>
             <div class="block_body clearfix">
                 <!--{foreach from=$arrBestProducts item=arrProduct name="recommend_products"}-->
                     <div class="product_item clearfix">

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl)
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl	                        (rev 0)
+++ branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,41 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *}-->
+
+<!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="$B=;=j8!:w(B" disable_wincol=1}-->
+
+<div id="zipsearchcolumn">
+    <h2>$B=;=j8!:w(B</h2>
+    <div id="zipsearch_area">
+        <form name="form1" id="form1" method="post" action="?">
+            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+            <input type="hidden" name="state" value="<!--{$tpl_state}-->" />
+            <input type="hidden" name="city" value="<!--{$tpl_city}-->" />
+            <input type="hidden" name="town" value="<!--{$tpl_town}-->" />
+            <div id="completebox">
+                <p><!--{$tpl_message}--></p>
+            </div>
+        </form>
+    </div>
+    <div class="btn"><a href="javascript:window.close()" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close_on.gif','b_close');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close.gif','b_close');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_close.gif" alt="$BJD$8$k(B" border="0" name="b_close" /></a></div>
+</div>
+
+<!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_footer.tpl"}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -51,13 +51,12 @@
 <!--{section name=cnt loop=$arrOrderDetail}-->
 $B>&IJ%3!<%I(B: <!--{$arrOrderDetail[cnt].product_code}-->
 $B>&IJL>(B: <!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
-$BC12A!'!o(B <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrOrderDetail[cnt].tax_rate:$arrOrderDetail[cnt].tax_rule|number_format}-->
+$BC12A!'!o(B <!--{$arrOrderDetail[cnt].price|sfCalcIncTax|number_format}-->
 $B?tNL!'(B<!--{$arrOrderDetail[cnt].quantity}-->
 
 <!--{/section}-->
 -------------------------------------------------
-$B>.!!7W(B $B!o(B <!--{$arrOrder.subtotal|number_format|default:0}--> <!--{if 0 < $arrOrder.tax}-->($B$&$A>CHq ＠ G(B $B!o(B<!--{$arrOrder.tax|number_format|default:0}-->$B!K(B<!--{/if}-->
-
+$B>.!!7W(B $B!o(B <!--{$arrOrder.subtotal|number_format|default:0}--> ($B$&$A>CHq ＠ G(B $B!o(B<!--{$arrOrder.tax|number_format|default:0}-->$B!K(B
 $BCM0z$-(B $B!o(B <!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|number_format|default:0}-->
 $BAw!!NA(B $B!o(B <!--{$arrOrder.deliv_fee|number_format|default:0}-->
 $B<j?tNA(B $B!o(B <!--{$arrOrder.charge|number_format|default:0}-->
@@ -84,7 +83,7 @@
 <!--{foreach item=item name=item from=$shipping.shipment_item}-->
 $B>&IJ%3!<%I(B: <!--{$item.product_code}-->
 $B>&IJL>(B: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-$BC12A!'!o(B <!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
+$BC12A!'!o(B <!--{$item.price|sfCalcIncTax|number_format}-->
 $B?tNL!'(B<!--{$item.quantity}-->
 
 <!--{/foreach}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,14 +32,11 @@
                 <span class="st">$B9XF~F|;~!'(B&nbsp;</span><!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
                 <span class="st">$BCmJ8HV9f!'(B&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
                 <span class="st">$B$*;YJ'$$J}K!!'(B&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
-                <!--{if $is_price_change == true}-->    
-                    <div class="attention" Align="right">$B"(6b3[$,JQ99$5$l$F$$$k>&IJ$,$"$k$?$a!":FCmJ8;~$O$4Cm0U$/$@$5$$!#(B</div>
-                <!--{/if}-->
             </p>
             <form action="order.php" method="post">
                 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                 <p class="btn">
-                    <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->" />
+                    <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->">
                     <input type="image" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re_on.jpg', this);" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg', this);" src="<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg" alt="$B$3$N9XF~FbMF$G:FCmJ8$9$k(B" name="submit" value="$B$3$N9XF~FbMF$G:FCmJ8$9$k(B" />
                 </p>
             </form>
@@ -86,18 +83,11 @@
                         <!--{$arrProductType[$orderDetail.product_type_id]}-->
                     <!--{/if}-->
                     </td>
-                    <!--{assign var=order_price   value=`$orderDetail.price`}-->
-                    <!--{assign var=product_price value=`$orderDetail.product_price`}-->
+                    <!--{assign var=price value=`$orderDetail.price`}-->
                     <!--{assign var=quantity value=`$orderDetail.quantity`}-->
-                    <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-                    <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->$B1_(B
-                    <!--{if $order_price != $product_price}-->
-                        <div class="attention">$B!Z8=:_2A3J![(B</div><span class="attention"><!--{$product_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->$B1_(B</span>
-                    <!--{/if}-->
-                    </td>
+                    <td class="alignR"><!--{$price|sfCalcIncTax|number_format|h}-->$B1_(B</td>
                     <td class="alignR"><!--{$quantity|h}--></td>
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->$B1_(B</td>
+                    <td class="alignR"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->$B1_(B</td>
                 </tr>
             <!--{/foreach}-->
             <tr>
@@ -179,7 +169,7 @@
                                 <!--{/if}-->
                             </td>
                             <td class="alignR">
-                                <!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->$B1_(B
+                                <!--{$item.price|sfCalcIncTax|number_format}-->$B1_(B
                             </td>
                             <td class="alignC"><!--{$item.quantity}--></td>
                             <!--{* XXX $B9XF~>.7W$H8m:9$,=P$k$?$a%3%a%s%H%"%&%H(B
@@ -190,9 +180,8 @@
                 </table>
             <!--{/if}-->
             <table summary="$B$*FO$1 ＠ h(B" class="delivname">
-                <col width="30%" />
-                <col width="70%" />
-                <tbody>
+                    <col width="30%" />
+                    <col width="70%" />
                     <tr>
                         <th class="alignL">$B$*L>A0(B</th>
                         <td><!--{$shippingItem.shipping_name01|h}-->&nbsp;<!--{$shippingItem.shipping_name02|h}--></td>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -115,7 +115,7 @@
                             <!--{else}-->
                                 <!--{$arrProduct.price01_min_inctax|number_format}-->$B!A(B<!--{$arrProduct.price01_max_inctax|number_format}-->
                             <!--{/if}-->
-                        <!--{/strip}--></span><span id="price01_dynamic"></span>
+                        </span><span id="price01_dynamic"></span><!--{/strip}-->
                         $B1_(B
                     </dd>
                 </dl>
@@ -131,7 +131,7 @@
                         <!--{else}-->
                             <!--{$arrProduct.price02_min_inctax|number_format}-->$B!A(B<!--{$arrProduct.price02_max_inctax|number_format}-->
                         <!--{/if}-->
-                    <!--{/strip}--></span><span id="price02_dynamic"></span>
+                    </span><span id="price02_dynamic"></span><!--{/strip}-->
                     $B1_(B
                 </dd>
             </dl>
@@ -149,7 +149,7 @@
                                 <!--{$arrProduct.price02_min|sfPrePoint:$arrProduct.point_rate|number_format}-->$B!A(B<!--{$arrProduct.price02_max|sfPrePoint:$arrProduct.point_rate|number_format}-->
                             <!--{/if}-->
                         <!--{/if}-->
-                    <!--{/strip}--></span><span id="point_dynamic"></span>
+                    </span><span id="point_dynamic"></span><!--{/strip}-->
                     Pt
                 </div>
             <!--{/if}-->
@@ -191,99 +191,99 @@
             <!--$B"'Gc$$J*$+$4(B-->
 
             <div class="cart_area clearfix">
-                <input type="hidden" name="mode" value="cart" />
-                <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
-                <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
-                <input type="hidden" name="favorite_product_id" value="" />
+            <input type="hidden" name="mode" value="cart" />
+            <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
+            <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
+            <input type="hidden" name="favorite_product_id" value="" />
 
-                <!--{if $tpl_stock_find}-->
-                    <!--{if $tpl_classcat_find1}-->
-                        <div class="classlist">
-                            <!--$B"'5,3J(B1-->
-                            <ul class="clearfix">
-                                <li><!--{$tpl_class_name1|h}-->$B!'(B</li>
-                                <li>
-                                    <select name="classcategory_id1" style="<!--{$arrErr.classcategory_id1|sfGetErrorColor}-->">
-                                    <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
-                                    </select>
-                                    <!--{if $arrErr.classcategory_id1 != ""}-->
-                                    <br /><span class="attention">$B"((B <!--{$tpl_class_name1}-->$B$rF~NO$7$F2<$5$$!#(B</span>
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                            <!--$B"%5,3J(B1-->
-                            <!--{if $tpl_classcat_find2}-->
-                            <!--$B"'5,3J(B2-->
-                            <ul class="clearfix">
-                                <li><!--{$tpl_class_name2|h}-->$B!'(B</li>
-                                <li>
-                                    <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
-                                    </select>
-                                    <!--{if $arrErr.classcategory_id2 != ""}-->
-                                    <br /><span class="attention">$B"((B <!--{$tpl_class_name2}-->$B$rF~NO$7$F2<$5$$!#(B</span>
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                            <!--$B"%5,3J(B2-->
-                            <!--{/if}-->
-                        </div>
-                    <!--{/if}-->
-
-                    <!--$B!z?tNL!z(B-->
-                    <dl class="quantity">
-                        <dt>$B?tNL!'(B</dt>
-                        <dd><input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
-                            <!--{if $arrErr.quantity != ""}-->
-                                <br /><span class="attention"><!--{$arrErr.quantity}--></span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-
-                    <div class="cartin">
-                        <div class="cartin_btn">
-                            <div id="cartbtn_default">
-                                <!--$B!z%+%4$KF~$l$k!z(B-->
-                                <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
-                                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="$B%+%4$KF~$l$k(B" name="cart" id="cart" /></a>
-                            </div>
-                        </div>
+            <!--{if $tpl_stock_find}-->
+                <!--{if $tpl_classcat_find1}-->
+                    <div class="classlist">
+                        <!--$B"'5,3J(B1-->
+                        <ul class="clearfix">
+                            <li><!--{$tpl_class_name1|h}-->$B!'(B</li>
+                            <li>
+                                <select name="classcategory_id1" style="<!--{$arrErr.classcategory_id1|sfGetErrorColor}-->">
+                                <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
+                                </select>
+                                <!--{if $arrErr.classcategory_id1 != ""}-->
+                                <br /><span class="attention">$B"((B <!--{$tpl_class_name1}-->$B$rF~NO$7$F2<$5$$!#(B</span>
+                                <!--{/if}-->
+                            </li>
+                        </ul>
+                        <!--$B"%5,3J(B1-->
+                        <!--{if $tpl_classcat_find2}-->
+                        <!--$B"'5,3J(B2-->
+                        <ul class="clearfix">
+                            <li><!--{$tpl_class_name2|h}-->$B!'(B</li>
+                            <li>
+                                <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
+                                </select>
+                                <!--{if $arrErr.classcategory_id2 != ""}-->
+                                <br /><span class="attention">$B"((B <!--{$tpl_class_name2}-->$B$rF~NO$7$F2<$5$$!#(B</span>
+                                <!--{/if}-->
+                            </li>
+                        </ul>
+                        <!--$B"%5,3J(B2-->
+                        <!--{/if}-->
                     </div>
-                    <div class="attention" id="cartbtn_dynamic"></div>
-                <!--{else}-->
-                    <div class="attention">$B?=$7Lu$4$6$$$^$;$s$,!"B~:#IJ ＠ Z$lCf$G$9!#(B</div>
                 <!--{/if}-->
 
-                <!--$B!z$*5$$KF~$jEPO?!z(B-->
-                <!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1 && $tpl_login === true}-->
-                    <div class="favorite_btn">
-                        <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
-                        <!--{if $arrErr[$add_favorite]}-->
-                            <div class="attention"><!--{$arrErr[$add_favorite]}--></div>
+                <!--$B!z?tNL!z(B-->
+                <dl class="quantity">
+                    <dt>$B?tNL!'(B</dt>
+                    <dd><input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
+                        <!--{if $arrErr.quantity != ""}-->
+                            <br /><span class="attention"><!--{$arrErr.quantity}--></span>
                         <!--{/if}-->
-                        <!--{if !$is_favorite}-->
-                            <a href="javascript:fnChangeAction('?product_id=<!--{$arrProduct.product_id|h}-->'); fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id|h}-->');" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg','add_favorite_product');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg','add_favorite_product');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg" alt="$B$*5$$KF~$j$KDI2C(B" name="add_favorite_product" id="add_favorite_product" /></a>
-                        <!--{else}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="$B$*5$$KF~$jEPO?:Q(B" name="add_favorite_product" id="add_favorite_product" />
-                            <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.tipsy.js"></script>
-                            <script type="text/javascript">
-                                var favoriteButton = $("#add_favorite_product");
-                                favoriteButton.tipsy({gravity: $.fn.tipsy.autoNS, fallback: "$B$*5$$KF~$j$KEPO?:Q$_(B", fade: true });
+                    </dd>
+                </dl>
 
-                                <!--{if $just_added_favorite == true}-->
-                                favoriteButton.load(function(){$(this).tipsy("show")});
-                                $(function(){
-                                    var tid = setTimeout('favoriteButton.tipsy("hide")',5000);
-                                });
-                                <!--{/if}-->
-                            </script>
-                        <!--{/if}-->
+                <div class="cartin">
+                    <div class="cartin_btn">
+                        <div id="cartbtn_default">
+                            <!--$B!z%+%4$KF~$l$k!z(B-->
+                            <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
+                                <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="$B%+%4$KF~$l$k(B" name="cart" id="cart" /></a>
+                        </div>
                     </div>
-                <!--{/if}-->
-            </div>
+                </div>
+                <div class="attention" id="cartbtn_dynamic"></div>
+            <!--{else}-->
+                <div class="attention">$B?=$7Lu$4$6$$$^$;$s$,!"B~:#IJ ＠ Z$lCf$G$9!#(B</div>
+            <!--{/if}-->
+
+            <!--$B!z$*5$$KF~$jEPO?!z(B-->
+            <!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1 && $tpl_login === true}-->
+                <div class="favorite_btn">
+                    <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
+                    <!--{if $arrErr[$add_favorite]}-->
+                        <div class="attention"><!--{$arrErr[$add_favorite]}--></div>
+                    <!--{/if}-->
+                    <!--{if !$is_favorite}-->
+                        <a href="javascript:fnChangeAction('?product_id=<!--{$arrProduct.product_id|h}-->'); fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id|h}-->');" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg','add_favorite_product');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg','add_favorite_product');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg" alt="$B$*5$$KF~$j$KDI2C(B" name="add_favorite_product" id="add_favorite_product" /></a>
+                    <!--{else}-->
+                        <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="$B$*5$$KF~$jEPO?:Q(B" name="add_favorite_product" id="add_favorite_product" />
+                        <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.tipsy.js"></script>
+                        <script type="text/javascript">
+                            var favoriteButton = $("#add_favorite_product");
+                            favoriteButton.tipsy({gravity: $.fn.tipsy.autoNS, fallback: "$B$*5$$KF~$j$KEPO?:Q$_(B", fade: true });
+
+                            <!--{if $just_added_favorite == true}-->
+                            favoriteButton.load(function(){$(this).tipsy("show")});
+                            $(function(){
+                                var tid = setTimeout('favoriteButton.tipsy("hide")',5000);
+                            });
+                            <!--{/if}-->
+                        </script>
+                    <!--{/if}-->
+                </div>
+            <!--{/if}-->
         </div>
-        <!--$B"%Gc$$J*$+$4(B-->
     </div>
-    </form>
+    <!--$B"%Gc$$J*$+$4(B-->
+</div>
+</form>
 
     <!--$B>\:Y$3$3$^$G(B-->
 
@@ -304,8 +304,7 @@
                             <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank" >
                         <!--{/if}-->
                         <img src="<!--{$arrFile[$ikey].filepath}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile[$ikey].width}-->" height="<!--{$arrFile[$ikey].height}-->" />
-                        <!--{if $arrProduct[$lkey]|strlen >= 1}-->
-                            </a>
+                        <!--{if $arrProduct[$lkey]|strlen >= 1}--></a>
                             <span class="mini">
                                 <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank">
                                     $B2hA|$r3HBg$9$k(B</a>
@@ -323,7 +322,7 @@
 
     <!--$B$3$N>&IJ$KBP$9$k$*5RMM$N@<(B-->
     <div id="customervoice_area">
-        <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_voice.png" alt="$B$3$N>&IJ$KBP$9$k$*5RMM$N@<(B" /></h2>
+        <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_voice.jpg" alt="$B$3$N>&IJ$KBP$9$k$*5RMM$N@<(B" /></h2>
 
         <div class="review_bloc clearfix">
             <p>$B$3$N>&IJ$KBP$9$k$446A[$r$<$R$*4s$;$/$@$5$$!#(B</p>
@@ -356,7 +355,7 @@
     <!--$B"'4XO">&IJ(B-->
     <!--{if $arrRecommend}-->
         <div id="whobought_area">
-            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_recommend.png" alt="$B$=$NB>$N%*%9%9%a>&IJ(B" /></h2>
+            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_recommend.jpg" alt="$B$=$NB>$N%*%9%9%a>&IJ(B" /></h2>
             <!--{foreach from=$arrRecommend item=arrItem name="arrRecommend"}-->
                 <div class="product_item">
                     <div class="productImage">

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -196,7 +196,6 @@
                 <!--$B"'Gc$$J*$+$4(B-->
                 <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
                 <input type="hidden" name="product_class_id" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
-                <input type="hidden" name="category_id" value="<!--{$arrSearchData.category_id|h}-->" />
 
                 <div class="cart_area clearfix">
                     <!--{if $tpl_stock_find[$id]}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -41,7 +41,7 @@
             <td><!--{$arrForm.name|h}--></td>
         </tr>
         <tr>
-            <th>$BEj9F<TL>(B</th>
+            <th>$BEj9F<TL>(B<span class="attention">$B"((B</span></th>
             <td><!--{$arrForm.reviewer_name|h}--></td>
         </tr>
         <tr>
@@ -53,15 +53,15 @@
             <td><!--{if $arrForm.sex eq 1}-->$BCK ＠ -(B<!--{elseif $arrForm.sex eq 2}-->$B=w ＠ -(B<!--{/if}--></td>
         </tr>
         <tr>
-            <th>$B$*$9$9$a%l%Y%k(B</th>
+            <th>$B$*$9$9$a%l%Y%k(B<span class="attention">$B"((B</span></th>
             <td><span class="recommend_level"><!--{$arrRECOMMEND[$arrForm.recommend_level]}--></span></td>
         </tr>
         <tr>
-            <th>$B%?%$%H%k(B</th>
+            <th>$B%?%$%H%k(B<span class="attention">$B"((B</span></th>
             <td><!--{$arrForm.title|h}--></td>
         </tr>
         <tr>
-            <th>$B%3%a%s%H(B</th>
+            <th>$B%3%a%s%H(B<span class="attention">$B"((B</span></th>
             <td><!--{$arrForm.comment|h|nl2br}--></td>
         </tr>
     </table>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -172,99 +172,102 @@
         <!--{/if}-->
         <!--{* $B%m%0%$%s:Q$_$N2q0w$N$_(B *}-->
 
-        <!--{* $B"'$*FO$1 ＠ h(B *}-->
+        <!--$B$*FO$1 ＠ h$3$3$+$i(B-->
+        <!--{* $BHNGdJ}K!H=Dj!J%@%&%s%m!<%IHNGd$N$_$N>l9g$O$*FO$1 ＠ h$rI=<($7$J$$!K(B *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
         <!--{foreach item=shippingItem from=$arrShipping name=shippingItem}-->
-            <h3>$B$*FO$1 ＠ h(B<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-            <!--{if $is_multiple}-->
-                <table summary="$B$4CmJ8FbMF3NG'(B">
-                    <col width="10%" />
-                    <col width="60%" />
-                    <col width="20%" />
-                    <col width="10%" />
+        <h3>$B$*FO$1 ＠ h(B<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
+        <!--{if $is_multiple}-->
+            <table summary="$B$4CmJ8FbMF3NG'(B">
+                <col width="10%" />
+                <col width="60%" />
+                <col width="20%" />
+                <col width="10%" />
+                <tr>
+                    <th scope="col">$B>&IJ<L??(B</th>
+                    <th scope="col">$B>&IJL>(B</th>
+                    <th scope="col">$BC12A(B</th>
+                    <th scope="col">$B?tNL(B</th>
+                    <!--{* XXX $B9XF~>.7W$H8m:9$,=P$k$?$a%3%a%s%H%"%&%H(B
+                    <th scope="col">$B>.7W(B</th>
+                    *}-->
+                </tr>
+                <!--{foreach item=item from=$shippingItem.shipment_item}-->
                     <tr>
-                        <th scope="col">$B>&IJ<L??(B</th>
-                        <th scope="col">$B>&IJL>(B</th>
-                        <th scope="col">$BC12A(B</th>
-                        <th scope="col">$B?tNL(B</th>
-                        <!--{* XXX $B9XF~>.7W$H8m:9$,=P$k$?$a%3%a%s%H%"%&%H(B
-                        <th scope="col">$B>.7W(B</th>
-                        *}-->
-                    </tr>
-                    <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                        <tr>
-                            <td class="alignC">
-                                <a
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
-                                    <!--{/if}-->
-                                >
-                                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
-                            </td>
-                            <td><!--{* $B>&IJL>(B *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
-                                <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                    <!--{$item.productsClass.class_name1}-->$B!'(B<!--{$item.productsClass.classcategory_name1}--><br />
+                        <td class="alignC">
+                            <a
+                                <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
                                 <!--{/if}-->
-                                <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                    <!--{$item.productsClass.class_name2}-->$B!'(B<!--{$item.productsClass.classcategory_name2}-->
-                                <!--{/if}-->
-                            </td>
-                            <td class="alignR">
-                                <!--{$item.price|sfCalcIncTax|number_format}-->$B1_(B
-                            </td>
-                            <td class="alignC"><!--{$item.quantity}--></td>
-                            <!--{* XXX $B9XF~>.7W$H8m:9$,=P$k$?$a%3%a%s%H%"%&%H(B
-                            <td class="alignR"><!--{$item.total_inctax|number_format}-->$B1_(B</td>
-                            *}-->
-                        </tr>
-                    <!--{/foreach}-->
-                </table>
-            <!--{/if}-->
-
-            <table summary="$B$*FO$1 ＠ h3NG'(B" class="delivname">
-                <col width="30%" />
-                <col width="70%" />
-                <tbody>
-                    <tr>
-                        <th scope="row">$B$*L>A0(B</th>
-                        <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">$B$*L>A0(B($B%U%j%,%J(B)</th>
-                        <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">$BM9JXHV9f(B</th>
-                        <td>$B")(B<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">$B=;=j(B</th>
-                        <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">$BEEOCHV9f(B</th>
-                        <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">FAX$BHV9f(B</th>
-                        <td>
-                            <!--{if $shippingItem.shipping_fax01 > 0}-->
-                                <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
+                            >
+                                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
+                        </td>
+                        <td><!--{* $B>&IJL>(B *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
+                            <!--{if $item.productsClass.classcategory_name1 != ""}-->
+                                <!--{$item.productsClass.class_name1}-->$B!'(B<!--{$item.productsClass.classcategory_name1}--><br />
                             <!--{/if}-->
+                            <!--{if $item.productsClass.classcategory_name2 != ""}-->
+                                <!--{$item.productsClass.class_name2}-->$B!'(B<!--{$item.productsClass.classcategory_name2}-->
+                            <!--{/if}-->
                         </td>
+                        <td class="alignR">
+                            <!--{$item.price|sfCalcIncTax|number_format}-->$B1_(B
+                        </td>
+                        <td class="alignC"><!--{$item.quantity}--></td>
+                        <!--{* XXX $B9XF~>.7W$H8m:9$,=P$k$?$a%3%a%s%H%"%&%H(B
+                        <td class="alignR"><!--{$item.total_inctax|number_format}-->$B1_(B</td>
+                        *}-->
                     </tr>
-                    <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                        <tr>
-                            <th scope="row">$B$*FO$1F|(B</th>
-                            <td><!--{$shippingItem.shipping_date|default:"$B;XDj$J$7(B"|h}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">$B$*FO$1;~4V(B</th>
-                            <td><!--{$shippingItem.shipping_time|default:"$B;XDj$J$7(B"|h}--></td>
-                        </tr>
-                    <!--{/if}-->
-                </tbody>
+                <!--{/foreach}-->
             </table>
+        <!--{/if}-->
+
+        <table summary="$B$*FO$1 ＠ h3NG'(B" class="delivname">
+            <col width="30%" />
+            <col width="70%" />
+            <tbody>
+                <tr>
+                    <th scope="row">$B$*L>A0(B</th>
+                    <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">$B$*L>A0(B($B%U%j%,%J(B)</th>
+                    <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">$BM9JXHV9f(B</th>
+                    <td>$B")(B<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">$B=;=j(B</th>
+                    <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">$BEEOCHV9f(B</th>
+                    <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">FAX$BHV9f(B</th>
+                    <td>
+                        <!--{if $shippingItem.shipping_fax01 > 0}-->
+                            <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
+                        <!--{/if}-->
+                    </td>
+                </tr>
+            <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                <tr>
+                    <th scope="row">$B$*FO$1F|(B</th>
+                    <td><!--{$shippingItem.shipping_date|default:"$B;XDj$J$7(B"|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">$B$*FO$1;~4V(B</th>
+                    <td><!--{$shippingItem.shipping_time|default:"$B;XDj$J$7(B"|h}--></td>
+                </tr>
+            <!--{/if}-->
+            </tbody>
+        </table>
         <!--{/foreach}-->
-        <!--{* $B"%$*FO$1 ＠ h(B *}-->
+        <!--{/if}-->
+        <!--$B$*FO$1 ＠ h$3$3$^$G(B-->
 
         <h3>$BG[AwJ}K!!&$*;YJ'J}K!!&$=$NB>$*Ld$$9g$o$;(B</h3>
         <table summary="$BG[AwJ}K!!&$*;YJ'J}K!!&$=$NB>$*Ld$$9g$o$;(B" class="delivname">

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
 
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" class="<!--{$tpl_page_class_name|h}-->">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
 
-<body class="<!--{$tpl_page_class_name|h}-->">
+<body>
 <!--{$GLOBAL_ERR}-->
 <noscript>
     <p>JavaScript $B$rM-8z$K$7$F$4MxMQ2<$5$$(B.</p>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -102,17 +102,6 @@
         &nbsp;-&nbsp;
         <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
 
-        $B!|(BFAX<br>
-        <!--{assign var=key1 value="`$prefix`fax01"}-->
-        <!--{assign var=key2 value="`$prefix`fax02"}-->
-        <!--{assign var=key3 value="`$prefix`fax03"}-->
-        <!--{if $arrErr[fax01] || $arrErr[fax02] || $arrErr[fax03]}-->
-            <font color="#FF0000"><!--{$arrErr[fax01]}--><!--{$arrErr[fax02]}--><!--{$arrErr[fax03]}--></font><br>
-        <!--{/if}-->
-        <input type="text" size="<!--{$size}-->" name="fax01" value="<!--{$arrForm.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
-        <input type="text" size="<!--{$size}-->" name="fax02" value="<!--{$arrForm.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
-        <input type="text" size="<!--{$size}-->" name="fax03" value="<!--{$arrForm.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" /><br>
-        
         $B!|%a!<%k%"%I%l%9(B<font color="#FF0000"> *</font><br>
         <font color="#FF0000"><!--{$arrErr.email}--></font>
         <input type="text" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -42,15 +42,14 @@
 <!--{/if}-->
 $B"#$4CmJ8>&IJL@:Y(B
 <!--{section name=cnt loop=$arrOrderDetail}-->
-$B>&IJ%3!<%I!'(B<!--{$arrOrderDetail[cnt].product_code}-->
-$B>&IJL>!'(B<!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
-$BC12A!'!o(B <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrOrderDetail[cnt].tax_rate:$arrOrderDetail[cnt].tax_rule|number_format}-->
+$B>&IJ%3!<%I(B: <!--{$arrOrderDetail[cnt].product_code}-->
+$B>&IJL>(B: <!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
+$BC12A!'!o(B <!--{$arrOrderDetail[cnt].price|sfCalcIncTax|number_format}-->
 $B?tNL!'(B<!--{$arrOrderDetail[cnt].quantity}-->
 
 <!--{/section}-->
 
-$B>.!!7W(B $B!o(B <!--{$arrOrder.subtotal|number_format|default:0}--> <!--{if 0 < $arrOrder.tax}-->($B$&$A>CHq ＠ G(B $B!o(B<!--{$arrOrder.tax|number_format|default:0}-->$B!K(B<!--{/if}-->
-
+$B>.!!7W(B $B!o(B <!--{$arrOrder.subtotal|number_format|default:0}--> ($B$&$A>CHq ＠ G(B $B!o(B<!--{$arrOrder.tax|number_format|default:0}-->$B!K(B
 $BCM0z$-(B $B!o(B <!--{$arrOrder.use_point+$arrOrder.discount|number_format|default:0}-->
 $BAw!!NA(B $B!o(B <!--{$arrOrder.deliv_fee|number_format|default:0}-->
 $B<j?tNA(B $B!o(B <!--{$arrOrder.charge|number_format|default:0}-->
@@ -68,12 +67,12 @@
 $B!!=;=j!!!!!'(B<!--{$arrPref[$shipping.shipping_pref]}--><!--{$shipping.shipping_addr01}--><!--{$shipping.shipping_addr02}-->
 $B!!EEOCHV9f!'(B<!--{$shipping.shipping_tel01}-->-<!--{$shipping.shipping_tel02}-->-<!--{$shipping.shipping_tel03}-->
 $B!!$*FO$1F|!'(B<!--{$shipping.shipping_date|date_format:"%Y/%m/%d"|default:"$B;XDj$J$7(B"}-->
-$B!!$*FO$1;~4V!'(B<!--{$shipping.shipping_time|default:"$B;XDj$J$7(B"}-->
+$B$*FO$1;~4V!'(B<!--{$shipping.shipping_time|default:"$B;XDj$J$7(B"}-->
 
 <!--{foreach item=item name=item from=$shipping.shipment_item}-->
-$B>&IJ%3!<%I!'(B<!--{$item.product_code}-->
-$B>&IJL>!'(B<!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-$BC12A!'!o(B <!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
+$B>&IJ%3!<%I(B: <!--{$item.product_code}-->
+$B>&IJL>(B: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
+$BC12A!'!o(B <!--{$item.price|sfCalcIncTax|number_format}-->
 $B?tNL!'(B<!--{$item.quantity}-->
 
 <!--{/foreach}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -26,6 +26,12 @@
     $B9XF~F|;~!'(B<!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br>
     $BCmJ8HV9f!'(B<!--{$tpl_arrOrderData.order_id}--><br>
     $B$*;YJ'$$J}K!!'(B<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+    <!--{if $tpl_arrOrderData.deliv_time_id != ""}--><br>
+        $B$*FO$1;~4V!'(B<!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
+    <!--{/if}-->
+    <!--{if $tpl_arrOrderData.deliv_date != ""}--><br>
+        $B$*FO$1F|!'(B<!--{$tpl_arrOrderData.deliv_date|h}-->
+    <!--{/if}-->
 
     <form action="order.php" method="post">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
@@ -61,11 +67,9 @@
         $BC12A!'(B
         <!--{assign var=price value=`$orderDetail.price`}-->
         <!--{assign var=quantity value=`$orderDetail.quantity`}-->
-        <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-        <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
-        <!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->$B1_(B<br>
+        <!--{$price|sfCalcIncTax|number_format|h}-->$B1_(B<br>
         $B?tNL!'(B<!--{$quantity|h}--><br>
-        $B>.7W!'(B<!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->$B1_(B<br>
+        $B>.7W!'(B<!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->$B1_(B<br>
     <!--{/foreach}-->
     <hr>
     $B>.7W!'(B<!--{$tpl_arrOrderData.subtotal|number_format}-->$B1_(B<br>
@@ -104,7 +108,7 @@
                 <!--{if $item.productsClass.classcategory_name2 != ""}-->
                     <!--{$item.productsClass.class_name2}-->$B!'(B<!--{$item.productsClass.classcategory_name2}--><br>
                 <!--{/if}-->
-                $BC12A!'(B<!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->$B1_(B<br>
+                $BC12A!'(B<!--{$item.price|sfCalcIncTax|number_format}-->$B1_(B<br>
                 $B?tNL!'(B<!--{$item.quantity}--><br>
                 <br>
             <!--{/foreach}-->
@@ -122,10 +126,6 @@
             $B!|(BFAX$BHV9f(B<br>
             <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}--><br>
         <!--{/if}-->
-        $B!|$*FO$1F|(B<br>
-        <!--{$shippingItem.shipping_date|default:'$B;XDj$J$7(B'|h}-->&nbsp;<br>
-        $B!|$*FO$1;~4V(B<br>
-        <!--{$shippingItem.shipping_time|default:'$B;XDj$J$7(B'|h}-->&nbsp;<br>
         <br>
     <!--{/foreach}-->
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -114,16 +114,6 @@
     <!--{/if}-->
     <br>
 
-    <!--$B!z%a!<%+!<!z(B-->
-    <!--{if $arrProduct.maker_name|strlen >= 1}-->
-        $B%a!<%+!<!'(B<!--{$arrProduct.maker_name|h}--><br>
-    <!--{/if}-->
-
-    <!--$B!z%a!<%+!<(BURL$B!z(B-->
-    <!--{if $arrProduct.comment1|strlen >= 1}-->
-        $B%a!<%+!<(BURL$B!'(B<a href="<!--{$arrProduct.comment1|h}-->"><!--{$arrProduct.comment1|h}--></a><br>
-    <!--{/if}-->
-
     <!--$B!z4XO"%+%F%4%j!z(B-->
     $B4XO"%+%F%4%j!'(B<br>
     <!--{section name=r loop=$arrRelativeCat}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -36,7 +36,7 @@
             <!--{html_options options=$arrClassCat2 selected=$arrForm.classcategory_id2.value}-->
         </select><br>
         <input type="hidden" name="mode" value="selectItem">
-        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
+        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
         <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
         <center><input type="submit" name="submit" value="$B<!$X(B"></center>
     </form>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,8 @@
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
         <input type="text" name="quantity" size="3" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength=<!--{$smarty.const.INT_LEN}--> istyle="4"><br>
         <input type="hidden" name="mode" value="cart">
-        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
-        <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value|h}-->">
+        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
+        <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value}-->">
         <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
         <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->">
         <input type="hidden" name="product_type" value="<!--{$tpl_product_type}-->">

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -68,7 +68,8 @@
             <br>
         <!--{/if}-->
 
-        <!--{if $arrShipping}-->
+        <!--{* $BHNGdJ}K!H=Dj!J%@%&%s%m!<%IHNGd$N$_$N>l9g$O$*FO$1 ＠ h$rI=<($7$J$$!K(B *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
             $B!Z$*FO$1 ＠ h![(B<br>
             <!--{foreach item=shippingItem from=$arrShipping name=shippingItem}-->
                 <!--{if $is_multiple}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -124,7 +124,7 @@
                                         <ul>
                                             <li class="quantity"><span class="mini">$B?tNL(B:</span><!--{$arrItem.quantity|number_format}--></li>
                                             <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.png" width="22" height="21" alt="$B!\(B" onclick="fnFormModeSubmit('form<!--{$key}-->', 'up','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></li>
-                                            <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.png" width="22" height="21" alt="-" onclick="fnFormModeSubmit('form<!--{$key}-->', 'down','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></li>
+                                            <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.png" width="22" height="21" alt="-" onclick="fnFormModeSubmit('form<!--{$key}-->', 'down','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></a></li>
                                             <li class="result"><span class="mini">$B>.7W!'(B</span><!--{$arrItem.total_inctax|number_format}-->$B1_(B</li>
                                         </ul>
                                     </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -61,7 +61,7 @@
                 <input type="text" name="kana01"
                     value="<!--{$arrForm.kana01.value|default:$arrData.kana01|h}-->"
                     maxlength="<!--{$smarty.const.STEXT_LEN}-->"
-                    style="<!--{$arrErr.kana01|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="$B%;%$(B"/>&nbsp;&nbsp;
+                    style="<!--{$arrErr.kana01|sfGetErrorColor}-->"class="boxHarf text data-role-none" placeholder="$B%;%$(B"/>&nbsp;&nbsp;
                 <input type="text" name="kana02"
                     value="<!--{$arrForm.kana02.value|default:$arrData.kana02|h}-->"
                     maxlength="<!--{$smarty.const.STEXT_LEN}-->"
@@ -92,7 +92,7 @@
             <dd>
                 <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
                 <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->" class="boxHarf top data-role-none">
-                    <option value="">$BETF;I\8)(B</option>
+                    <option value="" selected="selected">$BETF;I\8)(B</option>
                     <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}-->
                 </select>
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -46,11 +46,10 @@
             <hr />
             <p>
                 $B%a!<%k%"%I%l%9(B<br />
-                <span class="attention"><!--{$arrErr.email}--></span>
                 <input type="email" name="email"
                 value="<!--{$tpl_login_email|h}-->"
-                style="<!--{$arrErr.email|sfGetErrorColor}-->; ime-mode: disabled;"
-                maxlength="200" class="text boxLong data-role-none" />
+                style="<!--{$errmsg|sfGetErrorColor}-->; ime-mode: disabled;"
+                maxlength="200" class="boxLong data-role-none" />
             </p>
             <span class="attention"><!--{$errmsg}--></span>
             <hr />

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,9 +24,55 @@
 <section id="category_area">
     <h2 class="title_block">$B>&IJ%+%F%4%j(B</h2>
     <nav id="categorytree">
-        <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$arrTree treeID="categorytreelist" display=1 level=0}-->
+        <ul id="categorytreelist">
+            <!--{assign var=preLev value=1}-->
+            <!--{assign var=firstdone value=0}-->
+            <!--{section name=cnt loop=$arrTree}-->
+                <!--{* $B%$%s%G%s%H$O(B Smarty $B9=J8$rM%@h$H$7$F$$$^$9!#(B *}-->
+                <!--{* $B%+%F%4%jI=<(!&HsI=<(@Z$jBX$((B *}-->
+                <!--{if $arrTree[cnt].view_flg != "2"}-->
+                    <!--{* $BI=<(%U%i%0$,(BTRUE$B$J$iI=<((B *}-->
+                    <!--{assign var=level value=`$arrTree[cnt].level`}-->
+                    <!--{* level2$B0J2<$J$iI=<(!J(Blevel$B;XDj2DG=!K(B *}-->
+                    <!--{if $level <= 5 || $arrTree[cnt].display == 1}-->
+                        <!--{assign var=levdiff value=`$level-$preLev`}-->
+                        <!--{if $levdiff > 0}-->
+                            <ul>
+                        <!--{elseif $levdiff == 0 && $firstdone == 1}-->
+                            </li>
+                        <!--{elseif $levdiff < 0}-->
+                            <!--{section name=d loop=`$levdiff*-1`}-->
+                                    </li>
+                                </ul>
+                            <!--{/section}-->
+                            </li>
+                        <!--{/if}-->
 
+                        <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
+                        <!--{if $firstdone == 0}-->
+                            <!--{assign var=firstdone value=1}-->
+                        <!--{/if}-->
+                        <!--{assign var=preLev value=`$level`}-->
+                    <!--{/if}-->
+
+                    <!--{* $B%;%/%7%g%s$N:G8e$KJD$8%?%0$rDI2C(B *}-->
+                    <!--{if $smarty.section.cnt.last}-->
+                        <!--{if $preLev-1 > 0}-->
+                            <!--{section name=d loop=`$preLev-1`}-->
+                                    </li>
+                                </ul>
+                            <!--{/section}-->
+                            </li>
+                        <!--{else}-->
+                            </li>
+                        <!--{/if}-->
+                    <!--{/if}-->
+                <!--{/if}-->
+            <!--{/section}-->
+        </ul>
+
         <script>//<![CDATA[
+            initCategoryList(); //$B%+%F%4%j%j%9%H$N=i4|2=(B
         //]]></script>
     </nav>
 </section>

$B:o=|(B: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,37 +0,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if $level > 5 || !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}--><!--{if in_array($child.category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
-        <span class="category_header"></span><span class="category_body"><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></span>
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children treeID="" display=$disp_child level=$child.level}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
\ No newline at end of file

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,7 +28,7 @@
             <li>
                 <a id="windowcolumn<!--{$smarty.section.data.index}-->" href="javascript:getNewsDetail(<!--{$arrNews[data].news_id}-->);">
                 <span class="news_title"><!--{$arrNews[data].news_title|h}--></span></a><br />
-                <span class="news_date"><!--{$arrNews[data].cast_news_date|date_format:"%Y$BG/(B %m$B7n(B %d$BF|(B"}--></span>
+                <span class="news_date"><!--{$arrNews[data].news_date_disp|date_format:"%Y$BG/(B %m$B7n(B %d$BF|(B"}--></span>
             </li>
         <!--{/section}-->
     </ul>
@@ -78,7 +78,7 @@
                             $($("#news_area ul.newslist li a").get(maxCnt)).attr("href", "javascript:getNewsDetail(" + news.news_id + ");");
 
                             //$BG/7n$r%;%C%H(B
-                            var newsDateDispArray = news.cast_news_date.split("-"); //$B%O%$%U%s$GG/7nF|$rJ,2r(B
+                            var newsDateDispArray = news.news_date_disp.split("-"); //$B%O%$%U%s$GG/7nF|$rJ,2r(B
                             var newsDateDisp = newsDateDispArray[0] + "$BG/(B " + newsDateDispArray[1] + "$B7n(B " + newsDateDispArray[2] + "$BF|(B";
                             $($("#news_area ul.newslist li span.news_date").get(maxCnt)).text(newsDateDisp);
                         }
@@ -133,7 +133,7 @@
                         }
 
                         //$BG/7n$r%;%C%H(B
-                        //var newsDateDispArray = news.cast_news_date.split("-"); //$B%O%$%U%s$GG/7nF|$rJ,2r(B
+                        //var newsDateDispArray = news.news_date_disp.split("-"); //$B%O%$%U%s$GG/7nF|$rJ,2r(B
                         //var newsDateDisp = newsDateDispArray[0] + "$BG/(B " + newsDateDispArray[1] + "$B7n(B " + newsDateDispArray[2] + "$BF|(B";
                         //$($("#windowcolumn dl.view_detail dt").get(maxCnt)).text(newsDateDisp);
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,7 +33,7 @@
                             <h3><a rel="external" href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->"><!--{$arrBestProducts[cnt].name|h}--></a></h3>
                             <p class="mini comment"><!--{$arrBestProducts[cnt].comment|h|nl2br}--></p>
                             <p class="sale_price">
-                                <span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->($B ＠ G9~(B):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> $B1_(B</span>
+                                <span class="mini">$BHNGd2A3J(B($B ＠ G9~(B):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> $B1_(B</span>
                             </p>
                         </div>
                     </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -64,7 +64,7 @@
         <div class="attention"><!--{$arrErr[$key3]}--><!--{$arrErr[$key4]}--><!--{$arrErr[$key5]}--></div>
     <!--{/if}-->
     <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" class="boxHarf top data-role-none">
-        <option value="">$BETF;I\8)(B</option>
+        <option value="" selected="selected">$BETF;I\8)(B</option>
         <!--{html_options options=$arrPref selected=$arrForm[$key3]}-->
     </select>
 
@@ -127,8 +127,8 @@
             <div class="attention"><!--{$arrErr[$key1]}--></div>
         <!--{/if}-->
         <span style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
-            <input type="radio" id="man" name="<!--{$key1}-->" value="1" <!--{if $arrForm[$key1] eq 1}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="man">$BCK ＠ -(B</label>&nbsp;&nbsp;
-            <input type="radio" id="woman" name="<!--{$key1}-->" value="2" <!--{if $arrForm[$key1] eq 2}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="woman">$B=w ＠ -(B</label>
+            <p><input type="radio" id="man" name="<!--{$key1}-->" value="1" <!--{if $arrForm[$key1] eq 1}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="man">$BCK ＠ -(B</label>&nbsp;&nbsp;
+            <input type="radio" id="woman" name="<!--{$key1}-->" value="2" <!--{if $arrForm[$key1] eq 2}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="woman">$B=w ＠ -(B</label></p>
         </span>
     </dd>
 
@@ -139,7 +139,7 @@
             <div class="attention"><!--{$arrErr[$key1]}--></div>
         <!--{/if}-->
         <select name="<!--{$key1}-->" class="boxLong data-role-none">
-            <option value="">$BA*Br$7$F$/$@$5$$(B</option>
+            <option value="" selected="selected">$BA*Br$7$F$/$@$5$$(B</option>
             <!--{html_options options=$arrJob selected=$arrForm[$key1]}-->
         </select>
     </dd>
@@ -178,7 +178,7 @@
                 <div class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></div>
             <!--{/if}-->
             <select name="reminder" style="<!--{$arrErr.reminder|sfGetErrorColor}-->" class="boxLong top data-role-none">
-                <option value="">$B<ALd$rA*Br$7$F$/$@$5$$(B</option>
+                <option value="" selected="selected">$B<ALd$rA*Br$7$F$/$@$5$$(B</option>
                 <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
             </select>
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -110,7 +110,7 @@
 
         <div class="btn_area">
             <ul class="btn_btm">
-                <li><input type="submit" value="$B40N;%Z!<%8$X(B" class="btn data-role-none" name="complete" id="complete" /></li>
+                <li><input type="submit" value="$B40N;%Z!<%8$X(B" class="btn data-role-none" alt="$B40N;%Z!<%8$X(B" name="complete" id="complete" /></li>
                 <li><a class="btn_back" href="Javascript:fnModeSubmit('return', '', '');" rel="external">$BLa$k(B</a></li>
             </ul>
         </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,7 +24,7 @@
 
 <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`popup_header.tpl" subtitle="$B?7$7$$$*FO$1 ＠ h$NDI2C!&JQ99(B"}-->
 
-<section>
+<section id="windowcolumn">
     <h2 class="title"><!--{$tpl_title|h}--></h2>
 
     <!--$B!z%$%s%U%)%a!<%7%g%s!z(B-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -158,14 +158,14 @@
                         var priceVale = "";
                         //$BHNGd2A3J$,HO0O$+H=Dj(B
                         if (product.price02_min == product.price02_max) {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->$B!'(B" + product.price02_min_inctax_format + '$B1_(B';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->$B!'(B" + product.price02_min_tax_format + '$B1_(B';
                         } else {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->$B!'(B" + product.price02_min_inctax_format + '$B!A(B' + product.price02_max_inctax_format + '$B1_(B';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->$B!'(B" + product.price02_min_tax_format + '$B!A(B' + product.price02_max_tax_format + '$B1_(B';
                         }
                         price.append(priceVale);
 
                         //$B:o=|%\%?%s$r%;%C%H(B
-                        $($(".favoriteBox p.btn_delete img").get(maxCnt)).attr("onclick", "javascript:fnModeSubmit('delete_favorite','product_id','" + product.product_id + "');");
+                        $($(".favoriteBox p.btn_delete a").get(maxCnt)).attr("href", "javascript:fnModeSubmit('delete_favorite','product_id','" + product.product_id + "');");
 
                     }
                 }

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,6 +34,14 @@
                 <em>$BCmJ8HV9f(B</em>$B!'(B&nbsp;<!--{$tpl_arrOrderData.order_id}--><br />
                 <em>$B9XF~F|;~(B</em>$B!'(B&nbsp;<!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
                 <em>$B$*;YJ'$$J}K!(B</em>$B!'(B&nbsp;<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <!--{if $tpl_arrOrderData.deliv_time_id != ""}-->
+                    <br />
+                    <em>$B$*FO$1;~4V(B</em>$B!'(B&nbsp;</strong><!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
+                <!--{/if}-->
+                <!--{if $tpl_arrOrderData.deliv_date != ""}-->
+                    <br />
+                    <em>$B$*FO$1F|(B</em>$B!'(B&nbsp;</strong><!--{$tpl_arrOrderData.deliv_date|h}-->
+                <!--{/if}-->
             </p>
 
             <form action="order.php" method="post">
@@ -42,46 +50,7 @@
                 <input class="btn_reorder btn data-role-none" type="submit" name="submit" value="$B:FCmJ8(B">
             </form>
         </div>
-        <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
-            <h3>$B$*FO$1 ＠ h(B<!--{if $isMultiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-        <div class="historyBox">	
-        <p>
-            <!--{if $isMultiple}-->
-                    <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                        <em>$B>&IJ%3!<%I!'(B&nbsp;</em><!--{$item.productsClass.product_code|h}--><br />
-                        <em>$B>&IJL>!'(B&nbsp;</em>
-                                <!--{$item.productsClass.name|h}--><br />
-                                <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                    <!--{$item.productsClass.class_name1}-->$B!'(B<!--{$item.productsClass.classcategory_name1}--><br />
-                                <!--{/if}-->
-                                <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                    <!--{$item.productsClass.class_name2}-->$B!'(B<!--{$item.productsClass.classcategory_name2}--><br />
-                                <!--{/if}-->
-                        
-                        <em>$BC12A!'(B&nbsp;</em><!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->$B1_(B<br />
-                        <em>$B?tNL!'(B&nbsp;</em><!--{$item.quantity}--><br />
-                        <!--{* XXX $B9XF~>.7W$H8m:9$,=P$k$?$a%3%a%s%H%"%&%H(B
-                        <em>$B>.7W(B</em><!--{$item.total_inctax|number_format}-->$B1_(B
-                        *}-->
-                        <br />
-                    <!--{/foreach}-->
-            <!--{/if}-->
 
-            <em>$B$*L>A0(B</em>$B!'(B&nbsp;<!--{$shippingItem.shipping_name01|h}-->&nbsp;<!--{$shippingItem.shipping_name02|h}--><br />
-            <em>$B$*L>A0(B($B%U%j%,%J(B)</em>$B!'(B&nbsp;<!--{$shippingItem.shipping_kana01|h}-->&nbsp;<!--{$shippingItem.shipping_kana02|h}--><br />
-            <em>$BM9JXHV9f(B</em>$B!'(B&nbsp;$B")(B<!--{$shippingItem.shipping_zip01}-->-<!--{$shippingItem.shipping_zip02}--><br />
-            <em>$B=;=j(B</em>$B!'(B&nbsp;<!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--><br />
-            <em>$BEEOCHV9f(B</em>$B!'(B&nbsp;<!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--><br />
-                            <!--{if $shippingItem.shipping_fax01 > 0}-->
-            <em>FAX$BHV9f(B</em>$B!'(B&nbsp;<!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}--><br />
-                            <!--{/if}-->            
-            <em>$B$*FO$1F|(B</em>$B!'(B&nbsp;<!--{$shippingItem.shipping_date|default:'$B;XDj$J$7(B'|h}--><br />
-            <em>$B$*FO$1;~4V(B</em>$B!'(B&nbsp;<!--{$shippingItem.shipping_time|default:'$B;XDj$J$7(B'|h}--><br />
-</p>
-</div>
-
-        <!--{/foreach}-->
-
         <div class="formBox">
             <!--$B"'%+!<%H$NCf$N>&IJ0lMw(B -->
             <div class="cartinarea clearfix">
@@ -116,11 +85,10 @@
                                 <!--{/if}-->
                                 <!--$B"+>&IJ<oJL(B-->
                             </div>
-                            <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-                            <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
+
                             <ul>
                                 <li><span class="mini">$B?tNL!'(B</span><!--{$quantity|h}--></li>
-                                <li class="result"><span class="mini">$B>.7W!'(B</span><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->$B1_(B</li>
+                                <li class="result"><span class="mini">$B>.7W!'(B</span><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->$B1_(B</li>
                             </ul>
                         </div>
                     </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -101,8 +101,6 @@
     var pageNo = 2;
     var url = "<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php";
     var statusImagePath = "<!--{$TPL_URLPATH}-->";
-    var arrPayment = <!--{$json_payment}-->
-    var arrCustomerOrderStatus = <!--{$json_customer_order_status}-->
 
     function getHistory(limit) {
         $.mobile.showPageLoadingMsg();
@@ -135,28 +133,17 @@
                         var historyEl = $(".arrowBox").get(maxCnt);
                         historyEl = $(historyEl).clone(true).insertAfter(historyEl);
                         maxCnt++;
-                        
-                        var regex = new RegExp('([0-9]{2,4}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).');
-                        var matches = history.create_date.match(regex);
-                        var formatted_date = history.create_date;
-                        if(matches != null){
-                            formatted_date = matches[1]+'/'+matches[2]+'/'+matches[3]+' '+matches[4]+':'+matches[5];
-                        }
-                        
-                        var formatted_payment_total = history.payment_total.toString().replace(/([0-9]+?)(?=(?:[0-9]{3})+$)/g , '$1,');
 
                         //$BCmJ8HV9f$r%;%C%H(B
                         $($(".arrowBox span.order_id").get(maxCnt)).text(history.order_id);
                         //$B9XF~F|;~$r%;%C%H(B
-                        $($(".arrowBox span.create_date").get(maxCnt)).text(formatted_date);
+                        $($(".arrowBox span.create_date").get(maxCnt)).text(history.create_date);
                         //$B;YJ'$$J}K!$r%;%C%H(B
-                        $($(".arrowBox span.payment_id").get(maxCnt)).text(arrPayment[history.payment_id]);
+                        $($(".arrowBox span.payment_id").get(maxCnt)).text(history.payment_id);
                         //$B9g7W6b3[$r%;%C%H(B
-                        $($(".arrowBox span.payment_total").get(maxCnt)).text(formatted_payment_total);
+                        $($(".arrowBox span.payment_total").get(maxCnt)).text(history.payment_total);
                         //$BMzNr(BURL$B$r%;%C%H(B
                         $($(".arrowBox a").get(maxCnt)).attr("href", url + "?order_id=" + history.order_id);
-                        //$BCmJ8>u67$r%;%C%H(B
-                        $($(".arrowBox span.order_status").get(maxCnt)).text(arrCustomerOrderStatus[history.status]);
                     }
                 }
                 pageNo++;

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,6 +28,8 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0" />
     <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="Content-Script-Type" content="text/javascript" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
     <!--{* $B6&DL(BCSS *}-->
     <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->css/import.css" />
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -209,16 +209,6 @@
                         </p>
                     <!--{/if}-->
 
-                    <!--$B"'%a!<%+!<(B-->
-                    <!--{if $arrProduct.maker_name|strlen >= 1}-->
-                        <p class="maker">
-                            <span class="mini">$B%a!<%+!<!'(B</span><span>
-                                <!--{$arrProduct.maker_name|h}-->
-                            </span>
-                        </p>
-                    <!--{/if}-->
-                    <!--$B"%%a!<%+!<(B-->
-
                     <!--$B"'%a!<%+!<(BURL-->
                     <!--{if $arrProduct.comment1|strlen >= 1}-->
                         <p class="sale_price">
@@ -369,7 +359,7 @@
             <div class="review_btn">
                 <!--{if count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
                     <!--$B!z?75,%3%a%s%H$r=q$-9~$`!z(B-->
-                    <a href="./review.php?product_id=<!--{$arrProduct.product_id}-->" target="_blank" class="btn_sub">$B?75,%3%a%s%H$r=q$-9~$`(B</a>
+                    <a href="./review.php?product_id=<!--{$arrProduct.product_id}-->" target="_blank" class="btn_sub" />$B?75,%3%a%s%H$r=q$-9~$`(B</a>
                 <!--{/if}-->
             </div>
             </div>
@@ -386,7 +376,7 @@
             </ul>
             <!--{/if}-->
         </div>
-    
+    </div>
     <!--$B$*5RMM$N@<$3$3$^$G(B-->
 
 
@@ -423,7 +413,7 @@
     <!--$B"%$=$NB>$*$9$9$a>&IJ(B-->
 
     <div class="btn_area">
-        <p><a href="javascript:void(0);" class="btn_more" data-rel="back">$BLa$k(B</a></p>
+        <p><a href="javascript:void(0);" class="btn_more" data-rel="back">$B>&IJ0lMw$KLa$k(B</a></p>
     </div>
 </section>
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -94,7 +94,7 @@
 
                 <!--$B!z>&IJ2A3J!z(B-->
                 <p>
-                    <span class="pricebox sale_price"><span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->($B ＠ G9~(B):</span></span>
+                    <span class="pricebox sale_price"><span class="mini">$BHNGd2A3J(B($B ＠ G9~(B):</span></span>
                     <span class="price">
                         <span id="price02_default_<!--{$id}-->">
                             <!--{if $arrProduct.price02_min_inctax == $arrProduct.price02_max_inctax}-->
@@ -206,9 +206,9 @@
                     var priceVale = "";
                     //$BHNGd2A3J$,HO0O$+H=Dj(B
                     if (product.price02_min == product.price02_max) {
-                        priceVale = product.price02_min_inctax_format + '$B1_(B';
+                        priceVale = product.price02_min_tax_format + '$B1_(B';
                     } else {
-                        priceVale = product.price02_min_inctax_format + '$B!A(B' + product.price02_max_inctax_format + '$B1_(B';
+                        priceVale = product.price02_min_tax_format + '$B!A(B' + product.price02_max_tax_format + '$B1_(B';
                     }
                     price.append(priceVale);
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -78,7 +78,7 @@
             </tr>
         </table>
         <div class="btn_area">
-                <p><input type="submit" value="$B<!$X(B" class="btn data-role-none" name="next" id="next" /></p>
+                <p><input type="submit" value="$B<!$X(B" class="btn data-role-none" alt="$B<!$X(B" name="next" id="next" /></p>
             </div>
     </form>
 </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -64,7 +64,7 @@
         </table>
         <div class="btn_area">
             <ul class="btn_btm">
-                <li><input type="submit" value="$B40N;%Z!<%8$X(B" class="btn data-role-none" name="complete" id="complete" /></li>
+                <li><input type="submit" value="$B40N;%Z!<%8$X(B" class="btn data-role-none" alt="$B40N;%Z!<%8$X(B" name="complete" id="complete" /></li>
                 <li><a class="btn_back" href="Javascript:fnModeSubmit('return', '', '');" rel="external">$BLa$k(B</a></li>
             </ul>
         </div>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -168,7 +168,8 @@
         </section>
 
         <!--$B!z$*FO$1 ＠ h$N3NG'!z(B-->
-        <!--{if $arrShipping}-->
+        <!--{* $BHNGdJ}K!H=Dj!J%@%&%s%m!<%IHNGd$N$_$N>l9g$O$*FO$1 ＠ h$rI=<($7$J$$!K(B *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
             <section class="delivconfirm_area">
                 <h3 class="subtitle">$B$*FO$1 ＠ h(B</h3>
 

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -69,7 +69,7 @@
                                 <!--{$arrForm.price.value[$index]|sfCalcIncTax|number_format}-->$B1_(B
                             </p>
                             <ul>
-                                <li class="result"><span class="mini">$B?tNL(B</span></li>
+                                <li class="result"><span class="mini">$B?tNL(B</li>
                                 <li>
                                     <input type="number" name="<!--{$key}-->[<!--{$index}-->]" class="cartin_quantity txt" value="<!--{$arrForm[$key].value[$index]}-->" max="9" style="" />
                                 </li>

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -204,18 +204,16 @@
                                 <!--{else}-->
                                     <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="boxLong top data-role-none">
                                         <option value="" selected="">$B$*FO$1F|!';XDj$J$7(B</option>
-                                        <!--{assign var=shipping_date_value value=$arrForm[$key].value|default:$shippingItem.shipping_date}-->
-                                        <!--{html_options options=$arrDelivDate selected=$shipping_date_value}-->
+                                        <!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
                                     </select>
                                 <!--{/if}-->
-                                
+
                                 <!--$B!z$*FO$1;~4V!z(B-->
                                 <!--{assign var=key value="deliv_time_id`$index`"}-->
                                 <span class="attention"><!--{$arrErr[$key]}--></span>
                                 <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="boxLong data-role-none">
                                     <option value="" selected="">$B$*FO$1;~4V!';XDj$J$7(B</option>
-                                    <!--{assign var=shipping_time_value value=$arrForm[$key].value|default:$shippingItem.time_id}-->
-                                    <!--{html_options options=$arrDelivTime selected=$shipping_time_value}-->
+                                    <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
                                 </select>
                             </div>
                         </div><!-- /.formBox --><!-- /.time_select --><!--{* FIXME *}-->

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
 
-<html lang="ja">
+<html lang="ja" class="<!--{$tpl_page_class_name|h}-->">
     <head>
         <meta charset="UTF-8">
         <meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />

$BJQ99(B: branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl	2013-05-02 09:11:36 UTC (rev 22796)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
 
-<body class="<!--{$tpl_page_class_name|h}-->">
+<body>
     <div data-role="page" data-keep-native=".data-role-none" data-theme="f">
 
         <!--{* $B"'(BHeaderHeaderTop COLUMN*}-->

$BJQ99(B: branches/version-2_12-dev/data/class/SC_AdminView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_AdminView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_AdminView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -21,15 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-class SC_AdminView extends SC_View_Ex
-{
-    function __construct()
-    {
+class SC_AdminView extends SC_View_Ex {
+    function __construct() {
         parent::__construct();
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->_smarty->template_dir = TEMPLATE_ADMIN_REALDIR;

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Batch.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Batch.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Batch.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Batch 
-{
+class SC_Batch {
 
     // }}}
     // {{{ functions
@@ -40,6 +39,5 @@
      * @param mixed $argv $B%3%^%s%I%i%$%s0z?t(B
      * @return mixed $B%P%C%A$N<B9T7k2L(B
      */
-    function execute($argv = '')
-    {}
+    function execute($argv = '') {}
 }

$B:o=|(B: branches/version-2_12-dev/data/class/SC_Cache.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Cache.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Cache.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,124 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-require DATA_REALDIR . 'module/Cache/Lite.php';
-
-/**
- * Cache controll using PEAR::Cache_Lite.
- */
-class SC_Cache
-{
-
-    /**
-     * Instance of PEAR::Cache_Lite class.
-     * @var object 
-     */
-    static $_instance = NULL;
-
-    /**
-     * Default cache lifetime. 
-     */
-    const LIFETIME = MAX_LIFETIME;
-
-    /**
-     * Directory to save cache files.
-     */
-    const CACHEDIR = MASTER_DATA_REALDIR;
-
-    /**
-     * Create Cache_Lite object and set it to static variable.
-     * 
-     * @return void
-     */
-    public static function forge()
-    {
-        $options = array(
-            'cacheDir' => SC_Cache_Ex::CACHEDIR,
-            'lifeTime' => SC_Cache_Ex::LIFETIME,
-            'automaticSerialization' => TRUE
-        );
-        SC_Cache_Ex::$_instance = new Cache_Lite($options);
-    }
-
-    /**
-     * Get Cache_Lite object.
-     *
-     * @return void
-     */
-    public static function getInstance()
-    {
-        is_null(SC_Cache_Ex::$_instance) and SC_Cache_Ex::forge();
-        return SC_Cache_Ex::$_instance;
-    }
-
-    /**
-     * Get data from cache.
-     *
-     * @param   string  $id         cache id
-     * @param   string  $group      name of the cache group
-     * @param   int     $lifeTime   custom lifetime
-     * @return  mixed   data of cache (else : false)
-     */
-    public static function get($id, $group = 'default', $lifeTime = NULL)
-    {
-        $processor = SC_Cache_Ex::getInstance();
-
-        // set custom lifetime.
-        !is_null($lifeTime) and $processor->setOption('lifeTime', $lifeTime);
-
-        $cache = $processor->get($id, $group);
-
-        // set back to default lifetime.
-        !is_null($lifeTime) and $processor->setOption('lifeTime', SC_Cache_Ex::$_lifetime);
-
-        return $cache;
-    }
-
-    /**
-     * Save data into cache.
-     *
-     * @param   mixed   $data   data of cache
-     * @param   string  $id     cache id
-     * @param   string  $group  name of the cache group
-     * @return  void
-     */
-    public static function save($data, $id, $group = 'default')
-    {
-        $processor = SC_Cache_Ex::getInstance();
-
-        $processor->save($data, $id, $group);
-    }
-
-    /**
-     * Clean cache.
-     *
-     * @param string $group name of the cache group
-     * @return void
-     */
-    public static function clean($group = FALSE)
-    {
-        $processor = SC_Cache_Ex::getInstance();
-
-        $processor->clean($group);
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/SC_CartSession.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CartSession.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_CartSession.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -27,8 +27,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_CartSession 
-{
+class SC_CartSession {
     /** $B%f%K!<%/(BID$B$r;XDj$9$k(B. */
     var $key_tmp;
 
@@ -36,8 +35,7 @@
     var $cartSession;
 
     /* $B%3%s%9%H%i%/%?(B */
-    function __construct($cartKey = 'cart')
-    {
+    function __construct($cartKey = 'cart') {
         if (!isset($_SESSION[$cartKey])) {
             $_SESSION[$cartKey] = array();
         }
@@ -45,8 +43,7 @@
     }
 
     // $B>&IJ9XF~=hM}Cf$N%m%C%/(B
-    function saveCurrentCart($key_tmp, $productTypeId)
-    {
+    function saveCurrentCart($key_tmp, $productTypeId) {
         $this->key_tmp = 'savecart_' . $key_tmp;
         // $B$9$G$K>pJs$,$J$1$l$P8=>u$N%+!<%H>pJs$r5-O?$7$F$*$/(B
         if (count($_SESSION[$this->key_tmp]) == 0) {
@@ -61,8 +58,7 @@
     }
 
     // $B>&IJ9XF~Cf$NJQ99$,$"$C$?$+$r%A%'%C%/$9$k!#(B
-    function getCancelPurchase($productTypeId)
-    {
+    function getCancelPurchase($productTypeId) {
         $ret = isset($this->cartSession[$productTypeId]['cancel_purchase'])
             ? $this->cartSession[$productTypeId]['cancel_purchase'] : '';
         $this->cartSession[$productTypeId]['cancel_purchase'] = false;
@@ -70,8 +66,7 @@
     }
 
     // $B9XF~=hM}Cf$K>&IJ$KJQ99$,$J$+$C$?$+$rH=Dj(B
-    function checkChangeCart($productTypeId)
-    {
+    function checkChangeCart($productTypeId) {
         $change = false;
         $max = $this->getMax($productTypeId);
         for ($i = 1; $i <= $max; $i++) {
@@ -99,8 +94,7 @@
     }
 
     // $B<!$K3d$jEv$F$k%+!<%H$N(BID$B$r<hF@$9$k(B
-    function getNextCartID($productTypeId)
-    {
+    function getNextCartID($productTypeId) {
         $count = array();
         foreach ($this->cartSession[$productTypeId] as $key => $value) {
             $count[] = $this->cartSession[$productTypeId][$key]['cart_no'];
@@ -116,8 +110,7 @@
      * @return string $B>&IJ$4$H$N9g7W2A3J(B($B ＠ G9~$_(B)
      * @deprecated SC_CartSession::getCartList() $B$r;HMQ$7$F$/$@$5$$(B
      */
-    function getProductTotal($id, $productTypeId)
-    {
+    function getProductTotal($id, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
             if (isset($this->cartSession[$productTypeId][$i]['id'])
@@ -135,8 +128,7 @@
     }
 
     // $BCM$N%;%C%H(B
-    function setProductValue($id, $key, $val, $productTypeId)
-    {
+    function setProductValue($id, $key, $val, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
             if (isset($this->cartSession[$productTypeId][$i]['id'])
@@ -148,8 +140,7 @@
     }
 
     // $B%+!<%HFb>&IJ$N:GBgMWAGHV9f$r<hF@$9$k!#(B
-    function getMax($productTypeId)
-    {
+    function getMax($productTypeId) {
         $max = 0;
         if (count($this->cartSession[$productTypeId]) > 0) {
             foreach ($this->cartSession[$productTypeId] as $key => $value) {
@@ -164,8 +155,7 @@
     }
 
     // $B%+!<%HFb>&IJ?tNL$N9g7W(B
-    function getTotalQuantity($productTypeId)
-    {
+    function getTotalQuantity($productTypeId) {
         $total = 0;
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
@@ -175,8 +165,7 @@
     }
 
     // $BA4>&IJ$N9g7W2A3J(B
-    function getAllProductsTotal($productTypeId)
-    {
+    function getAllProductsTotal($productTypeId) {
         // $B ＠ G9~$_9g7W(B
         $total = 0;
         $max = $this->getMax($productTypeId);
@@ -200,8 +189,7 @@
     }
 
     // $BA4>&IJ$N9g7W ＠ G6b(B
-    function getAllProductsTax($productTypeId)
-    {
+    function getAllProductsTax($productTypeId) {
         // $B ＠ G9g7W(B
         $total = 0;
         $max = $this->getMax($productTypeId);
@@ -215,8 +203,7 @@
     }
 
     // $BA4>&IJ$N9g7W%]%$%s%H(B
-    function getAllProductsPoint($productTypeId)
-    {
+    function getAllProductsPoint($productTypeId) {
         // $B%]%$%s%H9g7W(B
         $total = 0;
         if (USE_POINT !== false) {
@@ -241,8 +228,7 @@
     }
 
     // $B%+!<%H$X$N>&IJDI2C(B
-    function addProduct($product_class_id, $quantity)
-    {
+    function addProduct($product_class_id, $quantity) {
         $objProduct = new SC_Product_Ex();
         $arrProduct = $objProduct->getProductsClass($product_class_id);
         $productTypeId = $arrProduct['product_type_id'];
@@ -266,8 +252,7 @@
     }
 
     // $BA0JG$N(BURL$B$r5-O?$7$F$*$/(B
-    function setPrevURL($url, $excludePaths = array())
-    {
+    function setPrevURL($url, $excludePaths = array()) {
         // $BA0JG$H$7$F5-O?$7$J$$%Z!<%8$r;XDj$9$k!#(B
         $arrExclude = array(
             '/shopping/'
@@ -288,14 +273,12 @@
     }
 
     // $BA0JG$N(BURL$B$r<hF@$9$k(B
-    function getPrevURL()
-    {
+    function getPrevURL() {
         return isset($_SESSION['prev_url']) ? $_SESSION['prev_url'] : '';
     }
 
     // $B%-!<$,0lCW$7$?>&IJ$N:o=|(B
-    function delProductKey($keyname, $val, $productTypeId)
-    {
+    function delProductKey($keyname, $val, $productTypeId) {
         $max = count($this->cartSession[$productTypeId]);
         for ($i = 0; $i < $max; $i++) {
             if ($this->cartSession[$productTypeId][$i][$keyname] == $val) {
@@ -304,13 +287,11 @@
         }
     }
 
-    function setValue($key, $val, $productTypeId)
-    {
+    function setValue($key, $val, $productTypeId) {
         $this->cartSession[$productTypeId][$key] = $val;
     }
 
-    function getValue($key, $productTypeId)
-    {
+    function getValue($key, $productTypeId) {
         return $this->cartSession[$productTypeId][$key];
     }
 
@@ -318,8 +299,7 @@
      * $B%;%C%7%g%sCf$N>&IJ>pJs%G!<%?$ND4 ＠ 0!#(B
      * productsClass$B9`L\$+$i!"ITI,MW$J9`L\$r:o=|$9$k!#(B
      */
-    function adjustSessionProductsClass(&$arrProductsClass)
-    {
+    function adjustSessionProductsClass(&$arrProductsClass) {
         $arrNecessaryItems = array(
             'product_id'          => true,
             'product_class_id'    => true,
@@ -352,8 +332,7 @@
      * @param integer $productTypeId $B>&IJ<oJL(BID
      * @return array $B%+!<%HFb>&IJ0lMw$NG[Ns(B
      */
-    function getCartList($productTypeId)
-    {
+    function getCartList($productTypeId) {
         $objProduct = new SC_Product_Ex();
         $max = $this->getMax($productTypeId);
         $arrRet = array();
@@ -393,8 +372,7 @@
      *
      * @return array $B$9$Y$F$N%+!<%H$NFbMF(B
      */
-    function getAllCartList()
-    {
+    function getAllCartList() {
         $results = array();
         $cartKeys = $this->getKeys();
         $i = 0;
@@ -410,13 +388,19 @@
     }
 
     /**
+     * @deprected getAllProductClassID $B$r;HMQ$7$F2<$5$$(B
+     */
+    function getAllProductID($productTypeId) {
+        trigger_error('$B ＠ 5$7$/F0:n$7$J$$%a%=%C%I$,8F$S=P$5$l$^$7$?!#(B', E_USER_ERROR);
+    }
+
+    /**
      * $B%+!<%HFb$K$"$k>&IJ5,3J(BID$B$rA4$F<hF@$9$k(B.
      *
      * @param integer $productTypeId $B>&IJ<oJL(BID
      * @return array $B>&IJ5,3J(BID $B$NG[Ns(B
      */
-    function getAllProductClassID($productTypeId)
-    {
+    function getAllProductClassID($productTypeId) {
         $max = $this->getMax($productTypeId);
         $productClassIDs = array();
         for ($i = 0; $i <= $max; $i++) {
@@ -433,8 +417,7 @@
      * @param integer $productTypeId $B>&IJ<oJL(BID
      * @return void
      */
-    function delAllProducts($productTypeId)
-    {
+    function delAllProducts($productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
             unset($this->cartSession[$productTypeId][$i]);
@@ -442,8 +425,7 @@
     }
 
     // $B>&IJ$N:o=|(B
-    function delProduct($cart_no, $productTypeId)
-    {
+    function delProduct($cart_no, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) {
@@ -453,8 +435,7 @@
     }
 
     // $B?tNL$NA}2C(B
-    function upQuantity($cart_no, $productTypeId)
-    {
+    function upQuantity($cart_no, $productTypeId) {
         $quantity = $this->getQuantity($cart_no, $productTypeId);
         if (strlen($quantity + 1) <= INT_LEN) {
             $this->setQuantity($quantity + 1, $cart_no, $productTypeId);
@@ -462,8 +443,7 @@
     }
 
     // $B?tNL$N8:>/(B
-    function downQuantity($cart_no, $productTypeId)
-    {
+    function downQuantity($cart_no, $productTypeId) {
         $quantity = $this->getQuantity($cart_no, $productTypeId);
         if ($quantity > 1) {
             $this->setQuantity($quantity - 1, $cart_no, $productTypeId);
@@ -477,8 +457,7 @@
      * @param integer $productTypeId $B>&IJ<oJL(BID
      * @return integer $B3:Ev>&IJ5,3J$N?tNL(B
      */
-    function getQuantity($cart_no, $productTypeId)
-    {
+    function getQuantity($cart_no, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) {
@@ -495,8 +474,7 @@
      * @param integer $productTypeId $B>&IJ<oJL(BID
      * @retrun void
      */
-    function setQuantity($quantity, $cart_no, $productTypeId)
-    {
+    function setQuantity($quantity, $cart_no, $productTypeId) {
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) {
@@ -512,8 +490,7 @@
      * @param integer $productTypeId $B>&IJ<oJL(BID
      * @return integer $B>&IJ5,3J(BID
      */
-    function getProductClassId($cart_no, $productTypeId)
-    {
+    function getProductClassId($cart_no, $productTypeId) {
         for ($i = 0; $i < count($this->cartSession[$productTypeId]); $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) {
                 return $this->cartSession[$productTypeId][$i]['id'];
@@ -535,11 +512,8 @@
      * @param string $productTypeId $B>&IJ<oJL(BID
      * @return string $B%(%i!<$,H/@8$7$?>l9g$O%(%i!<%a%C%;!<%8(B
      */
-    function checkProducts($productTypeId)
-    {
+    function checkProducts($productTypeId) {
         $objProduct = new SC_Product_Ex();
-        $objDelivery = new SC_Helper_Delivery_Ex();
-        $arrDeliv = $objDelivery->getList($productTypeId);
         $tpl_message = '';
 
         // $B%+!<%HFb$N>pJs$r<hF@(B
@@ -557,6 +531,7 @@
                 /*
                  * $BG[Aw6H<T$N%A%'%C%/(B
                  */
+                $arrDeliv = SC_Helper_Purchase_Ex::getDeliv($productTypeId);
                 if (SC_Utils_Ex::isBlank($arrDeliv)) {
                     $tpl_message .= '$B"(!V(B' . $product['name'] . '$B!W$O$^$@G[Aw$N=`Hw$,$G$-$F$*$j$^$;$s!#(B';
                     $tpl_message .= '$B62$lF~$j$^$9$,$*Ld$$9g$o$;%Z!<%8$h$j$*Ld$$9g$o$;$/$@$5$$!#(B' . "\n";
@@ -591,8 +566,7 @@
      * @param integer $productTypeId $B>&IJ<oJL(BID
      * @return boolean $BAwNAL5NA$N>l9g(B true
      */
-    function isDelivFree($productTypeId)
-    {
+    function isDelivFree($productTypeId) {
         $objDb = new SC_Helper_DB_Ex();
 
         $subtotal = $this->getAllProductsTotal($productTypeId);
@@ -651,10 +625,6 @@
         $results['subtotal'] = $this->getAllProductsTotal($productTypeId);
         $results['deliv_fee'] = 0;
 
-        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
-        $results['order_tax_rate'] = $arrInfo['tax'];
-        $results['order_tax_rule'] = $arrInfo['tax_rule'];
-
         // $B>&IJ$4$H$NAwNA$r2C;;(B
         if (OPTION_PRODUCT_DELIV_FEE == 1) {
             $cartItems = $this->getCartList($productTypeId);
@@ -667,7 +637,7 @@
         if (OPTION_DELIV_FEE == 1
             && !SC_Utils_Ex::isBlank($deliv_pref)
             && !SC_Utils_Ex::isBlank($deliv_id)) {
-            $results['deliv_fee'] += SC_Helper_Delivery_Ex::getDelivFee($deliv_pref, $deliv_id);
+            $results['deliv_fee'] += $this->sfGetDelivFee($deliv_pref, $deliv_id);
         }
 
         // $BAwNAL5NA%A%'%C%/(B
@@ -706,8 +676,7 @@
      *
      * @return array $B>&IJ<oJL(BID$B$NG[Ns(B
      */
-    function getKeys()
-    {
+    function getKeys() {
         $keys = array_keys($this->cartSession);
         // $B?tNL$,(B 0 $B$N>&IJ<oJL$O:o=|$9$k(B
         foreach ($keys as $key) {
@@ -725,8 +694,7 @@
      * @param integer $key $B>&IJ<oJL(BID
      * @return void
      */
-    function registerKey($key)
-    {
+    function registerKey($key) {
         $_SESSION['cartKey'] = $key;
     }
 
@@ -735,8 +703,7 @@
      *
      * @return void
      */
-    function unsetKey()
-    {
+    function unsetKey() {
         unset($_SESSION['cartKey']);
     }
 
@@ -745,8 +712,7 @@
      *
      * @return integer $B>&IJ<oJL(BID
      */
-    function getKey()
-    {
+    function getKey() {
         return $_SESSION['cartKey'];
     }
 
@@ -755,8 +721,7 @@
      *
      * @return boolean $B%+!<%H$,J#?t>&IJ<oJL$N>l9g(B true
      */
-    function isMultiple()
-    {
+    function isMultiple() {
         return count($this->getKeys()) > 1;
     }
 
@@ -766,8 +731,36 @@
      * @param integer $product_type_id $B>&IJ<oJL(BID
      * @return boolean $B;XDj$N>&IJ<oJL$,%+!<%H$K4^$^$l$k>l9g(B true
      */
-    function hasProductType($product_type_id)
-    {
+    function hasProductType($product_type_id) {
         return in_array($product_type_id, $this->getKeys());
     }
+
+    /**
+     * $BETF;I\8)$+$iG[AwNA6b$r<hF@$9$k(B.
+     *
+     * @param integer|array $pref_id $BETF;I\8)(BID $BKt$OETF;I\8)(BID$B$NG[Ns(B
+     * @param integer $deliv_id $BG[Aw6H<T(BID
+     * @return string $B;XDj$NETF;I\8)(B, $BG[Aw6H<T$NG[AwNA6b(B
+     */
+    function sfGetDelivFee($pref_id, $deliv_id = 0) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        if (!is_array($pref_id)) {
+            $pref_id = array($pref_id);
+        }
+        $sql = <<< __EOS__
+            SELECT T1.fee AS fee
+            FROM dtb_delivfee T1
+                JOIN dtb_deliv T2
+                    ON T1.deliv_id = T2.deliv_id
+            WHERE T1.pref = ?
+                AND T1.deliv_id = ?
+                AND T2.del_flg = 0
+__EOS__;
+        $result = 0;
+        foreach ($pref_id as $pref) {
+            $result += $objQuery->getOne($sql, array($pref, $deliv_id));
+        }
+        return $result;
+    }
+
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_CheckError.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CheckError.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_CheckError.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -26,14 +26,12 @@
  * [$B35MW(B] $B%(%i!<%A%'%C%/%/%i%9(B
  *----------------------------------------------------------------------
  */
-class SC_CheckError 
-{
+class SC_CheckError {
     var $arrErr = array();
     var $arrParam;
 
     // $B%A%'%C%/BP>]$NCM$,4^$^$l$kG[Ns$r%;%C%H$9$k!#(B
-    function __construct($array = '')
-    {
+    function __construct($array = '') {
         if ($array != '') {
             $this->arrParam = $array;
         } else {
@@ -42,8 +40,7 @@
 
     }
 
-    function doFunc($value, $arrFunc)
-    {
+    function doFunc($value, $arrFunc) {
         foreach ($arrFunc as $key) {
             $this->$key($value);
         }
@@ -55,19 +52,14 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B value[2] = $B5v2D$9$k%?%0$,3JG<$5$l$?G[Ns(B
      * @return void
      */
-    function HTML_TAG_CHECK($value)
-    {
+    function HTML_TAG_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
         $this->createParam($value);
         // HTML$B$K4^$^$l$F$$$k%?%0$rCj=P$9$k(B
-        $arrTagIncludedHtml = array();
-        preg_match_all('/<\/?([a-z]+)/i', $this->arrParam[$value[1]], $arrTagIncludedHtml);
-        // $BCj=P7k2L$r>.J8;z$KJQ49(B
-        foreach ($arrTagIncludedHtml[1] as $key => $matchedTag) {
-            $arrTagIncludedHtml[1][$key] = strtolower($matchedTag);
-        }
+        preg_match_all('/<\/?([a-z]+)/i', $this->arrParam[$value[1]], $arrTagIncludedHtml = array());
+
         $arrDiffTag = array_diff($arrTagIncludedHtml[1], $value[2]);
 
         if (empty($arrDiffTag)) return;
@@ -88,8 +80,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B
      * @return void
      */
-    function EXIST_CHECK($value)
-    {
+    function EXIST_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -108,8 +99,7 @@
      * @param array $value value[0] = $BH=DjBP>](B value[1] = $B9`L\L>(B
      * @return void
      */
-    function EXIST_CHECK_REVERSE($value)
-    {
+    function EXIST_CHECK_REVERSE($value) {
         if (isset($this->arrErr[$value[0]])) {
             return;
         }
@@ -126,8 +116,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B
      * @return void
      */
-    function SPTAB_CHECK($value)
-    {
+    function SPTAB_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -144,8 +133,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B
      * @return void
      */
-    function NO_SPTAB($value)
-    {
+    function NO_SPTAB($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -156,8 +144,7 @@
     }
 
     /* $B%<%m$G3+;O$5$l$F$$$k?tCM$NH=Dj(B */
-    function ZERO_START($value)
-    {
+    function ZERO_START($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -174,8 +161,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B
      * @return void
      */
-    function SELECT_CHECK($value)
-    {
+    function SELECT_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -192,8 +178,7 @@
      * @param array $value value[0] = $B9`L\L>(B1 value[1] = $B9`L\L>(B2 value[2] = $BH=DjBP>]J8;zNs(B1  value[3] = $BH=DjBP>]J8;zNs(B2
      * @return void
      */
-    function EQUAL_CHECK($value)
-    {
+    function EQUAL_CHECK($value) {
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
             return;
         }
@@ -211,8 +196,7 @@
      * @param array $value value[0] = $B9`L\L>(B1 value[1] = $B9`L\L>(B2 value[2] = $BH=DjBP>]J8;zNs(B1  value[3] = $BH=DjBP>]J8;zNs(B2
      * @return void
      */
-    function DIFFERENT_CHECK($value)
-    {
+    function DIFFERENT_CHECK($value) {
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
             return;
         }
@@ -230,8 +214,7 @@
      * @param array $value value[0] = $B9`L\L>(B1 value[1] = $B9`L\L>(B2 value[2] = $BH=DjBP>]J8;zNs(B1  value[3] = $BH=DjBP>]J8;zNs(B2
      * @return void
      */
-    function GREATER_CHECK($value)
-    {
+    function GREATER_CHECK($value) {
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
             return;
         }
@@ -249,8 +232,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B  value[2] = $B:GBgJ8;z?t(B($BH>3Q$bA43Q$b(B1$BJ8;z$H$7$F?t$($k(B)
      * @return void
      */
-    function MAX_LENGTH_CHECK($value)
-    {
+    function MAX_LENGTH_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -268,8 +250,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B value[2] = $B:G>.J8;z?t(B($BH>3Q$bA43Q$b(B1$BJ8;z$H$7$F?t$($k(B)
      * @return void
      */
-    function MIN_LENGTH_CHECK($value)
-    {
+    function MIN_LENGTH_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -287,8 +268,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B  value[2] = $B:GBg?t(B]
      * @return void
      */
-    function MAX_CHECK($value)
-    {
+    function MAX_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -306,8 +286,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B  value[2] = $B:G>.?t(B
      * @return void
      */
-    function MIN_CHECK($value)
-    {
+    function MIN_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -324,8 +303,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
      * @return void
      */
-    function NUM_CHECK($value)
-    {
+    function NUM_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -342,8 +320,7 @@
      * @param array $value value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
      * @return void
      */
-    function NUM_POINT_CHECK($value)
-    {
+    function NUM_POINT_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -353,8 +330,7 @@
         }
     }
 
-    function ALPHA_CHECK($value)
-    {
+    function ALPHA_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -377,8 +353,7 @@
      *     [5]: $BEEOCHV9fAm?t(B ($B;XDj$J$7$N>l9g!"(BTEL_LEN)
      * @return void
      */
-    function TEL_CHECK($value)
-    {
+    function TEL_CHECK($value) {
         $telItemLen = isset($value[4]) ? $value[4] : TEL_ITEM_LEN;
         $telLen = isset($value[5]) ? $value[5] : TEL_LEN;
 
@@ -419,8 +394,7 @@
         value[0]    : $B9`L\L>(B
         value[1]    : $BH=DjBP>]MWAGL>(B
     */
-    function FULL_EXIST_CHECK($value)
-    {
+    function FULL_EXIST_CHECK($value) {
         $max = count($value);
         $this->createParam($value);
         // $B4{$K3:Ev9`L\$K%(%i!<$,$"$k>l9g$O!"H=Dj$7$J$$!#(B
@@ -448,8 +422,7 @@
         value[0]    : $B9`L\L>(B
         value[1]    : $BH=DjBP>]MWAGL>(B
     */
-    function ALL_EXIST_CHECK($value)
-    {
+    function ALL_EXIST_CHECK($value) {
         $max = count($value);
 
         // $B4{$K3:Ev9`L\$K%(%i!<$,$"$k>l9g$O!"H=Dj$7$J$$!#(B
@@ -480,8 +453,7 @@
         value[0]    : $B9`L\L>(B
         value[1]    : $BH=DjBP>]MWAGL>(B
     */
-    function ONE_EXIST_CHECK($value)
-    {
+    function ONE_EXIST_CHECK($value) {
         $max = count($value);
         $this->createParam($value);
         // $B4{$K3:Ev9`L\$K%(%i!<$,$"$k>l9g$O!"H=Dj$7$J$$!#(B
@@ -509,8 +481,7 @@
         value[0]    : $B9`L\L>(B
         value[1]    : $BH=DjBP>]MWAGL>(B
     */
-    function TOP_EXIST_CHECK($value)
-    {
+    function TOP_EXIST_CHECK($value) {
         $max = count($value);
         $this->createParam($value);
 
@@ -543,8 +514,7 @@
     /*$B!!%+%?%+%J$NH=Dj!!(B*/
     // $BF~NOJ8;z$,%+%J0J30$J$i%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
-    function KANA_CHECK($value)
-    {
+    function KANA_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -557,8 +527,7 @@
     /*$B!!%+%?%+%J$NH=Dj(B2 ($B%?%V!"%9%Z!<%9$O5v2D$9$k(B) */
     // $BF~NOJ8;z$,%+%J0J30$J$i%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
-    function KANABLANK_CHECK($value)
-    {
+    function KANABLANK_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -571,8 +540,7 @@
     /*$B!!1Q?t;z$NH=Dj!!(B*/
     // $BF~NOJ8;z$,1Q?t;z0J30$J$i%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
-    function ALNUM_CHECK($value)
-    {
+    function ALNUM_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -585,8 +553,7 @@
     /*$B!!1Q?t5-9f$NH=Dj!!(B*/
     // $BF~NOJ8;z$,1Q?t5-9f0J30$J$i%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
-    function GRAPH_CHECK($value)
-    {
+    function GRAPH_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -599,8 +566,7 @@
     /*$B!!I,?\A*Br$NH=Dj!!(B*/
     // $BF~NOCM$G(B0$B$,5v$5$l$J$$>l9g%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B
-    function ZERO_CHECK($value)
-    {
+    function ZERO_CHECK($value) {
         $this->createParam($value);
         if ($this->arrParam[$value[1]] == '0') {
             $this->arrErr[$value[1]] = '$B"((B ' . $value[0] . '$B$O(B1$B0J>e$rF~NO$7$F$/$@$5$$!#(B<br />';
@@ -610,8 +576,7 @@
     /*$B!!7e?t$NH=Dj(B ($B:G>.:GBg(B)*/
     // $BF~NOJ8;z$N7e?tH=Dj!!"*!!:G>.7e?t!cF~NOJ8;zNs!c:GBg7e?t(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B value[2] = $B:G>.7e?t(B value[3] = $B:GBg7e?t(B
-    function NUM_RANGE_CHECK($value)
-    {
+    function NUM_RANGE_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -626,8 +591,7 @@
     /*$B!!7e?t$NH=Dj!!(B*/
     // $BF~NOJ8;z$N7e?tH=Dj!!"*!!F~NOJ8;zNs(B = $B7e?t!!0J30$O(BNG$B$N>l9g(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B value[2] = $B7e?t(B
-    function NUM_COUNT_CHECK($value)
-    {
+    function NUM_COUNT_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -646,8 +610,7 @@
      *     [1]: $BH=DjBP>]$r3JG<$7$F$$$kG[Ns%-!<(B
      * @return void
      */
-    function EMAIL_CHECK($value)
-    {
+    function EMAIL_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -696,8 +659,7 @@
     /*$B!!%a!<%k%"%I%l%9$K;HMQ$G$-$kJ8;z$NH=Dj!!(B*/
     //$B!!%a!<%k%"%I%l%9$K;HMQ$9$kJ8;z$r ＠ 55,I=8=$GH=Dj$9$k(B
     //  value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]%a!<%k%"%I%l%9(B
-    function EMAIL_CHAR_CHECK($value)
-    {
+    function EMAIL_CHAR_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -710,8 +672,7 @@
     /*$B!!(BURL$B7A<0$NH=Dj!!(B*/
     //$B!!(BURL$B$r ＠ 55,I=8=$GH=Dj$9$k!#%G%U%)%k%H$G(Bhttp://$B$,$"$C$F$b(BOK
     //  value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](BURL
-    function URL_CHECK($value)
-    {
+    function URL_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -722,8 +683,7 @@
 
     /*$B!!(BIP$B%"%I%l%9$NH=Dj!!(B*/
     //  value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](BIP$B%"%I%l%9J8;zNs(B
-    function IP_CHECK($value)
-    {
+    function IP_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -746,8 +706,7 @@
     /*$B!!3HD%;R$NH=Dj!!(B*/
     // $B<u$1<h$j$,$J$$>l9g%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B value[2]=array($B3HD%;R(B)
-    function FILE_EXT_CHECK($value)
-    {
+    function FILE_EXT_CHECK($value) {
         if (isset($this->arrErr[$value[1]]) || count($value[2]) == 0) {
             return;
         }
@@ -773,8 +732,7 @@
     /* $B%U%!%$%k$,B8:_$9$k$+%A%'%C%/$9$k(B */
     // $B<u$1<h$j$,$J$$>l9g%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B  value[2] = $B;XDj%G%#%l%/%H%j(B
-    function FIND_FILE($value)
-    {
+    function FIND_FILE($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -797,8 +755,7 @@
     /*$B!!%U%!%$%k$,>e$2$i$l$?$+3NG'!!(B*/
     // $B<u$1<h$j$,$J$$>l9g%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B  value[2] = $B;XDj%5%$%:(B(KB)
-    function FILE_EXIST_CHECK($value)
-    {
+    function FILE_EXIST_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -811,8 +768,7 @@
     /*$B!!%U%!%$%k%5%$%:$NH=Dj!!(B*/
     // $B<u$1<h$j$,$J$$>l9g%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>](B  value[2] = $B;XDj%5%$%:(B(KB)
-    function FILE_SIZE_CHECK($value)
-    {
+    function FILE_SIZE_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -830,8 +786,7 @@
     /*$B!!%U%!%$%kL>$NH=Dj!!(B*/
     // $BF~NOJ8;z$,1Q?t;z(B,'_','-'$B0J30$J$i%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
-    function FILE_NAME_CHECK($value)
-    {
+    function FILE_NAME_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -844,8 +799,7 @@
     /*$B!!%U%!%$%kL>$NH=Dj(B($B%"%C%W%m!<%I0J30$N;~(B)$B!!(B*/
     // $BF~NOJ8;z$,1Q?t;z(B,'_','-'$B0J30$J$i%(%i!<$rJV$9(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]J8;zNs(B
-    function FILE_NAME_CHECK_BY_NOUPLOAD($value)
-    {
+    function FILE_NAME_CHECK_BY_NOUPLOAD($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -860,8 +814,7 @@
     // value[1] = YYYY
     // value[2] = MM
     // value[3] = DD
-    function CHECK_DATE($value)
-    {
+    function CHECK_DATE($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -884,8 +837,7 @@
     // value[3] = DD
     // value[4] = HH
     // value[5] = mm
-    function CHECK_DATE2($value)
-    {
+    function CHECK_DATE2($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -905,8 +857,7 @@
     // value[0] = $B9`L\L>(B
     // value[1] = YYYY
     // value[2] = MM
-    function CHECK_DATE3($value)
-    {
+    function CHECK_DATE3($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -927,8 +878,7 @@
     // value[1] = YYYY
     // value[2] = MM
     // value[3] = DD
-    function CHECK_BIRTHDAY($value)
-    {
+    function CHECK_BIRTHDAY($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -973,8 +923,7 @@
     // value[5] = end_year
     // value[6] = end_month
     // value[7] = end_day
-    function CHECK_SET_TERM($value)
-    {
+    function CHECK_SET_TERM($value) {
 
         // $B4|4V;XDj(B
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[5]])) {
@@ -1024,8 +973,7 @@
     // value[13] = end_second
 
     /*-----------------------------------------------------------------*/
-    function CHECK_SET_TERM2($value)
-    {
+    function CHECK_SET_TERM2($value) {
 
         // $B4|4V;XDj(B
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[8]])) {
@@ -1068,8 +1016,7 @@
     // value[3] = start_month
     // value[4] = end_year
     // value[5] = end_month
-    function CHECK_SET_TERM3($value)
-    {
+    function CHECK_SET_TERM3($value) {
 
         // $B4|4V;XDj(B
         if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[4]])) {
@@ -1094,8 +1041,7 @@
     }
 
     //$B%G%#%l%/%H%jB8:_%A%'%C%/(B
-    function DIR_CHECK($value)
-    {
+    function DIR_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -1106,8 +1052,7 @@
     }
 
     // $B%I%a%$%s%A%'%C%/(B
-    function DOMAIN_CHECK($value)
-    {
+    function DOMAIN_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -1119,8 +1064,7 @@
     /*$B!!7HBS%a!<%k%"%I%l%9$NH=Dj!!(B*/
     //$B!!%a!<%k%"%I%l%9$r ＠ 55,I=8=$GH=Dj$9$k(B
     // value[0] = $B9`L\L>(B value[1] = $BH=DjBP>]%a!<%k%"%I%l%9(B
-    function MOBILE_EMAIL_CHECK($value)
-    {
+    function MOBILE_EMAIL_CHECK($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -1139,8 +1083,7 @@
      * @access public
      * @return void
      */
-    function CHECK_REGIST_CUSTOMER_EMAIL($value)
-    {
+    function CHECK_REGIST_CUSTOMER_EMAIL($value) {
         if (isset($this->arrErr[$value[1]])) {
             return;
         }
@@ -1166,8 +1109,7 @@
      *
      * @example $objErr->doFunc(array('URL', 'contents', $arrReviewDenyURL), array('PROHIBITED_STR_CHECK'));
      */
-    function PROHIBITED_STR_CHECK($value)
-    {
+    function PROHIBITED_STR_CHECK($value) {
         if (isset($this->arrErr[$value[1]]) || empty($this->arrParam[$value[1]])) {
             return;
         }
@@ -1176,7 +1118,7 @@
         $prohibitedStr = str_replace(array('|', '/'), array('\|', '\/'), $value[2]);
 
         $pattern = '/' . join('|', $prohibitedStr) . '/i';
-        if (preg_match_all($pattern, $targetStr, $matches)) {
+        if (preg_match_all($pattern, $targetStr, $matches = array())) {
             $this->arrErr[$value[1]] = '$B"((B ' . $value[0] . '$B$OF~NO$G$-$^$;$s!#(B<br />';
         }
     }
@@ -1188,8 +1130,7 @@
      * @param array $value [0] => $B9`L\L>(B, [1] => $BI>2A$9$kJ8;zNs(B
      * @return void
      */
-    function EVAL_CHECK($value)
-    {
+    function EVAL_CHECK($value) {
         if (isset($this->arrErr[$value[0]])) {
             return;
         }
@@ -1210,8 +1151,7 @@
      * @param string $BI>2A$9$kJ8;zNs(B
      * @return bool $B%Q%i%a!<%?!<$H$7$FE, ＠ Z$JJ8;zNs$+(B
      */
-    function evalCheck($value)
-    {
+    function evalCheck($value) {
         return @eval('return is_scalar(' . $value . ');');
     }
 
@@ -1222,8 +1162,7 @@
      * @param array $value $BG[Ns(B
      * @return void
      */
-    function createParam($value)
-    {
+    function createParam($value) {
         foreach ($value as $key) {
             if (is_string($key) || is_int($key)) {
                 if (!isset($this->arrParam[$key]))  $this->arrParam[$key] = '';
@@ -1238,8 +1177,7 @@
      * @param string $string $B%A%'%C%/$9$kJ8;zNs(B
      * @return boolean $BCM$,(B10$B?J?t$N?tCMI=8=$N$_$N>l9g(B true
      */
-    function numelicCheck($string)
-    {
+    function numelicCheck($string) {
         /*
          * XXX 10$B?J?t$N?tCMI=8=$+H]$+$rD4$Y$?$$$@$1$@$,(B,
          * ctype_digit() $B$OJ8;zNs0J30(B false $B$rJV$9(B.

$BJQ99(B: branches/version-2_12-dev/data/class/SC_ClassAutoloader.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_ClassAutoloader.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_ClassAutoloader.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,16 +28,14 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_ClassAutoloader 
-{
+class SC_ClassAutoloader {
     /**
      * $B%/%i%9$N%*!<%H%m!<%G%#%s%0K\BN(B
      *
      * LC_* $B$K$OBP1~$7$F$$$J$$!#(B
      * @return void
      */
-    public static function autoload($class)
-    {
+    public static function autoload($class) {
         $arrClassNamePart = explode('_', $class);
         $is_ex = end($arrClassNamePart) === 'Ex';
         $count = count($arrClassNamePart);

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Cookie.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Cookie.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Cookie.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -25,21 +25,18 @@
  * $B%/%C%-!<MQ%/%i%9(B
  *
  */
-class SC_Cookie 
-{
+class SC_Cookie {
 
     var $expire;
 
     // $B%3%s%9%H%i%/%?(B
-    function __construct($day = COOKIE_EXPIRE)
-    {
+    function __construct($day = COOKIE_EXPIRE) {
         // $BM-8z4|8B(B
         $this->expire = time() + ($day * 24 * 3600);
     }
 
     // $B%/%C%-!<=q$-9~$_(B
-    function setCookie($key, $val)
-    {
+    function setCookie($key, $val) {
         setcookie($key, $val, $this->expire, ROOT_URLPATH, DOMAIN_NAME);
     }
 
@@ -48,8 +45,7 @@
      *
      * EC-CUBE $B$r(BURL$B%Q%9%k!<%H0J30$K%$%s%9%H!<%k$7$F$$$k>l9g!">e0L%G%#%l%/%H%j$NCM$b(B($BNt8e$G$O$"$k$,(B)$B<hF@$9$kE@$KN10U!#(B
      */
-    function getCookie($key)
-    {
+    function getCookie($key) {
         return isset($_COOKIE[$key]) ? $_COOKIE[$key] : null;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Customer.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Customer.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,14 +24,12 @@
 /*  [$BL>>N(B] SC_Customer
  *  [$B35MW(B] $B2q0w4IM}%/%i%9(B
  */
-class SC_Customer 
-{
+class SC_Customer {
 
     /** $B2q0w>pJs(B */
     var $customer_data;
 
-    function getCustomerDataFromEmailPass($pass, $email, $mobile = false)
-    {
+    function getCustomerDataFromEmailPass($pass, $email, $mobile = false) {
         // $B>.J8;z$KJQ49(B
         $email = strtolower($email);
         $sql_mobile = $mobile ? ' OR email_mobile = ?' : '';
@@ -64,8 +62,7 @@
      * @return boolean $B3:Ev$9$k2q0w$,B8:_$9$k>l9g$O(B true$B!"$=$l0J30$N>l9g(B
      *                 $B$O(B false $B$rJV$9!#(B
      */
-    function checkMobilePhoneId()
-    {
+    function checkMobilePhoneId() {
         //docomo$BMQ$K%G!<%?$r<h$j=P$9!#(B
         if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') {
             if ($_SESSION['mobile']['phone_id'] == '' && strlen($_SESSION['mobile']['phone_id']) == 0) {
@@ -90,8 +87,7 @@
      * @return boolean $B3:Ev$9$k2q0w$,B8:_$7!"%Q%9%o!<%I$,9g$C$F$$$k>l9g$O(B true$B!"(B
      *                 $B$=$l0J30$N>l9g$O(B false $B$rJV$9!#(B
      */
-    function getCustomerDataFromMobilePhoneIdPass($pass)
-    {
+    function getCustomerDataFromMobilePhoneIdPass($pass) {
         //docomo$BMQ$K%G!<%?$r<h$j=P$9!#(B
         if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') {
             if ($_SESSION['mobile']['phone_id'] == '' && strlen($_SESSION['mobile']['phone_id']) == 0) {
@@ -121,8 +117,7 @@
      *
      * @return void
      */
-    function updateMobilePhoneId()
-    {
+    function updateMobilePhoneId() {
         if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) {
             return;
         }
@@ -140,8 +135,7 @@
     }
 
     // $B%Q%9%o!<%I$r3NG'$;$:$K%m%0%$%s(B
-    function setLogin($email)
-    {
+    function setLogin($email) {
         // $BK\EPO?$5$l$?2q0w$N$_(B
         $sql = 'SELECT * FROM dtb_customer WHERE (email = ? OR email_mobile = ?) AND del_flg = 0 AND status = 2';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -152,8 +146,7 @@
     }
 
     // $B%;%C%7%g%s>pJs$r:G?7$N>pJs$K99?7$9$k(B
-    function updateSession()
-    {
+    function updateSession() {
         $sql = 'SELECT * FROM dtb_customer WHERE customer_id = ? AND del_flg = 0';
         $customer_id = $this->getValue('customer_id');
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -163,16 +156,14 @@
     }
 
     // $B%m%0%$%s>pJs$r%;%C%7%g%s$KEPO?$7!"%m%0$K=q$-9~$`(B
-    function startSession()
-    {
+    function startSession() {
         $_SESSION['customer'] = $this->customer_data;
         // $B%;%C%7%g%s>pJs$NJ]B8(B
         GC_Utils_Ex::gfPrintLog('access : user='.$this->customer_data['customer_id'] ."\t".'ip='. $this->getRemoteHost(), CUSTOMER_LOG_REALFILE, false);
     }
 
     // $B%m%0%"%&%H!!(B$_SESSION['customer']$B$r2rJ|$7!"%m%0$K=q$-9~$`(B
-    function EndSession()
-    {
+    function EndSession() {
         // $B%;%C%7%g%s>pJsGK4~$NA0$K(Bcustomer_id$B$rJ]B8(B
         $customer_id = $_SESSION['customer']['customer_id'];
 
@@ -192,8 +183,7 @@
     }
 
     // $B%m%0%$%s$K ＠ .8y$7$F$$$k$+H=Dj$9$k!#(B
-    function isLoginSuccess($dont_check_email_mobile = false)
-    {
+    function isLoginSuccess($dont_check_email_mobile = false) {
         // $B%m%0%$%s;~$N%a!<%k%"%I%l%9$H(BDB$B$N%a!<%k%"%I%l%9$,0lCW$7$F$$$k>l9g(B
         if (isset($_SESSION['customer']['customer_id'])
             && SC_Utils_Ex::sfIsInt($_SESSION['customer']['customer_id'])
@@ -214,8 +204,7 @@
     }
 
     // $B%Q%i%a!<%?!<$N<hF@(B
-    function getValue($keyname)
-    {
+    function getValue($keyname) {
         // $B%]%$%s%H$O%j%"%k%?%$%`I=<((B
         if ($keyname == 'point') {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -228,14 +217,12 @@
     }
 
     // $B%Q%i%a!<%?!<$N%;%C%H(B
-    function setValue($keyname, $val)
-    {
+    function setValue($keyname, $val) {
         $_SESSION['customer'][$keyname] = $val;
     }
 
     // $B%Q%i%a!<%?!<$,(BNULL$B$+$I$&$+$NH=Dj(B
-    function hasValue($keyname)
-    {
+    function hasValue($keyname) {
         if (isset($_SESSION['customer'][$keyname])) {
             return !SC_Utils_Ex::isBlank($_SESSION['customer'][$keyname]);
         }
@@ -243,8 +230,7 @@
     }
 
     // $BCB ＠ 8F|7n$G$"$k$+$I$&$+$NH=Dj(B
-    function isBirthMonth()
-    {
+    function isBirthMonth() {
         if (isset($_SESSION['customer']['birth'])) {
             $arrRet = preg_split('|[- :/]|', $_SESSION['customer']['birth']);
             $birth_month = intval($arrRet[1]);
@@ -265,8 +251,7 @@
      *
      * @return string $_SERVER['REMOTE_HOST'] $BKt$O(B $_SERVER['REMOTE_ADDR']$B$NJ8;zNs(B
      */
-    function getRemoteHost()
-    {
+    function getRemoteHost() {
 
         if (!empty($_SERVER['REMOTE_HOST'])) {
             return $_SERVER['REMOTE_HOST'];
@@ -278,8 +263,7 @@
     }
 
     //$B<uCm4XO"$N2q0w>pJs$r99?7(B
-    function updateOrderSummary($customer_id)
-    {
+    function updateOrderSummary($customer_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrOrderSummary =  $objQuery->getRow('SUM( payment_total) as buy_total, COUNT(order_id) as buy_times,MAX( create_date) as last_buy_date, MIN(create_date) as first_buy_date','dtb_order','customer_id = ? AND del_flg = 0 AND status <> ?',array($customer_id,ORDER_CANCEL));
         $objQuery->update('dtb_customer',$arrOrderSummary,'customer_id = ?',array($customer_id));
@@ -297,8 +281,7 @@
      * @param string $login_pass $B%m%0%$%s%Q%9%o!<%I(B
      * @return boolean $B%m%0%$%s$K ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doLogin($login_email, $login_pass)
-    {
+    function doLogin($login_email, $login_pass) {
         switch (SC_Display_Ex::detectDevice()) {
             case DEVICE_TYPE_MOBILE:
                 if (!$this->getCustomerDataFromMobilePhoneIdPass($login_pass) &&

$BJQ99(B: branches/version-2_12-dev/data/class/SC_CustomerList.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CustomerList.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_CustomerList.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,13 +24,11 @@
 /*  [$BL>>N(B] SC_CustomerList
  *  [$B35MW(B] $B2q0w8!:wMQ%/%i%9(B
  */
-class SC_CustomerList extends SC_SelectSql_Ex 
-{
+class SC_CustomerList extends SC_SelectSql_Ex {
 
     var $arrColumnCSV;
 
-    function __construct($array, $mode = '')
-    {
+    function __construct($array, $mode = '') {
         parent::__construct($array);
 
         $objDb = new SC_Helper_DB_Ex();
@@ -328,14 +326,12 @@
     }
 
     // $B8!:wMQ(BSQL
-    function getList()
-    {
+    function getList() {
         $this->select = 'SELECT customer_id,name01,name02,kana01,kana02,sex,email,email_mobile,tel01,tel02,tel03,pref,status,update_date,mailmaga_flg FROM dtb_customer ';
-        return $this->getSql(2);
+        return $this->getSql(0);
     }
 
-    function getListMailMagazine($is_mobile = false)
-    {
+    function getListMailMagazine($is_mobile = false) {
 
         $colomn = $this->getMailMagazineColumn($is_mobile);
         $this->select = "
@@ -347,15 +343,13 @@
     }
 
     // $B8!:wAm?t%+%&%s%HMQ(BSQL
-    function getListCount()
-    {
+    function getListCount() {
         $this->select = 'SELECT COUNT(customer_id) FROM dtb_customer ';
         return $this->getSql(1);
     }
 
     // CSV$B%@%&%s%m!<%IMQ(BSQL
-    function getListCSV($arrColumnCSV)
-    {
+    function getListCSV($arrColumnCSV) {
         $this->arrColumnCSV = $arrColumnCSV;
         $i = 0;
         foreach ($this->arrColumnCSV as $val) {
@@ -368,8 +362,7 @@
         return $this->getSql(2);
     }
 
-    function getWhere()
-    {
+    function getWhere() {
         return array($this->where, $this->arrVal);
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Date.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Date.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Date.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,50 +22,39 @@
  */
 
 /* $BF|;~I=<(MQ%/%i%9(B */
-class SC_Date 
-{
+class SC_Date {
     var $start_year;
     var $month;
     var $day;
     var $end_year;
 
-    public static $arrHoliday = NULL;
-    public static $arrRegularHoliday = NULL;
-
     // $B%3%s%9%H%i%/%?(B
-    function __construct($start_year='', $end_year='')
-    {
+    function __construct($start_year='', $end_year='') {
         if ($start_year)  $this->setStartYear($start_year);
         if ($end_year)    $this->setEndYear($end_year);
     }
 
-    function setStartYear($year)
-    {
+    function setStartYear($year) {
         $this->start_year = $year;
     }
 
-    function getStartYear()
-    {
+    function getStartYear() {
         return $this->start_year;
     }
 
-    function setEndYear($endYear)
-    {
+    function setEndYear($endYear) {
         $this->end_year = $endYear;
     }
 
-    function getEndYear()
-    {
+    function getEndYear() {
         return $this->end_year;
     }
 
-    function setMonth($month)
-    {
+    function setMonth($month) {
         $this->month = $month;
     }
 
-    function setDay($day)
-    {
+    function setDay($day) {
         $this->day = $day;
     }
 
@@ -79,8 +68,7 @@
      *     string $B!VA*Br$J$7!W$O;XDj$5$l$?CM$N2<$KIU2C$9$k!#(B
      * @param string $default_key
      */
-    function getYear($year = '', $default_year = false, $default_key = '----')
-    {
+    function getYear($year = '', $default_year = false, $default_key = '----') {
         if ($year) $this->setStartYear($year);
 
         $year = $this->start_year;
@@ -104,8 +92,7 @@
         return $year_array;
     }
 
-    function getZeroYear($year = '')
-    {
+    function getZeroYear($year = '') {
         if ($year) $this->setStartYear($year);
 
         $year = $this->start_year;
@@ -123,8 +110,7 @@
         return $year_array;
     }
 
-    function getZeroMonth()
-    {
+    function getZeroMonth() {
 
         $month_array = array();
         for ($i=1; $i <= 12; $i++) {
@@ -134,8 +120,7 @@
         return $month_array;
     }   
 
-    function getMonth($default = false)
-    {
+    function getMonth($default = false) {
         $month_array = array();
 
         if ($default) $month_array[''] = '--';
@@ -146,8 +131,7 @@
         return $month_array;
     }   
 
-    function getDay($default = false)
-    {
+    function getDay($default = false) {
         $day_array = array();
 
         if ($default) $day_array[''] = '--';
@@ -159,8 +143,7 @@
         return $day_array;
     }
 
-    function getHour()
-    {
+    function getHour() {
 
         $hour_array = array();
         for ($i=0; $i<=23; $i++) {
@@ -170,8 +153,7 @@
         return $hour_array;
     }
 
-    function getMinutes()
-    {
+    function getMinutes() {
 
         $minutes_array = array();
         for ($i=0; $i<=59; $i++) {
@@ -181,64 +163,9 @@
         return $minutes_array;
     }
 
-    function getMinutesInterval()
-    {
+    function getMinutesInterval() {
 
         $minutes_array = array('00'=>'00', '30'=>'30');
         return $minutes_array;
     }
-
-    /**
-     * $B5YF|$NH=Dj(B.
-     * 
-     * @param integer $year
-     * @param integer $month
-     * @param integer $day
-     * @return boolean $B5YF|$N>l9g$O(Btrue
-     */
-    public function isHoliday($year, $month, $day)
-    {
-        is_null(SC_Date_Ex::$arrHoliday) and $this->setArrHoliday();
-        is_null(SC_Date_Ex::$arrRegularHoliday) and $this->setRegularHoliday();
-
-        if (!empty(SC_Date_Ex::$arrHoliday[$month])) {
-            if (in_array($day, SC_Date_Ex::$arrHoliday[$month])) {
-                return true;
-            }
-        }
-        if (!empty(SC_Date_Ex::$arrRegularHoliday)) {
-            $day = date('w', mktime(0,0,0 ,$month, $day, $year));
-            if (in_array($day, SC_Date_Ex::$arrRegularHoliday)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * $B5YF|>pJs$r%9%?%F%#%C%/JQ?t$K%;%C%H(B.
-     * 
-     * @return void
-     */
-    private function setArrHoliday()
-    {
-        $objHoliday = new SC_Helper_Holiday_Ex();
-        $holiday = $objHoliday->getList();
-        $arrHoliday = array();
-        foreach ($holiday AS $val) {
-            $arrHoliday[$val['month']][] = $val['day'];
-        }
-        SC_Date_Ex::$arrHoliday = $arrHoliday;
-    }
-
-    /**
-     * $BDj5YF|>pJs$r%9%?%F%#%C%/JQ?t$K%;%C%H(B.
-     * 
-     * @return void
-     */
-    private function setRegularHoliday()
-    {
-        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
-        SC_Date_Ex::$arrRegularHoliday = explode('|', $arrInfo['regular_holiday_ids']);
-    }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Display.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Display.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Display.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -27,8 +27,7 @@
  * @author Ryuichi Tokugami
  * @version $Id$
  */
-class SC_Display
-{
+class SC_Display{
 
     var $response;
 
@@ -49,16 +48,14 @@
      * const('ADMIN',99);
      */
 
-    function __construct($hasPrevURL = true)
-    {
+    function __construct($hasPrevURL = true) {
         $this->response = new SC_Response_Ex();
         if ($hasPrevURL) {
             $this->setPrevURL();
         }
     }
 
-    function setPrevURL()
-    {
+    function setPrevURL() {
         // TODO SC_SiteSession $B$G<BAu$7$?J}$,NI$5$2(B
         $objCartSess = new SC_CartSession_Ex();
         $objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
@@ -70,8 +67,7 @@
      * @param LC_Page $page LC_Page $B%$%s%9%?%s%9(B
      * @param $is_admin boolean $B4IM}2hLL$r07$&>l9g(B true
      */
-    function prepare($page, $is_admin = false)
-    {
+    function prepare($page, $is_admin = false) {
         if (!$this->deviceSeted || !is_null($this->view)) {
             $device = ($is_admin) ? DEVICE_TYPE_ADMIN : $this->detectDevice();
             $this->setDevice($device);
@@ -86,21 +82,18 @@
      *
      * SC_Response::reload() $B$N%i%C%Q!<$G$9(B.
      */
-    function reload($queryString = array(), $removeQueryString = false)
-    {
+    function reload($queryString = array(), $removeQueryString = false) {
         $this->response->reload($queryString, $removeQueryString);
     }
 
-    function noAction()
-    {
+    function noAction() {
         return;
     }
 
     /**
      * $B%X%C%@$rDI2C$9$k(B.
      */
-    function addHeader($name, $value)
-    {
+    function addHeader($name, $value) {
         $this->response->addHeader($name, $value);
     }
 
@@ -108,8 +101,7 @@
      * $B%G%P%$%9Kh$N=PNOJ}K!$r<+F0$GJQ99$9$k!"%U%!%5!<%I(B
      * Enter description here ...
      */
-    function setDevice($device = DEVICE_TYPE_PC)
-    {
+    function setDevice($device = DEVICE_TYPE_PC) {
 
         switch ($device) {
             case DEVICE_TYPE_MOBILE:
@@ -134,8 +126,7 @@
     /**
      * SC_View $B%$%s%9%?%s%9$r ＠ _Dj$9$k(B.
      */
-    function setView($view)
-    {
+    function setView($view) {
         $this->view = $view;
     }
 
@@ -150,8 +141,7 @@
      * @param   $reset  boolean
      * @return integer $BC<Kv<oJL(BID
      */
-    public static function detectDevice($reset = FALSE)
-    {
+    public static function detectDevice($reset = FALSE) {
         if (is_null(SC_Display_Ex::$device) || $reset) {
             $nu = new Net_UserAgent_Mobile();
             $su = new SC_SmartphoneUserAgent_Ex();
@@ -166,18 +156,15 @@
         return SC_Display_Ex::$device;
     }
 
-    function assign($val1,$val2)
-    {
+    function assign($val1,$val2) {
         $this->view->assign($val1, $val2);
     }
 
-    function assignobj($obj)
-    {
+    function assignobj($obj) {
         $this->view->assignobj($obj);
     }
 
-    function assignarray($array)
-    {
+    function assignarray($array) {
         $this->view->assignarray($array);
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_FormParam.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_FormParam.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_FormParam.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,8 +29,7 @@
  * @package SC
  * @author LOCKON CO.,LTD.
  */
-class SC_FormParam 
-{
+class SC_FormParam {
 
     /**
      * $B2?$bF~NO$5$l$F$$$J$$$H$-$KI=<($9$kCM(B
@@ -62,8 +61,7 @@
     /**
      * $B%3%s%9%H%i%/%?(B
      */
-    function __construct()
-    {
+    function __construct() {
         $this->check_dir = IMAGE_SAVE_REALDIR;
 
         // SC_FormParam$B$N%U%C%/%]%$%s%H(B
@@ -83,8 +81,7 @@
      *
      * @deprecated 2.12.0 #1702
      */
-    function initParam()
-    {
+    function initParam() {
         $this->disp_name = array();
         $this->keyname = array();
         $this->length = array();
@@ -95,8 +92,7 @@
     }
 
     // $B%Q%i%a!<%?!<$NDI2C(B
-    function addParam($disp_name, $keyname, $length = '', $convert = '', $arrCheck = array(), $default = '', $input_db = true)
-    {
+    function addParam($disp_name, $keyname, $length = '', $convert = '', $arrCheck = array(), $default = '', $input_db = true) {
         $this->disp_name[] = $disp_name;
         $this->keyname[] = $keyname;
         $this->length[] = $length;
@@ -110,8 +106,7 @@
     // $B%Q%i%a!<%?!<$NF~NO(B
     // $arrVal  :$arrVal['keyname']$B!&!&$NG[Ns$r0lCW$7$?%-!<$N%$%s%9%?%s%9$K3JG<$9$k(B
     // $seq     :true$B$N>l9g!"(B$arrVal[0]~$B$NG[Ns$rEPO?=g$K%$%s%9%?%s%9$K3JG<$9$k(B
-    function setParam($arrVal, $seq = false)
-    {
+    function setParam($arrVal, $seq = false) {
         if (!is_array($arrVal)) return;
         if (!$seq) {
             foreach ($arrVal as $key => $val) {
@@ -125,8 +120,7 @@
     }
 
     // $B2hLLI=<(MQ%?%$%H%k ＠ 8@.(B
-    function setHtmlDispNameArray()
-    {
+    function setHtmlDispNameArray() {
         foreach ($this->keyname as $index => $key) {
             $find = false;
             foreach ($this->arrCheck[$index] as $val) {
@@ -150,14 +144,12 @@
     }
 
     // $B2hLLI=<(MQ%?%$%H%k<hF@(B
-    function getHtmlDispNameArray()
-    {
+    function getHtmlDispNameArray() {
         return $this->html_disp_name;
     }
 
     // $BJ#?tNs%Q%i%a!<%?!<$N<hF@(B
-    function setParamList($arrVal2d, $keyname)
-    {
+    function setParamList($arrVal2d, $keyname) {
         // DB$B$N7o?t$r<hF@$9$k!#(B
         $no = 1;
         foreach ($arrVal2d as $arrVal) {
@@ -167,8 +159,7 @@
         }
     }
 
-    function setDBDate($db_date, $year_key = 'year', $month_key = 'month', $day_key = 'day')
-    {
+    function setDBDate($db_date, $year_key = 'year', $month_key = 'month', $day_key = 'day') {
         if (empty($db_date)) {
             return;
         }
@@ -179,8 +170,7 @@
     }
 
     // $B%-!<$KBP1~$7$?CM$r%;%C%H$9$k!#(B
-    function setValue($key, $value)
-    {
+    function setValue($key, $value) {
         if (!in_array($key, $this->keyname)) {
             // TODO $B7Y9pH/@8(B
             return;
@@ -188,16 +178,14 @@
         $this->arrValue[$key] = $value;
     }
 
-    function toLower($key)
-    {
+    function toLower($key) {
         if (isset($this->arrValue[$key])) {
             $this->arrValue[$key] = strtolower($this->arrValue[$key]);
         }
     }
 
     // $B%(%i!<%A%'%C%/(B
-    function checkError($br = true)
-    {
+    function checkError($br = true) {
         $arrErr = array();
 
         foreach ($this->keyname as $index => $key) {
@@ -229,7 +217,6 @@
                     case 'KANABLANK_CHECK':
                     case 'SELECT_CHECK':
                     case 'FILE_NAME_CHECK_BY_NOUPLOAD':
-                    case 'NUM_POINT_CHECK':
                         $this->recursionCheck($this->disp_name[$index], $func,
                             $value, $arrErr, $key, $this->length[$index]);
                         break;
@@ -314,8 +301,7 @@
      * @return void
      * @see mb_convert_kana
      */
-    function convParam()
-    {
+    function convParam() {
         foreach ($this->keyname as $index => $key) {
             if (isset($this->arrValue[$key])) {
                 $this->recursionConvParam($this->arrValue[$key], $this->convert[$index]);
@@ -329,8 +315,7 @@
      * @param mixed $value $BJQ49$9$kCM(B. $BG[Ns$N>l9g$O:F5"E*$K<B9T$9$k(B.
      * @param string $convert mb_convert_kana $B$NJQ49%*%W%7%g%s(B
      */
-    function recursionConvParam(&$value, $convert)
-    {
+    function recursionConvParam(&$value, $convert) {
         if (is_array($value)) {
             foreach ($value as $key => $val) {
                 $this->recursionConvParam($value[$key], $convert);
@@ -348,8 +333,7 @@
      * @param array $arrKey $BBP>]$N%-!<(B
      * @return array $BO"A[G[Ns(B
      */
-    function getHashArray($arrKey = array())
-    {
+    function getHashArray($arrKey = array()) {
         $arrRet = array();
         foreach ($this->keyname as $keyname) {
             if (empty($arrKey) || in_array($keyname, $arrKey)) {
@@ -360,8 +344,7 @@
     }
 
     // DB$B3JG<MQG[Ns$N:n ＠ .(B
-    function getDbArray()
-    {
+    function getDbArray() {
         $dbArray = array();
         foreach ($this->keyname as $index => $key) {
             if ($this->input_db[$index]) {
@@ -377,28 +360,24 @@
      * @param array $arrKey $BBP>]$N%-!<(B
      * @return array $B=D2#$rF~$lBX$($?G[Ns(B
      */
-    function getSwapArray($arrKey = array())
-    {
+    function getSwapArray($arrKey = array()) {
         $arrTmp = $this->getHashArray($arrKey);
         return SC_Utils_Ex::sfSwapArray($arrTmp);
     }
 
     // $B9`L\L>0lMw$N<hF@(B
-    function getTitleArray()
-    {
+    function getTitleArray() {
         return $this->disp_name;
     }
 
     // $B9`L\?t$rJV$9(B
-    function getCount()
-    {
+    function getCount() {
         $count = count($this->keyname);
         return $count;
     }
 
     // $B%U%)!<%`$KEO$9MQ$N%Q%i%a!<%?!<$rJV$9(B
-    function getFormParamList()
-    {
+    function getFormParamList() {
         $formParamList = array();
         foreach ($this->keyname as $index => $key) {
             // $B%-!<L>(B
@@ -418,14 +397,12 @@
      *
      * @return array $B%-!<L>$N0lMw(B
      */
-    function getKeyList()
-    {
+    function getKeyList() {
         return $this->keyname;
     }
 
     // $B%-!<L>$H0lCW$7$?CM$rJV$9(B
-    function getValue($keyname, $default = '')
-    {
+    function getValue($keyname, $default = '') {
         $ret = null;
         foreach ($this->keyname as $key) {
             if ($key == $keyname) {
@@ -451,8 +428,7 @@
     /**
      * @deprecated
      */
-    function splitParamCheckBoxes($keyname)
-    {
+    function splitParamCheckBoxes($keyname) {
         foreach ($this->keyname as $key) {
             if ($key == $keyname) {
                 if (isset($this->arrValue[$key]) && !is_array($this->arrValue[$key])) {
@@ -468,8 +444,7 @@
      * @param boolean $has_wide_space $BA43Q6uGr$b:o=|$9$k>l9g(B true
      * @return void
      */
-    function trimParam($has_wide_space = true)
-    {
+    function trimParam($has_wide_space = true) {
         foreach ($this->arrValue as &$value) {
             $this->recursionTrim($value, $has_wide_space);
         }
@@ -482,12 +457,11 @@
      * @param boolean $has_wide_space $BA43Q6uGr$b:o=|$9$k>l9g(B true
      * @return void
      */
-    function recursionTrim(&$value, $has_wide_space = true)
-    {
+    function recursionTrim(&$value, $has_wide_space = true) {
         $pattern = '/^[ $B!!(B\r\n\t]*(.*?)[ $B!!(B\r\n\t]*$/u';
         if (is_array($value)) {
             foreach ($value as $key => $val) {
-                $this->recursionTrim($value[$key], $has_wide_space);
+                $this->recursionTrim($value[$key], $convert);
             }
         } else {
             if (!SC_Utils_Ex::isBlank($value)) {
@@ -507,8 +481,7 @@
      * @param string $prefix $B%Q%i%a!<%?!<L>$N@\F,<-(B
      * @return array $B8!:w7k2L0z$-7Q$.MQ$NO"A[G[Ns(B.
      */
-    function getSearchArray($prefix = 'search_')
-    {
+    function getSearchArray($prefix = 'search_') {
         $arrResults = array();
         foreach ($this->keyname as $key) {
             if (preg_match('/^' . $prefix . '/', $key)) {
@@ -524,8 +497,7 @@
      * 1$B<!%-!<$,E:;z$J$N$,FCD'$@$C$?$H;W$o$l$k!#(B
      * @deprecated 2.12.0 $BI,MW$J$i$P(B getFormParamList $B%a%=%C%I$K0z?t$rDI2C$9$k$J$I$G<B8=2DG=(B
      */
-    function getFormDispArray()
-    {
+    function getFormDispArray() {
         $formDispArray = array();
         foreach ($this->keyname as $index => $key) {
             // $B%-!<L>(B
@@ -545,8 +517,7 @@
      * addParam$B$N5U$N4X?t(B
      * $B%+%9%?%^%$%:$*$h$S%W%i%0%$%s$G;HMQ$5$l$k$N$rA[Dj(B
      */
-    function removeParam($keyname)
-    {
+    function removeParam($keyname) {
         $index = array_search($keyname, $this->keyname);
 
         if ($index !== FALSE) {
@@ -589,8 +560,7 @@
      * @param string $target $B>e=q$-$7$?$$9`L\L>(B(disp_name,length,convert$BEy(B)
      * @param mixed $value $B;XDj$7$?FbMF$K>e=q$-$9$k(B
      */
-    function overwriteParam($keyname, $target, $value)
-    {
+    function overwriteParam($keyname, $target, $value) {
         $index = array_search($keyname, $this->keyname);
 
         if ($index !== FALSE) {

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Fpdf.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Fpdf.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,10 +29,8 @@
 
 define('PDF_TEMPLATE_REALDIR', TEMPLATE_ADMIN_REALDIR . 'pdf/');
 
-class SC_Fpdf extends SC_Helper_FPDI 
-{
-    function __construct($download, $title, $tpl_pdf = 'nouhinsyo1.pdf')
-    {
+class SC_Fpdf extends SC_Helper_FPDI {
+    function __construct($download, $title, $tpl_pdf = 'nouhinsyo1.pdf') {
         $this->FPDF();
         // $B%G%U%)%k%H$N ＠ _Dj(B
         $this->tpl_pdf = PDF_TEMPLATE_REALDIR . $tpl_pdf;  // $B%F%s%W%l!<%H%U%!%$%k(B
@@ -68,8 +66,7 @@
         $this->pageno = $this->setSourceFile($this->tpl_pdf);
     }
 
-    function setData($arrData)
-    {
+    function setData($arrData) {
         $this->arrData = $arrData;
 
         // $B%Z!<%8HV9f$h$j(BID$B$r<hF@(B
@@ -95,8 +92,7 @@
 
     }
 
-    function setShopData()
-    {
+    function setShopData() {
         // $B%7%g%C%W>pJs(B
 
         $objDb = new SC_Helper_DB_Ex();
@@ -133,8 +129,7 @@
         $this->Image($logo_file, 124, 46, 40);
     }
 
-    function setMessageData()
-    {
+    function setMessageData() {
         // $B%a%C%;!<%8(B
         $this->lfText(27, 70, $this->arrData['msg1'], 8);  //$B%a%C%;!<%8(B1
         $this->lfText(27, 74, $this->arrData['msg2'], 8);  //$B%a%C%;!<%8(B2
@@ -143,8 +138,7 @@
         $this->lfText(158, 288, $text, 8);  //$B:n ＠ .F|(B
     }
 
-    function setOrderData()
-    {
+    function setOrderData() {
         $arrOrder = array();
         // DB$B$+$i<uCm>pJs$rFI$_9~$`(B
         $this->lfGetOrderData($this->arrData['order_id']);
@@ -183,7 +177,7 @@
             $data[0] = $this->arrDisp['quantity'][$i];
 
             // $B ＠ G9~6b3[!JC12A!K(B
-            $data[1] = SC_Helper_DB_Ex::sfCalcIncTax($this->arrDisp['price'][$i], $this->arrDisp['tax_rate'][$i], $this->arrDisp['tax_rule'][$i]);
+            $data[1] = SC_Helper_DB_Ex::sfCalcIncTax($this->arrDisp['price'][$i]);
 
             // $B>.7W!J>&IJKh!K(B
             $data[2] = $data[0] * $data[1];
@@ -269,18 +263,16 @@
      * @param string $str $BF~NOJ8;zNs(B
      * @return string $BJQ998e$NJ8;zNs(B
      */
-    function setEtcData()
-    {
+    function setEtcData() {
         $this->Cell(0, 10, '', 0, 1, 'C', 0, '');
         $this->SetFont('Gothic', 'B', 9);
         $this->MultiCell(0, 6, '$B!c(B $BHw9M(B $B!d(B', 'T', 2, 'L', 0, '');
         $this->SetFont('SJIS', '', 8);
-        $text = SC_Utils_Ex::rtrim($this->arrData['etc1'] . " \n" . $this->arrData['etc2'] . " \n" . $this->arrData['etc3']);
+        $text = SC_Utils_Ex::rtrim($this->arrData['etc1'] . "\n" . $this->arrData['etc2'] . "\n" . $this->arrData['etc3']);
         $this->MultiCell(0, 4, $text, '', 2, 'L', 0, '');
     }
 
-    function createPdf()
-    {
+    function createPdf() {
         // PDF$B$r%V%i%&%6$KAw?.(B
         ob_clean();
         if ($this->pdf_download == 1) {
@@ -299,8 +291,7 @@
     }
 
     // PDF_Japanese::Text $B$X$N%Q!<%5!<(B
-    function lfText($x, $y, $text, $size = 0, $style = '')
-    {
+    function lfText($x, $y, $text, $size = 0, $style = '') {
         // $BB`Hr(B
         $bak_font_style = $this->FontStyle;
         $bak_font_size = $this->FontSizePt;
@@ -313,8 +304,7 @@
     }
 
     // $B<uCm%G!<%?$N<hF@(B
-    function lfGetOrderData($order_id)
-    {
+    function lfGetOrderData($order_id) {
         if (SC_Utils_Ex::sfIsInt($order_id)) {
             // DB$B$+$i<uCm>pJs$rFI$_9~$`(B
             $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -338,10 +328,9 @@
     }
 
     // $B<uCm>\:Y%G!<%?$N<hF@(B
-    function lfGetOrderDetail($order_id)
-    {
+    function lfGetOrderDetail($order_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate, tax_rate, tax_rule';
+        $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate';
         $where = 'order_id = ?';
         $objQuery->setOrder('order_detail_id');
         $arrRet = $objQuery->select($col, 'dtb_order_detail', $where, array($order_id));

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Image.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Image.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Image.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,20 +22,17 @@
  */
 
 //---- $B%"%C%W%m!<%I%U%!%$%k2C9)%/%i%9(B(thumb.php$B$H%;%C%H$G;HMQ$9$k(B)
-class SC_Image 
-{
+class SC_Image {
 
     var $tmp_dir;
 
-    function __construct($tmp_dir)
-    {
+    function __construct($tmp_dir) {
         // $B%X%C%@%U%!%$%kFI9~(B
         $this->tmp_dir = rtrim($tmp_dir, '/') . '/';
     }
 
     //--- $B0l;~%U%!%$%k ＠ 8@.(B($B%5%`%M%$%k2hA|@8 ＠ .MQ(B)
-    function makeTempImage($keyname, $max_width, $max_height)
-    {
+    function makeTempImage($keyname, $max_width, $max_height) {
         // $B0l0U$J(BID$B$r<hF@$9$k!#(B
         $mainname = uniqid('').'.';
         // $B3HD%;R0J30$rCV$-49$($k!#(B
@@ -46,8 +43,7 @@
     }
 
     //--- $B%U%!%$%k$r;XDjJ]B8(BDIR$B$X0\F0(B
-    function moveTempImage($filename, $save_dir)
-    {
+    function moveTempImage($filename, $save_dir) {
         // $B%3%T!<85%U%!%$%k!"%3%T!<@h%G%#%l%/%H%j$,B8:_$9$k>l9g$K$N$_<B9T$9$k(B
         $from_path = $this->tmp_dir.$filename;
         $to_path = $save_dir.'/'.$filename;
@@ -61,8 +57,7 @@
     }
 
     //---- $B;XDj%U%!%$%k$r:o=|(B
-    function deleteImage($filename, $dir)
-    {
+    function deleteImage($filename, $dir) {
         if (file_exists($dir.'/'.$filename)) {
             unlink($dir.'/'.$filename);
         }
@@ -78,8 +73,7 @@
      * @param integer $newFileName $B?7%U%!%$%kL>(B
      * @param array $B?7%U%!%$%kL>$r3JG<$7$?G[Ns(B
      */
-    function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = '')
-    {
+    function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = '') {
         // $B2hA|$N:GBg2#I}!JC10L!'%T%/%;%k!K(B
         $ThmMaxWidth = LARGE_IMAGE_WIDTH;
 

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Initial.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Initial.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -27,16 +27,14 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Initial 
-{
+class SC_Initial {
 
     // {{{ cunstructor
 
     /**
      * $B%3%s%9%H%i%/%?(B.
      */
-    function __construct()
-    {
+    function __construct() {
 
         /** EC-CUBE$B$N%P!<%8%g%s(B */
         define('ECCUBE_VERSION', '2.12.3-dev');
@@ -51,8 +49,7 @@
      * @access protected
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->requireInitialConfig();
         $this->defineDSN();                 // requireInitialConfig $B%a%=%C%I$h$j8e$G<B9T(B
         $this->defineDirectoryIndex();
@@ -72,8 +69,7 @@
      * @access protected
      * @return void
      */
-    function requireInitialConfig()
-    {
+    function requireInitialConfig() {
 
         define('CONFIG_REALFILE', realpath(dirname(__FILE__)) . '/../config/config.php');
         if (file_exists(CONFIG_REALFILE)) {
@@ -88,8 +84,7 @@
      * @return void
      * @deprecated $B2<0L8_49MQ(B
      */
-    function defineDSN()
-    {
+    function defineDSN() {
         if (defined('DB_TYPE') && defined('DB_USER') && defined('DB_PASSWORD')
             && defined('DB_SERVER') && defined('DB_PORT') && defined('DB_NAME')
         ) {
@@ -103,8 +98,7 @@
     /**
      * @deprecated
      */
-    function setErrorReporting()
-    {
+    function setErrorReporting() {
         error_reporting(E_ALL & ~E_NOTICE);
         // PHP 5.3.0$BBP1~(B
         if (error_reporting() > 6143) {
@@ -120,8 +114,7 @@
      * @access protected
      * @return void
      */
-    function phpconfigInit()
-    {
+    function phpconfigInit() {
         ini_set('html_errors', '1');
         ini_set('mbstring.http_input', CHAR_CODE);
         ini_set('mbstring.http_output', CHAR_CODE);
@@ -156,8 +149,7 @@
      * @access protected
      * @return void
      */
-    function defineDirectoryIndex()
-    {
+    function defineDirectoryIndex() {
 
         // DirectoryIndex $B$N<B%U%!%$%kL>(B
         if (!defined('DIR_INDEX_FILE')) {
@@ -188,8 +180,7 @@
      * @access protected
      * @return void
      */
-    function defineParameter()
-    {
+    function defineParameter() {
 
         $errorMessage
             = '<div style="color: #F00; font-weight: bold; background-color: #FEB; text-align: center">'
@@ -232,8 +223,7 @@
      * @access protected
      * @return void
      */
-    function complementParameter()
-    {
+    function complementParameter() {
     }
 
     /**
@@ -244,8 +234,7 @@
      * @access protected
      * @return void
      */
-    function createCacheDir()
-    {
+    function createCacheDir() {
         if (defined('HTML_REALDIR')) {
             umask(0);
             if (!file_exists(COMPILE_REALDIR)) {
@@ -272,8 +261,7 @@
      * @access protected
      * @return void
      */
-    function defineConstants()
-    {
+    function defineConstants() {
         // LC_Page_Error$BMQ(B
         /** $B;XDj>&IJ%Z!<%8$,$J$$(B */
         define('PRODUCT_NOT_FOUND', 1);
@@ -440,8 +428,7 @@
      *
      * @return void
      */
-    function stripslashesDeepGpc()
-    {
+    function stripslashesDeepGpc() {
         // Strip magic quotes from request data.
         if (get_magic_quotes_gpc()
             && version_compare(PHP_VERSION, '5.0.0', '>=')) {
@@ -471,8 +458,7 @@
      * @access protected
      * @return void
      */
-    function resetSuperglobalsRequest()
-    {
+    function resetSuperglobalsRequest() {
         $_REQUEST = array_merge($_GET, $_POST);
     }
 
@@ -483,8 +469,7 @@
      * @param mixed $value $BDj?t$NCM!#(B
      * @return void
      */
-    function defineIfNotDefined($name, $value = null)
-    {
+    function defineIfNotDefined($name, $value = null) {
         if (!defined($name)) {
             define($name, $value);
         }
@@ -495,8 +480,7 @@
      *
      * @return void
      */
-    function setTimezone()
-    {
+    function setTimezone() {
         date_default_timezone_set('Asia/Tokyo');
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_InstallView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_InstallView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_InstallView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -21,10 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-class SC_InstallView extends SC_View_Ex 
-{
-    function __construct($template_dir, $compile_dir = COMPILE_REALDIR)
-    {
+class SC_InstallView extends SC_View_Ex {
+    function __construct($template_dir, $compile_dir = COMPILE_REALDIR) {
         parent::__construct();
 
         $this->_smarty->template_dir = $template_dir;

$BJQ99(B: branches/version-2_12-dev/data/class/SC_MobileEmoji.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileEmoji.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_MobileEmoji.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
 /**
  * $B7HBSC<Kv$N3(J8;z$r07$&%/%i%9(B
  */
-class SC_MobileEmoji 
-{
+class SC_MobileEmoji {
     /**
      * $B3(J8;z%?%0$r3F%-%c%j%"MQ$NJ8;z%3!<%I$KJQ49$9$k(B
      * output buffering $BMQ%3!<%k%P%C%/4X?t(B
@@ -39,8 +38,7 @@
      * @param string $BF~NO(B
      * @return string $B=PNO(B
      */
-    static function handler($buffer)
-    {
+    static function handler($buffer) {
         $replace_callback = create_function('$matches', 'return SC_MobileEmoji_Ex::indexToCode($matches[1]);');
         return preg_replace_callback('/\[emoji:(e?\d+)\]/', $replace_callback, $buffer);
     }
@@ -51,8 +49,7 @@
      * @param string $index $B3(J8;zHV9f(B
      * @return string $B3(J8;z$rI=$9(B Shift JIS $B$NJ8;zNs$rJV$9!#(B
      */
-    function indexToCode($index)
-    {
+    function indexToCode($index) {
         $carrier = SC_MobileUserAgent_Ex::getCarrier();
         if ($carrier === false) {
             return MOBILE_EMOJI_SUBSTITUTE;

$BJQ99(B: branches/version-2_12-dev/data/class/SC_MobileImage.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileImage.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_MobileImage.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,8 +29,7 @@
 /**
  * $B2hA|JQ49%/%i%9(B
  */
-class SC_MobileImage
-{
+class SC_MobileImage {
     /**
      * $B2hA|$rC<Kv$N2rA|EY$K9g$o$;$FJQ49$9$k(B
      * output buffering $BMQ%3!<%k%P%C%/4X?t(B
@@ -38,8 +37,7 @@
      * @param string $BF~NO(B
      * @return string $B=PNO(B
      */
-    static function handler($buffer)
-    {
+    static function handler($buffer) {
 
         // $BC<Kv>pJs$r<hF@$9$k(B
         $carrier = SC_MobileUserAgent_Ex::getCarrier();
@@ -99,11 +97,11 @@
             foreach ($images[1] as $key => $path) {
                 // resize_image.php$B$O=|30(B
                 if (stripos($path, ROOT_URLPATH . 'resize_image.php') !== FALSE) {
-                    continue;
+                    break;
                 }
 
                 $realpath = html_entity_decode($path, ENT_QUOTES);
-                $realpath = substr_replace($realpath, HTML_REALDIR, 0, strlen(ROOT_URLPATH));
+                $realpath = preg_replace('|^' . ROOT_URLPATH . '|', HTML_REALDIR, $realpath);
                 $converted = $imageConverter->execute($realpath);
                 if (isset($converted['outputImageName'])) {
                     $buffer = str_replace($path, MOBILE_IMAGE_URLPATH . $converted['outputImageName'], $buffer);

$BJQ99(B: branches/version-2_12-dev/data/class/SC_MobileUserAgent.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileUserAgent.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_MobileUserAgent.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -27,8 +27,7 @@
  * $BBP>]$H$9$k7HBSC<Kv$O(B $_SERVER $B$+$i7hDj$9$k!#(B
  * $B$9$Y$F$N%a%=%C%I$O%/%i%9%a%=%C%I!#(B
  */
-class SC_MobileUserAgent 
-{
+class SC_MobileUserAgent {
     /**
      * $B7HBSC<Kv$N%-%c%j%"$rI=$9J8;zNs$r<hF@$9$k!#(B
      *
@@ -37,8 +36,7 @@
      * @return string|false $B7HBSC<Kv$N%-%c%j%"$rI=$9J8;zNs$rJV$9!#(B
      *                      $B7HBSC<Kv$G$O$J$$>l9g$O(B false $B$rJV$9!#(B
      */
-    function getCarrier()
-    {
+    function getCarrier() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
         if (Net_UserAgent_Mobile::isError($objAgent)) {
             return false;
@@ -68,8 +66,7 @@
      *
      * @return string|false $B<hF@$7$?(BID$B$rJV$9!#<hF@$G$-$J$+$C$?>l9g$O(B false $B$rJV$9!#(B
      */
-    function getId()
-    {
+    function getId() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
         if (Net_UserAgent_Mobile::isError($objAgent)) {
             return false;
@@ -87,8 +84,7 @@
      *
      * @return string $B7HBSC<Kv$N%b%G%k$rI=$9J8;zNs$rJV$9!#(B
      */
-    function getModel()
-    {
+    function getModel() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
         if (Net_UserAgent_Mobile::isError($objAgent)) {
             return 'Unknown';
@@ -111,8 +107,7 @@
      *
      * @return boolean $B%5%]!<%H$7$F$$$k>l9g$O(B true$B!"$=$l0J30$N>l9g$O(B false $B$rJV$9!#(B
      */
-    function isSupported()
-    {
+    function isSupported() {
         $objAgent =& Net_UserAgent_Mobile::singleton();
 
         // $B7HBSC<Kv$@$HG'<1$5$l$?$,!"(BUser-Agent $B$N7A<0$,L$CN$N>l9g(B
@@ -142,8 +137,7 @@
      * 
      * @return boolean $B%5%]!<%H$7$F$$$k>l9g$O(B true$B!"$=$l0J30$N>l9g$O(B false $B$rJV$9!#(B 
      */
-    function isMobile()
-    { 
+    function isMobile() { 
         $objAgent =& Net_UserAgent_Mobile::singleton(); 
         if (Net_UserAgent_Mobile::isError($objAgent)) { 
             return false; 

$BJQ99(B: branches/version-2_12-dev/data/class/SC_MobileView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_MobileView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -21,15 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-class SC_MobileView extends SC_SiteView_Ex 
-{
-    function __construct($setPrevURL = true)
-    {
+class SC_MobileView extends SC_SiteView_Ex {
+    function __construct($setPrevURL = true) {
         parent::__construct($setPrevURL);
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->_smarty->template_dir = MOBILE_TEMPLATE_REALDIR;

$BJQ99(B: branches/version-2_12-dev/data/class/SC_PageNavi.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_PageNavi.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_PageNavi.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,14 +28,12 @@
         $objPage->tpl_pageno = $_POST['pageno'];
     $B!&(B$func_name$B$K;XDj$9$k(BJavaScript$B$NNc(B
         // $B%Z!<%8%J%S$G;HMQ$9$k(B
-        function fnNaviPage(pageno)
-        {
+        function fnNaviPage(pageno) {
             document.form1['pageno'].value = pageno;
             document.form1.submit();
         }
 */
-class SC_PageNavi 
-{
+class SC_PageNavi {
     var $now_page;      // $B8=:_$N%Z!<%8HV9f(B
     var $max_page;      // $B:G=*$N%Z!<%8HV9f(B
     var $start_row;     // $B3+;O%l%3!<%I(B
@@ -43,8 +41,7 @@
     var $arrPagenavi = array(); // $B%Z!<%8(B
 
     // $B%3%s%9%H%i%/%?(B
-    function __construct($now_page, $all_row, $page_row, $func_name, $navi_max = NAVI_PMAX, $urlParam = '', $display_number = true)
-    {
+    function __construct($now_page, $all_row, $page_row, $func_name, $navi_max = NAVI_PMAX, $urlParam = '', $display_number = true) {
         $this->arrPagenavi['mode'] = 'search';
 
         //$B8=:_%Z!<%8(B($now_page)$B$, ＠ 5$7$$?tCM$G$J$$>l9g(B

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Product.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Product.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Product.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class SC_Product 
-{
+class SC_Product {
 
     /** $B5,3JL>0lMw(B */
     var $arrClassName;
@@ -60,8 +59,7 @@
      * @param string $order $BJB$SBX$($N=g=x(B ASC / DESC
      * @return void
      */
-    function setProductsOrder($col, $table = 'dtb_products', $order = 'ASC')
-    {
+    function setProductsOrder($col, $table = 'dtb_products', $order = 'ASC') {
         $this->arrOrderData = array('col' => $col, 'table' => $table, 'order' => $order);
     }
 
@@ -74,10 +72,10 @@
      * @param array $arrVal $B8!:w%Q%i%a!<%?!<$NG[Ns(B
      * @return array $B>&IJ(BID$B$NG[Ns(B
      */
-    function findProductIdsOrder(&$objQuery, $arrVal = array())
-    {
-        $table = 'dtb_products AS alldtl';
-
+    function findProductIdsOrder(&$objQuery, $arrVal = array()) {
+        $table = <<< __EOS__
+            dtb_products AS alldtl
+__EOS__;
         $objQuery->setGroupBy('alldtl.product_id');
         if (is_array($this->arrOrderData) and $objQuery->order == '') {
             $o_col = $this->arrOrderData['col'];
@@ -95,9 +93,12 @@
 __EOS__;
             $objQuery->setOrder($order);
         }
-        $arrReturn = $objQuery->getCol('alldtl.product_id', $table, '', $arrVal);
-
-        return $arrReturn;
+        $results = $objQuery->select('alldtl.product_id', $table, '', $arrVal, MDB2_FETCHMODE_ORDERED);
+        $resultValues = array();
+        foreach ($results as $val) {
+            $resultValues[] = $val[0];
+        }
+        return $resultValues;
     }
 
     /**
@@ -109,10 +110,10 @@
      * @param array $arrVal $B8!:w%Q%i%a!<%?!<$NG[Ns(B
      * @return array $BBP>]>&IJ(BID$B?t(B
      */
-    function findProductCount(&$objQuery, $arrVal = array())
-    {
-        $table = 'dtb_products AS alldtl';
-
+    function findProductCount(&$objQuery, $arrVal = array()) {
+        $table = <<< __EOS__
+            dtb_products AS alldtl
+__EOS__;
         return $objQuery->count($table, '', $arrVal);
     }
 
@@ -126,8 +127,7 @@
      * @param SC_Query $objQuery SC_Query $B%$%s%9%?%s%9(B
      * @return array $B>&IJ0lMw$NG[Ns(B
      */
-    function lists(&$objQuery)
-    {
+    function lists(&$objQuery) {
         $col = <<< __EOS__
              product_id
             ,product_code_min
@@ -153,7 +153,6 @@
             ,update_date
 __EOS__;
         $res = $objQuery->select($col, $this->alldtlSQL());
-
         return $res;
     }
 
@@ -169,8 +168,7 @@
      * @param array $arrProductId $B>&IJ(BID
      * @return array $B>&IJ0lMw$NG[Ns(B ($B%-!<(B: $B>&IJ(BID)
      */
-    function getListByProductIds(&$objQuery, $arrProductId = array())
-    {
+    function getListByProductIds(&$objQuery, $arrProductId = array()) {
         if (empty($arrProductId)) {
             return array();
         }
@@ -182,7 +180,12 @@
         $arrProducts = $this->lists($objQuery);
 
         // $BG[Ns$N%-!<$r>&IJ(BID$B$K(B
-        $arrProducts = SC_Utils_Ex::makeArrayIDToKey('product_id', $arrProducts);
+        $arrTmp = array();
+        foreach ($arrProducts as $arrProduct) {
+            $arrTmp[$arrProduct['product_id']] = $arrProduct;
+        }
+        $arrProducts =& $arrTmp;
+        unset($arrTmp);
 
         // SC_Query::setOrder() $B$N;XDj$,$J$$>l9g!"(B$arrProductId $B$G;XDj$5$l$?>&IJ(BID$B$N=g$KG[NsMWAG$rJB$SBX$((B
         if (strlen($objQuery->order) === 0) {
@@ -206,8 +209,7 @@
      * @param integer $productId $B>&IJ(BID
      * @return array $B>&IJ>\:Y>pJs$NG[Ns(B
      */
-    function getDetail($productId)
-    {
+    function getDetail($productId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrProduct = $objQuery->getRow('*', $this->alldtlSQL('product_id = ?'),
                                     'product_id = ?',
@@ -226,11 +228,9 @@
      * @param integer $productClassId $B>&IJ5,3J(BID
      * @return array $B>&IJ>\:Y>pJs$H>&IJ5,3J$NG[Ns(B
      */
-    function getDetailAndProductsClass($productClassId)
-    {
+    function getDetailAndProductsClass($productClassId) {
         $result = $this->getProductsClass($productClassId);
         $result = array_merge($result, $this->getDetail($result['product_id']));
-
         return $result;
     }
 
@@ -244,8 +244,7 @@
      * @param boolean $has_deleted $B:o=|$5$l$?>&IJ5,3J$b4^$`>l9g(B true; $B=i4|CM(B false
      * @return void
      */
-    function setProductsClassByProductIds($arrProductId, $has_deleted = false)
-    {
+    function setProductsClassByProductIds($arrProductId, $has_deleted = false) {
 
         foreach ($arrProductId as $productId) {
             $arrProductClasses = $this->getProductsClassFullByProductId($productId, $has_deleted);
@@ -347,8 +346,7 @@
      * @param array $params $B8!:w%Q%i%a!<%?!<$NG[Ns(B
      * @return array $B>&IJ5,3J$NG[Ns(B
      */
-    function getProductsClassByQuery(&$objQuery, $params)
-    {
+    function getProductsClassByQuery(&$objQuery, $params) {
         // $BKvC<$N5,3J$r<hF@(B
         $col = <<< __EOS__
             T1.product_id,
@@ -401,12 +399,10 @@
      * @param integer $productClassId $B>&IJ5,3J(BID
      * @return array $B>&IJ5,3J$NG[Ns(B
      */
-    function getProductsClass($productClassId)
-    {
+    function getProductsClass($productClassId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setWhere('product_class_id = ? AND T1.del_flg = 0');
         $arrRes = $this->getProductsClassByQuery($objQuery, $productClassId);
-
         return (array)$arrRes[0];
     }
 
@@ -417,8 +413,7 @@
      * @param boolean $has_deleted $B:o=|$5$l$?>&IJ5,3J$b4^$`>l9g(B true; $B=i4|CM(B false
      * @return array $B>&IJ5,3J$NG[Ns(B
      */
-    function getProductsClassByProductIds($productIds = array(), $has_deleted = false)
-    {
+    function getProductsClassByProductIds($productIds = array(), $has_deleted = false) {
         if (empty($productIds)) {
             return array();
         }
@@ -428,7 +423,6 @@
             $where .= ' AND T1.del_flg = 0';
         }
         $objQuery->setWhere($where);
-
         return $this->getProductsClassByQuery($objQuery, $productIds);
     }
 
@@ -439,10 +433,8 @@
      * @param boolean $has_deleted $B:o=|$5$l$?>&IJ5,3J$b4^$`>l9g(B true; $B=i4|CM(B false
      * @return array $B$9$Y$F$NAH$_9g$o$;$N>&IJ5,3J$NG[Ns(B
      */
-    function getProductsClassFullByProductId($productId, $has_deleted = false)
-    {
+    function getProductsClassFullByProductId($productId, $has_deleted = false) {
         $arrRet = $this->getProductsClassByProductIds(array($productId), $has_deleted);
-
         return $arrRet;
     }
 
@@ -452,8 +444,7 @@
      * @param array $B>&IJ(BID $B$NG[Ns(B
      * @return array $B>&IJ(BID$B$r%-!<$K$7$?>&IJ%9%F!<%?%9(BID$B$NG[Ns(B
      */
-    function getProductStatus($productIds)
-    {
+    function getProductStatus($productIds) {
         if (empty($productIds)) {
             return array();
         }
@@ -466,7 +457,6 @@
         foreach ($productStatus as $status) {
             $results[$status['product_id']][] = $status['product_status_id'];
         }
-
         return $results;
     }
 
@@ -478,8 +468,7 @@
      * @param integer $productId $B>&IJ(BID
      * @param array $productStatusIds ON $B$K$9$k>&IJ%9%F!<%?%9(BID$B$NG[Ns(B
      */
-    function setProductStatus($productId, $productStatusIds)
-    {
+    function setProductStatus($productId, $productStatusIds) {
 
         $val['product_id'] = $productId;
         $val['creator_id'] = $_SESSION['member_id'];
@@ -505,8 +494,7 @@
      * @return integer $B>&IJ>\:Y$N7k2L$+$i5a$a$?HNGd@)8B?t(B.
      * @see getDetailAndProductsClass()
      */
-    function getBuyLimit($p)
-    {
+    function getBuyLimit($p) {
         $limit = null;
         if ($p['stock_unlimited'] != '1' && is_numeric($p['sale_limit'])) {
             $limit = min($p['sale_limit'], $p['stock']);
@@ -515,7 +503,6 @@
         } elseif ($p['stock_unlimited'] != '1') {
             $limit = $p['stock'];
         }
-
         return $limit;
     }
 
@@ -531,8 +518,7 @@
      * @param integer $quantity $B8:>/$5$;$k:_8K?t(B
      * @return boolean $B:_8K$N8:>/$K ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function reduceStock($productClassId, $quantity)
-    {
+    function reduceStock($productClassId, $quantity) {
 
         if ($quantity == 0) {
             return false;
@@ -558,34 +544,25 @@
      * $B$3$N4X?t$O(B, $B<g$K%9%^!<%H%U%)%s$G;HMQ$7$^$9(B.
      *
      * @param array $arrProducts $B>&IJ>pJs$NG[Ns(B
-     * @return array $B5l%P!<%8%g%s8_49MQ$N%G!<%?(B
+     * @return array $B ＠ G9~6b3[$r ＠ _Dj$7$?>&IJ>pJs$NG[Ns(B
      */
-    static function setPriceTaxTo(&$arrProducts)
-    {
-        foreach ($arrProducts as &$arrProduct) {
-            $arrProduct['price01_min_format'] = number_format($arrProduct['price01_min']);
-            $arrProduct['price01_max_format'] = number_format($arrProduct['price01_max']);
-            $arrProduct['price02_min_format'] = number_format($arrProduct['price02_min']);
-            $arrProduct['price02_max_format'] = number_format($arrProduct['price02_max']);
+    function setPriceTaxTo($arrProducts) {
+        foreach ($arrProducts as $key => $value) {
+            $arrProducts[$key]['price01_min_format'] = number_format($arrProducts[$key]['price01_min']);
+            $arrProducts[$key]['price01_max_format'] = number_format($arrProducts[$key]['price01_max']);
+            $arrProducts[$key]['price02_min_format'] = number_format($arrProducts[$key]['price02_min']);
+            $arrProducts[$key]['price02_max_format'] = number_format($arrProducts[$key]['price02_max']);
 
-            SC_Product_Ex::setIncTaxToProduct($arrProduct);
+            $arrProducts[$key]['price01_min_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price01_min']);
+            $arrProducts[$key]['price01_max_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price01_max']);
+            $arrProducts[$key]['price02_min_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price02_min']);
+            $arrProducts[$key]['price02_max_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price02_max']);
 
-            $arrProduct['price01_min_inctax_format'] = number_format($arrProduct['price01_min_inctax']);
-            $arrProduct['price01_max_inctax_format'] = number_format($arrProduct['price01_max_inctax']);
-            $arrProduct['price02_min_inctax_format'] = number_format($arrProduct['price02_min_inctax']);
-            $arrProduct['price02_max_inctax_format'] = number_format($arrProduct['price02_max_inctax']);
-
-            // @deprecated 2.12.4
-            // $B5l%P!<%8%g%s8_49MQ(B
-            // $BK\Mh$O!"@G3[$NBeF~$G;HMQ$9$Y$-%-!<L>!#(B
-            $arrProduct['price01_min_tax_format'] =& $arrProduct['price01_min_inctax_format'];
-            $arrProduct['price01_max_tax_format'] =& $arrProduct['price01_max_inctax_format'];
-            $arrProduct['price02_min_tax_format'] =& $arrProduct['price02_min_inctax_format'];
-            $arrProduct['price02_max_tax_format'] =& $arrProduct['price02_max_inctax_format'];
+            $arrProducts[$key]['price01_min_tax_format'] = number_format($arrProducts[$key]['price01_min_tax']);
+            $arrProducts[$key]['price01_max_tax_format'] = number_format($arrProducts[$key]['price01_max_tax']);
+            $arrProducts[$key]['price02_min_tax_format'] = number_format($arrProducts[$key]['price02_min_tax']);
+            $arrProducts[$key]['price02_max_tax_format'] = number_format($arrProducts[$key]['price02_max_tax']);
         }
-        // @deprecated 2.12.4
-        // $B5l%P!<%8%g%s8_49MQ(B
-        // $B8=:_$O;2>HEO$7$GLa$;$k(B
         return $arrProducts;
     }
 
@@ -595,8 +572,7 @@
      * @param array $arrProducts $B>&IJ>pJs$NG[Ns(B
      * @return void
      */
-    static function setIncTaxToProducts(&$arrProducts)
-    {
+    static function setIncTaxToProducts(&$arrProducts) {
         foreach ($arrProducts as &$arrProduct) {
             SC_Product_Ex::setIncTaxToProduct($arrProduct);
         }
@@ -608,12 +584,11 @@
      * @param array $arrProducts $B>&IJ>pJs$NG[Ns(B
      * @return void
      */
-    static function setIncTaxToProduct(&$arrProduct)
-    {
-        $arrProduct['price01_min_inctax'] = isset($arrProduct['price01_min']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price01_min']) : null;
-        $arrProduct['price01_max_inctax'] = isset($arrProduct['price01_max']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price01_max']) : null;
-        $arrProduct['price02_min_inctax'] = isset($arrProduct['price02_min']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price02_min']) : null;
-        $arrProduct['price02_max_inctax'] = isset($arrProduct['price02_max']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price02_max']) : null;
+    static function setIncTaxToProduct(&$arrProduct) {
+        $arrProduct['price01_min_inctax'] = isset($arrProduct['price01_min']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price01_min']) : null;
+        $arrProduct['price01_max_inctax'] = isset($arrProduct['price01_max']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price01_max']) : null;
+        $arrProduct['price02_min_inctax'] = isset($arrProduct['price02_min']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price02_min']) : null;
+        $arrProduct['price02_max_inctax'] = isset($arrProduct['price02_max']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price02_max']) : null;
     }
 
     /**
@@ -622,8 +597,7 @@
      * @param string $where_products_class $B>&IJ5,3J>pJs$N(B WHERE $B6g(B
      * @return string $B>&IJ>\:Y$N(B SQL
      */
-    function alldtlSQL($where_products_class = '')
-    {
+    function alldtlSQL($where_products_class = '') {
         if (!SC_Utils_Ex::isBlank($where_products_class)) {
             $where_products_class = 'AND (' . $where_products_class . ')';
         }
@@ -718,7 +692,6 @@
                         ON dtb_products.maker_id = dtb_maker.maker_id
             ) AS alldtl
 __EOS__;
-
         return $sql;
     }
 
@@ -730,8 +703,7 @@
      * @param string $where $B>&IJ>\:Y$N(B WHERE $B6g(B
      * @return string $B>&IJ5,3J>\:Y$N(B SQL
      */
-    function prdclsSQL($where = '')
-    {
+    function prdclsSQL($where = '') {
         $where_clause = '';
         if (!SC_Utils_Ex::isBlank($where)) {
             $where_clause = ' WHERE ' . $where;
@@ -769,7 +741,6 @@
             $where_clause
         ) as prdcls
 __EOS__;
-
         return $sql;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Query.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Query.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,8 +29,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Query 
-{
+class SC_Query {
 
     var $option = '';
     var $where = '';
@@ -49,8 +48,7 @@
      * @param boolean $force_run $B%(%i!<$,H/@8$7$F$b=hM}$rB39T$9$k>l9g(B true
      * @param boolean $new $B?75,$K@\B3$r9T$&$+$I$&$+(B
      */
-    function __construct($dsn = '', $force_run = false, $new = false)
-    {
+    function __construct($dsn = '', $force_run = false, $new = false) {
 
         if ($dsn == '') {
             $dsn = array('phptype'  => DB_TYPE,
@@ -100,8 +98,7 @@
      * @param boolean $new $B?75,$K@\B3$r9T$&$+$I$&$+(B
      * @return SC_Query $B%7%s%0%k%H%s$N(B SC_Query $B%$%s%9%?%s%9(B
      */
-    static function getSingletonInstance($dsn = '', $force_run = false, $new = false)
-    {
+    static function getSingletonInstance($dsn = '', $force_run = false, $new = false) {
         $objThis = SC_Query_Ex::getPoolInstance($dsn);
         if (is_null($objThis)) {
             $objThis = SC_Query_Ex::setPoolInstance(new SC_Query_Ex($dsn, $force_run, $new), $dsn);
@@ -121,8 +118,7 @@
      * @deprecated PEAR::isError() $B$r;HMQ$7$F2<$5$$(B
      * @return boolean
      */
-    function isError()
-    {
+    function isError() {
         if (PEAR::isError($this->conn)) {
             return true;
         }
@@ -137,8 +133,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@(B
      * @return integer $B7o?t(B
      */
-    function count($table, $where = '', $arrWhereVal = array())
-    {
+    function count($table, $where = '', $arrWhereVal = array()) {
         return $this->get('COUNT(*)', $table, $where, $arrWhereVal);
     }
 
@@ -150,8 +145,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@(B
      * @return boolean $BM-L5(B
      */
-    function exists($table, $where = '', $arrWhereVal = array())
-    {
+    function exists($table, $where = '', $arrWhereVal = array()) {
         $sql_inner = $this->getSql('*', $table, $where, $arrWhereVal);
         $sql = "SELECT CASE WHEN EXISTS($sql_inner) THEN 1 ELSE 0 END";
         $res = $this->getOne($sql, $arrWhereVal);
@@ -168,8 +162,7 @@
      * @param integer $fetchmode $B;HMQ$9$k%U%'%C%A%b!<%I!#%G%U%)%k%H$O(B MDB2_FETCHMODE_ASSOC$B!#(B
      * @return array|null
      */
-    function select($cols, $from = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function select($cols, $from = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
         $sqlse = $this->getSql($cols, $from, $where, $arrWhereVal);
         return $this->getAll($sqlse, $arrWhereVal, $fetchmode);
     }
@@ -180,8 +173,7 @@
      * @param boolean $disp true$B$N>l9g!"2hLL=PNO$r9T$&(B.
      * @return string SQL$BJ8(B
      */
-    function getLastQuery($disp = true)
-    {
+    function getLastQuery($disp = true) {
         $sql = $this->conn->last_query;
         if ($disp) {
             echo $sql . ";<br />\n";
@@ -195,8 +187,7 @@
      * @return MDB2_OK $B ＠ .8y$7$?>l9g$O(B MDB2_OK;
      *         $B<:GT$7$?>l9g$O(B PEAR::Error $B%*%V%8%'%/%H(B
      */
-    function commit()
-    {
+    function commit() {
         return $this->conn->commit();
     }
 
@@ -206,8 +197,7 @@
      * @return MDB2_OK $B ＠ .8y$7$?>l9g$O(B MDB2_OK;
      *         $B<:GT$7$?>l9g$O(B PEAR::Error $B%*%V%8%'%/%H(B
      */
-    function begin()
-    {
+    function begin() {
         return $this->conn->beginTransaction();
     }
 
@@ -217,8 +207,7 @@
      * @return MDB2_OK $B ＠ .8y$7$?>l9g$O(B MDB2_OK;
      *         $B<:GT$7$?>l9g$O(B PEAR::Error $B%*%V%8%'%/%H(B
      */
-    function rollback()
-    {
+    function rollback() {
         return $this->conn->rollback();
     }
 
@@ -227,8 +216,7 @@
      *
      * @return boolean $B%H%i%s%6%/%7%g%s$,3+;O$5$l$F$$$k>l9g(B true
      */
-    function inTransaction()
-    {
+    function inTransaction() {
         return $this->conn->inTransaction();
     }
 
@@ -239,8 +227,7 @@
      *
      * FIXME MDB2::exec() $B$N<BAu$G$"$k$Y$-(B
      */
-    function exec($str, $arrVal = array())
-    {
+    function exec($str, $arrVal = array()) {
         return $this->query($str, $arrVal);
     }
 
@@ -253,8 +240,7 @@
      * @param integer $fetchmode $B;HMQ$9$k%U%'%C%A%b!<%I!#%G%U%)%k%H$O(B DB_FETCHMODE_ASSOC$B!#(B
      * @return boolean $B7k2L(B
      */
-    function doCallbackAll($cbFunc, $sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function doCallbackAll($cbFunc, $sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
 
         $sql = $this->dbFactory->sfChangeMySQL($sql);
 
@@ -286,8 +272,7 @@
      * @param integer $fetchmode $B;HMQ$9$k%U%'%C%A%b!<%I!#%G%U%)%k%H$O(B DB_FETCHMODE_ASSOC$B!#(B
      * @return array $B%G!<%?$r4^$`(B2$B<!85G[Ns!#<:GT$7$?>l9g$K(B 0 $B$^$?$O(B DB_Error $B%*%V%8%'%/%H$rJV$7$^$9!#(B
      */
-    function getAll($sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function getAll($sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
 
         $sql = $this->dbFactory->sfChangeMySQL($sql);
 
@@ -320,8 +305,7 @@
      * @param mixed $arrWhereVal $B%W%l!<%9%[%k%@(B($B;2>H(B)
      * @return string $B9=C[:Q$_$N(B SELECT $BJ8(B
      */
-    function getSql($cols, $from = '', $where = '', &$arrWhereVal = null)
-    {
+    function getSql($cols, $from = '', $where = '', &$arrWhereVal = null) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
 
         $sqlse = "SELECT $cols";
@@ -357,8 +341,7 @@
      * @param string $str $BIUM?$9$k(B SQL $BJ8(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function setOption($str)
-    {
+    function setOption($str) {
         $this->option = $str;
         return $this;
     }
@@ -372,8 +355,7 @@
      * @param integer $offset OFFSET $B6g$KIUM?$9$kCM(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function setLimitOffset($limit, $offset = 0)
-    {
+    function setLimitOffset($limit, $offset = 0) {
         if (is_numeric($limit) && is_numeric($offset)) {
             $this->conn->setLimit($limit, $offset);
         }
@@ -388,8 +370,7 @@
      * @param string $str GROUP BY $B6g$KIUM?$9$kJ8;zNs(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function setGroupBy($str)
-    {
+    function setGroupBy($str) {
         if (strlen($str) == 0) {
             $this->groupby = '';
         } else {
@@ -406,8 +387,7 @@
      * @param string $str WHERE $B6g$KIUM?$9$k(B AND $B>r7o$NJ8;zNs(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function andWhere($str)
-    {
+    function andWhere($str) {
         if ($this->where != '') {
             $this->where .= ' AND ' . $str;
         } else {
@@ -424,8 +404,7 @@
      * @param string $str WHERE $B6g$KIUM?$9$k(B OR $B>r7o$NJ8;zNs(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function orWhere($str)
-    {
+    function orWhere($str) {
         if ($this->where != '') {
             $this->where .= ' OR ' . $str;
         } else {
@@ -443,8 +422,7 @@
      * @param mixed $arrWhereVal $B%W%l!<%9%[%k%@(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function setWhere($where = '', $arrWhereVal = array())
-    {
+    function setWhere($where = '', $arrWhereVal = array()) {
         $this->where = $where;
         $this->arrWhereVal = $arrWhereVal;
         return $this;
@@ -458,8 +436,7 @@
      * @param string $str ORDER BY $B6g$KIUM?$9$kJ8;zNs(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function setOrder($str)
-    {
+    function setOrder($str) {
         if (strlen($str) == 0) {
             $this->order = '';
         } else {
@@ -476,8 +453,7 @@
      * @param integer $limit LIMIT $B6g$K ＠ _Dj$9$kCM(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function setLimit($limit)
-    {
+    function setLimit($limit) {
         if (is_numeric($limit)) {
             $this->conn->setLimit($limit);
         }
@@ -492,8 +468,7 @@
      * @param integer $offset OFFSET $B6g$K ＠ _Dj$9$kCM(B
      * @return SC_Query $B<+J,<+?H$N%$%s%9%?%s%9(B
      */
-    function setOffset($offset)
-    {
+    function setOffset($offset) {
         if (is_numeric($offset)) {
             $this->conn->setLimit($this->conn->limit, $offset);
         }
@@ -511,8 +486,7 @@
      * @param string $arrFromVal FROM $B6g!&(BWHERE $B6g$G;HMQ$9$k%W%l!<%9%[%k%@G[Ns(B
      * @return integer|DB_Error|boolean $BA^F~7o?t$^$?$O%(%i!<(B(DB_Error, false)
      */
-    function insert($table, $arrVal, $arrSql = array(), $arrSqlVal = array(), $from = '', $arrFromVal = array())
-    {
+    function insert($table, $arrVal, $arrSql = array(), $arrSqlVal = array(), $from = '', $arrFromVal = array()) {
         $strcol = '';
         $strval = '';
         $find = false;
@@ -569,8 +543,7 @@
      * @param array $arrRawSqlVal $BDI2C%+%i%`MQ$N%W%l!<%9%[%k%@G[Ns(B
      * @return
      */
-    function update($table, $arrVal, $where = '', $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array())
-    {
+    function update($table, $arrVal, $where = '', $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array()) {
         $arrCol = array();
         $arrValForQuery = array();
         $find = false;
@@ -625,8 +598,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@$KA^F~$9$kCM(B
      * @return integer MAX$BJ8$N<B9T7k2L(B
      */
-    function max($col, $table, $where = '', $arrWhereVal = array())
-    {
+    function max($col, $table, $where = '', $arrWhereVal = array()) {
         $ret = $this->get("MAX($col)", $table, $where, $arrWhereVal);
         return $ret;
     }
@@ -640,8 +612,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@$KA^F~$9$kCM(B
      * @return integer MIN$BJ8$N<B9T7k2L(B
      */
-    function min($col, $table, $where = '', $arrWhereVal = array())
-    {
+    function min($col, $table, $where = '', $arrWhereVal = array()) {
         $ret = $this->get("MIN($col)", $table, $where, $arrWhereVal);
         return $ret;
     }
@@ -655,8 +626,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@$KA^F~$9$kCM(B
      * @return mixed SQL $B$N<B9T7k2L(B
      */
-    function get($col, $table = '', $where = '', $arrWhereVal = array())
-    {
+    function get($col, $table = '', $where = '', $arrWhereVal = array()) {
         $sqlse = $this->getSql($col, $table, $where, $arrWhereVal);
         // SQL$BJ8$N<B9T(B
         $ret = $this->getOne($sqlse, $arrWhereVal);
@@ -670,8 +640,7 @@
      * @param array $arrVal $B%W%l!<%9%[%k%@$KA^F~$9$kCM(B
      * @return mixed SQL $B$N<B9T7k2L(B
      */
-    function getOne($sql, $arrVal = array())
-    {
+    function getOne($sql, $arrVal = array()) {
 
         $sql = $this->dbFactory->sfChangeMySQL($sql);
 
@@ -704,8 +673,7 @@
      * @param integer $fetchmode $B;HMQ$9$k%U%'%C%A%b!<%I!#%G%U%)%k%H$O(B MDB2_FETCHMODE_ASSOC$B!#(B
      * @return array array('$B%+%i%`L>(B' => '$BCM(B', ...)$B$NO"A[G[Ns(B
      */
-    function getRow($col, $table = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
-    {
+    function getRow($col, $table = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
 
         $sql = $this->getSql($col, $table, $where, $arrWhereVal);
         $sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -738,8 +706,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@$KA^F~$9$kCM(B
      * @return array SQL $B$N<B9T7k2L$NG[Ns(B
      */
-    function getCol($col, $table = '', $where = '', $arrWhereVal = array())
-    {
+    function getCol($col, $table = '', $where = '', $arrWhereVal = array()) {
         $sql = $this->getSql($col, $table, $where, $arrWhereVal);
         $sql = $this->dbFactory->sfChangeMySQL($sql);
 
@@ -770,8 +737,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@(B
      * @return
      */
-    function delete($table, $where = '', $arrWhereVal = array())
-    {
+    function delete($table, $where = '', $arrWhereVal = array()) {
         if (strlen($where) <= 0) {
             $sqlde = "DELETE FROM $table";
         } else {
@@ -787,8 +753,7 @@
      * @param string $seq_name $B<hF@$9$k%7!<%1%s%9L>(B
      * @param integer $B<!$N%7!<%1%s%9CM(B
      */
-    function nextVal($seq_name)
-    {
+    function nextVal($seq_name) {
         return $this->conn->nextID($seq_name);
     }
 
@@ -798,8 +763,7 @@
      * @param string $seq_name $B<hF@$9$k%7!<%1%s%9L>(B
      * @return integer $B8=:_$N%7!<%1%s%9CM(B
      */
-    function currVal($seq_name)
-    {
+    function currVal($seq_name) {
         return $this->conn->currID($seq_name);
     }
 
@@ -810,8 +774,7 @@
      * @param integer $start $B ＠ _Dj$9$k%7!<%1%s%9CM(B
      * @return MDB2_OK
      */
-    function setVal($seq_name, $start)
-    {
+    function setVal($seq_name, $start) {
         $objManager =& $this->conn->loadModule('Manager');
 
         // XXX $BCMJQ99$NLr3d$N$?$a!"B8:_%A%'%C%/$O9T$J$o$J$$!#B8:_$7$J$$>l9g!"$3$3$G%(%i!<$H$J$k!#(B
@@ -839,8 +802,7 @@
      * @param mixed $result_types $BJVCM$N7?;XDj$^$?$O(BDML$B<B9T(B(MDB2_PREPARE_MANIP)
      * @return array SQL $B$N<B9T7k2L$NG[Ns(B
      */
-    function query($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT)
-    {
+    function query($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT) {
 
         $n = $this->dbFactory->sfChangeMySQL($n);
 
@@ -865,8 +827,7 @@
      *
      * @return array $B%7!<%1%s%9L>$NG[Ns(B
      */
-    function listSequences()
-    {
+    function listSequences() {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->listSequences();
     }
@@ -876,8 +837,7 @@
      *
      * @return array $B%F!<%V%kL>$NG[Ns(B
      */
-    function listTables()
-    {
+    function listTables() {
         return $this->dbFactory->listTables($this);
     }
 
@@ -887,8 +847,7 @@
      * @param string $table $B%F!<%V%kL>(B
      * @return array $B;XDj$N%F!<%V%k$N%+%i%`L>$NG[Ns(B
      */
-    function listTableFields($table)
-    {
+    function listTableFields($table) {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->listTableFields($table);
     }
@@ -899,8 +858,7 @@
      * @param string $table $B%F!<%V%kL>(B
      * @return array $B;XDj$N%F!<%V%k$N%$%s%G%C%/%90lMw(B
      */
-    function listTableIndexes($table)
-    {
+    function listTableIndexes($table) {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->listTableIndexes($table);
     }
@@ -913,8 +871,7 @@
      * @param array $definition $B%U%#!<%k%IL>$J$I!!DL>o$N%U%#!<%k%I;XDj;~$O!"(B$definition=array('fields' => array('$B%U%#!<%k%IL>(B' => array()));
      *               MySQL$B$N(Btext$B7?%U%#!<%k%I$r;XDj$9$k>l9g$O(B $definition['length'] = 'text_field(NNN)' $B$,I,MW(B
      */
-    function createIndex($table, $name, $definition)
-    {
+    function createIndex($table, $name, $definition) {
         $definition = $this->dbFactory->sfGetCreateIndexDefinition($table, $name, $definition);
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->createIndex($table, $name, $definition);
@@ -926,8 +883,7 @@
      * @param string $table $B%F!<%V%kL>(B
      * @param string $name $B%$%s%G%C%/%9L>(B
      */
-    function dropIndex($table, $name)
-    {
+    function dropIndex($table, $name) {
         $objManager =& $this->conn->loadModule('Manager');
         return $objManager->dropIndex($table, $name);
     }
@@ -938,8 +894,7 @@
      * @param string $table $B%F!<%V%kL>(B
      * @return array $B%F!<%V%k>pJs$NG[Ns(B
      */
-    function getTableInfo($table)
-    {
+    function getTableInfo($table) {
         $objManager =& $this->conn->loadModule('Reverse');
         return $objManager->tableInfo($table, NULL);
     }
@@ -955,8 +910,7 @@
      * @param string $val $B%/%)!<%H$r9T$&J8;zNs(B
      * @return string $B%/%)!<%H$5$l$?J8;zNs(B
      */
-    function quote($val)
-    {
+    function quote($val) {
         return $this->conn->quote($val);
     }
 
@@ -967,8 +921,7 @@
      * @param array $B%W%l!<%9%[%k%@$NO"A[G[Ns(B
      * @return array $B%F!<%V%k$KB8:_$9$kNs$N$_Cj=P$7$?O"A[G[Ns(B
      */
-    function extractOnlyColsOf($table, $arrParams)
-    {
+    function extractOnlyColsOf($table, $arrParams) {
         $arrCols = $this->listTableFields($table);
         $arrResults = array();
         foreach ($arrParams as $key => $val) {
@@ -988,8 +941,7 @@
      * @param mixed $result_types $BJVCM$N7?;XDj$^$?$O(BDML$B<B9T(B(MDB2_PREPARE_MANIP)$B!"(Bnull$B$O;XDjL5$7(B
      * @return MDB2_Statement_Common $B%W%j%Z%"%I%9%F!<%H%a%s%H%$%s%9%?%s%9(B
      */
-    function prepare($sql, $types = null, $result_types = MDB2_PREPARE_RESULT)
-    {
+    function prepare($sql, $types = null, $result_types = MDB2_PREPARE_RESULT) {
         $sth =& $this->conn->prepare($sql, $types, $result_types);
         if (PEAR::isError($sth)) {
             $msg = $this->traceError($sth, $sql);
@@ -1006,8 +958,7 @@
      * @param array $arrVal $B%W%l!<%9%[%k%@$KA^F~$9$kG[Ns(B
      * @return MDB2_Result $B7k2L%;%C%H$N%$%s%9%?%s%9(B
      */
-    function execute(&$sth, $arrVal = array())
-    {
+    function execute(&$sth, $arrVal = array()) {
 
         $arrStartInfo =& $this->lfStartDbTraceLog($sth, $arrVal);
         $affected =& $sth->execute((array)$arrVal);
@@ -1033,8 +984,7 @@
      * @param array $arrVal $B%W%l!<%9%[%k%@(B
      * @return string $B%H%l!<%9$7$?%(%i!<J8;zNs(B
      */
-    function traceError($error, $sql = '', $arrVal = false)
-    {
+    function traceError($error, $sql = '', $arrVal = false) {
         $err = "SQL: [$sql]\n";
         if ($arrVal !== false) {
             $err .= 'PlaceHolder: [' . var_export($arrVal, true) . "]\n";
@@ -1051,8 +1001,7 @@
     /**
      * $B%(%i!<=hM}(B
      */
-    function error($msg)
-    {
+    function error($msg) {
         $msg = "DB$B=hM}$G%(%i!<$,H/@8$7$^$7$?!#(B\n" . $msg;
         if (!$this->force_run) {
             trigger_error($msg, E_USER_ERROR);
@@ -1071,8 +1020,7 @@
      * @param mixed $result_types $BJVCM$N7?;XDj$^$?$O(BDML$B<B9T(B(MDB2_PREPARE_MANIP)
      * @return array $B<B9T7k2L$NG[Ns(B
      */
-    function getQueryDefsFields($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT)
-    {
+    function getQueryDefsFields($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT) {
 
         $n = $this->dbFactory->sfChangeMySQL($n);
 
@@ -1099,8 +1047,7 @@
      * @param array $arrVal $B%W%l!<%9%[%k%@$KA^F~$9$kG[Ns(B
      * @return void
      */
-    private function lfStartDbTraceLog(&$objSth, &$arrVal)
-    {
+    private function lfStartDbTraceLog(&$objSth, &$arrVal) {
         if (!defined('SQL_QUERY_LOG_MODE') || SQL_QUERY_LOG_MODE === 0) {
             return;
         }
@@ -1135,8 +1082,7 @@
      * @param array $arrVal $B%W%l!<%9%[%k%@$KA^F~$9$kG[Ns(B
      * @return void
      */
-    private function lfEndDbTraceLog(&$arrStartInfo, &$objSth, &$arrVal)
-    {
+    private function lfEndDbTraceLog(&$arrStartInfo, &$objSth, &$arrVal) {
         if (!defined('SQL_QUERY_LOG_MODE') || SQL_QUERY_LOG_MODE === 0) {
             return;
         }
@@ -1167,8 +1113,7 @@
      * @param string $dsn $B%G!<%?%=!<%9L>(B
      * @return SC_Query $B%W!<%k$7$?%$%s%9%?%s%9(B
      */
-    static function setPoolInstance(&$objThis, $dsn = '')
-    {
+    static function setPoolInstance(&$objThis, $dsn = '') {
         $key_str = serialize($dsn);
         return SC_Query_Ex::$arrPoolInstance[$key_str] = $objThis;
     }
@@ -1179,8 +1124,7 @@
      * @param string $dsn $B%G!<%?%=!<%9L>(B
      * @return SC_Query|null
      */
-    static function getPoolInstance($dsn = '')
-    {
+    static function getPoolInstance($dsn = '') {
         $key_str = serialize($dsn);
         if (isset(SC_Query_Ex::$arrPoolInstance[$key_str])) {
             return SC_Query_Ex::$arrPoolInstance[$key_str];

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Response.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Response.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Response.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -27,8 +27,7 @@
  * @author Ryuichi Tokugami
  * @version $Id$
  */
-class SC_Response
-{
+class SC_Response{
 
     /**
      * $B%3%s%F%s%D%?%$%W(B
@@ -49,14 +48,12 @@
     /**
      * $B%l%9%]%s%9=PNO$r=q$-9~$`(B.
      */
-    function write()
-    {
+    function write() {
         $this->sendHeader();
         echo $this->body;
     }
 
-    function sendHeader()
-    {
+    function sendHeader() {
         // HTTP$B$N%X%C%@(B
         foreach ($this->header as $name => $head) {
             header($name.': '.$head);
@@ -66,23 +63,19 @@
         }
     }
 
-    function setContentType($contentType)
-    {
+    function setContentType($contentType) {
         $this->header['Content-Type'] = $contentType;
     }
 
-    function setResposeBody($body)
-    {
+    function setResposeBody($body) {
         $this->body = $body;
     }
 
-    function addHeader($name, $value)
-    {
+    function addHeader($name, $value) {
         $this->header[$name] = $value;
     }
 
-    function containsHeader($name)
-    {
+    function containsHeader($name) {
         return isset($this->header[$name]);
     }
 
@@ -90,8 +83,7 @@
      * $B%"%W%j%1!<%7%g%s$N(Bexit$B=hM}$r$9$k!#0J9_$N=PNO$O4pK\E*$KDd;_$9$k!#(B
      * $B3F%/%i%9FbIt$G>!<j$K(Bexit$B$9$k$J!*(B
     */
-    function actionExit()
-    {
+    function actionExit() {
         // $B%m!<%+%k%U%C%/%]%$%s%H=hM}(B
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         $arrBacktrace = debug_backtrace();
@@ -122,8 +114,7 @@
      * @return void
      * @static
      */
-    function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null)
-    {
+    function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) {
 
         // $B%m!<%+%k%U%C%/%]%$%s%H=hM}(B
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
@@ -224,8 +215,7 @@
      * @return void
      * @static
      */
-    function sendRedirectFromUrlPath($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null)
-    {
+    function sendRedirectFromUrlPath($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) {
         $location = ROOT_URLPATH . ltrim($location, '/');
         SC_Response_Ex::sendRedirect($location, $arrQueryString, $inheritQueryString, $useSsl);
     }
@@ -233,8 +223,7 @@
     /**
      * @static
      */
-    function reload($arrQueryString = array(), $removeQueryString = false)
-    {
+    function reload($arrQueryString = array(), $removeQueryString = false) {
         // $B8=:_$N(B URL $B$r<hF@(B
         $netUrl = new Net_URL($_SERVER['REQUEST_URI']);
 
@@ -246,13 +235,11 @@
         SC_Response_Ex::sendRedirect($netUrl->getURL(), $arrQueryString);
     }
 
-    function setHeader($headers)
-    {
+    function setHeader($headers) {
         $this->header = $headers;
     }
 
-    function setStatusCode($statusCode = null)
-    {
+    function setStatusCode($statusCode = null) {
         $this->statusCode = $statusCode;
     }
 
@@ -271,8 +258,7 @@
      * @license http://www.gnu.org/licenses/fdl.html GFDL ($BK.Lu(B)
      * @static
      */
-    function sendHttpStatus($statusCode)
-    {
+    function sendHttpStatus($statusCode) {
         $protocol = $_SERVER['SERVER_PROTOCOL'];
         $httpVersion = (strpos($protocol, '1.1') !== false) ? '1.1' : '1.0';
         $messages = array(

$BJQ99(B: branches/version-2_12-dev/data/class/SC_SelectSql.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SelectSql.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_SelectSql.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,8 +22,7 @@
  */
 
 /* ---- SQL$BJ8$r:n$k%/%i%9(B ---- */
-class SC_SelectSql 
-{
+class SC_SelectSql {
 
     var $sql;
 
@@ -35,16 +34,14 @@
     var $arrVal;
 
     //--$B!!%3%s%9%H%i%/%?!#(B
-    function __construct($array = '')
-    {
+    function __construct($array = '') {
         if (is_array($array)) {
             $this->arrSql = $array;
         }
     }
 
     //-- SQL$BJ, ＠ 8@.(B
-    function getSql($mode = '')
-    {
+    function getSql($mode = '') {
         $this->sql = $this->select .' '. $this->where .' '. $this->group .' ';
 
         if ($mode == 2) {
@@ -55,15 +52,13 @@
     }
 
         // $B8!:wMQ(B
-    function addSearchStr($val)
-    {
+    function addSearchStr($val) {
         $return = '%' .$val. '%';
         return $return;
     }
 
     //-- $BHO0O8!:w!J!{!!(B~$B!!!{!!$^$G!K(B
-    function selectRange($from, $to, $column)
-    {
+    function selectRange($from, $to, $column) {
 
         // $B$"$kC10L$N$_8!:w(B($from = $to)
         if ($from == $to) {
@@ -86,8 +81,7 @@
     }
 
     //--$B!!4|4V8!:w!J!{G/!{7n!{F|$+(B~$B!{G/!{7n!{F|$^$G!K(B
-    function selectTermRange($from_year, $from_month, $from_day, $to_year, $to_month, $to_day, $column)
-    {
+    function selectTermRange($from_year, $from_month, $from_day, $to_year, $to_month, $to_day, $column) {
         $return = array();
 
         // $B3+;O4|4V$N9=C[(B
@@ -126,8 +120,7 @@
     }
 
     // checkbox$B$J$I$GF10l%+%i%`Fb$GC10l!"$b$7$/$OJ#?tA*Br;h$,M-$k>l9g!!Nc(B: AND ( sex = xxx OR sex = xxx OR sex = xxx) AND ...
-    function setItemTerm($arr, $ItemStr)
-    {
+    function setItemTerm($arr, $ItemStr) {
         $return = array();
         foreach ($arr as $data) {
 
@@ -152,8 +145,7 @@
     }
 
     //$B!!(BNULL$BCM$,I,MW$J>l9g(B
-    function setItemTermWithNull($arr, $ItemStr)
-    {
+    function setItemTermWithNull($arr, $ItemStr) {
         $return = array();
         $item = " {$ItemStr} IS NULL ";
 
@@ -171,8 +163,7 @@
         return $return;
     }
     // NULL$B$b$7$/$O(B''$B$G8!:w$9$k>l9g(B
-    function setItemTermWithNullAndSpace($arr, $ItemStr)
-    {
+    function setItemTermWithNullAndSpace($arr, $ItemStr) {
         $return = array();
         $count = count($arr);
         $item = " {$ItemStr} IS NULL OR {$ItemStr} = '' ";
@@ -197,8 +188,7 @@
                                                             'value'  => $_POST['show_site1']);
 
     */
-    function setWhereByOR($arrWhere)
-    {
+    function setWhereByOR($arrWhere) {
 
         $count = count($arrWhere);
 
@@ -220,8 +210,7 @@
         }
     }
 
-    function setWhere($where)
-    {
+    function setWhere($where) {
         if ($where != '') {
             if ($this->where) {
 
@@ -234,30 +223,26 @@
         }
     }
 
-    function setOrder($order)
-    {
+    function setOrder($order) {
 
             $this->order =  'ORDER BY ' . $order;
 
     }
 
-    function setGroup($group)
-    {
+    function setGroup($group) {
 
         $this->group =  'GROUP BY ' . $group;
 
     }
 
-    function clearSql()
-    {
+    function clearSql() {
         $this->select = '';
         $this->where = '';
         $this->group = '';
         $this->order = '';
     }
 
-    function setSelect($sql)
-    {
+    function setSelect($sql) {
         $this->select = $sql;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_SendMail.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SendMail.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_SendMail.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,8 +22,7 @@
  */
 
 // $B%F%-%9%H(B/HTML$B!!%a!<%kAw?.(B
-class SC_SendMail 
-{
+class SC_SendMail {
 
     var $to;            // $BAw?. ＠ h(B
     var $subject;       // $BBjL>(B
@@ -39,8 +38,7 @@
      *
      * @return void
      */
-    function __construct()
-    {
+    function __construct() {
         $this->arrRecip = array();
         $this->to = '';
         $this->subject = '';
@@ -63,14 +61,12 @@
     }
 
     // $BAw?. ＠ h$N ＠ _Dj(B
-    function setRecip($key, $recipient)
-    {
+    function setRecip($key, $recipient) {
         $this->arrRecip[$key] = $recipient;
     }
 
     // $B08 ＠ h$N ＠ _Dj(B
-    function setTo($to, $to_name = '')
-    {
+    function setTo($to, $to_name = '') {
         if ($to != '') {
             $this->to = $this->getNameAddress($to_name, $to);
             $this->setRecip('To', $to);
@@ -78,14 +74,12 @@
     }
 
     // $BAw?.85$N ＠ _Dj(B
-    function setFrom($from, $from_name = '')
-    {
+    function setFrom($from, $from_name = '') {
         $this->from = $this->getNameAddress($from_name, $from);
     }
 
     // CC$B$N ＠ _Dj(B
-    function setCc($cc, $cc_name = '')
-    {
+    function setCc($cc, $cc_name = '') {
         if ($cc != '') {
             $this->cc = $this->getNameAddress($cc_name, $cc);
             $this->setRecip('Cc', $cc);
@@ -93,8 +87,7 @@
     }
 
     // BCC$B$N ＠ _Dj(B
-    function setBCc($bcc)
-    {
+    function setBCc($bcc) {
         if ($bcc != '') {
             $this->bcc = $bcc;
             $this->setRecip('Bcc', $bcc);
@@ -102,29 +95,25 @@
     }
 
     // Reply-To$B$N ＠ _Dj(B
-    function setReplyTo($reply_to)
-    {
+    function setReplyTo($reply_to) {
         if ($reply_to != '') {
             $this->reply_to = $reply_to;
         }
     }
 
     // Return-Path$B$N ＠ _Dj(B
-    function setReturnPath($return_path)
-    {
+    function setReturnPath($return_path) {
         $this->return_path = $return_path;
     }
 
     // $B7oL>$N ＠ _Dj(B
-    function setSubject($subject)
-    {
+    function setSubject($subject) {
         $this->subject = mb_encode_mimeheader($subject, 'JIS', 'B', "\n");
         $this->subject = str_replace(array("\r\n", "\r"), "\n", $this->subject);
     }
 
     // $BK\J8$N ＠ _Dj(B
-    function setBody($body)
-    {
+    function setBody($body) {
         // iso-2022-jp$B$@$HFC<lJ8;z$,!)$GAw?.$5$l$k$N$G(BJIS$B$r;HMQ$9$k(B
         $this->body = mb_convert_encoding($body, 'JIS', CHAR_CODE);
     }
@@ -134,8 +123,7 @@
      *
      * @deprecated 2.12.2 (#1912)
      */
-    function setHost($host)
-    {
+    function setHost($host) {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         $this->host = $host;
         $arrHost = array(
@@ -152,8 +140,7 @@
      *
      * @deprecated 2.12.2 (#1912)
      */
-    function setPort($port)
-    {
+    function setPort($port) {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         $this->port = $port;
         $arrHost = array(
@@ -165,8 +152,7 @@
     }
 
     // $BL>A0(B<$B%a!<%k%"%I%l%9(B>$B$N7A<0$r ＠ 8@.(B
-    function getNameAddress($name, $mail_address)
-    {
+    function getNameAddress($name, $mail_address) {
             if ($name != '') {
                 // $B@)8fJ8;z$rJQ49$9$k!#(B
                 $_name = $name;
@@ -179,13 +165,11 @@
             return $name_address;
     }
 
-    function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='')
-    {
+    function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='') {
         $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc);
     }
 
-    function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='')
-    {
+    function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='') {
         $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc);
     }
 
@@ -201,8 +185,7 @@
          $cc            -> $B%+!<%\%s%3%T!<(B
          $bcc           -> $B%V%i%$%s%I%+!<%\%s%3%T!<(B
     */
-    function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='')
-    {
+    function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to='', $bcc='', $cc ='') {
         // $B08 ＠ h@_Dj(B
         $this->setTo($to);
         // $B7oL>@_Dj(B
@@ -229,8 +212,7 @@
     }
 
     // $B%X%C%@!<$rJV$9(B
-    function getBaseHeader()
-    {
+    function getBaseHeader() {
         // $BAw?.$9$k%a!<%k$NFbMF$HAw?. ＠ h(B
         $arrHeader = array();
         $arrHeader['MIME-Version'] = '1.0';
@@ -253,16 +235,14 @@
     }
 
     // $B%X%C%@!<$rJV$9(B
-    function getTEXTHeader()
-    {
+    function getTEXTHeader() {
         $arrHeader = $this->getBaseHeader();
         $arrHeader['Content-Type'] = 'text/plain; charset="ISO-2022-JP"';
         return $arrHeader;
     }
 
     // $B%X%C%@!<$rJV$9(B
-    function getHTMLHeader()
-    {
+    function getHTMLHeader() {
         $arrHeader = $this->getBaseHeader();
         $arrHeader['Content-Type'] = 'text/html; charset="ISO-2022-JP"';
         return $arrHeader;
@@ -273,8 +253,7 @@
      *
      * @return array|string $B%a!<%i!<%P%C%/%(%s%I$K1~$8$?Aw?. ＠ h(B
      */
-    function getRecip()
-    {
+    function getRecip() {
         switch ($this->backend) {
             // PEAR::Mail_mail#send $B$O!"(B($BB>$N%a!<%i!<%P%C%/%(%s%I$H0[$J$j(B) $BBh(B1$B0z?t$r(B To: $B$H$7$F07$&!#(BCc: $B$d(B Bcc: $B$O!"%X%C%@!<>pJs$+$i=hM}$9$k!#(B
             case 'mail':
@@ -294,8 +273,7 @@
      *
      * @return void
      */
-    function sendMail($isHtml = false)
-    {
+    function sendMail($isHtml = false) {
         $header = $isHtml ? $this->getHTMLHeader() : $this->getTEXTHeader();
         $recip = $this->getRecip();
         // $B%a!<%kAw?.(B
@@ -316,8 +294,7 @@
      *
      * @return void
      */
-    function sendHtmlMail()
-    {
+    function sendHtmlMail() {
         return $this->sendMail(true);
     }
 
@@ -327,8 +304,7 @@
      * @param string $backend Pear::Mail $B$N%P%C%/%(%s%I(B
      * @return array $B%a!<%i!<%P%C%/%(%s%I$K1~$8$?%Q%i%a!<%?!<$NG[Ns(B
      */
-    function getBackendParams($backend)
-    {
+    function getBackendParams($backend) {
         switch ($backend) {
             case 'mail':
                 $arrParams = array();

$BJQ99(B: branches/version-2_12-dev/data/class/SC_Session.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Session.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_Session.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,8 +22,7 @@
  */
 
 /* $B%;%C%7%g%s4IM}%/%i%9(B */
-class SC_Session 
-{
+class SC_Session {
 
     /** $B%m%0%$%s%f!<%6L>(B */
     var $login_id;
@@ -44,8 +43,7 @@
     var $uniqid;
 
     /* $B%3%s%9%H%i%/%?(B */
-    function __construct()
-    {
+    function __construct() {
         // $B%;%C%7%g%s>pJs$NJ]B8(B
         if (isset($_SESSION['cert'])) {
             $this->sid = session_id();
@@ -66,8 +64,7 @@
         }
     }
     /* $BG'>Z ＠ .8y$NH=Dj(B */
-    function IsSuccess()
-    {
+    function IsSuccess() {
         if ($this->cert == CERT_STRING) {
             $masterData = new SC_DB_MasterData_Ex();
             $admin_path = preg_replace('/\/+/', '/', $_SERVER['SCRIPT_NAME']);
@@ -85,26 +82,22 @@
     }
 
     /* $B%;%C%7%g%s$N=q$-9~$_(B */
-    function SetSession($key, $val)
-    {
+    function SetSession($key, $val) {
         $_SESSION[$key] = $val;
     }
 
     /* $B%;%C%7%g%s$NFI$_9~$_(B */
-    function GetSession($key)
-    {
+    function GetSession($key) {
         return $_SESSION[$key];
     }
 
     /* $B%;%C%7%g%s(BID$B$N<hF@(B */
-    function GetSID()
-    {
+    function GetSID() {
         return $this->sid;
     }
 
     /** $B%f%K!<%/(BID$B$N<hF@(B **/
-    function getUniqId()
-    {
+    function getUniqId() {
         // $B%f%K!<%/(BID$B$,%;%C%H$5$l$F$$$J$$>l9g$O%;%C%H$9$k!#(B
         if (empty($_SESSION['uniqid'])) {
             $this->setUniqId();
@@ -113,15 +106,13 @@
     }
 
     /** $B%f%K!<%/(BID$B$N%;%C%H(B **/
-    function setUniqId()
-    {
+    function setUniqId() {
         // $BM=B,$5$l$J$$$h$&$K%i%s%@%`J8;zNs$rIUM?$9$k!#(B
         $this->SetSession('uniqid', SC_Utils_Ex::sfGetUniqRandomId());
     }
 
     // $B4XO"%;%C%7%g%s$N$_GK4~$9$k!#(B
-    function logout()
-    {
+    function logout() {
         unset($_SESSION['cert']);
         unset($_SESSION['login_id']);
         unset($_SESSION['authority']);

$BJQ99(B: branches/version-2_12-dev/data/class/SC_SessionFactory.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SessionFactory.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_SessionFactory.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -41,8 +41,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_SessionFactory 
-{
+class SC_SessionFactory {
 
     // }}}
     // {{{ functions
@@ -52,8 +51,7 @@
      *
      * @return SC_SessionFactory
      */
-    function getInstance()
-    {
+    function getInstance() {
 
         $type = defined('SESSION_KEEP_METHOD')
             ? SESSION_KEEP_METHOD
@@ -88,16 +86,14 @@
      * $B%;%C%7%g%s$N=i4|2=$r9T$&(B.
      *
      */
-    function initSession()
-    {}
+    function initSession() {}
 
     /**
      * Cookie$B$r;HMQ$9$k$+$I$&$+$rJV$9(B.
      *
      * @return boolean
      */
-    function useCookie()
-    {}
+    function useCookie() {}
 
 }
 /*

$BJQ99(B: branches/version-2_12-dev/data/class/SC_SiteSession.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SiteSession.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_SiteSession.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,11 +22,9 @@
  */
 
 /* $B%+!<%H%;%C%7%g%s4IM}%/%i%9(B */
-class SC_SiteSession 
-{
+class SC_SiteSession {
     /* $B%3%s%9%H%i%/%?(B */
-    function __construct()
-    {
+    function __construct() {
         // $BA0%Z!<%8$G$NEPO?@.8yH=Dj$r0z$-7Q$0(B
         $_SESSION['site']['pre_regist_success'] =
                 isset($_SESSION['site']['regist_success'])
@@ -41,8 +39,7 @@
     }
 
     /* $BA0%Z!<%8$, ＠ 5Ev$G$"$k$+$NH=Dj(B */
-    function isPrePage()
-    {
+    function isPrePage() {
         if ($_SESSION['site']['pre_page'] != '' && $_SESSION['site']['now_page'] != '') {
             if ($_SESSION['site']['pre_regist_success'] || $_SESSION['site']['pre_page'] == $_SESSION['site']['now_page']) {
                 return true;
@@ -51,20 +48,17 @@
         return false;
     }
 
-    function setNowPage($path)
-    {
+    function setNowPage($path) {
         $_SESSION['site']['now_page'] = $path;
     }
 
     /* $BCM$N<hF@(B */
-    function getValue($keyname)
-    {
+    function getValue($keyname) {
         return $_SESSION['site'][$keyname];
     }
 
     /* $B%f%K!<%/(BID$B$N<hF@(B */
-    function getUniqId()
-    {
+    function getUniqId() {
         // $B%f%K!<%/(BID$B$,%;%C%H$5$l$F$$$J$$>l9g$O%;%C%H$9$k!#(B
         if (!isset($_SESSION['site']['uniqid']) || $_SESSION['site']['uniqid'] == '') {
             $this->setUniqId();
@@ -73,15 +67,13 @@
     }
 
     /* $B%f%K!<%/(BID$B$N%;%C%H(B */
-    function setUniqId()
-    {
+    function setUniqId() {
         // $BM=B,$5$l$J$$$h$&$K%i%s%@%`J8;zNs$rIUM?$9$k!#(B
         $_SESSION['site']['uniqid'] = SC_Utils_Ex::sfGetUniqRandomId();
     }
 
     /* $B%f%K!<%/(BID$B$N%A%'%C%/(B */
-    function checkUniqId()
-    {
+    function checkUniqId() {
         if (!empty($_POST['uniqid'])) {
             if ($_POST['uniqid'] != $_SESSION['site']['uniqid']) {
                 return false;
@@ -91,14 +83,12 @@
     }
 
     /* $B%f%K!<%/(BID$B$N2r=|(B */
-    function unsetUniqId()
-    {
+    function unsetUniqId() {
         $_SESSION['site']['uniqid'] = '';
     }
 
     /* $BEPO?@.8y$r5-O?(B */
-    function setRegistFlag()
-    {
+    function setRegistFlag() {
         $_SESSION['site']['regist_success'] = true;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_SiteView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SiteView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_SiteView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -21,10 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-class SC_SiteView extends SC_View_Ex 
-{
-    function __construct($setPrevURL = true)
-    {
+class SC_SiteView extends SC_View_Ex {
+    function __construct($setPrevURL = true) {
         parent::__construct();
 
         if ($setPrevURL) {
@@ -32,8 +30,7 @@
         }
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->_smarty->template_dir = TEMPLATE_REALDIR;
@@ -42,8 +39,7 @@
         $this->assignTemplatePath(DEVICE_TYPE_PC);
     }
 
-    function setPrevURL()
-    {
+    function setPrevURL() {
             $objCartSess = new SC_CartSession_Ex();
             $objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
     }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -26,8 +26,7 @@
  *
  * @auther Yu Nobira
  */
-class SC_SmartphoneUserAgent 
-{
+class SC_SmartphoneUserAgent {
 
     /**
      * $B%9%^!<%H%U%)%s$+$I$&$+$rH=JL$9$k!#(B
@@ -35,8 +34,7 @@
      *
      * @return boolean
      */
-    function isSmartphone()
-    {
+    function isSmartphone() {
         $nu = new Net_UserAgent_Mobile();
         // SP$B$G$+$D(BPC$BI=<((BOFF$B$N>l9g(B
         return $nu->isSmartphone() && !SC_SmartphoneUserAgent_Ex::getSmartphonePcFlag();
@@ -47,8 +45,7 @@
      *
      * @return boolean
      */
-    function isNonSmartphone()
-    {
+    function isNonSmartphone() {
         return !SC_SmartphoneUserAgent_Ex::isSmartphone();
     }
 
@@ -57,8 +54,7 @@
      *
      * @return string
      */
-    function getSmartphonePcFlag()
-    {
+    function getSmartphonePcFlag() {
         $_SESSION['pc_disp'] = empty($_SESSION['pc_disp']) ? false : $_SESSION['pc_disp'];
         return $_SESSION['pc_disp'];
     }
@@ -66,16 +62,14 @@
     /**
      * PC$BI=<((BON
      */
-    function setPcDisplayOn()
-    {
+    function setPcDisplayOn() {
         $_SESSION['pc_disp'] = true;
     }
 
     /**
      * PC$BI=<((BOFF
      */
-    function setPcDisplayOff()
-    {
+    function setPcDisplayOff() {
         $_SESSION['pc_disp'] = false;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/SC_SmartphoneView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SmartphoneView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_SmartphoneView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -21,15 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-class SC_SmartphoneView extends SC_SiteView_Ex 
-{
-    function __construct($setPrevURL = true)
-    {
+class SC_SmartphoneView extends SC_SiteView_Ex {
+    function __construct($setPrevURL = true) {
         parent::__construct($setPrevURL);
     }
 
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->_smarty->template_dir = SMARTPHONE_TEMPLATE_REALDIR;

$BJQ99(B: branches/version-2_12-dev/data/class/SC_UploadFile.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_UploadFile.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_UploadFile.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,8 +22,7 @@
  */
 
 /* $B%"%C%W%m!<%I%U%!%$%k4IM}%/%i%9(B */
-class SC_UploadFile 
-{
+class SC_UploadFile {
     var $temp_dir;
     var $save_dir;
 
@@ -58,16 +57,14 @@
     var $image = array();
 
     // $B%U%!%$%k4IM}%/%i%9(B
-    function __construct($temp_dir, $save_dir)
-    {
+    function __construct($temp_dir, $save_dir) {
         $this->temp_dir = rtrim($temp_dir, '/') . '/';
         $this->save_dir = rtrim($save_dir, '/') . '/';
         $this->file_max = 0;
     }
 
     // $B%U%!%$%k>pJsDI2C(B
-    function addFile($disp_name, $keyname, $arrExt, $size, $necessary=false, $width=0, $height=0, $image=true)
-    {
+    function addFile($disp_name, $keyname, $arrExt, $size, $necessary=false, $width=0, $height=0, $image=true) {
         $this->disp_name[] = $disp_name;
         $this->keyname[] = $keyname;
         $this->width[] = $width;
@@ -78,8 +75,7 @@
         $this->image[] = $image;
     }
     // $B%5%`%M%$%k2hA|$N:n ＠ .(B
-    function makeThumb($src_file, $width, $height, $dst_file)
-    {
+    function makeThumb($src_file, $width, $height, $dst_file) {
         $objThumb = new gdthumb();
         $ret = $objThumb->Main($src_file, $width, $height, $dst_file);
 
@@ -93,8 +89,7 @@
     }
 
     // $B%"%C%W%m!<%I$5$l$?%U%!%$%k$rJ]B8$9$k!#(B
-    function makeTempFile($keyname, $rename = IMAGE_RENAME)
-    {
+    function makeTempFile($keyname, $rename = IMAGE_RENAME) {
         $objErr = new SC_CheckError_Ex();
         $cnt = 0;
         $arrKeyname = array_flip($this->keyname);
@@ -141,8 +136,7 @@
     }
 
     // $B%"%C%W%m!<%I$5$l$?%@%&%s%m!<%I%U%!%$%k$rJ]B8$9$k!#(B
-    function makeTempDownFile($keyname='down_file')
-    {
+    function makeTempDownFile($keyname='down_file') {
         $objErr = new SC_CheckError_Ex();
         $cnt = 0;
         $arrKeyname = array_flip($this->keyname);
@@ -173,8 +167,7 @@
     }
 
     // $B2hA|$r:o=|$9$k!#(B
-    function deleteFile($keyname)
-    {
+    function deleteFile($keyname) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -191,8 +184,7 @@
     }
 
     // $B2hA|$r:o=|$9$k!#(B
-    function deleteKikakuFile($keyname)
-    {
+    function deleteKikakuFile($keyname) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -209,8 +201,7 @@
     }
 
     // $B0l;~%U%!%$%k%Q%9$r<hF@$9$k!#(B
-    function getTempFilePath($keyname)
-    {
+    function getTempFilePath($keyname) {
         $cnt = 0;
         $filepath = '';
         foreach ($this->keyname as $val) {
@@ -225,8 +216,7 @@
     }
 
     // $B0l;~%U%!%$%k$rJ]B8%G%#%l%/%H%j$K0\$9(B
-    function moveTempFile()
-    {
+    function moveTempFile() {
         $objImage = new SC_Image_Ex($this->temp_dir);
 
         for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
@@ -247,8 +237,7 @@
     }
 
     // $B%@%&%s%m!<%I0l;~%U%!%$%k$rJ]B8%G%#%l%/%H%j$K0\$9(B
-    function moveTempDownFile()
-    {
+    function moveTempDownFile() {
         $objImage = new SC_Image_Ex($this->temp_dir);
         for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
             if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') {
@@ -265,8 +254,7 @@
     }
 
     // HIDDEN$BMQ$N%U%!%$%kL>G[Ns$rJV$9(B
-    function getHiddenFileList()
-    {
+    function getHiddenFileList() {
         $cnt = 0;
         $arrRet = array();
         foreach ($this->keyname as $val) {
@@ -282,8 +270,7 @@
     }
 
     // HIDDEN$B$GAw$i$l$F$-$?%U%!%$%kL>$r<hF@$9$k(B
-    function setHiddenFileList($arrPOST)
-    {
+    function setHiddenFileList($arrPOST) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
             $key = 'temp_' . $val;
@@ -298,8 +285,7 @@
         }
     }
 
-    function setHiddenKikakuFileList($arrPOST)
-    {
+    function setHiddenKikakuFileList($arrPOST) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
             $key = 'temp_' . $val;
@@ -315,8 +301,7 @@
     }
 
     // $B%U%)!<%`$KEO$9MQ$N%U%!%$%k>pJsG[Ns$rJV$9(B
-    function getFormFileList($temp_url, $save_url, $real_size = false)
-    {
+    function getFormFileList($temp_url, $save_url, $real_size = false) {
         $arrRet = array();
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -355,8 +340,7 @@
     }
 
     // $B%U%)!<%`$KEO$9MQ$N%@%&%s%m!<%I%U%!%$%k>pJs$rJV$9(B
-    function getFormDownFile()
-    {
+    function getFormDownFile() {
         $arrRet = '';
         for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
             if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') {
@@ -367,8 +351,7 @@
         }
         return $arrRet;
     }
-    function getFormKikakuDownFile()
-    {
+    function getFormKikakuDownFile() {
         $arrRet = array();
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -383,8 +366,7 @@
     }
 
     // DB$BJ]B8MQ$N%U%!%$%kL>G[Ns$rJV$9(B
-    function getDBFileList()
-    {
+    function getDBFileList() {
         $cnt = 0;
         $dbFileList = array();
         foreach ($this->keyname as $val) {
@@ -399,8 +381,7 @@
     }
 
     // DB$B$GJ]B8$5$l$?%U%!%$%kL>G[Ns$r%;%C%H$9$k(B
-    function setDBFileList($arrVal)
-    {
+    function setDBFileList($arrVal) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
             if (isset($arrVal[$val]) && $arrVal[$val] != '') {
@@ -411,16 +392,14 @@
     }
 
     // DB$B$GJ]B8$5$l$?%@%&%s%m!<%I%U%!%$%kL>$r%;%C%H$9$k(B
-    function setDBDownFile($arrVal)
-    {
+    function setDBDownFile($arrVal) {
         if (isset($arrVal['down_realfilename']) && $arrVal['down_realfilename'] != '') {
             $this->save_file[0] = $arrVal['down_realfilename'];
         }
     }
 
     // DB$B$GJ]B8$5$l$?%@%&%s%m!<%I%U%!%$%kL>$r%;%C%H$9$k(B(setDBDownFile$B$HE}9gM=Dj(B)
-    function setPostFileList($arrPost)
-    {
+    function setPostFileList($arrPost) {
         for ($cnt = 0;$cnt < count($this->keyname); $cnt++) {
             if (isset($arrPost['temp_down_realfilename:' . ($cnt+1)])) {
                 $this->temp_file[$cnt] = $arrPost['temp_down_realfilename:' . ($cnt+1)];
@@ -429,8 +408,7 @@
     }
 
     // $B2hA|$r%;%C%H$9$k(B
-    function setDBImageList($arrVal)
-    {
+    function setDBImageList($arrVal) {
         $cnt = 0;
         foreach ($this->keyname as $val) {
             if ($arrVal[$val] != '' && $val == 'tv_products_image') {
@@ -441,8 +419,7 @@
     }
 
     // DB$B>e$N%U%!%$%k$NFb:o=|MW5a$,$"$C$?%U%!%$%k$r:o=|$9$k!#(B
-    function deleteDBFile($arrVal)
-    {
+    function deleteDBFile($arrVal) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
         foreach ($this->keyname as $val) {
@@ -456,8 +433,7 @@
     }
 
     // DB$B>e$N%@%&%s%m!<%I%U%!%$%k$NFb:o=|MW5a$,$"$C$?%U%!%$%k$r:o=|$9$k!#(B
-    function deleteDBDownFile($arrVal)
-    {
+    function deleteDBDownFile($arrVal) {
         $objImage = new SC_Image_Ex($this->temp_dir);
         $cnt = 0;
         if ($arrVal['down_realfilename'] != '') {
@@ -468,8 +444,7 @@
     }
 
     // $BI,?\H=Dj(B
-    function checkExists($keyname = '')
-    {
+    function checkExists($keyname = '') {
         $cnt = 0;
         $arrRet = array();
         foreach ($this->keyname as $val) {
@@ -491,8 +466,7 @@
     }
 
     // $B3HBgN($r;XDj$7$F2hA|J]B8(B
-    function saveResizeImage($keyname, $to_w, $to_h)
-    {
+    function saveResizeImage($keyname, $to_w, $to_h) {
         $path = '';
 
         // keyname$B$NE:IU%U%!%$%k$r<hF@(B
@@ -513,8 +487,7 @@
      * @param int $keyname
      * @return string
      */
-    function lfGetTmpImageName($rename, $keyname = '', $uploadfile = '')
-    {
+    function lfGetTmpImageName($rename, $keyname = '', $uploadfile = '') {
 
         if ($rename === true) {
             // $B0l0U$J(BID$B$r<hF@$7!"2hA|L>$r%j%M!<%`$7J]B8(B

$BJQ99(B: branches/version-2_12-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_View.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/SC_View.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,21 +23,18 @@
 
 require_once realpath(dirname(__FILE__)) . '/../module/Smarty/libs/Smarty.class.php';
 
-class SC_View 
-{
+class SC_View {
 
     var $_smarty;
 
     var $objPage;
 
     // $B%3%s%9%H%i%/%?(B
-    function __construct()
-    {
+    function __construct() {
         $this->init();
     }
 
-    function init()
-    {
+    function init() {
         $this->_smarty = new Smarty;
         $this->_smarty->left_delimiter = '<!--{';
         $this->_smarty->right_delimiter = '}-->';
@@ -75,14 +72,12 @@
     }
 
     // $B%F%s%W%l!<%H$KCM$r3d$jEv$F$k(B
-    function assign($val1, $val2)
-    {
+    function assign($val1, $val2) {
         $this->_smarty->assign($val1, $val2);
     }
 
     // $B%F%s%W%l!<%H$N=hM}7k2L$r<hF@(B
-    function fetch($template)
-    {
+    function fetch($template) {
         return $this->_smarty->fetch($template);
     }
 
@@ -93,8 +88,7 @@
      * @param boolean $no_error
      * @return string
      */
-    function getResponse($template, $no_error = false)
-    {
+    function getResponse($template, $no_error = false) {
         if (!$no_error) {
             global $GLOBAL_ERR;
             if (!defined('OUTPUT_ERR')) {
@@ -117,8 +111,7 @@
      * @param LC_Page_Ex $objPage 
      * @return void
      */
-    function setPage($objPage)
-    {
+    function setPage($objPage) {
        $this->objPage = $objPage;
     }
 
@@ -126,8 +119,7 @@
      * Smarty$B$N(Bfilter$B$r%;%C%H$7$^$9(B. 
      * @return void
      */
-    function registFilter()
-    {
+    function registFilter() {
         $this->_smarty->register_prefilter(array(&$this, 'prefilter_transform'));
         $this->_smarty->register_outputfilter(array(&$this, 'outputfilter_transform'));
     }
@@ -138,8 +130,7 @@
      * @param Smarty_Compiler $smarty Smarty$B$N%3%s%Q%$%i%/%i%9(B
      * @return string $source $B%=!<%9(B
      */
-    function prefilter_transform($source, &$smarty)
-    {
+    function prefilter_transform($source, &$smarty) {
         if (!is_null($this->objPage)) {
             // $B%U%C%/%]%$%s%H$r<B9T(B.
             $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
@@ -154,8 +145,7 @@
      * @param Smarty_Compiler $smarty Smarty$B$N%3%s%Q%$%i%/%i%9(B
      * @return string $source $B%=!<%9(B
      */
-    function outputfilter_transform($source, &$smarty)
-    {
+    function outputfilter_transform($source, &$smarty) {
         if (!is_null($this->objPage)) {
             // $B%U%C%/%]%$%s%H$r<B9T(B.
             $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
@@ -165,8 +155,7 @@
     }
 
     // $B%F%s%W%l!<%H$N=hM}7k2L$rI=<((B
-    function display($template, $no_error = false)
-    {
+    function display($template, $no_error = false) {
         if (!$no_error) {
             global $GLOBAL_ERR;
             if (!defined('OUTPUT_ERR')) {
@@ -185,8 +174,7 @@
     }
 
     // $B%*%V%8%'%/%HFb$NJQ?t$r$9$Y$F3d$jEv$F$k!#(B
-    function assignobj($obj)
-    {
+    function assignobj($obj) {
         $data = get_object_vars($obj);
 
         foreach ($data as $key => $value) {
@@ -195,8 +183,7 @@
     }
 
     // $BO"A[G[NsFb$NJQ?t$r$9$Y$F3d$jEv$F$k!#(B
-    function assignarray($array)
-    {
+    function assignarray($array) {
         foreach ($array as $key => $val) {
             $this->_smarty->assign($key, $val);
         }
@@ -207,8 +194,7 @@
      *
      * @param integer $device_type_id $BC<Kv<oJL(BID
      */
-    function assignTemplatePath($device_type_id)
-    {
+    function assignTemplatePath($device_type_id) {
 
         // $B%F%s%W%l!<%HJQ?t$r3d$jEv$F(B
         $this->assign('TPL_URLPATH', SC_Helper_PageLayout_Ex::getUserDir($device_type_id, true));
@@ -223,8 +209,7 @@
     }
 
     // $B%G%P%C%0(B
-    function debug($var = true)
-    {
+    function debug($var = true) {
         $this->_smarty->debugging = $var;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php
===================================================================
--- branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,8 +29,7 @@
  * @version $Id$
  */
 
-abstract class SC_Api_Abstract 
-{
+abstract class SC_Api_Abstract {
 
     /** $BG'>Z%?%$%W(B */
     const API_AUTH_TYPE_REFERER = '1';          // $B%j%U%!%i!<(B
@@ -56,11 +55,9 @@
     protected $status = true;
     protected $arrErr = array();
 
-    final public function __construct()
-    {}
+    final public function __construct() {}
 
-    final public function __destruct()
-    {}
+    final public function __destruct() {}
 
     abstract public function doAction($arrParam);
 
@@ -68,18 +65,15 @@
 
     abstract protected function lfInitParam(&$objFormParam);
 
-    public function getResponseArray()
-    {
+    public function getResponseArray() {
         return $this->arrResponse;
     }
 
-    public function getErrorArray()
-    {
+    public function getErrorArray() {
         return $this->arrErr;
     }
 
-    public function getDefaultConfig()
-    {
+    public function getDefaultConfig() {
         $arrApiConfig = array();
         $arrApiConfig['operation_name'] = $this->operation_name;
         $arrApiConfig['operation_description'] = $this->operation_description;
@@ -90,27 +84,22 @@
         return $arrApiConfig;
     }
 
-    protected function setResponse($key, $data)
-    {
+    protected function setResponse($key, $data) {
         $this->arrResponse[$key] = $data;
     }
 
-    protected function addError($arrErr)
-    {
+    protected function addError($arrErr) {
         $this->arrErr = array_merge((array)$this->arrErr, (array)$arrErr);
     }
 
-    protected function isParamError()
-    {
+    protected function isParamError() {
         return !SC_Utils_Ex::isBlank($this->arrErr);
     }
 
-    protected function checkErrorExtended($arrParam)
-    {
+    protected function checkErrorExtended($arrParam) {
     }
 
-    protected function doInitParam($arrParam = array())
-    {
+    protected function doInitParam($arrParam = array()) {
         $this->objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($this->objFormParam);
         $this->objFormParam->setParam($arrParam);
@@ -120,8 +109,7 @@
         return $this->objFormParam->getHashArray();
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         $arrParam = $this->objFormParam->getHashArray();
         if (!SC_Utils_Ex::isBlank($arrParam)) {
             return $arrParam;

$BJQ99(B: branches/version-2_12-dev/data/class/api/SC_Api_Operation.php
===================================================================
--- branches/version-2_12-dev/data/class/api/SC_Api_Operation.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/SC_Api_Operation.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  */
 
 
-class SC_Api_Operation 
-{
+class SC_Api_Operation {
 
     /** API_DEBUG_MODE */
     const API_DEBUG_MODE = false;
@@ -58,8 +57,7 @@
      * @param string $member_password $B%m%0%$%s%Q%9%o!<%IJ8;zNs(B
      * @return boolean $B%m%0%$%s>pJs$,M-8z$J>l9g(B true
      */
-    protected function checkMemberAccount($member_id, $member_password)
-    {
+    protected function checkMemberAccount($member_id, $member_password) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //$B%Q%9%o!<%I!"(Bsalt$B$N<hF@(B
         $cols = 'password, salt';
@@ -83,8 +81,7 @@
      * @param string $password $B%m%0%$%s%Q%9%o!<%I(B
      * @return boolean $B%m%0%$%s$K ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    protected function checkCustomerAccount($login_email, $login_password)
-    {
+    protected function checkCustomerAccount($login_email, $login_password) {
         $objCustomer = new SC_Customer_Ex();
         if ($objCustomer->getCustomerDataFromEmailPass($login_password, $login_email)) {
             return true;
@@ -98,8 +95,7 @@
      *
      * @return boolean $B%A%'%C%/$K ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    protected function checkReferer()
-    {
+    protected function checkReferer() {
         $ret = false;
         if (!SC_Utils_Ex::isBlank($_SERVER['HTTP_REFERER'])) {
             $domain  = SC_Utils_Ex::sfIsHTTPS() ? HTTPS_URL : HTTP_URL;
@@ -120,8 +116,7 @@
      * @param array $B%j%/%(%9%H%Q%i%a!<%?(B
      * @return boolean $B=pL>G'>Z$K ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig)
-    {
+    protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig) {
         if (SC_Utils_Ex::isBlank($arrParam['Signature'])) {
             return false;
         }
@@ -175,8 +170,7 @@
      * @param  string $B<B9T=hM}L>(B
      * @return boolean $B%A%'%C%/$K ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    protected function checkIp($operation_name)
-    {
+    protected function checkIp($operation_name) {
         $ret = false;
         $allow_hosts = SC_Api_Utils_Ex::getOperationSubConfig($operation_name, 'allow_hosts');
         $arrAllowHost = explode("\n", $allow_hosts);
@@ -194,8 +188,7 @@
      * @param string $access_key
      * @return string $BHkL)80J8;zNs(B
      */
-    protected function getApiSecretKey($access_key)
-    {
+    protected function getApiSecretKey($access_key) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $secret_key = $objQuery->get('api_secret_key', 'dtb_api_account', 'api_access_key = ? and enable = 1 and del_flg = 0', array($access_key));
         return $secret_key;
@@ -208,8 +201,7 @@
      * @param array $B%j%/%(%9%H%Q%i%a!<%?(B
      * @return boolean $B8"8B$,$"$k>l9g(B true; $BL5$$>l9g(B false
      */
-    protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig)
-    {
+    protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig) {
         if (SC_Utils_Ex::isBlank($operation_name)) {
             return false;
         }
@@ -272,8 +264,7 @@
      * @param object SC_FormParam
      * @return void
      */
-    protected function setApiBaseParam(&$objFormParam)
-    {
+    protected function setApiBaseParam(&$objFormParam) {
         $objFormParam->addParam('Operation', 'Operation', STEXT_LEN, 'an', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('Service', 'Service', STEXT_LEN, 'an', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('Style', 'Style', STEXT_LEN, 'an', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -287,8 +278,7 @@
      * @param array $arrPost $B%j%/%(%9%H%Q%i%a!<%?!<(B
      * @return array(string $B%l%9%]%s%9L>(B, array $B%l%9%]%s%9G[Ns(B)
      */
-    public function doApiAction($arrPost)
-    {
+    public function doApiAction($arrPost) {
         // $B<B9T;~4V7WB,MQ(B
         $start_time = microtime(true);
 
@@ -383,8 +373,7 @@
      * @param float $start_time $B<B9T;~4V7WB,MQ3+;O;~4V(B
      * @return array $B%(%3!<>pJsG[Ns(B (XML$BMQ$N(B _attributes $B;XDjF~$j!K(B
      */
-    protected function getOperationRequestEcho($arrParam, $start_time)
-    {
+    protected function getOperationRequestEcho($arrParam, $start_time) {
         $arrRet = array(
                 'HTTPHeaders' => array('Header' => array('_attributes' => array('Name' => 'UserAgent',
                                                                                 'Value' => htmlspecialchars($_SERVER['HTTP_USER_AGENT'])))),
@@ -399,8 +388,7 @@
     }
 
     // TODO: $B$3$3$i$X$s$O(B SC_Display$B$K;}$C$F9T$-$?$$=j$@$,!&!&(B
-    public function sendApiResponse($type, $response_outer_name, &$arrResponse)
-    {
+    public function sendApiResponse($type, $response_outer_name, &$arrResponse) {
         switch ($type) {
             case 'xml':
                 SC_Api_Utils_Ex::sendResponseXml($response_outer_name, $arrResponse);

$BJQ99(B: branches/version-2_12-dev/data/class/api/SC_Api_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/api/SC_Api_Utils.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/SC_Api_Utils.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
 define('API_CLASS_EX_REALDIR', CLASS_EX_REALDIR . 'api_extends/operations/');
 define('API_CLASS_REALDIR', CLASS_REALDIR . 'api/operations/');
 
-class SC_Api_Utils 
-{
+class SC_Api_Utils {
 
     /** API XML Namspase Header */
     const API_XMLNS = 'http://www.ec-cube.net/ECCUBEApi/';
@@ -53,8 +52,7 @@
      * @param string $access_key
      * @return string $BHkL)80J8;zNs(B
      */
-    public function getOperationSubConfig($operation_name, $key_name = '', $arrApiConfig = '')
-    {
+    public function getOperationSubConfig($operation_name, $key_name = '', $arrApiConfig = '') {
         if (SC_Utils_Ex::isBlank($arrApiConfig)) {
             $arrApiConfig = SC_Api_Utils_Ex::getAuthConfig($operation_name);
         }
@@ -80,8 +78,7 @@
      * @param string $operation_name
      * @return array $B ＠ _DjG[Ns(B
      */
-    public function getApiConfig($operation_name)
-    {
+    public function getApiConfig($operation_name) {
         // $B ＠ _DjM%@hEY(B DB > plugin default > base
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'operation_name Like ? AND del_flg = 0 AND enable = 1';
@@ -114,8 +111,7 @@
      * @param text $operation_name
      @ @rturn void
      */
-    public function printApiLog($msg, $start_time = '' , $operation_name = '')
-    {
+    public function printApiLog($msg, $start_time = '' , $operation_name = '') {
         if (!SC_Utils_Ex::isBlank($operation_name)) {
             $msg = 'API_' . $operation_name . ':' . $msg;
         }
@@ -132,8 +128,7 @@
      * @param array $arrParam $B%j%/%(%9%H%Q%i%a!<%?!<(B
      * @return object API$B%*%Z%l!<%7%g%s%/%i%9%*%V%8%'%/%H(B
      */
-    public function loadApiOperation($operation_name, $arrParam = array())
-    {
+    public function loadApiOperation($operation_name, $arrParam = array()) {
         // API_UPLOAD$B$N$[$&$,M%@h(B
         // API_UPLOAD > API_CLASS_EX > API_CLASS
         if (file_exists(API_UPLOAD_REALDIR . $operation_name . '.php')) {
@@ -159,8 +154,7 @@
      *
      * @return array $arrFiles
      */
-    public function getApiDirFiles()
-    {
+    public function getApiDirFiles() {
         $arrFiles = array();
         // Core API $B%G%#%l%/%H%j(B
         if (is_dir(API_CLASS_EX_REALDIR)) {
@@ -188,22 +182,19 @@
         return $arrFiles;
     }
 
-    public function sendResponseJson($response_outer_name, &$arrResponse)
-    {
+    public function sendResponseJson($response_outer_name, &$arrResponse) {
         header('Content-Type: application/json; charset=UTF-8');
         $arrResponse['response_name'] = $response_outer_name;
         echo SC_Utils_Ex::jsonEncode($arrResponse);
     }
 
-    public function sendResponsePhp($response_outer_name, &$arrResponse)
-    {
+    public function sendResponsePhp($response_outer_name, &$arrResponse) {
         header('Content-Type: application/php; charset=UTF-8');
         $arrResponse['response_name'] = $response_outer_name;
         echo serialize($arrResponse);
     }
 
-    public function sendResponseXml($response_outer_name, &$arrResponse)
-    {
+    public function sendResponseXml($response_outer_name, &$arrResponse) {
         require_once 'XML/Serializer.php';
 
         $options = array(

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_AddrFromZip extends SC_Api_Abstract_Ex 
-{
+class API_AddrFromZip extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'AddrFromZip';
     protected $operation_description = '$BM9JXHV9f$+$i=;=j$r8!:w$7$^$9!#(B';
@@ -40,8 +39,7 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
             $zipcode = $arrRequest['zip1'] . $arrRequest['zip2'];
@@ -59,14 +57,12 @@
         return false;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BM9JXHV9f(B1', 'zip1', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BM9JXHV9f(B2', 'zip2', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'AddressResponse';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_BrowseNodeLookup extends SC_Api_Abstract_Ex 
-{
+class API_BrowseNodeLookup extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'BrowseNodeLookup';
     protected $operation_description = '$B%+%F%4%j<hF@(B';
@@ -40,8 +39,7 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
             $category_id = $arrRequest['BrowseNodeId'];
@@ -105,14 +103,12 @@
         return false;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BBP>]%+%F%4%j(BID', 'BrowseNodeId', INT_LEN, 'a', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BJVEz<oJL(B', 'ResponseGroup', INT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'BrowseNodes';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/CartAdd.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartAdd.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/CartAdd.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartAdd extends SC_Api_Abstract_Ex 
-{
+class API_CartAdd extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartAdd';
     protected $operation_description = '$B%+!<%H$X$N>&IJDI2C(B';
@@ -40,24 +39,20 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/CartClear.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartClear.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/CartClear.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartClear extends SC_Api_Abstract_Ex 
-{
+class API_CartClear extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartClear';
     protected $operation_description = '$B%+!<%H$N%/%j%"(B';
@@ -40,24 +39,20 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/CartCreate.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartCreate.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/CartCreate.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartCreate extends SC_Api_Abstract_Ex 
-{
+class API_CartCreate extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartCreate';
     protected $operation_description = '$B%+!<%H$N?75,:n ＠ .(B';
@@ -40,24 +39,20 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/CartGet.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartGet.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/CartGet.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartGet extends SC_Api_Abstract_Ex 
-{
+class API_CartGet extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartGet';
     protected $operation_description = '$B%+!<%H$N<hF@(B';
@@ -40,24 +39,20 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/CartModify.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartModify.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/CartModify.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_CartModify extends SC_Api_Abstract_Ex 
-{
+class API_CartModify extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'CartModify';
     protected $operation_description = '$B%+!<%H$N=$@5(B';
@@ -40,24 +39,20 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/Default.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/Default.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/Default.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_Default extends SC_Api_Abstract_Ex 
-{
+class API_Default extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'Default';
     protected $operation_description = 'Default Operation';
@@ -40,23 +39,19 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array('DefaultEmpty' => array());
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return array('DefaultResponse' => array());
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'DefaultResponse';
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/GetVersion.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/GetVersion.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/GetVersion.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_GetVersion extends SC_Api_Abstract_Ex 
-{
+class API_GetVersion extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'GetVersion';
     protected $operation_description = 'EC-CUBE Version';
@@ -40,24 +39,20 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $this->arrResponse = array(
             'Version' => ECCUBE_VERSION);
         return true;
     }
 
-    public function getRequestValidate()
-    {
+    public function getRequestValidate() {
         return;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'VersionResponse';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/ItemLookup.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/ItemLookup.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/ItemLookup.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_ItemLookup extends SC_Api_Abstract_Ex 
-{
+class API_ItemLookup extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'ItemLookup';
     protected $operation_description = '$B>&IJ>\:Y>pJs$r<hF@$7$^$9!#(B';
@@ -40,8 +39,7 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
             $objProduct = new SC_Product_Ex();
@@ -76,8 +74,7 @@
         return false;
     }
 
-    protected function checkErrorExtended($arrParam)
-    {
+    protected function checkErrorExtended($arrParam) {
         switch ($arrParam['IdType']) {
         case 'product_code':
             break;
@@ -91,8 +88,7 @@
         }
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B>&IJ%3%s%G%#%7%g%s(B', 'Condition', STEXT_LEN, 'a', array('ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B>&IJ(BID$B<oJL(B', 'IdType', STEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B;XDj(BID', 'ItemId', STEXT_LEN, 'a', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -105,8 +101,7 @@
         $objFormParam->addParam('$B4XO"%?%0%=!<%H(B', 'TagSort', STEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'Item';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/api/operations/ItemSearch.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/ItemSearch.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/api/operations/ItemSearch.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  */
 require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
-class API_ItemSearch extends SC_Api_Abstract_Ex 
-{
+class API_ItemSearch extends SC_Api_Abstract_Ex {
 
     protected $operation_name = 'ItemSearch';
     protected $operation_description = '$B>&IJ8!:w!&>&IJ0lMw>pJs$r<hF@$7$^$9!#(B';
@@ -40,8 +39,7 @@
     protected $default_is_log = '0';
     protected $default_sub_data = '';
 
-    public function doAction($arrParam)
-    {
+    public function doAction($arrParam) {
         $arrRequest = $this->doInitParam($arrParam);
         if (!$this->isParamError()) {
 
@@ -69,7 +67,7 @@
 
             if (!SC_Utils_Ex::isBlank($arrProducts)) {
                 $arrProducts = $this->setStatusDataTo($arrProducts, $arrSTATUS, $arrSTATUS_IMAGE);
-                SC_Product_Ex::setPriceTaxTo($arrProducts);
+                $arrProducts = $objProduct->setPriceTaxTo($arrProducts);
                 foreach ($arrProducts as $key=>$val) {
                     $arrProducts[$key]['main_list_image'] = SC_Utils_Ex::sfNoImageMainList($val['main_list_image']);
                 }
@@ -93,8 +91,7 @@
         return false;
     }
 
-    protected function lfInitParam(&$objFormParam)
-    {
+    protected function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%+%F%4%j(BID', 'BrowseNode', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%-!<%o!<%I(B', 'Keywords', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%a!<%+!<L>(B', 'Manufacturer', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -102,8 +99,7 @@
         $objFormParam->addParam('$B%=!<%H(B', 'Sort', STEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    public function getResponseGroupName()
-    {
+    public function getResponseGroupName() {
         return 'Items';
     }
 
@@ -114,8 +110,7 @@
      * @return array
      * TODO: LC_Page_Products_List::lfGetProductsList() $B$H6&DL2=(B
      */
-    protected function getProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct)
-    {
+    protected function getProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct) {
 
         $arrOrderVal = array();
 
@@ -189,8 +184,7 @@
      * @return array
      * TODO: LC_Page_Products_List:;lfGetSearchCondition() $B$H6&DL2=(B
      */
-    protected function getSearchCondition($arrSearchData)
-    {
+    protected function getSearchCondition($arrSearchData) {
         $searchCondition = array(
             'where'             => '',
             'arrval'            => array(),
@@ -259,8 +253,7 @@
      * @param Array $arrStatusImage $B%9%?!<%?%92hA|G[Ns(B
      * @return Array $arrProducts $B>&IJ0lMw>pJs(B
      */
-    protected function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage)
-    {
+    protected function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage) {
 
         foreach ($arrProducts['productStatus'] as $product_id => $arrValues) {
             for ($i = 0; $i < count($arrValues); $i++) {

$BJQ99(B: branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php
===================================================================
--- branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Batch_Update extends SC_Batch 
-{
+class SC_Batch_Update extends SC_Batch {
 
     /**
      * $BJQ49$7$?$$%U%!%$%k$N3HD%;R$r%+%s%^6h ＠ Z$j$GMeNs(B.
@@ -49,8 +48,7 @@
      * @param string $target $B%"%C%W%G!<%?%U%!%$%k$N%G%#%l%/%H%j%Q%9(B
      * @return void
      */
-    function execute($target = '.')
-    {
+    function execute($target = '.') {
         $msg = '';
         $oldMask = umask(0);
         $bkupDistInfoArray = array(); //$B%P%C%/%"%C%W%U%!%$%kMQ$N(Bdistinfo$B%U%!%$%kFbMF(B
@@ -197,8 +195,7 @@
      * @return array $dir $B$h$j2<AX$KB8:_$9$k%Q%9L>$NG[Ns(B
      * @see http://www.php.net/glob
      */
-    function listdirs($dir)
-    {
+    function listdirs($dir) {
         static $alldirs = array();
         $dirs = glob($dir . '/*');
         if (is_array($dirs) && count($dirs) > 0) {
@@ -215,8 +212,7 @@
      *
      * @param string $path $B ＠ dBP%Q%9(B
      */
-    function lfMkdirRecursive($path)
-    {
+    function lfMkdirRecursive($path) {
         $path = dirname($path);
 
         // HTML_REALDIR/DATA_REALDIR$B$NH=JL(B
@@ -239,8 +235,7 @@
         }
     }
 
-    function makeDistInfo($bkupDistInfoArray)
-    {
+    function makeDistInfo($bkupDistInfoArray) {
         $src = "<?php\n"
              . '$distifo = array(' . "\n";
 
@@ -252,8 +247,7 @@
         return $src;
     }
 
-    function printLog($msg)
-    {
+    function printLog($msg) {
         GC_Utils_Ex::gfPrintLog($msg, DATA_REALDIR . 'logs/ownersstore_batch_update.log');
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php
===================================================================
--- branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_DB_DBFactory.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_DBFactory 
-{
+class SC_DB_DBFactory {
 
     /**
      * DB_TYPE $B$K1~$8$?(B DBFactory $B%$%s%9%?%s%9$r ＠ 8@.$9$k(B.
@@ -37,8 +36,7 @@
      * @param string $db_type $BG$0U$N%$%s%9%?%s%9$rJV$7$?$$>l9g$O(B DB_TYPE $BJ8;zNs$r;XDj(B
      * @return mixed DBFactory $B%$%s%9%?%s%9(B
      */
-    function getInstance($db_type = DB_TYPE)
-    {
+    function getInstance($db_type = DB_TYPE) {
         switch ($db_type) {
             case 'mysql':
                 return new SC_DB_DBFactory_MYSQL();
@@ -61,8 +59,7 @@
      * @param mixed $dsn $B%G!<%?%=!<%9L>(B
      * @return mixed $B%G!<%?%=!<%9L>$^$?$O(BDB$B@\B3%Q%i%a!<%?$NO"A[G[Ns(B
      */
-    function getDSN($dsn = '')
-    {
+    function getDSN($dsn = '') {
         if (empty($dsn)) {
             if (defined('DEFAULT_DSN')) {
                 $dsn = array('phptype'  => DB_TYPE,
@@ -86,8 +83,7 @@
      * @param string $dsn $B%G!<%?%=!<%9L>(B
      * @return string $B%G!<%?%Y!<%9$N%P!<%8%g%s(B
      */
-    function sfGetDBVersion($dsn = '')
-    { return null; }
+    function sfGetDBVersion($dsn = '') { return null; }
 
     /**
      * MySQL $BMQ$N(B SQL $BJ8$KJQ99$9$k(B.
@@ -95,8 +91,7 @@
      * @param string $sql SQL $BJ8(B
      * @return string MySQL $BMQ$KCV49$7$?(B SQL $BJ8(B
      */
-    function sfChangeMySQL($sql)
-    { return null; }
+    function sfChangeMySQL($sql) { return null; }
 
     /**
      * $B:rF|$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL $B$rJV$9(B.
@@ -104,8 +99,7 @@
      * @param string $method SUM $B$^$?$O(B COUNT
      * @return string $B:rF|$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL
      */
-    function getOrderYesterdaySql($method)
-    { return null; }
+    function getOrderYesterdaySql($method) { return null; }
 
     /**
      * $BEv7n$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL $B$rJV$9(B.
@@ -113,32 +107,28 @@
      * @param string $method SUM $B$^$?$O(B COUNT
      * @return string $BEv7n$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL
      */
-    function getOrderMonthSql($method)
-    { return null; }
+    function getOrderMonthSql($method) { return null; }
 
     /**
      * $B:rF|$N%l%S%e!<=q$-9~$_7o?t$r;;=P$9$k(B SQL $B$rJV$9(B.
      *
      * @return string $B:rF|$N%l%S%e!<=q$-9~$_7o?t$r;;=P$9$k(B SQL
      */
-    function getReviewYesterdaySql()
-    { return null; }
+    function getReviewYesterdaySql() { return null; }
 
     /**
      * $B%a!<%kAw?.MzNr$N(B start_date $B$N8!:w>r7o$N(B SQL $B$rJV$9(B.
      *
      * @return string $B8!:w>r7o$N(B SQL
      */
-    function getSendHistoryWhereStartdateSql()
-    { return null; }
+    function getSendHistoryWhereStartdateSql() { return null; }
 
     /**
      * $B%@%&%s%m!<%IHNGd$N8!:w>r7o$N(B SQL $B$rJV$9(B.
      *
      * @return string $B8!:w>r7o$N(B SQL
      */
-    function getDownloadableDaysWhereSql()
-    { return null; }
+    function getDownloadableDaysWhereSql() { return null; }
 
     /**
      * $BJ8;zNsO"7k$r9T$&(B.
@@ -146,8 +136,7 @@
      * @param array $columns $BO"7k$r9T$&%+%i%`L>(B
      * @return string $BO"7k8e$N(B SQL $BJ8(B
      */
-    function concatColumn($columns)
-    { return null; }
+    function concatColumn($columns) { return null; }
 
     /**
      * $B%F!<%V%k$r8!:w$9$k(B.
@@ -158,8 +147,7 @@
      * @param string $expression $B8!:wJ8;zNs(B
      * @return array $B%F!<%V%kL>$NG[Ns(B
      */
-    function findTableNames($expression = '')
-    { return array(); }
+    function findTableNames($expression = '') { return array(); }
 
     /**
      * $B%$%s%G%C%/%9:n ＠ .$NDI2CDj5A$r<hF@$9$k(B
@@ -170,8 +158,7 @@
      * @param string $name $BBP>]%+%i%`L>(B
      * @return array $B%$%s%G%C%/%9 ＠ _Dj>pJsG[Ns(B
      */
-    function sfGetCreateIndexDefinition($table, $name, $definition)
-    { return $definition; }
+    function sfGetCreateIndexDefinition($table, $name, $definition) { return $definition; }
 
     /**
      * $B3F(B DB $B$K1~$8$?(B SC_Query $B$G$N=i4|2=$r9T$&(B
@@ -179,8 +166,7 @@
      * @param SC_Query $objQuery SC_Query $B%$%s%9%?%s%9(B
      * @return void
      */
-    function initObjQuery(SC_Query &$objQuery)
-    {
+    function initObjQuery(SC_Query &$objQuery) {
     }
 
     /**
@@ -188,8 +174,7 @@
      *
      * @return array $B%F!<%V%kL>$NG[Ns(B
      */
-    function listTables(SC_Query &$objQuery)
-    {
+    function listTables(SC_Query &$objQuery) {
         $objManager =& $objQuery->conn->loadModule('Manager');
         return $objManager->listTables();
     }

$BJQ99(B: branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php
===================================================================
--- branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -41,8 +41,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_DB_MasterData.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_MasterData 
-{
+class SC_DB_MasterData {
 
     // {{{ properties
 
@@ -70,8 +69,7 @@
      *                        $B$rI=$9%+%i%`L>$r3JG<$7$?G[Ns(B
      * @return array $B%^%9%?!<%G!<%?(B
      */
-    function getMasterData($name, $columns = array())
-    {
+    function getMasterData($name, $columns = array()) {
 
         $columns = $this->getDefaultColumnName($columns);
 
@@ -103,8 +101,7 @@
      * @param bool $autoCommit $B%H%i%s%6%/%7%g%s$r<+F0E*$K(B commit $B$9$k>l9g(B true
      * @return integer $B%^%9%?!<%G!<%?$NEPO??t(B
      */
-    function registMasterData($name, $columns, $masterData, $autoCommit = true)
-    {
+    function registMasterData($name, $columns, $masterData, $autoCommit = true) {
 
         $columns = $this->getDefaultColumnName($columns);
 
@@ -139,8 +136,7 @@
      * @param bool $autoCommit $B%H%i%s%6%/%7%g%s$r<+F0E*$K(B commit $B$9$k>l9g(B true
      * @return integer $B%^%9%?!<%G!<%?$N99?7?t(B
      */
-    function updateMasterData($name, $columns, $masterData, $autoCommit = true)
-    {
+    function updateMasterData($name, $columns, $masterData, $autoCommit = true) {
 
         $columns = $this->getDefaultColumnName($columns);
 
@@ -174,8 +170,7 @@
      * @param bool $autoCommit $B%H%i%s%6%/%7%g%s$r<+F0E*$K(B commit $B$9$k>l9g(B true
      * @return integer $B%^%9%?!<%G!<%?$N99?7?t(B
      */
-    function insertMasterData($name, $key, $value, $comment, $autoCommit = true)
-    {
+    function insertMasterData($name, $key, $value, $comment, $autoCommit = true) {
 
         $columns = $this->getDefaultColumnName();
 
@@ -207,8 +202,7 @@
      * @param bool $autoCommit $B%H%i%s%6%/%7%g%s$r<+F0E*$K(B commit $B$9$k>l9g(B true
      * @return integer $B%^%9%?!<%G!<%?$N:o=|?t(B
      */
-    function deleteMasterData($name, $autoCommit = true)
-    {
+    function deleteMasterData($name, $autoCommit = true) {
         $this->objQuery =& SC_Query_Ex::getSingletonInstance();
         if ($autoCommit) {
             $this->objQuery->begin();
@@ -230,8 +224,7 @@
      * @param string $name $B%^%9%?!<%G!<%?L>(B
      * @return bool $B>C5n$7$?>l9g(B true
      */
-    function clearCache($name)
-    {
+    function clearCache($name) {
         $masterDataFile = MASTER_DATA_REALDIR . $name . '.php';
         if (is_file($masterDataFile)) {
             unlink($masterDataFile);
@@ -258,8 +251,7 @@
      *                             [2] => $BI=<(=g(B $B$rI=$9%+%i%`L>$r3JG<$7$?G[Ns(B
      * @return bool $B%-%c%C%7%e$N ＠ 8@.$K ＠ .8y$7$?>l9g(B true
      */
-    function createCache($name, $columns = array(), $isDefine = false, $commentColumn = array())
-    {
+    function createCache($name, $columns = array(), $isDefine = false, $commentColumn = array()) {
 
         // $B%^%9%?!<%G!<%?$r<hF@(B
         $masterData = $this->getDbMasterData($name, $columns);
@@ -308,8 +300,7 @@
      *                        $B$rI=$9%+%i%`L>$r3JG<$7$?G[Ns(B
      * @return array $B%^%9%?!<%G!<%?(B
      */
-    function getDbMasterData($name, $columns = array())
-    {
+    function getDbMasterData($name, $columns = array()) {
 
         $columns = $this->getDefaultColumnName($columns);
 
@@ -341,8 +332,7 @@
      *                        $B$rI=$9%+%i%`L>$r3JG<$7$?G[Ns(B
      * @return array $B%+%i%`L>$r3JG<$7$?G[Ns(B
      */
-    function getDefaultColumnName($columns = array())
-    {
+    function getDefaultColumnName($columns = array()) {
 
         if (!empty($columns)) {
             return $columns;
@@ -359,8 +349,7 @@
      * @param array $comments $B%3%a%s%H$NG[Ns(B
      * @return string $BDj?tDj5A$NJ8;zNs(B
      */
-    function getMasterDataAsDefine($masterData, $comments = array())
-    {
+    function getMasterDataAsDefine($masterData, $comments = array()) {
         $data = '';
         foreach ($masterData as $key => $val) {
             if (!empty($comments[$key])) {

$BJQ99(B: branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_DB_DBFactory_MYSQL.php 15267 2007-08-09 12:31:52Z nanasess $
  */
-class SC_DB_DBFactory_MYSQL extends SC_DB_DBFactory 
-{
+class SC_DB_DBFactory_MYSQL extends SC_DB_DBFactory {
 
     /** SC_Query $B%$%s%9%?%s%9(B */
     var $objQuery;
@@ -44,8 +43,7 @@
      * @param string $dsn $B%G!<%?%=!<%9L>(B
      * @return string $B%G!<%?%Y!<%9$N%P!<%8%g%s(B
      */
-    function sfGetDBVersion($dsn = '')
-    {
+    function sfGetDBVersion($dsn = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
         $val = $objQuery->getOne('select version()');
         return 'MySQL ' . $val;
@@ -58,8 +56,7 @@
      * @param string $sql SQL $BJ8(B
      * @return string MySQL $BMQ$KCV49$7$?(B SQL $BJ8(B
      */
-    function sfChangeMySQL($sql)
-    {
+    function sfChangeMySQL($sql) {
         // $B2~9T!"%?%V$r(B1$B%9%Z!<%9$KJQ49(B
         $sql = preg_replace("/[\r\n\t]/",' ',$sql);
         // ILIKE$B8!:w$r(BLIKE$B8!:w$KJQ49$9$k(B
@@ -78,8 +75,7 @@
      *
      * @return array $BJ8;z%3!<%I>pJs(B
      */
-    function getCharSet()
-    {
+    function getCharSet() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->getAll("SHOW VARIABLES LIKE 'char%'");
         return $arrRet;
@@ -91,8 +87,7 @@
      * @param string $method SUM $B$^$?$O(B COUNT
      * @return string $B:rF|$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL
      */
-    function getOrderYesterdaySql($method)
-    {
+    function getOrderYesterdaySql($method) {
         return 'SELECT ' . $method . '(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
                . 'AND cast(create_date as date) = DATE_ADD(current_date, interval -1 day) '
@@ -105,8 +100,7 @@
      * @param string $method SUM $B$^$?$O(B COUNT
      * @return string $BEv7n$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL
      */
-    function getOrderMonthSql($method)
-    {
+    function getOrderMonthSql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
                . "AND date_format(create_date, '%Y/%m') = ? "
@@ -119,8 +113,7 @@
      *
      * @return string $B:rF|$N%l%S%e!<=q$-9~$_7o?t$r;;=P$9$k(B SQL
      */
-    function getReviewYesterdaySql()
-    {
+    function getReviewYesterdaySql() {
         return 'SELECT COUNT(*) FROM dtb_review AS A '
                . 'LEFT JOIN dtb_products AS B '
                . 'ON A.product_id = B.product_id '
@@ -135,8 +128,7 @@
      *
      * @return string $B8!:w>r7o$N(B SQL
      */
-    function getSendHistoryWhereStartdateSql()
-    {
+    function getSendHistoryWhereStartdateSql() {
         return 'start_date BETWEEN date_add(CURRENT_TIMESTAMP,INTERVAL -5 minute) AND date_add(CURRENT_TIMESTAMP,INTERVAL 5 minute)';
     }
 
@@ -146,8 +138,7 @@
      * @param string $dtb_order_alias
      * @return string $B8!:w>r7o$N(B SQL
      */
-    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order')
-    {
+    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
         return '(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD(' . $dtb_order_alias . '.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))';
     }
 
@@ -157,8 +148,7 @@
      * @param mixed $type
      * @return string $B8!:w>r7o$N(BSQL
      */
-    function getOrderTotalDaysWhereSql($type)
-    {
+    function getOrderTotalDaysWhereSql($type) {
         switch ($type) {
             case 'month':
                 $format = '%m';
@@ -194,8 +184,7 @@
      *
      * @return string $BG/BeCj=PItJ,$N(B SQL
      */
-    function getOrderTotalAgeColSql()
-    {
+    function getOrderTotalAgeColSql() {
         return 'TRUNC((YEAR(create_date) - YEAR(order_birth)) - (RIGHT(create_date, 5) < RIGHT(order_birth, 5)), -1)';
     }
 
@@ -205,8 +194,7 @@
      * @param array $columns $BO"7k$r9T$&%+%i%`L>(B
      * @return string $BO"7k8e$N(B SQL $BJ8(B
      */
-    function concatColumn($columns)
-    {
+    function concatColumn($columns) {
         $sql = 'concat(';
         $i = 0;
         $total = count($columns);
@@ -229,8 +217,7 @@
      * @param string $expression $B8!:wJ8;zNs(B
      * @return array $B%F!<%V%kL>$NG[Ns(B
      */
-    function findTableNames($expression = '')
-    {
+    function findTableNames($expression = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sql = 'SHOW TABLES LIKE '. $objQuery->quote('%' . $expression . '%');
         $arrColList = $objQuery->getAll($sql);
@@ -245,8 +232,7 @@
      * @param string $sql SQL$BJ8(B
      * @return string $BJQ498e$N(B SQL $BJ8(B
      */
-    function sfChangeILIKE($sql)
-    {
+    function sfChangeILIKE($sql) {
         $changesql = preg_replace('/(^|[^\w])ILIKE([^\w]|$)/i', '$1LIKE$2', $sql);
         return $changesql;
     }
@@ -258,8 +244,7 @@
      * @param string $sql SQL$BJ8(B
      * @return string $BJQ498e$N(B SQL $BJ8(B
      */
-    function sfChangeRANDOM($sql)
-    {
+    function sfChangeRANDOM($sql) {
         $changesql = preg_replace('/(^|[^\w])RANDOM\(/i', '$1RAND(', $sql);
         return $changesql;
     }
@@ -271,8 +256,7 @@
      * @param string $sql SQL$BJ8(B
      * @return string $BJQ498e$N(B SQL $BJ8(B
      */
-    function sfChangeTrunc($sql)
-    {
+    function sfChangeTrunc($sql) {
         $changesql = preg_replace('/(^|[^\w])TRUNC([^\w]|$)/i', '$1TRUNCATE$2', $sql);
         return $changesql;
     }
@@ -284,8 +268,7 @@
      * @param string $sql SQL$BJ8(B
      * @return string $BJQ498e$N(B SQL $BJ8(B
      */
-    function sfChangeArrayToString($sql)
-    {
+    function sfChangeArrayToString($sql) {
         if (strpos(strtoupper($sql), 'ARRAY_TO_STRING') !== FALSE) {
             preg_match_all('/ARRAY_TO_STRING.*?\(.*?ARRAY\(.*?SELECT (.+?) FROM (.+?) WHERE (.+?)\).*?\,.*?\'(.+?)\'.*?\)/is', $sql, $match, PREG_SET_ORDER);
 
@@ -306,8 +289,7 @@
      * @param string $name $BBP>]%+%i%`L>(B
      * @return array $B%$%s%G%C%/%9 ＠ _Dj>pJsG[Ns(B
      */
-    function sfGetCreateIndexDefinition($table, $name, $definition)
-    {
+    function sfGetCreateIndexDefinition($table, $name, $definition) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrTblInfo = $objQuery->getTableInfo($table);
         foreach ($arrTblInfo as $fieldInfo) {
@@ -327,8 +309,7 @@
      *
      * @return string
      */
-    function getDummyFromClauseSql()
-    {
+    function getDummyFromClauseSql() {
         return 'FROM DUAL';
     }
 
@@ -338,8 +319,7 @@
      * @param SC_Query $objQuery SC_Query $B%$%s%9%?%s%9(B
      * @return void
      */
-    function initObjQuery(SC_Query &$objQuery)
-    {
+    function initObjQuery(SC_Query &$objQuery) {
         $objQuery->exec('SET SESSION storage_engine = InnoDB');
         $objQuery->exec("SET SESSION sql_mode = 'ANSI'");
     }

$BJQ99(B: branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
===================================================================
--- branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_DB_DBFactory_PGSQL.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_DBFactory_PGSQL extends SC_DB_DBFactory 
-{
+class SC_DB_DBFactory_PGSQL extends SC_DB_DBFactory {
 
     /**
      * DB$B$N%P!<%8%g%s$r<hF@$9$k(B.
@@ -41,8 +40,7 @@
      * @param string $dsn $B%G!<%?%=!<%9L>(B
      * @return string $B%G!<%?%Y!<%9$N%P!<%8%g%s(B
      */
-    function sfGetDBVersion($dsn = '')
-    {
+    function sfGetDBVersion($dsn = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
         $val = $objQuery->getOne('select version()');
         $arrLine = explode(' ' , $val);
@@ -58,8 +56,7 @@
      * @param string $sql SQL $BJ8(B
      * @return string MySQL $BMQ$KCV49$7$?(B SQL $BJ8(B
      */
-    function sfChangeMySQL($sql)
-    {
+    function sfChangeMySQL($sql) {
         return $sql;
     }
 
@@ -69,8 +66,7 @@
      * @param string $method SUM $B$^$?$O(B COUNT
      * @return string $B:rF|$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL
      */
-    function getOrderYesterdaySql($method)
-    {
+    function getOrderYesterdaySql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
                . "AND to_char(create_date,'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
@@ -83,8 +79,7 @@
      * @param string $method SUM $B$^$?$O(B COUNT
      * @return string $BEv7n$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL
      */
-    function getOrderMonthSql($method)
-    {
+    function getOrderMonthSql($method) {
         return 'SELECT '.$method.'(total) FROM dtb_order '
                . 'WHERE del_flg = 0 '
                . "AND to_char(create_date,'YYYY/MM') = ? "
@@ -97,8 +92,7 @@
      *
      * @return string $B:rF|$N%l%S%e!<=q$-9~$_7o?t$r;;=P$9$k(B SQL
      */
-    function getReviewYesterdaySql()
-    {
+    function getReviewYesterdaySql() {
         return 'SELECT COUNT(*) FROM dtb_review AS A '
                . 'LEFT JOIN dtb_products AS B '
                . 'ON A.product_id = B.product_id '
@@ -113,8 +107,7 @@
      *
      * @return string $B8!:w>r7o$N(B SQL
      */
-    function getSendHistoryWhereStartdateSql()
-    {
+    function getSendHistoryWhereStartdateSql() {
         return "start_date BETWEEN current_timestamp + '- 5 minutes' AND current_timestamp + '5 minutes'";
     }
 
@@ -124,8 +117,7 @@
      * @param string $dtb_order_alias
      * @return string $B8!:w>r7o$N(B SQL
      */
-    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order')
-    {
+    function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
         $baseinfo = SC_Helper_DB_Ex::sfGetBasisData();
         //downloadable_days$B$K(BNULL$B$,F~$C$F$$$k>l9g(B($BL54|8B%@%&%s%m!<%I2DG=;~(B)$B$b$"$k$N$G!"(BNULL$B$N>l9g$O(B0$BF|$KJd ＠ 5(B
         $downloadable_days = $baseinfo['downloadable_days'];
@@ -152,8 +144,7 @@
      * @param mixed $type
      * @return string $B8!:w>r7o$N(BSQL
      */
-    function getOrderTotalDaysWhereSql($type)
-    {
+    function getOrderTotalDaysWhereSql($type) {
         switch ($type) {
             case 'month':
                 $format = 'MM';
@@ -189,8 +180,7 @@
      *
      * @return string $BG/BeCj=PItJ,$N(B SQL
      */
-    function getOrderTotalAgeColSql()
-    {
+    function getOrderTotalAgeColSql() {
         return 'TRUNC(CAST(EXTRACT(YEAR FROM AGE(create_date, order_birth)) AS INT), -1)';
     }
 
@@ -200,8 +190,7 @@
      * @param array $columns $BO"7k$r9T$&%+%i%`L>(B
      * @return string $BO"7k8e$N(B SQL $BJ8(B
      */
-    function concatColumn($columns)
-    {
+    function concatColumn($columns) {
         $sql = '';
         $i = 0;
         $total = count($columns);
@@ -224,8 +213,7 @@
      * @param string $expression $B8!:wJ8;zNs(B
      * @return array $B%F!<%V%kL>$NG[Ns(B
      */
-    function findTableNames($expression = '')
-    {
+    function findTableNames($expression = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sql = '   SELECT c.relname AS name, '
             .  '     CASE c.relkind '
@@ -249,8 +237,7 @@
      *
      * @return array $BJ8;z%3!<%I>pJs(B
      */
-    function getCharSet()
-    {
+    function getCharSet() {
         // $BL$<BAu(B
         return array();
     }
@@ -260,8 +247,7 @@
      *
      * @return string
      */
-    function getDummyFromClauseSql()
-    {
+    function getDummyFromClauseSql() {
         return '';
     }
 
@@ -271,8 +257,7 @@
      * MDB2_Driver_Manager_pgsql#listTables $B$NIT6q9g2sHr$rL\E*$H$7$FFH<+<BAu$7$F$$$k!#(B
      * @return array $B%F!<%V%kL>$NG[Ns(B
      */
-    function listTables(SC_Query &$objQuery)
-    {
+    function listTables(SC_Query &$objQuery) {
         $col = 'tablename';
         $from = 'pg_tables';
         $where = "schemaname NOT IN ('pg_catalog', 'information_schema', 'sys')";

$BJQ99(B: branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php
===================================================================
--- branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,8 +22,7 @@
  */
 
 // $BK@%0%i%U ＠ 8@.%/%i%9(B
-class SC_Graph_Bar extends SC_Graph_Line_Ex
-{
+class SC_Graph_Bar extends SC_Graph_Line_Ex{
     // $B%3%s%9%H%i%/%?(B
     function __construct(
         $bgw = BG_WIDTH, $bgh = BG_HEIGHT, $left = LINE_LEFT, $top = LINE_TOP,
@@ -32,8 +31,7 @@
     }
 
     // $B%0%i%U$NIA2h(B
-    function drawGraph()
-    {
+    function drawGraph() {
         $this->drawYLine();
         $this->drawXLine(true);
 
@@ -52,8 +50,7 @@
     }
 
     // $BK@%0%i%U$NIA2h(B
-    function drawBar($line_no)
-    {
+    function drawBar($line_no) {
         $arrPointList = $this->arrPointList[$line_no];
         // $B%G!<%??t$r?t$($k(B
         $count = count($arrPointList);
@@ -82,8 +79,7 @@
     }
 
     // $B%i%Y%k$rIA2h$9$k(B
-    function drawLabel($line_no)
-    {
+    function drawLabel($line_no) {
         $arrData = $this->arrDataList[$line_no];
         $arrPointList = $this->arrPointList[$line_no];
         $count = count($arrPointList);

$BJQ99(B: branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php
===================================================================
--- branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -130,8 +130,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Graph_Base 
-{
+class SC_Graph_Base {
 
     // {{{ properties
 
@@ -182,8 +181,7 @@
     var $ARR_GRID_COLOR;
 
     // $B%3%s%9%H%i%/%?(B
-    function __construct($bgw, $bgh, $left, $top)
-    {
+    function __construct($bgw, $bgh, $left, $top) {
         $this->init();
         // $B2hA|:n ＠ .(B
         $this->bgw = $bgw;
@@ -212,8 +210,7 @@
     }
 
     // $B%j%5%s%W%k(B($B2hA|$r3j$i$+$K=L>.$9$k(B)
-    function resampled()
-    {
+    function resampled() {
         $new_width = $this->bgw * 0.8;
         $new_height = $this->bgh * 0.8;
         $tmp_image = imagecreatetruecolor($new_width, $new_height);
@@ -223,8 +220,7 @@
     }
 
     // $B%*%V%8%'%/%H%+%i!<$N ＠ _Dj(B
-    function setColorList($arrRGB)
-    {
+    function setColorList($arrRGB) {
         $this->arrRGB = $arrRGB;
         $count = count($this->arrRGB);
         // $BDL>o?'$N ＠ _Dj(B
@@ -238,14 +234,12 @@
     }
 
     // $B1F$N$"$j$J$7(B
-    function setShadeOn($shade_on)
-    {
+    function setShadeOn($shade_on) {
         $this->shade_on = $shade_on;
     }
 
     // $B2hA|$r=PNO$9$k(B
-    function outputGraph($header = true, $filename = '')
-    {
+    function outputGraph($header = true, $filename = '') {
         if ($header) {
             header('Content-type: image/png');
         }
@@ -260,8 +254,7 @@
     }
 
     // $BIA2h;~$N%F%-%9%HI}$r5a$a$k(B
-    function getTextWidth($text, $font_size)
-    {
+    function getTextWidth($text, $font_size) {
         $text_len = strlen($text);
         $ret = $font_size * $text_len * TEXT_RATE;
         /*
@@ -274,8 +267,7 @@
     }
 
     // $B%F%-%9%H$r=PNO$9$k(B
-    function setText($font_size, $left, $top, $text, $color = NULL, $angle = 0, $labelbg = false)
-    {
+    function setText($font_size, $left, $top, $text, $color = NULL, $angle = 0, $labelbg = false) {
         // $B;~7W2s$j$K3QEY$rJQ99(B
         $angle = -$angle;
         // $B%i%Y%kGX7J(B
@@ -307,8 +299,7 @@
     }
 
     // $B%?%$%H%k$r=PNO$9$k(B
-    function drawTitle($text, $font_size = TITLE_FONT_SIZE)
-    {
+    function drawTitle($text, $font_size = TITLE_FONT_SIZE) {
         // $B=PNO0LCV$N;;=P(B
         $text_width = $this->getTextWidth($text, $font_size);
         $left = ($this->bgw - $text_width) / 2;
@@ -317,8 +308,7 @@
     }
 
     // $B%m%0$r=PNO$9$k(B
-    function debugPrint($text)
-    {
+    function debugPrint($text) {
         $text = mb_convert_encoding($text, 'UTF-8', CHAR_CODE);
         if (!isset($this->text_top)) {
             $this->text_top = FONT_SIZE + LINE_PAD;
@@ -329,8 +319,7 @@
     }
 
     // $B%+%i!<%i%Y%k$rIA2h(B
-    function drawLegend($legend_max = '', $clabelbg = true)
-    {
+    function drawLegend($legend_max = '', $clabelbg = true) {
         // $BK^Nc$,EPO?$5$l$F$$$J$1$l$PCf;_(B
         if (count($this->arrLegend) <= 0) {
             return;
@@ -379,8 +368,7 @@
     }
 
     // $B%+%i!<%i%Y%kGX7J$NIA2h(B
-    function drawClabelBG($left, $top, $right, $bottom)
-    {
+    function drawClabelBG($left, $top, $right, $bottom) {
         // $B1F$NIA2h(B
         if ($this->shade_on) {
             imagefilledrectangle($this->image, $left + 2, $top + 2, $right + 2, $bottom + 2, $this->shade_color);
@@ -391,8 +379,7 @@
     }
 
     // $BK^Nc$r%;%C%H$9$k(B
-    function setLegend($arrLegend)
-    {
+    function setLegend($arrLegend) {
         $this->arrLegend = array_values((array)$arrLegend);
     }
 
@@ -407,8 +394,7 @@
      * @access protected
      * @return void
      */
-    function init()
-    {
+    function init() {
         // $BK^NcGX7J(B
         $this->ARR_LEGENDBG_COLOR = array(245,245,245);
         // $B%i%Y%kGX7J(B
@@ -450,8 +436,7 @@
      * @param integer $e $B3QEY(B
      * @return array $B1_$NCf?4E@$HD>7B$+$i8L$N=*C<:BI8$NG[Ns(B
      */
-    function lfGetArcPos($cx, $cy, $cw, $ch, $e)
-    {
+    function lfGetArcPos($cx, $cy, $cw, $ch, $e) {
         // $B;03Q4X?tMQ$N3QEY$r5a$a$k(B
         $s = 90 - $e;
         $r = $cw / 2;
@@ -462,8 +447,7 @@
     }
 
     /** $B2hA|$K%F%-%9%H$rIA2h$9$k(B */
-    function lfImageText($dst_image, $text, $font_size, $left, $top, $font, $arrRGB)
-    {
+    function lfImageText($dst_image, $text, $font_size, $left, $top, $font, $arrRGB) {
         $color = ImageColorAllocate($dst_image, $arrRGB[0], $arrRGB[1], $arrRGB[2]);
         $text = mb_convert_encoding($text, 'UTF-8', CHAR_CODE);
         // $BI=<(3QEY(B
@@ -473,8 +457,7 @@
     }
 
     /** $BI=<(?'$N<hF@(B */
-    function lfGetImageColor($image, $array)
-    {
+    function lfGetImageColor($image, $array) {
         if (count($array) != 3) {
             return NULL;
         }
@@ -483,8 +466,7 @@
     }
 
     /** $B1FMQI=<(?'$N<hF@(B */
-    function lfGetImageDarkColor($image, $array)
-    {
+    function lfGetImageDarkColor($image, $array) {
         if (count($array) != 3) {
             return NULL;
         }

$BJQ99(B: branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php
===================================================================
--- branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,8 +22,7 @@
  */
 
 // $B@^$l@~%0%i%U ＠ 8@.%/%i%9(B
-class SC_Graph_Line extends SC_Graph_Base_Ex
-{
+class SC_Graph_Line extends SC_Graph_Base_Ex{
     var $area_width;
     var $area_height;
     var $ygrid_on;
@@ -55,14 +54,12 @@
     }
 
     // X$B<4%i%Y%k$N3QEY%;%C%H(B
-    function setXLabelAngle($Angle)
-    {
+    function setXLabelAngle($Angle) {
         $this->XLabelAngle = $Angle;
     }
 
     // Y$B<4%?%$%H%k(B
-    function drawYTitle()
-    {
+    function drawYTitle() {
         // Y$B<4$K%?%$%H%k$rF~$l$k(B
         if ($this->YTitle != '') {
             $text_width = $this->getTextWidth($this->YTitle, FONT_SIZE);
@@ -73,8 +70,7 @@
     }
 
     // X$B<4%?%$%H%k(B
-    function drawXTitle()
-    {
+    function drawXTitle() {
         // Y$B<4$K%?%$%H%k$rF~$l$k(B
         if ($this->XTitle != '') {
             $text_width = $this->getTextWidth($this->XTitle, FONT_SIZE);
@@ -85,8 +81,7 @@
     }
 
     // Y$B<4$NIA2h(B
-    function drawYLine()
-    {
+    function drawYLine() {
         imageline($this->image, $this->left, $this->top, $this->left, $this->top + $this->area_height, $this->flame_color);
         // $BL\@9$jI}$r5a$a$k(B($BCf4VE@$O<+F0(B)
         $size = $this->area_height / (LINE_Y_SCALE * 2);
@@ -111,8 +106,7 @@
     }
 
     // X$B<4$NIA2h(B
-    function drawXLine($bar = false)
-    {
+    function drawXLine($bar = false) {
         imageline($this->image, $this->left, $this->top + $this->area_height, $this->left + $this->area_width, $this->top + $this->area_height, $this->flame_color);
         $arrPointList = $this->arrPointList[0];
         $count = count($arrPointList);
@@ -155,14 +149,12 @@
     }
 
     // $B%0%j%C%II=<((B
-    function setYGridOn($ygrid_on)
-    {
+    function setYGridOn($ygrid_on) {
         $this->ygrid_on = $ygrid_on;
     }
 
     // $B%]%$%s%H$NIA2h(B
-    function setMark($line_no, $left, $top, $size = LINE_MARK_SIZE)
-    {
+    function setMark($line_no, $left, $top, $size = LINE_MARK_SIZE) {
         // $B6v?t$KJQ49$7$F$*$/(B
         $size += $size % 2;
         $array = array(
@@ -177,8 +169,7 @@
     }
 
     // Y$B<4L\@9$j$KCM$rF~$l$k(B
-    function setYScale()
-    {
+    function setYScale() {
         // 1$BL\@9$j$NCM(B
         $number = intval($this->graph_max / LINE_Y_SCALE);
         // $BL\@9$jI}$r5a$a$k(B
@@ -194,8 +185,7 @@
     }
 
     //
-    function setMax($arrData)
-    {
+    function setMax($arrData) {
         // $B%G!<%?$N:GBgCM$r<hF@$9$k!#(B
         $data_max = max($arrData);
         // 10$B$N2?G\$+$r<hF@(B
@@ -211,8 +201,7 @@
     }
 
     // $B%0%i%U$NIA2h(B
-    function drawGraph()
-    {
+    function drawGraph() {
         // $B%0%i%UGX7J$rIA2h(B
         $this->drawYLine();
         $this->drawXLine();
@@ -237,8 +226,7 @@
     }
 
     // $B%i%$%s$rIA2h$9$k(B
-    function drawLine($line_no)
-    {
+    function drawLine($line_no) {
         $arrPointList = $this->arrPointList[$line_no];
 
         $count = count($arrPointList);
@@ -254,8 +242,7 @@
     }
 
     // $B%^!<%/$rIA2h$9$k(B
-    function drawMark($line_no)
-    {
+    function drawMark($line_no) {
         $arrPointList = $this->arrPointList[$line_no];
         $count = count($arrPointList);
         for ($i = 0; $i < $count; $i++) {
@@ -266,8 +253,7 @@
     }
 
     // $B%i%Y%k$rIA2h$9$k(B
-    function drawLabel($line_no)
-    {
+    function drawLabel($line_no) {
         $arrData = $this->arrDataList[$line_no];
         $arrPointList = $this->arrPointList[$line_no];
         $count = count($arrPointList);
@@ -282,8 +268,7 @@
     }
 
     // $B%G!<%?$r%;%C%H$9$k(B
-    function setData($arrData)
-    {
+    function setData($arrData) {
         $this->arrDataList[$this->line_max] = array_values((array)$arrData);
         $this->setMax($this->arrDataList[$this->line_max]);
         // $BCM$NIA2hJQ49N((B
@@ -304,20 +289,17 @@
     }
 
     // X$B<4%i%Y%k$r%;%C%H$9$k(B
-    function setXLabel($arrXLabel)
-    {
+    function setXLabel($arrXLabel) {
         $this->arrXLabel = array_values((array)$arrXLabel);
     }
 
     // X$B<4%?%$%H%k$r%;%C%H$9$k(B
-    function setXTitle($title)
-    {
+    function setXTitle($title) {
         $this->XTitle = $title;
     }
 
     // Y$B<4%?%$%H%k$r%;%C%H$9$k(B
-    function setYTitle($title)
-    {
+    function setYTitle($title) {
         $this->YTitle = $title;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php
===================================================================
--- branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,8 +22,7 @@
  */
 
 // $B1_%0%i%U ＠ 8@.%/%i%9(B
-class SC_Graph_Pie extends SC_Graph_Base_Ex
-{
+class SC_Graph_Pie extends SC_Graph_Base_Ex{
     var $cw;
     var $ch;
     var $cz;
@@ -33,8 +32,7 @@
     var $arrData;
 
     // $B%3%s%9%H%i%/%?(B
-    function __construct($bgw = BG_WIDTH, $bgh = BG_HEIGHT, $left = PIE_LEFT, $top = PIE_TOP)
-    {
+    function __construct($bgw = BG_WIDTH, $bgh = BG_HEIGHT, $left = PIE_LEFT, $top = PIE_TOP) {
         parent::__construct($bgw, $bgh, $left, $top);
         // $B%5%$%:@_Dj(B
         $this->setSize(PIE_WIDTH, PIE_HEIGHT, PIE_THICK);
@@ -43,8 +41,7 @@
     }
 
     // $B%G!<%?$r(B360$B!kCM$KJQ49$9$k(B
-    function getCircleData($array)
-    {
+    function getCircleData($array) {
         $total = '';
         $new_total = '';
         if (!is_array($array)) {
@@ -75,23 +72,20 @@
     }
 
     // $B1_$N0LCV ＠ _Dj$r9T$&(B
-    function setPosition($cx, $cy)
-    {
+    function setPosition($cx, $cy) {
         $this->cx = $cx;
         $this->cy = $cy;
     }
 
     // $B1_$N%5%$%:@_Dj$r9T$&(B
-    function setSize($cw, $ch, $cz = 0)
-    {
+    function setSize($cw, $ch, $cz = 0) {
         $this->cw = $cw;
         $this->ch = $ch;
         $this->cz = $cz;
     }
 
     // $B1F$NIA2h(B
-    function drawShade()
-    {
+    function drawShade() {
         $move = 1;
         for ($i = ($this->cy + $this->cz); $i <= ($this->cy + $this->cz + ($this->cz * PIE_SHADE_IMPACT)); $i++) {
             imagefilledarc($this->image, $this->cx + $move, $i, $this->cw, $this->ch, 0, 360, $this->shade_color, IMG_ARC_PIE);
@@ -100,14 +94,12 @@
     }
 
     // $B%G!<%?$r%;%C%H$9$k(B
-    function setData($arrData)
-    {
+    function setData($arrData) {
         $this->arrData = array_values($arrData);
     }
 
     // $B1_%0%i%U$rIA2h$9$k(B
-    function drawGraph()
-    {
+    function drawGraph() {
         $x = $this->cx;
         $y = $this->cy;
         $z = $this->cz;
@@ -116,9 +108,10 @@
 
         // $B%G!<%?$N3QEY$r<hF@$9$k(B
         $arrRad = $this->getCircleData($this->arrData);
+        $rd_max = count($arrRad);
 
         // $B%G!<%?$,B8:_$7$J$$>l9g(B
-        if (empty($arrRad)) {
+        if ($rd_max <= 0) {
             return;
         }
 
@@ -134,10 +127,10 @@
         // $BB&LL$NIA2h(B
         for ($i = ($y + $z - 1); $i >= $y; $i--) {
             $start = 0;
-            foreach ($arrRad as $rad) {
+            for ($j = 0; $j < $rd_max; $j++) {
                 // $B3QEY$,(B0$BEY0J>e$N>l9g$N$_B&LL$rIA2h$9$k!#(B
-                if ($rad > 0) {
-                    $end = $start + $rad;
+                if ($arrRad[$j] > 0) {
+                    $end = $start + $arrRad[$j];
                     if ($start == 0 && $end == 360) {
                         // -90~270$B$G;XDj$9$k$H1_$,IA2h$G$-$J$$$N$G(B0~360$B$K;XDj(B
                         imagearc($this->image, $x, $i, $w, $h, 0, 360, $this->arrDarkColor[($j % $dc_max)]);
@@ -154,19 +147,27 @@
 
         // $B>eLL$NIA2h(B
         $start = 0;
-        foreach ($arrRad as $key => $rad) {
-            $end = $start + $rad;
-            // $B3+;O!&=*N;$,F10lCM$@$H!"(B(imagefilledarc $B4X?t$K$*$1$k(B) 0$B!k$+$i(B360$B!k$H$7$FF0:n$9$k$h$&$J$N$G!"%9%-%C%W$9$k!#(B
-            // XXX $BCM%i%Y%k$OJL%m%8%C%/$J$N$G!"<B<ALdBj$r ＠ 8$8$J$$$H9M$($F$$$k!#(B
-            if ($start == $end) {
-                continue 1;
+        for ($i = 0; $i < $rd_max; $i++) {
+            $end = $start + $arrRad[$i];
+            if ($start == 0 && $end == 360) {
+                // -90~270$B$G;XDj$9$k$H1_$,IA2h$G$-$J$$$N$G(B0~360$B$K;XDj(B
+                imagefilledarc($this->image, $x, $y, $w, $h, 0, 360, $this->arrColor[($i % $c_max)], IMG_ARC_PIE);
+            } else {
+                // -90$B!k$O(B12$B;~$N0LCV$+$i3+;O$9$k$h$&$KJd ＠ 5$7$F$$$k!#(B
+                imagefilledarc($this->image, $x, $y, $w, $h, $start - 90, $end - 90, $this->arrColor[($i % $c_max)], IMG_ARC_PIE);
             }
-            // -90$B!k$O(B12$B;~$N0LCV$+$i3+;O$9$k$h$&$KJd ＠ 5$9$k$b$N!#(B
-            // $BEI$j$D$V$7(B
-            imagefilledarc($this->image, $x, $y, $w, $h, $start - 90, $end - 90, $this->arrColor[($key % $c_max)], $style);
-            // FIXME 360$B!kIA2h$N>l9g!"(B(imagefilledarc $B4X?t$K$*$1$k(B) 0$B!k$+$i(B360$B!k$H$7$FF0:n$9$k!#K\Mh(B-90$B!k$+$i(B360$B!k$H$7$FF0:n$9$Y$-!#(B
-            //       $B$J$*!"(B360$B!k$H(B0$B!k$NAH$_9g$o$;$r9MN8$9$k$H@~$,L5$$$N$bLdBj$,$"$k$N$G!"$3$N=hM}$r%9%-%C%W$9$kBP1~$OITE,Ev$G$"$k!#(B
-            // $B1o<h$j@~(B
+            $start = $end;
+        }
+
+        // $B>eLL$N1o<h$j(B
+        $start = 0;
+        for ($i = 0; $i < $rd_max; $i++) {
+            $end = $start + $arrRad[$i];
+            if ($start == 0 && $end == 360) {
+                // -90~270$B$G;XDj$9$k$H1_$,IA2h$G$-$J$$$N$G(B0~360$B$K;XDj(B
+                imagearc($this->image, $x, $y, $w, $h, 0, 360 , $this->flame_color);
+            }
+            // -90$B!k$O(B12$B;~$N0LCV$+$i3+;O$9$k$h$&$KJd ＠ 5$7$F$$$k!#(B
             imagefilledarc($this->image, $x, $y, $w, $h, $start - 90, $end - 90, $this->flame_color, IMG_ARC_EDGED|IMG_ARC_NOFILL);
             $start = $end;
         }
@@ -175,8 +176,8 @@
         imageline($this->image, $x + ($w / 2), $y, $x + ($w / 2), $y + $z, $this->flame_color);
         imageline($this->image, $x - ($w / 2), $y, $x - ($w / 2), $y + $z, $this->flame_color);
         $start = 0;
-        foreach ($arrRad as $rad) {
-            $end = $start + $rad;
+        for ($i = 0; $i < $rd_max; $i++) {
+            $end = $start + $arrRad[$i];
             // $BA0LL$N$_(B
             if ($end > 90 && $end < 270) {
                 list($ax, $ay) = $this->lfGetArcPos($x, $y, $w, $h, $end);
@@ -196,17 +197,17 @@
     }
 
     // $B1_%0%i%U$N%i%Y%k$rIA2h$9$k(B
-    function drawLabel($arrRad)
-    {
+    function drawLabel($arrRad) {
+        $rd_max = count($arrRad);
         $start = 0;
-        foreach ($arrRad as $key => $rad) {
-            $center = $start + ($rad / 2);
-            $end = $start + $rad;
+        for ($i = 0; $i < $rd_max; $i++) {
+            $center = $start + ($arrRad[$i] / 2);
+            $end = $start + $arrRad[$i];
             list($sx, $sy) = $this->lfGetArcPos($this->cx, $this->cy, ($this->cw / 1.5), ($this->ch / 1.5), $center);
             list($ex, $ey) = $this->lfGetArcPos($this->cx, $this->cy, ($this->cw * 1.5), ($this->ch * 1.5), $center);
             // $B;X<(@~$NIA2h(B
             imageline($this->image, $sx, $sy, $ex + 2, $ey - PIE_LABEL_UP, $this->flame_color);
-            $this->setText(FONT_SIZE, $ex - 10, $ey - PIE_LABEL_UP - FONT_SIZE, $this->arrLabel[$key], NULL, 0, true);
+            $this->setText(FONT_SIZE, $ex - 10, $ey - PIE_LABEL_UP - FONT_SIZE, $this->arrLabel[$i], NULL, 0, true);
             $start = $end;
         }
     }

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -36,8 +36,7 @@
      * @param array $sqlval
      * @return array()
      */
-    function registAddress($sqlval)
-    {
+    function save($sqlval) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $customer_id = $sqlval['customer_id'];
         $other_deliv_id = $sqlval['other_deliv_id'];
@@ -77,8 +76,7 @@
      * @param integer $other_deliv_id
      * @return array()
      */
-    function getAddress($other_deliv_id)
-    {
+    function get($other_deliv_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $address = $objQuery->select('*', 'dtb_other_deliv', 'other_deliv_id = ?', array($other_deliv_id));
         return $address ? $address[0] : FALSE;
@@ -91,8 +89,7 @@
      * @param integer $startno
      * @return array
      */
-    function getList($customer_id, $startno = '')
-    {
+    function getList($customer_id, $startno = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setOrder('other_deliv_id DESC');
         //$B%9%^!<%H%U%)%sMQ$N=hM}(B
@@ -108,8 +105,7 @@
      * @param integer $delivId
      * @return void
      */
-    function deleteAddress($other_deliv_id)
-    {
+    function delete($other_deliv_id) {
         $where      = 'other_deliv_id = ?';
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $objQuery->delete('dtb_other_deliv', $where, array($other_deliv_id));
@@ -121,8 +117,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function setFormParam(&$objFormParam)
-    {
+    function setFormParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
         $objFormParam->addParam('', 'other_deliv_id');
     }
@@ -133,8 +128,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function errorCheck(&$objFormParam)
-    {
+    function errorCheck(&$objFormParam) {
         $objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam);
         return $objErr->arrErr;
     }

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Bloc.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Bloc.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Bloc.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,198 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B%V%m%C%/$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Bloc
-{
-    private $device_type_id = NULL;
-
-    function __construct($devide_type_id = DEVICE_TYPE_PC)
-    {
-        $this->device_type_id = $devide_type_id;
-    }
-
-    /**
-     * $B%V%m%C%/$N>pJs$r<hF@(B.
-     * 
-     * @param integer $bloc_id $B%V%m%C%/(BID
-     * @return array
-     */
-    public function get($bloc_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'bloc_id = ? AND device_type_id = ?';
-        $arrRet = $objQuery->getRow($col, 'dtb_bloc', $where, array($bloc_id, $this->device_type_id));
-        if (SC_Utils_Ex::isAbsoluteRealPath($arrRet['tpl_path'])) {
-            $tpl_path = $arrRet['tpl_path'];
-        } else {
-            $tpl_path = SC_Helper_PageLayout_Ex::getTemplatePath($this->device_type_id) . BLOC_DIR . $arrRet['tpl_path'];
-        }
-        if (file_exists($tpl_path)) {
-            $arrRet['bloc_html'] = file_get_contents($tpl_path);
-        }
-        return $arrRet;
-    }
-
-    /**
-     * $B%V%m%C%/0lMw$N<hF@(B.
-     *
-     * @return array
-     */
-    public function getList()
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'device_type_id = ?';
-        $table = 'dtb_bloc';
-        $arrRet = $objQuery->select($col, $table, $where, array($this->device_type_id));
-        return $arrRet;
-    }
-
-    /**
-     * where$B6g$G>r7o$r;XDj$7$F%V%m%C%/0lMw$r<hF@(B.
-     * 
-     * @param string $where
-     * @param array $sqlval
-     */
-    public function getWhere($where = '', $sqlval = array())
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
-        array_unshift($sqlval, $this->device_type_id);
-        $table = 'dtb_bloc';
-        $arrRet = $objQuery->select($col, $table, $where, $sqlval);
-        return $arrRet;
-    }
-
-    /**
-     * $B%V%m%C%/$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return multiple $BEPO?@.8y(B:$B%V%m%C%/(BID, $B<:GT(B:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
-
-        // blod_id $B$,6u$N>l9g$O?75,EPO?(B
-        $is_new = SC_Utils_Ex::isBlank($sqlval['bloc_id']);
-        $bloc_dir = SC_Helper_PageLayout_Ex::getTemplatePath($sqlval['device_type_id']) . BLOC_DIR;
-        // $B4{B8%G!<%?$N=EJ#%A%'%C%/(B
-        if (!$is_new) {
-            $arrExists = $this->get($sqlval['bloc_id']);
-
-            // $B4{B8$N%U%!%$%k$,B8:_$9$k>l9g$O:o=|$7$F$*$/(B
-            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
-            if (file_exists($exists_file)) {
-                unlink($exists_file);
-            }
-        }
-
-        $table = 'dtb_bloc';
-        $arrValues = $objQuery->extractOnlyColsOf($table, $sqlval);
-        $arrValues['tpl_path'] = $sqlval['filename'] . '.tpl';
-        $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
-
-        // $B?75,EPO?(B
-        if ($is_new || SC_Utils_Ex::isBlank($arrExists)) {
-            $objQuery->setOrder('');
-            $arrValues['bloc_id'] = 1 + $objQuery->max('bloc_id', $table, 'device_type_id = ?',
-                                                       array($arrValues['device_type_id']));
-            $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
-            $objQuery->insert($table, $arrValues);
-        }
-        // $B99?7(B
-        else {
-            $objQuery->update($table, $arrValues, 'bloc_id = ? AND device_type_id = ?',
-                              array($arrValues['bloc_id'], $arrValues['device_type_id']));
-        }
-
-        $bloc_path = $bloc_dir . $arrValues['tpl_path'];
-        if (!SC_Helper_FileManager_Ex::sfWriteFile($bloc_path, $sqlval['bloc_html'])) {
-            $objQuery->rollback();
-            return false;
-        }
-
-        $objQuery->commit();
-        return $arrValues['bloc_id'];
-    }
-
-    /**
-     * $B%V%m%C%/$N:o=|(B.
-     * 
-     * @param integer $bloc_id
-     * @return boolean
-     */
-    public function delete($bloc_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
-
-        $arrExists = $this->getWhere('bloc_id = ? AND deletable_flg = 1', array($bloc_id));
-        $is_error = false;
-        if (!SC_Utils_Ex::isBlank($arrExists)) {
-            $objQuery->delete('dtb_bloc', 'bloc_id = ? AND device_type_id = ?',
-                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
-            $objQuery->delete('dtb_blocposition', 'bloc_id = ? AND device_type_id = ?',
-                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
-
-            $bloc_dir = SC_Helper_PageLayout_Ex::getTemplatePath($this->device_type_id) . BLOC_DIR;
-            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
-
-            // $B%U%!%$%k$N:o=|(B
-            if (file_exists($exists_file)) {
-                if (!unlink($exists_file)) {
-                    $is_error = true;
-                }
-            }
-        } else {
-            $is_error = true;
-        }
-
-        if ($is_error) {
-            $objQuery->rollback();
-            return false;
-        }
-        $objQuery->commit();
-        return true;
-    }
-
-    /**
-     * $BC<Kv<oJL(BID$B$N%a%s%P!<JQ?t$r<hF@(B.
-     * 
-     * @return integer $BC<Kv<oJL(BID
-     */
-    public function getDeviceTypeID()
-    {
-        return $this->device_type_id; 
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -12,8 +12,7 @@
    * @author LOCKON CO.,LTD.
    * @version $Id$
    */
-class SC_Helper_CSV 
-{
+class SC_Helper_CSV {
 
     // {{{ properties
 
@@ -29,8 +28,7 @@
     /**
      * $B%G%U%)%k%H%3%s%9%H%i%/%?(B.
      */
-    function __construct()
-    {
+    function __construct() {
         $this->init();
     }
 
@@ -43,8 +41,7 @@
      * @access private
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->arrSubnavi = array(
             1 => 'product',
             2 => 'customer',
@@ -72,8 +69,7 @@
      * @param boolean $is_download true:$B%@%&%s%m!<%IMQ=PNO$^$G$5$;$k(B false:CSV$B$NFbMF$rJV$9(B($B5lJ}<0!"%a%b%j$r?)$$$^$9!#!K(B
      * @return mixed $is_download = true$B;~(B $B ＠ .8y<:GT%U%i%0(B(boolean) $B!"(B$is_downalod = false$B;~(B string
      */
-    function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false)
-    {
+    function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false) {
         // CSV$B=PNO%?%$%H%k9T$N:n ＠ .(B
         $arrOutput = SC_Utils_Ex::sfSwapArray($this->sfGetCsvOutput($csv_id, 'status = ' . CSV_COLUMN_STATUS_FLG_ENABLE));
         if (count($arrOutput) <= 0) return false; // $B<:GT=*N;(B
@@ -103,9 +99,6 @@
             // $B%+%F%4%j$N>l9g(B
             $sql = 'SELECT ' . $cols . ' FROM dtb_category ' . $where;
         }
-        // $B!V(BgetSql$B$r;H$C$F$$$k(Bcsv_id=1$B!W0J30$G!V(Border$B;XDj!W$,$"$k>l9g$OKvHx$KIUM?(B
-        // $BA4(Bcsv_id$B$G(BgetSql$B$r;HMQ$7$F ＠ 8@.$9$k$h$&E}0l$9$k>l9g$OEv%a%=%C%I$N8F$S85$bMW=$@5(B
-        $sql = ($csv_id != '1' && strlen($order) >= 1) ? $sql.' order by '.$order : $sql;
         // $B8GM-=hM}$3$3$^$G(B
         return $this->sfDownloadCsvFromSql($sql, $arrVal, $this->arrSubnavi[$csv_id], $arrOutput['disp_name'], $is_download);
     }
@@ -119,8 +112,7 @@
      * @param array $order SQL $B$N(B ORDER BY $B6g(B
      * @return array CSV $B9`L\$NG[Ns(B
      */
-    function sfGetCsvOutput($csv_id = '', $where = '', $arrVal = array(), $order = 'rank, no')
-    {
+    function sfGetCsvOutput($csv_id = '', $where = '', $arrVal = array(), $order = 'rank, no') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $cols = 'no, csv_id, col, disp_name, rank, status, rw_flg, mb_convert_kana_option, size_const_type, error_check_types';
@@ -146,8 +138,7 @@
      * @param array sfGetCsvOutput$B$G<hF@$7$?FbMF!J$^$?$O$=$l$HF1Ey$NG[Ns(B)
      * @return boolean true:$B%$%s%]!<%H2DG=!"(Bfalse:$B%$%s%]!<%HIT2D(B
      */
-    function sfIsImportCSVFrame(&$arrCSVFrame)
-    {
+    function sfIsImportCSVFrame(&$arrCSVFrame) {
         $result = true;
         foreach ($arrCSVFrame as $val) {
             if ($val['status'] != CSV_COLUMN_STATUS_FLG_ENABLE
@@ -168,8 +159,7 @@
      * @param array sfGetCsvOutput$B$G<hF@$7$?FbMF!J$^$?$O$=$l$HF1Ey$NG[Ns(B)
      * @return boolean true:$B99?72DG=!"(Bfalse:$B?75,DI2C$N$_IT2D(B
      */
-    function sfIsUpdateCSVFrame(&$arrCSVFrame)
-    {
+    function sfIsUpdateCSVFrame(&$arrCSVFrame) {
         $result = true;
         foreach ($arrCSVFrame as $val) {
             if ($val['status'] != CSV_COLUMN_STATUS_FLG_ENABLE
@@ -188,8 +178,7 @@
      * @param resource $fp fopen$B$r;HMQ$7$F:n ＠ .$7$?%U%!%$%k%]%$%s%?(B
      * @return integer CSV $B$N%+%&%s%H?t(B
      */
-    function sfGetCSVRecordCount($fp)
-    {
+    function sfGetCSVRecordCount($fp) {
         $count = 0;
         while (!feof($fp)) {
             $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
@@ -209,8 +198,7 @@
      * @param mixed $data $B=PNO%G!<%?(B
      * @return boolean true (true:$B8GDj(B false:$BCfCG(B)
      */
-    function cbOutputCSV($data)
-    {
+    function cbOutputCSV($data) {
         $line = $this->sfArrayToCSV($data);
         $line = mb_convert_encoding($line, 'SJIS-Win');
         $line .= "\r\n";
@@ -229,8 +217,7 @@
      * @param boolean $is_download true:$B%@%&%s%m!<%IMQ=PNO$^$G$5$;$k(B false:CSV$B$NFbMF$rJV$9(B($B5lJ}<0!"%a%b%j$r?)$$$^$9!#!K(B
      * @return mixed $is_download = true$B;~(B $B ＠ .8y<:GT%U%i%0(B(boolean) $B!"(B$is_downalod = false$B;~(B string
      */
-    function sfDownloadCsvFromSql($sql, $arrVal = array(), $file_head = 'csv', $arrHeader = array(), $is_download = false)
-    {
+    function sfDownloadCsvFromSql($sql, $arrVal = array(), $file_head = 'csv', $arrHeader = array(), $is_download = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B%X%C%@9=C[(B
@@ -274,8 +261,7 @@
      * @param string $arrayDelimiter
      * @return string $B7k2L9T(B
      */
-    function sfArrayToCsv($fields, $delimiter = ',', $enclosure = '"', $arrayDelimiter = '|')
-    {
+    function sfArrayToCsv($fields, $delimiter = ',', $enclosure = '"', $arrayDelimiter = '|') {
         if (strlen($delimiter) != 1) {
             trigger_error('delimiter must be a single character', E_USER_WARNING);
             return '';
@@ -312,8 +298,7 @@
      * @param string $prefix
      * @return void
      */
-    function lfDownloadCsv($arrData, $prefix = '')
-    {
+    function lfDownloadCsv($arrData, $prefix = '') {
 
         if ($prefix == '') {
             $dir_name = SC_Utils_Ex::sfUpDirName();
@@ -343,8 +328,7 @@
      * @param string $prefix
      * @return void
      */
-    function lfDownloadCSVFile($filepath, $prefix = '')
-    {
+    function lfDownloadCSVFile($filepath, $prefix = '') {
         $file_name = $prefix . date('YmdHis') . '.csv';
 
         /* HTTP$B%X%C%@$N=PNO(B */

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Category.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Category.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Category.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,130 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B%+%F%4%j!<$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Category
-{
-    private $count_check;
-
-    /**
-     * $B%3%s%9%H%i%/%?!<(B
-     * 
-     * @param boolean $count_check $BEPO?>&IJ?t$r%A%'%C%/$9$k>l9g$O(Btrue
-     */
-    function __construct($count_check = FALSE)
-    {
-        $this->count_check = $count_check;
-    }
-
-    /**
-     * $B%+%F%4%j!<$N>pJs$r<hF@(B.
-     * 
-     * @param integer $category_id $B%+%F%4%j!<(BID
-     * @return array
-     */
-    public function get($category_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id';
-        $where = 'dtb_category.category_id = ? AND del_flg = 0';
-        // $BEPO?>&IJ?t$N%A%'%C%/(B
-        if ($this->count_check) {
-            $where .= ' AND product_count > 0';
-        }
-        $arrRet = $objQuery->getRow($col, $from, $where, array($category_id));
-        return $arrRet;
-    }
-
-    /**
-     * $B%+%F%4%j!<0lMw$N<hF@(B.
-     * 
-     * @param boolean $cid_to_key $BG[Ns$N%-!<$r%+%F%4%j!<(BID$B$K$9$k>l9g$O(Btrue
-     * @return array $B%+%F%4%j!<0lMw$NG[Ns(B
-     */
-    public function getList($cid_to_key = FALSE)
-    {
-        static $arrCategory = array(), $cidIsKey = array();
-
-        if (!isset($arrCategory[$this->count_check])) {
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $col = '*';
-            $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id';
-            // $BEPO?>&IJ?t$N%A%'%C%/(B
-            if ($this->count_check) {
-                $where = 'del_flg = 0 AND product_count > 0';
-            } else {
-                $where = 'del_flg = 0';
-            }
-            $objQuery->setOption('ORDER BY rank DESC');
-            $arrTmp = $objQuery->select($col, $from, $where);
-
-            $arrCategory[$this->count_check] = $arrTmp;
-        }
-
-        if ($cid_to_key) {
-            if (!isset($cidIsKey[$this->count_check])) {
-                // $BG[Ns$N%-!<$r%+%F%4%j!<(BID$B$K(B
-                $cidIsKey[$this->count_check] = SC_Utils_Ex::makeArrayIDToKey('category_id', $arrCategory[$this->count_check]);
-            }
-            return $cidIsKey[$this->count_check];
-        }
-
-        return $arrCategory[$this->count_check];
-    }
-
-    /**
-     * $B%+%F%4%j!<%D%j!<$N<hF@(B.
-     * 
-     * @return type
-     */
-    public function getTree()
-    {
-        static $arrTree = array();
-        if (!isset($arrTree[$this->count_check])) {
-            $arrList = $this->getList();
-            $arrTree[$this->count_check] = SC_Utils_Ex::buildTree('category_id', 'parent_category_id', LEVEL_MAX, $arrList);
-        }
-        return $arrTree[$this->count_check];
-    }
-
-    /**
-     * $B?F%+%F%4%j!<(BID$B$NG[Ns$r<hF@(B.
-     * 
-     * @param integer $category_id $B5/E@$N%+%F%4%j!<(BID
-     * @param boolean $id_only ID$B$@$1$NG[Ns$rJV$9>l9g$O(Btrue
-     * @return array
-     */
-    public function getTreeTrail($category_id, $id_only = TRUE)
-    {
-        $arrCategory = $this->getList(TRUE);
-        $arrTrailID = SC_Utils_Ex::getTreeTrail($category_id, 'category_id', 'parent_category_id', $arrCategory, TRUE, 0, $id_only);
-        return $arrTrailID;
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,92 +29,85 @@
  * @author Hirokazu Fukuda
  * @version $Id$
  */
-class SC_Helper_Customer 
-{
+class SC_Helper_Customer {
 
     /**
      * $B2q0w>pJs$NEPO?!&JT=8=hM}$r9T$&(B.
      *
-     * @param array $arrData $BEPO?$9$k%G!<%?$NG[Ns!J(BSC_FormParam$B$N(BgetDbArray$B$NLa$jCM!K(B
+     * @param array $array $BEPO?$9$k%G!<%?$NG[Ns!J(BSC_FormParam$B$N(BgetDbArray$B$NLa$jCM!K(B
      * @param array $customer_id null$B$N>l9g$O(Binsert, $BB8:_$9$k>l9g$O(Bupdate
      * @access public
      * @return integer $BEPO?JT=8$7$?%f!<%6!<$N(Bcustomer_id
      */
-    function sfEditCustomerData($arrData, $customer_id = null)
-    {
+    function sfEditCustomerData($array, $customer_id = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
 
-        $old_version_flag = false;
+        $array['update_date'] = 'CURRENT_TIMESTAMP';    // $B99?7F|(B
 
-        $arrData['update_date'] = 'CURRENT_TIMESTAMP';    // $B99?7F|(B
-
         // salt$BCM$N ＠ 8@.(B(insert$B;~(B)$B$^$?$O<hF@(B(update$B;~(B)$B!#(B
         if (is_numeric($customer_id)) {
             $salt = $objQuery->get('salt', 'dtb_customer', 'customer_id = ? ', array($customer_id));
 
             // $B5l%P!<%8%g%s(B(2.11$BL$K~(B)$B$+$i$N0\9T$r9MN8(B
-            if (strlen($salt) === 0) {
-                $old_version_flag = true;
-            }
+            if (empty($salt)) $old_version_flag = true;
         } else {
             $salt = SC_Utils_Ex::sfGetRandomString(10);
-            $arrData['salt'] = $salt;
+            $array['salt'] = $salt;
         }
         //-- $B%Q%9%o!<%I$N99?7$,$"$k>l9g$O0E9f2=(B
-        if ($arrData['password'] == DEFAULT_PASSWORD or $arrData['password'] == '') {
+        if ($array['password'] == DEFAULT_PASSWORD or $array['password'] == '') {
             //$B99?7$7$J$$(B
-            unset($arrData['password']);
+            unset($array['password']);
         } else {
             // $B5l%P!<%8%g%s(B(2.11$BL$K~(B)$B$+$i$N0\9T$r9MN8(B
             if ($old_version_flag) {
                 $is_password_updated = true;
                 $salt = SC_Utils_Ex::sfGetRandomString(10);
-                $arrData['salt'] = $salt;
+                $array['salt'] = $salt;
             }
 
-            $arrData['password'] = SC_Utils_Ex::sfGetHashString($arrData['password'], $salt);
+            $array['password'] = SC_Utils_Ex::sfGetHashString($array['password'], $salt);
         }
         //-- $BHkL)$N<ALd$N99?7$,$"$k>l9g$O0E9f2=(B
-        if ($arrData['reminder_answer'] == DEFAULT_PASSWORD or $arrData['reminder_answer'] == '') {
+        if ($array['reminder_answer'] == DEFAULT_PASSWORD or $array['reminder_answer'] == '') {
             //$B99?7$7$J$$(B
-            unset($arrData['reminder_answer']);
+            unset($array['reminder_answer']);
 
             // $B5l%P!<%8%g%s(B(2.11$BL$K~(B)$B$+$i$N0\9T$r9MN8(B
             if ($old_version_flag && $is_password_updated) {
                 // $B%Q%9%o!<%I$,99?7$5$l$k>l9g$O!"J?J8$K$J$C$F$$$kHkL)$N<ALd$r0E9f2=$9$k(B
                 $reminder_answer = $objQuery->get('reminder_answer', 'dtb_customer', 'customer_id = ? ', array($customer_id));
-                $arrData['reminder_answer'] = SC_Utils_Ex::sfGetHashString($reminder_answer, $salt);
+                $array['reminder_answer'] = SC_Utils_Ex::sfGetHashString($reminder_answer, $salt);
             }
         } else {
             // $B5l%P!<%8%g%s(B(2.11$BL$K~(B)$B$+$i$N0\9T$r9MN8(B
             if ($old_version_flag && !$is_password_updated) {
                 // $B%Q%9%o!<%I$,99?7$5$l$J$$>l9g$O!"J?J8$N$^$^$K$9$k(B
-                unset($arrData['salt']);
+                unset($array['salt']);
             } else {
-                $arrData['reminder_answer'] = SC_Utils_Ex::sfGetHashString($arrData['reminder_answer'], $salt);
+                $array['reminder_answer'] = SC_Utils_Ex::sfGetHashString($array['reminder_answer'], $salt);
             }
         }
 
         //-- $BJT=8EPO?<B9T(B
         if (is_numeric($customer_id)) {
             // $BJT=8(B
-            $objQuery->update('dtb_customer', $arrData, 'customer_id = ? ', array($customer_id));
+            $objQuery->update('dtb_customer', $array, 'customer_id = ? ', array($customer_id));
         } else {
             // $B?75,EPO?(B
 
             // $B2q0w(BID
             $customer_id = $objQuery->nextVal('dtb_customer_customer_id');
-            $arrData['customer_id'] = $customer_id;
+            $array['customer_id'] = $customer_id;
             // $B:n ＠ .F|(B
-            if (is_null($arrData['create_date'])) {
-                $arrData['create_date'] = 'CURRENT_TIMESTAMP';
+            if (is_null($array['create_date'])) {
+                $array['create_date'] = 'CURRENT_TIMESTAMP';
             }
-            $objQuery->insert('dtb_customer', $arrData);
+            $objQuery->insert('dtb_customer', $array);
         }
 
         $objQuery->commit();
-
         return $customer_id;
     }
 
@@ -126,10 +119,8 @@
      * @param integer $add_point $B2C;;%]%$%s%H(B
      * @return array $B:G=*%]%$%s%H$NG[Ns(B
      */
-    function sfGetCustomerPoint($order_id, $use_point, $add_point)
-    {
+    function sfGetCustomerPoint($order_id, $use_point, $add_point) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-
         $arrRet = $objQuery->select('customer_id', 'dtb_order', 'order_id = ?', array($order_id));
         $customer_id = $arrRet[0]['customer_id'];
         if ($customer_id != '' && $customer_id >= 1) {
@@ -145,7 +136,6 @@
             $total_point = '';
             $point = '';
         }
-
         return array($point, $total_point);
     }
 
@@ -157,8 +147,7 @@
      * @param string $email  $B%a!<%k%"%I%l%9(B
      * @return integer  0:$BEPO?2DG=(B     1:$BEPO?:Q$_(B   2:$B:FEPO?@)8B4|4VFb:o=|%f!<%6!<(B  3:$B<+J,$N%"%I%l%9(B
      */
-    function sfCheckRegisterUserFromEmail($email)
-    {
+    function sfCheckRegisterUserFromEmail($email) {
         $objCustomer = new SC_Customer_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -206,8 +195,7 @@
      * @param string $email $B%A%'%C%/BP>]$N%a!<%k%"%I%l%9(B
      * @return boolean $B%a!<%k%"%I%l%9$,=EJ#$9$k>l9g(B true
      */
-    function sfCustomerEmailDuplicationCheck($customer_id, $email)
-    {
+    function sfCustomerEmailDuplicationCheck($customer_id, $email) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $arrResults = $objQuery->getRow('email, email_mobile',
@@ -217,7 +205,6 @@
             =  strlen($arrResults['email']) >= 1 && $email === $arrResults['email']
             || strlen($arrResults['email_mobile']) >= 1 &&  $email === $arrResults['email_mobile']
         ;
-
         return $return;
     }
 
@@ -229,8 +216,7 @@
      * @access public
      * @return array $B2q0w>pJs$NG[Ns$rJV$9(B
      */
-    function sfGetCustomerData($customer_id, $mask_flg = true)
-    {
+    function sfGetCustomerData($customer_id, $mask_flg = true) {
         $objQuery       =& SC_Query_Ex::getSingletonInstance();
 
         // $B2q0w>pJs(BDB$B<hF@(B
@@ -252,7 +238,6 @@
             $arrForm['password02']        = DEFAULT_PASSWORD;
             $arrForm['reminder_answer']   = DEFAULT_PASSWORD;
         }
-
         return $arrForm;
     }
 
@@ -267,10 +252,8 @@
      * @access public
      * @return array $BBP>]2q0w%G!<%?(B
      */
-    function sfGetCustomerDataFromId($customer_id, $add_where = '', $arrAddVal = array())
-    {
+    function sfGetCustomerDataFromId($customer_id, $add_where = '', $arrAddVal = array()) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
-
         if ($add_where == '') {
             $where = 'customer_id = ?';
             $arrData = $objQuery->getRow('*', 'dtb_customer', $where, array($customer_id));
@@ -282,7 +265,6 @@
             }
             $arrData = $objQuery->getRow('*', 'dtb_customer', $where, $arrAddVal);
         }
-
         return $arrData;
     }
 
@@ -292,15 +274,13 @@
      * @access public
      * @return string $B2q0wEPO?%-!<$NJ8;zNs(B
      */
-    function sfGetUniqSecretKey()
-    {
+    function sfGetUniqSecretKey() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         do {
             $uniqid = SC_Utils_Ex::sfGetUniqRandomId('r');
             $exists = $objQuery->exists('dtb_customer', 'secret_key = ?', array($uniqid));
         } while ($exists);
-
         return $uniqid;
     }
 
@@ -312,10 +292,8 @@
      * @access public
      * @return integer $B2q0w(BID
      */
-    function sfGetCustomerId($uniqid, $check_status = false)
-    {
+    function sfGetCustomerId($uniqid, $check_status = false) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
-
         $where      = 'secret_key = ?';
 
         if ($check_status) {
@@ -333,8 +311,7 @@
      * @access public
      * @return void
      */
-    function sfCustomerEntryParam(&$objFormParam, $isAdmin = false)
-    {
+    function sfCustomerEntryParam(&$objFormParam, $isAdmin = false) {
         SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
         SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, $isAdmin);
         if ($isAdmin) {
@@ -358,8 +335,7 @@
      * @access public
      * @return void
      */
-    function sfCustomerMypageParam(&$objFormParam)
-    {
+    function sfCustomerMypageParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
         SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, false, true);
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) {
@@ -378,8 +354,7 @@
      * @access public
      * @return void
      */
-    function sfCustomerCommonParam(&$objFormParam)
-    {
+    function sfCustomerCommonParam(&$objFormParam) {
         $objFormParam->addParam('$B$*L>A0(B($B ＠ +(B)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*L>A0(B($BL>(B)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*L>A0(B($B%U%j%,%J!&@+(B)', 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
@@ -405,9 +380,8 @@
      * @param boolean $is_mypage $B%^%$%Z!<%8$N>l9g(B true
      * @return void
      */
-    function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false)
-    {
-        $objFormParam->addParam('$B%Q%9%o!<%I(B', 'password', PASSWORD_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
+    function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false) {
+        $objFormParam->addParam('$B%Q%9%o!<%I(B', 'password', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%Q%9%o!<%I3NG'MQ$N<ALd$NEz$((B', 'reminder_answer', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%Q%9%o!<%I3NG'MQ$N<ALd(B', 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B ＠ -JL(B', 'sex', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -419,7 +393,7 @@
 
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) {
             $objFormParam->addParam('$B%a!<%k%"%I%l%9(B', 'email', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK'));
-            $objFormParam->addParam('$B%Q%9%o!<%I(B($B3NG'(B)', 'password02', PASSWORD_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK' ,'ALNUM_CHECK'), '', false);
+            $objFormParam->addParam('$B%Q%9%o!<%I(B($B3NG'(B)', 'password02', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK' ,'ALNUM_CHECK'), '', false);
             if (!$isAdmin) {
                 $objFormParam->addParam('$B%a!<%k%"%I%l%9(B($B3NG'(B)', 'email02', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK','SPTAB_CHECK' , 'EMAIL_CHAR_CHECK'), '', false);
             }
@@ -436,8 +410,7 @@
      * @access public
      * @return array $B%(%i!<$NG[Ns(B
      */
-    function sfCustomerEntryErrorCheck(&$objFormParam)
-    {
+    function sfCustomerEntryErrorCheck(&$objFormParam) {
         $objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam);
         $objErr = SC_Helper_Customer_Ex::sfCustomerRegisterErrorCheck($objErr);
 
@@ -466,8 +439,7 @@
      * @access public
      * @return array $B%(%i!<$NG[Ns(B
      */
-    function sfCustomerMypageErrorCheck(&$objFormParam, $isAdmin = false)
-    {
+    function sfCustomerMypageErrorCheck(&$objFormParam, $isAdmin = false) {
 
         $objFormParam->toLower('email_mobile');
         $objFormParam->toLower('email_mobile02');
@@ -484,7 +456,6 @@
                 && $objFormParam->getValue('reminder_answer') == DEFAULT_PASSWORD) {
             unset($objErr->arrErr['reminder_answer']);
         }
-
         return $objErr->arrErr;
     }
 
@@ -495,8 +466,7 @@
      * @access private
      * @return array $B%(%i!<>pJs$NG[Ns(B
      */
-    function sfCustomerCommonErrorCheck(&$objFormParam)
-    {
+    function sfCustomerCommonErrorCheck(&$objFormParam) {
         $objFormParam->convParam();
         $objFormParam->toLower('email');
         $objFormParam->toLower('email02');
@@ -520,13 +490,12 @@
      * @param boolean $isAdmin $B4IM}2hLL%A%'%C%/;~(B:true
      * @return SC_CheckError $objErr $B%(%i!<>pJs(B
      */
-    function sfCustomerRegisterErrorCheck(&$objErr, $isAdmin = false)
-    {
+    function sfCustomerRegisterErrorCheck(&$objErr, $isAdmin = false) {
         $objErr->doFunc(array('$B ＠ 8G/7nF|(B', 'year', 'month', 'day'), array('CHECK_BIRTHDAY'));
-        $objErr->doFunc(array('$B%Q%9%o!<%I(B', 'password', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN) ,array('NUM_RANGE_CHECK'));
 
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) {
             if (!$isAdmin) {
+                $objErr->doFunc(array('$B%Q%9%o!<%I(B', 'password', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN) ,array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
                 $objErr->doFunc(array('$B%a!<%k%"%I%l%9(B', '$B%a!<%k%"%I%l%9(B($B3NG'(B)', 'email', 'email02') ,array('EQUAL_CHECK'));
             }
             $objErr->doFunc(array('$B%Q%9%o!<%I(B', '$B%Q%9%o!<%I(B($B3NG'(B)', 'password', 'password02') ,array('EQUAL_CHECK'));
@@ -537,7 +506,6 @@
             $objErr->doFunc(array('$B%a!<%k%"%I%l%9(B', 'email'), array('CHECK_REGIST_CUSTOMER_EMAIL'));
             $objErr->doFunc(array('$B7HBS%a!<%k%"%I%l%9(B', 'email_mobile'), array('CHECK_REGIST_CUSTOMER_EMAIL', 'MOBILE_EMAIL_CHECK'));
         }
-
         return $objErr;
     }
 
@@ -548,8 +516,7 @@
      * @access public
      * @return void
      */
-    function sfSetSearchParam(&$objFormParam)
-    {
+    function sfSetSearchParam(&$objFormParam) {
         $objFormParam->addParam('$B2q0w(BID', 'search_customer_id', ID_MAX_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*L>A0(B', 'search_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*L>A0(B($B%U%j%,%J(B)', 'search_kana', STEXT_LEN, 'CKV', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'KANABLANK_CHECK'));
@@ -598,14 +565,11 @@
      * @access public
      * @return array $B%(%i!<G[Ns(B
      */
-    function sfCheckErrorSearchParam(&$objFormParam)
-    {
+    function sfCheckErrorSearchParam(&$objFormParam) {
         // $B%Q%i%a!<%?!<$N4pK\%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
-        // $B%(%i!<%A%'%C%/BP>]$N%Q%i%a!<%?<hF@(B
-        $array = $objFormParam->getHashArray();
         // $B3HD%%(%i!<%A%'%C%/=i4|2=(B
-        $objErr = new SC_CheckError_Ex($array);
+        $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         // $B3HD%%(%i!<%A%'%C%/(B
         $objErr->doFunc(array('$BCB ＠ 8F|(B($B3+;OF|(B)', 'search_b_start_year', 'search_b_start_month', 'search_b_start_day'), array('CHECK_DATE'));
         $objErr->doFunc(array('$BCB ＠ 8F|(B($B=*N;F|(B)', 'search_b_end_year', 'search_b_end_month', 'search_b_end_day'), array('CHECK_DATE'));
@@ -621,7 +585,7 @@
 
         if (SC_Utils_Ex::sfIsInt($array['search_buy_total_from'])
             && SC_Utils_Ex::sfIsInt($array['search_buy_total_to'])
-            && $array['search_buy_total_from'] > $array['search_buy_total_to']
+            && $array['search_buy_total_from'] > $array['buy_total_to']
         ) {
             $objErr->arrErr['search_buy_total_from'] .= '$B"((B $B9XF~6b3[$N;XDjHO0O$,IT ＠ 5$G$9!#(B';
         }
@@ -635,7 +599,6 @@
         if (!SC_Utils_Ex::isBlank($objErr->arrErr)) {
             $arrErr = array_merge($arrErr, $objErr->arrErr);
         }
-
         return $arrErr;
     }
 
@@ -646,11 +609,9 @@
      * @param string $limitMode $B%Z!<%8%s%0$rMxMQ$9$k$+H=DjMQ%U%i%0(B
      * @return array( integer $BA4BN7o?t(B, mixed $B2q0w%G!<%?0lMwG[Ns(B, mixed SC_PageNavi$B%*%V%8%'%/%H(B)
      */
-    function sfGetSearchData($arrParam, $limitMode = '')
-    {
+    function sfGetSearchData($arrParam, $limitMode = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
-
         $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_max']);
         $disp_pageno = $arrParam['search_pageno'];
         if ($disp_pageno == 0) {
@@ -681,34 +642,10 @@
      * @param string $login_email $B%a!<%k%"%I%l%9(B
      * @return boolean $B2>2q0w$N>l9g(B true
      */
-    public function checkTempCustomer($login_email)
-    {
+    public function checkTempCustomer($login_email) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-
         $where = 'email = ? AND status = 1 AND del_flg = 0';
         $exists = $objQuery->exists('dtb_customer', $where, array($login_email));
-
         return $exists;
     }
-
-    /**
-     * $B2q0w$r:o=|$9$k=hM}(B
-     *
-     * @param integer $customer_id $B2q0w(BID
-     * @return boolean true:$B ＠ .8y(B false:$B<:GT(B
-     */
-    public static function delete($customer_id)
-    {
-        $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, 'del_flg = 0');
-        if (SC_Utils_Ex::isBlank($arrData)) {
-            //$BBP>]$H$J$k%G!<%?$,8+$D$+$i$J$$!#(B
-            return false;
-        }
-        // XXXX: $B2>2q0w$OJ*M}:o=|$H$J$C$F$$$?$,O ＠ M}:o=|$KJQ99!#(B
-        $arrVal = array(
-            'del_flg' => '1',
-        );
-        SC_Helper_Customer_Ex::sfEditCustomerData($arrVal, $customer_id);
-        return true;
-    }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Helper_DB.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_DB 
-{
+class SC_Helper_DB {
 
     // {{{ properties
 
@@ -64,8 +63,7 @@
      *               $B%F!<%V%k$,B8:_$7$J$$>l9g(B false,
      *               $B0z?t(B $add == false $B$G%+%i%`$,B8:_$7$J$$>l9g(B false
      */
-    function sfColumnExists($table_name, $col_name, $col_type = '', $dsn = '', $add = false)
-    {
+    function sfColumnExists($table_name, $col_name, $col_type = '', $dsn = '', $add = false) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
 
@@ -103,8 +101,7 @@
      * @return bool $B%G!<%?$,B8:_$9$k>l9g(B true, $B%G!<%?$NDI2C$K ＠ .8y$7$?>l9g(B true,
      *               $add == false $B$G(B, $B%G!<%?$,B8:_$7$J$$>l9g(B false
      */
-    function sfDataExists($table_name, $where, $arrWhereVal, $dsn = '', $sql = '', $add = false)
-    {
+    function sfDataExists($table_name, $where, $arrWhereVal, $dsn = '', $sql = '', $add = false) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
 
@@ -133,8 +130,7 @@
      * @param string $col $B<hF@%+%i%`$r;XDj$9$k(B
      * @return array $BE9J^4pK\>pJs$NG[Ns(B
      */
-    function sfGetBasisData($force = false, $col = '')
-    {
+    function sfGetBasisData($force = false, $col = '') {
         static $data = array();
 
         if ($force || empty($data)) {
@@ -156,80 +152,12 @@
     }
 
     /**
-     * $B4pK\>pJs$N%-%c%C%7%e%G!<%?$r<hF@$9$k(B
-     *
-     * @param boolean $generate $B%-%c%C%7%e%U%!%$%k$,L5$$;~!"(BDB$B$N%G!<%?$r4p$K%-%c%C%7%e$r ＠ 8@.$9$k$+(B
-     * @return array $BE9J^4pK\>pJs$NG[Ns(B
-     */
-    function sfGetBasisDataCache($generate = false)
-    {
-        // $B%F!<%V%kL>(B
-        $name = 'dtb_baseinfo';
-        // $B%-%c%C%7%e%U%!%$%k%Q%9(B
-        $filepath = MASTER_DATA_REALDIR . $name . '.serial';
-        // $B%U%!%$%kB8:_3NG'(B
-        if (!file_exists($filepath) && $generate) {
-            // $BB8:_$7$F$$$J$1$l$P%-%c%C%7%e ＠ 8@.(B
-            $this->sfCreateBasisDataCache();
-        }
-        // $BLa$jCM=i4|2=(B
-        $cacheData = array();
-        // $B%-%c%C%7%e%U%!%$%k$,B8:_$9$l$PFI$_9~$`(B
-        if (file_exists($filepath)) {
-            // $B%-%c%C%7%e%G!<%?%U%!%$%k$rFI$_9~$_%"%s%7%j%"%i%$%:$7$?G[Ns$r<hF@(B
-            $cacheData = unserialize(file_get_contents($filepath));
-        }
-        // return
-        return $cacheData;
-    }
-
-    /**
-     * $B4pK\>pJs$N%-%c%C%7%e%G!<%?%U%!%$%k$r ＠ 8@.$9$k(B
-     * $B%G!<%?$O(BsfGetBasisData$B$h$j<hF@!#(B
-     * 
-     * $B$3$N%a%=%C%I$,D>@\8F$P$l$k$N$O!"(B
-     *$B!V4pK\>pJs4IM}!d(BSHOP$B%^%9%?!<!W$N99?740N;8e!#(B
-     * sfGetBasisDataCache$B$G$O!"(B
-     * $B%-%c%C%7%e%G!<%?%U%!%$%k$,L5$$>l9g$K8F$P$l$^$9!#(B
-     *
-     * @return bool $B%-%c%C%7%e%G!<%?%U%!%$%k ＠ 8@.7k2L(B
-     */
-    function sfCreateBasisDataCache()
-    {
-        // $B%F!<%V%kL>(B
-        $name = 'dtb_baseinfo';
-        // $B%-%c%C%7%e%U%!%$%k%Q%9(B
-        $filepath = MASTER_DATA_REALDIR . $name . '.serial';
-        // $B%G!<%?<hF@(B
-        $arrData = $this->sfGetBasisData(true);
-        // $B%7%j%"%i%$%:(B
-        $data = serialize($arrData);
-        // $B%U%!%$%k$r=q$-=P$7%b!<%I$G3+$/(B
-        $handle = fopen($filepath, 'w');
-        if (!$handle) {
-            // $B%U%!%$%k ＠ 8@.<:GT(B
-            return false;
-        }
-        // $B%U%!%$%k$NFbMF$r=q$-=P$9(B.
-        $res = fwrite($handle, $data);
-        // $B%U%!%$%k$rJD$8$k(B
-        fclose($handle);
-        if ( $res === false) {
-            // $B%U%!%$%k ＠ 8@.<:GT(B
-            return false;
-        }
-        // $B%U%!%$%k ＠ 8@. ＠ .8y(B
-        return true;
-    }
-
-    /**
      * $B4pK\>pJs$NEPO??t$r<hF@$9$k(B
      *
      * @return int
      * @deprecated
      */
-    function sfGetBasisCount()
-    {
+    function sfGetBasisCount() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         return $objQuery->count('dtb_baseinfo');
@@ -240,16 +168,14 @@
      *
      * @return boolean $BM-L5(B
      */
-    function sfGetBasisExists()
-    {
+    function sfGetBasisExists() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         return $objQuery->exists('dtb_baseinfo');
     }
 
     /* $BA*BrCf$N%"%$%F%`$N%k!<%H%+%F%4%j(BID$B$r<hF@$9$k(B */
-    function sfGetRootId()
-    {
+    function sfGetRootId() {
 
         if (!$this->g_root_on) {
             $this->g_root_on = true;
@@ -285,8 +211,7 @@
      * @param integer $order_status $BBP1~>u67(B
      * @return array $B%*!<%@!<A0%]%$%s%H$NG[Ns(B
      */
-    function sfGetRollbackPoint($order_id, $use_point, $add_point, $order_status)
-    {
+    function sfGetRollbackPoint($order_id, $use_point, $add_point, $order_status) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('customer_id', 'dtb_order', 'order_id = ?', array($order_id));
         $customer_id = $arrRet[0]['customer_id'];
@@ -318,8 +243,7 @@
      * @param bool $count_check $BEPO?>&IJ?t$N%A%'%C%/$r9T$&>l9g(B true
      * @return array $B%+%F%4%j%D%j!<$NG[Ns(B
      */
-    function sfGetCatTree($parent_category_id, $count_check = false)
-    {
+    function sfGetCatTree($parent_category_id, $count_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '';
         $col .= ' cat.category_id,';
@@ -342,7 +266,7 @@
         $objQuery->setOption('ORDER BY rank DESC');
         $arrRet = $objQuery->select($col, $from, $where);
 
-        $arrParentID = SC_Utils_Ex::getTreeTrail($parent_category_id, 'category_id', 'parent_category_id', $arrRet);
+        $arrParentID = SC_Helper_DB_Ex::sfGetParents('dtb_category', 'parent_category_id', 'category_id', $parent_category_id);
 
         foreach ($arrRet as $key => $array) {
             foreach ($arrParentID as $val) {
@@ -365,8 +289,7 @@
      * @result void
      * @see sfGetCatTree()
      */
-    function findTree(&$arrTree, $parent, &$result)
-    {
+    function findTree(&$arrTree, $parent, &$result) {
         if ($result[count($result) - 1]['parent_category_id'] === 0) {
             return;
         } else {
@@ -390,8 +313,7 @@
      * @param bool $count_check $BEPO?>&IJ?t$N%A%'%C%/$r9T$&>l9g(B true
      * @return array $B%+%F%4%j%D%j!<$NG[Ns(B
      */
-    function sfGetMultiCatTree($product_id, $count_check = false)
-    {
+    function sfGetMultiCatTree($product_id, $count_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '';
         $col .= ' cat.category_id,';
@@ -439,8 +361,7 @@
      * @param integer $category_id $B%+%F%4%j(BID
      * @return string $B?F%+%F%4%j$rO"7k$7$?J8;zNs(B
      */
-    function sfGetCatCombName($category_id)
-    {
+    function sfGetCatCombName($category_id) {
         // $B>&IJ$,B0$9$k%+%F%4%j(BID$B$r=D$K<hF@(B
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrCatID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id);
@@ -460,13 +381,28 @@
     }
 
     /**
+     * $B;XDj$7$?%+%F%4%j(BID$B$N%+%F%4%j$r<hF@$9$k(B.
+     *
+     * @param integer $category_id $B%+%F%4%j(BID
+     * @return array $B;XDj$7$?%+%F%4%j(BID$B$N%+%F%4%j(B
+     */
+    function sfGetCat($category_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // $B%+%F%4%j$r<hF@$9$k(B
+        $arrVal = array($category_id);
+        $res = $objQuery->select('category_id AS id, category_name AS name', 'dtb_category', 'category_id = ?', $arrVal);
+
+        return $res[0];
+    }
+
+    /**
      * $B;XDj$7$?%+%F%4%j(BID$B$NBg%+%F%4%j$r<hF@$9$k(B.
      *
      * @param integer $category_id $B%+%F%4%j(BID
      * @return array $B;XDj$7$?%+%F%4%j(BID$B$NBg%+%F%4%j(B
      */
-    function sfGetFirstCat($category_id)
-    {
+    function sfGetFirstCat($category_id) {
         // $B>&IJ$,B0$9$k%+%F%4%j(BID$B$r=D$K<hF@(B
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = array();
@@ -491,8 +427,7 @@
      * @param string $head $B%+%F%4%jL>$N%W%l%U%#%C%/%9J8;zNs(B
      * @return array $B%+%F%4%j%D%j!<$NG[Ns(B
      */
-    function sfGetCategoryList($addwhere = '', $products_check = false, $head = CATEGORY_HEAD)
-    {
+    function sfGetCategoryList($addwhere = '', $products_check = false, $head = CATEGORY_HEAD) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'del_flg = 0';
 
@@ -531,8 +466,7 @@
      * @param bool $parent_zero $B?F%+%F%4%j$N(B Value=0 $B$N>l9g(B true
      * @return array $B%+%F%4%j%D%j!<$NG[Ns(B
      */
-    function sfGetLevelCatList($parent_zero = true)
-    {
+    function sfGetLevelCatList($parent_zero = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B%+%F%4%jL>%j%9%H$r<hF@(B
@@ -581,8 +515,7 @@
      * @return array $BA*BrCf$N>&IJ$N%+%F%4%j(BID$B$NG[Ns(B
      *
      */
-    function sfGetCategoryId($product_id, $category_id = 0, $closed = false)
-    {
+    function sfGetCategoryId($product_id, $category_id = 0, $closed = false) {
         if ($closed) {
             $status = '';
         } else {
@@ -609,8 +542,7 @@
      * @param integer $product_id $B%W%m%@%/%H(BID
      * @return void
      */
-    function addProductBeforCategories($category_id, $product_id)
-    {
+    function addProductBeforCategories($category_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $sqlval = array('category_id' => $category_id,
@@ -631,8 +563,7 @@
      * @param integer $product_id $B%W%m%@%/%H(BID
      * @return void
      */
-    function addProductAfterCategories($category_id, $product_id)
-    {
+    function addProductAfterCategories($category_id, $product_id) {
         $sqlval = array('category_id' => $category_id,
                         'product_id' => $product_id);
 
@@ -664,8 +595,7 @@
      * @param integer $product_id $B%W%m%@%/%H(BID
      * @return void
      */
-    function removeProductByCategories($category_id, $product_id)
-    {
+    function removeProductByCategories($category_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->delete('dtb_product_categories',
                           'category_id = ? AND product_id = ?', array($category_id, $product_id));
@@ -678,8 +608,7 @@
      * @param integer $product_id $B%W%m%@%/%H(BID
      * @return void
      */
-    function updateProductCategories($arrCategory_id, $product_id)
-    {
+    function updateProductCategories($arrCategory_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B8=:_$N%+%F%4%j>pJs$r<hF@(B
@@ -712,8 +641,7 @@
      * @param boolean $is_force_all_count $BA4%+%F%4%j$N=87W$r6/@)$9$k>l9g(B true
      * @return void
      */
-    function sfCountCategory($objQuery = NULL, $is_force_all_count = false)
-    {
+    function sfCountCategory($objQuery = NULL, $is_force_all_count = false) {
         $objProduct = new SC_Product_Ex();
 
         if ($objQuery == NULL) {
@@ -890,8 +818,7 @@
      * @param integer $id ID
      * @param array $B;R(BID $B$NG[Ns(B
      */
-    function sfGetChildsID($table, $pid_name, $id_name, $id)
-    {
+    function sfGetChildsID($table, $pid_name, $id_name, $id) {
         $arrRet = $this->sfGetChildrenArray($table, $pid_name, $id_name, $id);
         return $arrRet;
     }
@@ -905,8 +832,7 @@
      * @param integer $id ID$BHV9f(B
      * @return array $B;R(BID$B$NG[Ns(B
      */
-    function sfGetChildrenArray($table, $pid_name, $id_name, $id)
-    {
+    function sfGetChildrenArray($table, $pid_name, $id_name, $id) {
         $arrChildren = array();
         $arrRet = array($id);
 
@@ -927,8 +853,7 @@
      * @param array $arrPID $B?F(BID$B$NG[Ns(B
      * @return array $B;R(BID$B$NG[Ns(B
      */
-    function sfGetChildrenArraySub($table, $pid_name, $id_name, $arrPID)
-    {
+    function sfGetChildrenArraySub($table, $pid_name, $id_name, $arrPID) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $where = "$pid_name IN (" . SC_Utils_Ex::repeatStrWithSeparator('?', count($arrPID)) . ')';
@@ -948,8 +873,7 @@
      * @param integer $id ID
      * @return array $B?F(BID$B$NG[Ns(B
      */
-    function sfGetParents($table, $pid_name, $id_name, $id)
-    {
+    function sfGetParents($table, $pid_name, $id_name, $id) {
         $arrRet = SC_Helper_DB_Ex::sfGetParentsArray($table, $pid_name, $id_name, $id);
         return $arrRet;
     }
@@ -963,8 +887,7 @@
      * @param integer $id ID
      * @return array $B?F(BID$B$NG[Ns(B
      */
-    function sfGetParentsArray($table, $pid_name, $id_name, $id)
-    {
+    function sfGetParentsArray($table, $pid_name, $id_name, $id) {
         $arrParents = array();
         $ret = $id;
 
@@ -979,8 +902,7 @@
     }
 
     /* $B;R(BID$B=jB0$9$k?F(BID$B$r<hF@$9$k(B */
-    function sfGetParentsArraySub($table, $pid_name, $id_name, $child)
-    {
+    function sfGetParentsArraySub($table, $pid_name, $id_name, $child) {
         if (SC_Utils_Ex::isBlank($child)) {
             return false;
         }
@@ -998,8 +920,7 @@
      * @param integer $category_id $B%+%F%4%j(BID
      * @return array $B>&IJ$r8!:w$9$k>l9g$NG[Ns(B
      */
-    function sfGetCatWhere($category_id)
-    {
+    function sfGetCatWhere($category_id) {
         // $B;R%+%F%4%j(BID$B$N<hF@(B
         $arrRet = SC_Helper_DB_Ex::sfGetChildrenArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
 
@@ -1018,8 +939,7 @@
      * @param array $arrWhereVal $B%W%l!<%9%[%k%@(B
      * @return array SELECT $B%\%C%/%9MQ%j%9%H$NG[Ns(B
      */
-    function sfGetIDValueList($table, $keyname, $valname, $where = '', $arrVal = array())
-    {
+    function sfGetIDValueList($table, $keyname, $valname, $where = '', $arrVal = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = "$keyname, $valname";
         $objQuery->setWhere('del_flg = 0');
@@ -1044,8 +964,7 @@
      * @param string $andwhere SQL $B$N(B AND $B>r7o$G$"$k(B WHERE $B6g(B
      * @return void
      */
-    function sfRankUp($table, $colname, $id, $andwhere = '')
-    {
+    function sfRankUp($table, $colname, $id, $andwhere = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
         $where = "$colname = ?";
@@ -1096,8 +1015,7 @@
      * @param string $andwhere SQL $B$N(B AND $B>r7o$G$"$k(B WHERE $B6g(B
      * @return void
      */
-    function sfRankDown($table, $colname, $id, $andwhere = '')
-    {
+    function sfRankDown($table, $colname, $id, $andwhere = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
         $where = "$colname = ?";
@@ -1148,8 +1066,7 @@
      * @param string $where SQL $B$N(B AND $B>r7o$G$"$k(B WHERE $B6g(B
      * @return void
      */
-    function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = '')
-    {
+    function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
 
@@ -1276,8 +1193,7 @@
      * @param array $arrId ID$B$NG[Ns(B
      * @return array $BFCDj$N%+%i%`$NG[Ns(B
      */
-    function sfGetParentsCol($objQuery, $table, $id_name, $col_name, $arrId)
-    {
+    function sfGetParentsCol($objQuery, $table, $id_name, $col_name, $arrId) {
         $col = $col_name;
         $len = count($arrId);
         $where = '';
@@ -1309,8 +1225,7 @@
      * @param integer $id ID
      * @return void
      */
-    function sfMoveCatRank($objQuery, $table, $id_name, $cat_name, $old_catid, $new_catid, $id)
-    {
+    function sfMoveCatRank($objQuery, $table, $id_name, $cat_name, $old_catid, $new_catid, $id) {
         if ($old_catid == $new_catid) {
             return;
         }
@@ -1349,8 +1264,7 @@
      * @param array $addwhere SQL $B$N(B AND $B>r7o$G$"$k(B WHERE $B6g(B
      * @return bool $B%l%3!<%I$,B8:_$9$k>l9g(B true
      */
-    function sfIsRecord($table, $col, $arrVal, $addwhere = '')
-    {
+    function sfIsRecord($table, $col, $arrVal, $addwhere = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrCol = preg_split('/[, ]/', $col);
 
@@ -1383,8 +1297,7 @@
      * @param SC_Query $objQuery SC_Query $B%$%s%9%?%s%9(B
      * @return void
      */
-    function sfCountMaker($objQuery)
-    {
+    function sfCountMaker($objQuery) {
         $sql = '';
 
         //$B%F!<%V%kFbMF$N:o=|(B
@@ -1408,8 +1321,7 @@
      * @return array $BA*BrCf$N>&IJ$N%a!<%+!<(BID$B$NG[Ns(B
      *
      */
-    function sfGetMakerId($product_id, $maker_id = 0, $closed = false)
-    {
+    function sfGetMakerId($product_id, $maker_id = 0, $closed = false) {
         if ($closed) {
             $status = '';
         } else {
@@ -1443,8 +1355,7 @@
      * @param bool $products_check $B>&IJ$NB8:_$9$k%+%F%4%j$N$_<hF@$9$k>l9g(B true
      * @return array $B%+%F%4%j%D%j!<$NG[Ns(B
      */
-    function sfGetMakerList($addwhere = '', $products_check = false)
-    {
+    function sfGetMakerList($addwhere = '', $products_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'del_flg = 0';
 
@@ -1481,8 +1392,7 @@
      * @param integer $price $B7W;;BP>]$N6b3[(B
      * @return integer $B ＠ G6b3[(B
      */
-    function sfTax($price)
-    {
+    function sfTax($price) {
         // $BE9J^4pK\>pJs$r<hF@(B
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
 
@@ -1496,14 +1406,11 @@
      * @param integer $price $B7W;;BP>]$N6b3[(B
      * @return integer $B ＠ G6bIUM?$7$?6b3[(B
      */
-    function sfCalcIncTax($price, $tax = null, $tax_rule = null)
-    {
+    function sfCalcIncTax($price, $tax = null, $tax_rule = null) {
         // $BE9J^4pK\>pJs$r<hF@(B
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
-        $tax      = $tax      === null ? $CONF['tax']      : $tax;
-        $tax_rule = $tax_rule === null ? $CONF['tax_rule'] : $tax_rule;
 
-        return SC_Utils_Ex::sfCalcIncTax($price, $tax, $tax_rule);
+        return SC_Utils_Ex::sfCalcIncTax($price, $CONF['tax'], $CONF['tax_rule']);
     }
 
     /**
@@ -1513,8 +1420,7 @@
      * @param integer $use_point
      * @return integer $B2C;;%]%$%s%H(B
      */
-    function sfGetAddPoint($totalpoint, $use_point)
-    {
+    function sfGetAddPoint($totalpoint, $use_point) {
         // $BE9J^4pK\>pJs$r<hF@(B
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
 
@@ -1529,8 +1435,7 @@
      * @param string $sqlFilePath SQL $B%U%!%$%k$N%Q%9(B
      * @return void
      */
-    function sfExecSqlByFile($sqlFilePath)
-    {
+    function sfExecSqlByFile($sqlFilePath) {
         if (file_exists($sqlFilePath)) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -1551,8 +1456,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return bool $B>&IJ5,3J$,B8:_$9$k>l9g(B:true, $B$=$l0J30(B:false
      */
-    function sfHasProductClass($product_id)
-    {
+    function sfHasProductClass($product_id) {
         if (!SC_Utils_Ex::sfIsInt($product_id)) return false;
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -1561,50 +1465,4 @@
 
         return $exists;
     }
-
-    /**
-     * $BE9J^4pK\>pJs$rEPO?$9$k(B
-     *
-     * @param array $arrData $BEPO?$9$k%G!<%?(B
-     * @return void
-     */
-    static function registerBasisData($arrData)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $arrData = $objQuery->extractOnlyColsOf('dtb_baseinfo', $arrData);
-
-        if (isset($arrData['regular_holiday_ids']) && is_array($arrData['regular_holiday_ids'])) {
-            // $BDj5YF|$r%Q%$%W6h ＠ Z$j$NJ8;zNs$KJQ49(B
-            $arrData['regular_holiday_ids'] = implode('|', $arrData['regular_holiday_ids']);
-        }
-
-        $arrData['update_date'] = 'CURRENT_TIMESTAMP';
-
-        // UPDATE$B$N<B9T(B
-        $ret = $objQuery->update('dtb_baseinfo', $arrData);
-        GC_Utils_Ex::gfPrintLog('dtb_baseinfo $B$K(B UPDATE $B$r<B9T$7$^$7$?!#(B');
-
-        // UPDATE $B$G$-$J$+$C$?>l9g!"(BINSERT
-        if ($ret == 0) {
-            $arrData['id'] = 1;
-            $ret = $objQuery->insert('dtb_baseinfo', $arrData);
-            GC_Utils_Ex::gfPrintLog('dtb_baseinfo $B$K(B INSERT $B$r<B9T$7$^$7$?!#(B');
-        }
-    }
-
-    /**
-     * $B%l%3!<%I7o?t$r7W;;(B.
-     * 
-     * @param string $table
-     * @param string $where
-     * @param array $arrval
-     * @return integer $B%l%3!<%I7o?t(B
-     */
-    public function countRecords($table, $where = '', $arrval = array())
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'COUNT(*)';
-        return $objQuery->get($col, $table, $where, $arrval);
-    }
 }

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Delivery.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Delivery.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Delivery.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,351 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $BG[AwJ}K!$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Delivery {
-
-    /**
-     * $BG[AwJ}K!$N>pJs$r<hF@(B.
-     * 
-     * @param integer $deliv_id $BG[AwJ}K!(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?;YJ'J}K!$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function get($deliv_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        // $BG[Aw6H<T0lMw$N<hF@(B
-        $col = '*';
-        $where = 'deliv_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $table = 'dtb_deliv';
-        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
-        $arrDeliv = $arrRet[0];
-        if (!$arrDeliv) {
-            return $arrDeliv;
-        }
-
-        // $B$*FO$1;~4V$N<hF@(B
-        $arrDeliv['deliv_time'] = $this->getDelivTime($deliv_id);
-
-        // $BG[AwNA6b$N<hF@(B
-        $arrDeliv['deliv_fee'] = $this->getDelivFeeList($deliv_id);
-
-        // $B;YJ'J}K!(B
-        $arrDeliv['payment_ids'] = $this->getPayments($deliv_id);
-
-        return $arrDeliv;
-    }
-
-    /**
-     * $BG[AwJ}K!0lMw$N<hF@(B.
-     *
-     * @param integer $product_type_id $B>&IJ<oJL(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?;YJ'J}K!$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getList($product_type_id = null, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = '';
-        $arrVal = array();
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        if (!is_null($product_type_id)) {
-            if (!$has_deleted) {
-                $where .= ' AND ';
-            }
-            $where .= 'product_type_id = ?';
-            $arrVal[] = $product_type_id;
-        }
-        $table = 'dtb_deliv';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where, $arrVal);
-        return $arrRet;
-    }
-
-    /**
-     * $BG[AwJ}K!$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return integer $deliv_id
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
-
-        // $B$*FO$1;~4V(B
-        $sqlval_deliv_time = $sqlval['deliv_time'];
-        unset($sqlval['deliv_time']);
-        // $BG[AwNA(B
-        if (INPUT_DELIV_FEE) {
-            $sqlval_deliv_fee = $sqlval['deliv_fee'];
-        }
-        unset($sqlval['deliv_fee']);
-        // $B;YJ'$$J}K!(B
-        $sqlval_payment_ids = $sqlval['payment_ids'];
-        unset($sqlval['payment_ids']);
-
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-
-        // deliv_id $B$,7h$^$C$F$$$?>l9g(B
-        if ($sqlval['deliv_id'] != '') {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $deliv_id = $sqlval['deliv_id'];
-            $where = 'deliv_id = ?';
-            $objQuery->update('dtb_deliv', $sqlval, $where, array($deliv_id));
-
-            // $B$*FO$1;~4V$NEPO?(B
-            $table = 'dtb_delivtime';
-            $where = 'deliv_id = ? AND time_id = ?';
-            for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
-                $arrWhereVal = array($deliv_id, $cnt);
-                // $B4{B8%G!<%?$NM-L5$r3NG'(B
-                $curData = $objQuery->select('*', $table, $where, $arrWhereVal);
-
-                if (isset($sqlval_deliv_time[$cnt])) {
-                    $deliv_time = array();
-                    $deliv_time['deliv_time'] = $sqlval_deliv_time[$cnt];
-
-                    // $BF~NO$,6u$G$O$J$/!"(BDB$B$K>pJs$,$"$l$P99?7(B
-                    if (count($curData)) {
-                        $objQuery->update($table, $deliv_time, $where, $arrWhereVal);
-                    }
-                    // DB$B$K>pJs$,$J$1$l$PEPO?(B
-                    else {
-                        $deliv_time['deliv_id'] = $deliv_id;
-                        $deliv_time['time_id'] = $cnt;
-                        $objQuery->insert($table, $deliv_time);
-                    }
-                }
-                // $BF~NO$,6u$G!"(BDB$B$K>pJs$,$"$k>l9g$O:o=|(B
-                elseif (count($curData)) {
-                    $objQuery->delete($table, $where, $arrWhereVal);
-                }
-            }
-
-            // $BG[AwNA$NEPO?(B
-            if (INPUT_DELIV_FEE) {
-                foreach ($sqlval_deliv_fee as $deliv_fee) {
-                    $objQuery->update('dtb_delivfee', array('fee' => $deliv_fee['fee']), 'deliv_id = ? AND fee_id = ?', array($deliv_id, $deliv_fee['fee_id']));
-                }
-            }
-        } else {
-            // $BEPO?$9$kG[Aw6H<T(BID$B$N<hF@(B
-            $deliv_id = $objQuery->nextVal('dtb_deliv_deliv_id');
-            $sqlval['deliv_id'] = $deliv_id;
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_deliv') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            // INSERT$B$N<B9T(B
-            $objQuery->insert('dtb_deliv', $sqlval);
-
-            // $B$*FO$1;~4V$N ＠ _Dj(B
-            foreach ($sqlval_deliv_time as $cnt => $deliv_time) {
-                $deliv_time['deliv_id'] = $deliv_id;
-                $deliv_time['time_id'] = $cnt;
-                // INSERT$B$N<B9T(B
-                $objQuery->insert('dtb_delivtime', $deliv_time);
-            }
-
-            if (INPUT_DELIV_FEE) {
-                // $BG[AwNA6b$N ＠ _Dj(B
-                foreach ($sqlval_deliv_fee as $deliv_fee) {
-                    $deliv_fee['deliv_id'] = $deliv_id;
-                    // INSERT$B$N<B9T(B
-                    $objQuery->insert('dtb_delivfee', $deliv_fee);
-                }
-            }
-        }
-
-        // $B;YJ'$$J}K!(B
-        $objQuery->delete('dtb_payment_options', 'deliv_id = ?', array($deliv_id));
-        $i = 1;
-        foreach ($sqlval_payment_ids as $payment_id) {
-            $sqlval_payment_id = array();
-            $sqlval_payment_id['deliv_id'] = $deliv_id;
-            $sqlval_payment_id['payment_id'] = $payment_id;
-            $sqlval_payment_id['rank'] = $i;
-            $objQuery->insert('dtb_payment_options', $sqlval_payment_id);
-            $i++;
-        }
-
-        $objQuery->commit();
-
-        return $deliv_id;
-    }
-
-    /**
-     * $BG[AwJ}K!$N:o=|(B.
-     * 
-     * @param integer $deliv_id $BG[AwJ}K!(BID
-     * @return void
-     */
-    public function delete($deliv_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
-        $objDb->sfDeleteRankRecord('dtb_deliv', 'deliv_id', $deliv_id);
-    }
-
-    /**
-     * $BG[AwJ}K!$NI=<(=g$r$R$H$D>e$2$k(B.
-     * 
-     * @param integer $deliv_id $BG[AwJ}K!(BID
-     * @return void
-     */
-    public function rankUp($deliv_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_deliv', 'deliv_id', $deliv_id);
-    }
-
-    /**
-     * $BG[AwJ}K!$NI=<(=g$r$R$H$D2<$2$k(B.
-     * 
-     * @param integer $deliv_id $BG[AwJ}K!(BID
-     * @return void
-     */
-    public function rankDown($deliv_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_deliv', 'deliv_id', $deliv_id);
-    }
-
-    /**
-     * $BF1$8FbMF$NG[AwJ}K!$,B8:_$9$k$+3NG'(B.
-     * 
-     * @param array $arrDeliv
-     * @return boolean
-     */
-    public function checkExist($arrDeliv)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        if ($arrDeliv['deliv_id'] == '') {
-            $ret = $objDb->sfIsRecord('dtb_deliv', 'service_name', array($arrDeliv['service_name']));
-        } else {
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $ret = (($objQuery->count('dtb_deliv', 'deliv_id != ? AND service_name = ? ', array($arrDeliv['deliv_id'], $arrDeliv['service_name'])) > 0) ? true : false);
-        }
-        return $ret;
-    }
-
-    /**
-     * $BG[AwJ}K!(BID$B$r%-!<(B, $BL>A0$rCM$H$9$kG[Ns$r<hF@(B.
-     * 
-     * @param string $type $BCM$N%?%$%W(B
-     * @return array
-     */
-    public static function getIDValueList($type = 'name')
-    {
-        return SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', $type);
-    }
-
-    /**
-     * $BG[Aw6H<T(BID$B$+$i$*FO$1;~4V$NG[Ns$r<hF@$9$k(B.
-     *
-     * @param integer $deliv_id $BG[Aw6H<T(BID
-     * @return array $B$*FO$1;~4V$NG[Ns(B
-     */
-    public static function getDelivTime($deliv_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->setOrder('time_id');
-        $results = $objQuery->select('time_id, deliv_time', 'dtb_delivtime', 'deliv_id = ?', array($deliv_id));
-        $arrDelivTime = array();
-        foreach ($results as $val) {
-            $arrDelivTime[$val['time_id']] = $val['deliv_time'];
-        }
-        return $arrDelivTime;
-    }
-
-    /**
-     * $BG[Aw6H<T(BID $B$+$i(B, $BM-8z$J;YJ'J}K!(BID$B$r<hF@$9$k(B.
-     *
-     * @param integer $deliv_id $BG[Aw6H<T(BID
-     * @return array $BM-8z$J;YJ'J}K!(BID$B$NG[Ns(B
-     */
-    public static function getPayments($deliv_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->setOrder('rank');
-        return $objQuery->getCol('payment_id', 'dtb_payment_options', 'deliv_id = ?', array($deliv_id), MDB2_FETCHMODE_ORDERED);
-    }
-
-    /**
-     * $BETF;I\8)$+$iG[AwNA6b$r<hF@$9$k(B.
-     *
-     * @param integer|array $pref_id $BETF;I\8)(BID $BKt$OETF;I\8)(BID$B$NG[Ns(B
-     * @param integer $deliv_id $BG[Aw6H<T(BID
-     * @return string $B;XDj$NETF;I\8)(B, $BG[Aw6H<T$NG[AwNA6b(B
-     */
-    public static function getDelivFee($pref_id, $deliv_id = 0)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        if (!is_array($pref_id)) {
-            $pref_id = array($pref_id);
-        }
-        $sql = <<< __EOS__
-            SELECT T1.fee AS fee
-            FROM dtb_delivfee T1
-                JOIN dtb_deliv T2
-                    ON T1.deliv_id = T2.deliv_id
-            WHERE T1.pref = ?
-                AND T1.deliv_id = ?
-                AND T2.del_flg = 0
-__EOS__;
-        $result = 0;
-        foreach ($pref_id as $pref) {
-            $result += $objQuery->getOne($sql, array($pref, $deliv_id));
-        }
-        return $result;
-    }
-
-    /**
-     * $BG[Aw6H<T(BID $B$+$i(B, $BG[AwNA6b$N0lMw$r<hF@$9$k(B.
-     *
-     * @param integer $deliv_id $BG[Aw6H<T(BID
-     * @return array $BG[AwNA6b$NG[Ns(B
-     */
-    public static function getDelivFeeList($deliv_id)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->setOrder('pref');
-        $col = 'fee_id, fee, pref';
-        $where = 'deliv_id = ?';
-        $table = 'dtb_delivfee';
-        return $objQuery->select($col, $table, $where, array($deliv_id));
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,15 +5,13 @@
 // japanese.php $B$N%P%02sHr(B
 $GLOBALS[SJIS_widths] = $SJIS_widths;
 
-class SC_Helper_FPDI extends PDF_Japanese 
-{
+class SC_Helper_FPDI extends PDF_Japanese {
     /**
      * PDF_Japanese $B$NL ＠ D+%U%)%s%H$K2C$(%4%7%C%/%U%)%s%H$rDI2CDj5A(B
      *
      * @return void
      */
-    function AddSJISFont()
-    {
+    function AddSJISFont() {
         parent::AddSJISFont();
         $cw = $GLOBALS['SJIS_widths'];
         $c_map = '90msp-RKSJ-H';
@@ -26,8 +24,7 @@
      *
      * PDF_Japanese#SJISMultiCell $B$r%Y!<%9$K%+%9%?%^%$%:!#(B
      */
-    function SJISMultiCellForFancyTable($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
-    {
+    function SJISMultiCellForFancyTable($w, $h, $txt, $border = 0, $align = 'L', $fill = 0) {
         $y = $this->y;
 
         // $B$3$3$G(B SJIS $B$KJQ49$9$k!#$=$N$?$a!"$3$N%a%=%C%I$NCf$G$O!"(BPDF_Japanese#Cell $B$rD>@\8F$V!#(B
@@ -147,8 +144,7 @@
      *
      * FIXME: $B8e$NNs$N9b$5$,Bg$-$$>l9g!"I=<($,Mp$l$k!#(B
      */
-    function FancyTable($header, $data, $w)
-    {
+    function FancyTable($header, $data, $w) {
         // Colors, line width and bold font
         $this->SetFillColor(216, 216, 216);
         $this->SetTextColor(0);
@@ -189,19 +185,16 @@
         $this->SetFillColor(255);
     }
 
-    function Text($x, $y, $txt)
-    {
+    function Text($x, $y, $txt) {
         parent::Text($x, $y, $this->lfConvSjis($txt));
     }
 
-    function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
-    {
+    function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='') {
         parent::Cell($w, $h, $this->lfConvSjis($txt), $border, $ln, $align, $fill, $link);
     }
 
     // $BJ8;z%3!<%I(BSJIS$BJQ49(B -> japanese.php$B$G;HMQ=PMh$kJ8;z%3!<%I$O(BSJIS-win$B$N$_(B
-    function lfConvSjis($conv_str)
-    {
+    function lfConvSjis($conv_str) {
         return mb_convert_encoding($conv_str, 'SJIS-win', CHAR_CODE);
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_FileManager 
-{
+class SC_Helper_FileManager {
 
     /**
      * $B;XDj%Q%9G[2<$N%G%#%l%/%H%j<hF@$9$k(B.
@@ -37,8 +36,7 @@
      * @param string $dir $B<hF@$9$k%G%#%l%/%H%j%Q%9(B
      * @return void
      */
-    function sfGetFileList($dir)
-    {
+    function sfGetFileList($dir) {
         $arrFileList = array();
         $arrDirList = array();
 
@@ -92,8 +90,7 @@
      * @param string $dir $B%G%#%l%/%H%j(B
      * @return void
      */
-    function sfGetDirSize($dir)
-    {
+    function sfGetDirSize($dir) {
         $bytes = 0;
         if (file_exists($dir)) {
             // $B%G%#%l%/%H%j$N>l9g2<AX%U%!%$%k$NAmNL$r<hF@(B
@@ -131,8 +128,7 @@
      *                            | $B6h ＠ Z$j$G3JG<(B
      * @return array $B%D%j!<@8 ＠ .MQ$NG[Ns(B
      */
-    function sfGetFileTree($dir, $tree_status)
-    {
+    function sfGetFileTree($dir, $tree_status) {
 
         $cnt = 0;
         $arrTree = array();
@@ -173,8 +169,7 @@
      *                            | $B6h ＠ Z$j$G3JG<(B
      * @return array $B%D%j!<@8 ＠ .MQ$NG[Ns(B
      */
-    function sfGetFileTreeSub($dir, $default_rank, &$cnt, &$arrTree, $tree_status)
-    {
+    function sfGetFileTreeSub($dir, $default_rank, &$cnt, &$arrTree, $tree_status) {
 
         if (file_exists($dir)) {
             $handle = opendir($dir);
@@ -221,8 +216,7 @@
      * @param string $B%G%#%l%/%H%j(B
      * @return bool $B%U%!%$%k$,B8:_$9$k>l9g(B true
      */
-    function sfDirChildExists($dir)
-    {
+    function sfDirChildExists($dir) {
         if (file_exists($dir)) {
             if (is_dir($dir)) {
                 $handle = opendir($dir);
@@ -248,8 +242,7 @@
      *                            | $B6h ＠ Z$j$G3JG<(B
      * @return bool $BA02s3+$+$l$?>uBV$N>l9g(B true
      */
-    function lfIsFileOpen($dir, $tree_status)
-    {
+    function lfIsFileOpen($dir, $tree_status) {
         $arrTreeStatus = explode('|', $tree_status);
         if (in_array($dir, $arrTreeStatus)) {
             return true;
@@ -264,8 +257,7 @@
      * @param string $file $B%U%!%$%k%Q%9(B
      * @return void
      */
-    function sfDownloadFile($file)
-    {
+    function sfDownloadFile($file) {
         // $B%U%!%$%k$N>l9g$O%@%&%s%m!<%I$5$;$k(B
         Header('Content-disposition: attachment; filename='.basename($file));
         Header('Content-type: application/octet-stream; name='.basename($file));
@@ -281,8 +273,7 @@
      * @param integer $mode $B%Q!<%_%C%7%g%s(B
      * @return bool $B%U%!%$%k:n ＠ .$K ＠ .8y$7$?>l9g(B true
      */
-    function sfCreateFile($file, $mode = '')
-    {
+    function sfCreateFile($file, $mode = '') {
         // $B9TKv$N(B/$B$r<h$j=|$/(B
         if ($mode != '') {
             $ret = @mkdir($file, $mode);
@@ -299,8 +290,7 @@
      * @param string $B%U%!%$%k%Q%9(B
      * @return string $B%U%!%$%k$NFbMF(B
      */
-    function sfReadFile($filename)
-    {
+    function sfReadFile($filename) {
         $str = '';
         // $B%P%$%J%j%b!<%I$G%*!<%W%s(B
         $fp = @fopen($filename, 'rb');
@@ -320,8 +310,7 @@
      * @param string $value $B=q$-9~$_FbMF(B
      * @return boolean $B%U%!%$%k$N=q$-9~$_$K ＠ .8y$7$?>l9g(B true
      */
-    function sfWriteFile($filename, $value)
-    {
+    function sfWriteFile($filename, $value) {
         if (!is_dir(dirname($filename))) {
             SC_Utils_Ex::recursiveMkdir(dirname($filename), 0777);
         }
@@ -342,8 +331,7 @@
      * @param string $template_code $B%F%s%W%l!<%H%3!<%I(B
      * @return boolean $B ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function downloadArchiveFiles($dir, $template_code)
-    {
+    function downloadArchiveFiles($dir, $template_code) {
         // $B%@%&%s%m!<%I$5$l$k%U%!%$%kL>(B
         $dlFileName = 'tpl_package_' . $template_code . '_' . date('YmdHis') . '.tar.gz';
 
@@ -381,8 +369,7 @@
      * @param string $path $B%"!<%+%$%V%Q%9(B
      * @return boolean Archive_Tar::extractModify()$B$N%(%i!<(B
      */
-    function unpackFile($path)
-    {
+    function unpackFile($path) {
         // $B05=L%U%i%0(BTRUE$B$O(Bgzip$B2rE`$r$*$3$J$&(B
         $tar = new Archive_Tar($path, true);
 
@@ -410,8 +397,7 @@
      * @param boolean $del_myself $path$B$=$N$b$N$r:o=|$9$k$+(B. true $B$J$i:o=|$9$k(B.
      * @return void
      */
-    function deleteFile($path, $del_myself = true)
-    {
+    function deleteFile($path, $del_myself = true) {
         $flg = false;
         // $BBP>]$,B8:_$9$k$+$r8!>Z(B.
         if (file_exists($path) === false) {

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,16 +29,14 @@
  * @package Helper
  * @version $Id$
  */
-class SC_Helper_HandleError 
-{
+class SC_Helper_HandleError {
 
     /**
      * $B=hM}$NFI$_9~$_$r9T$&(B
      *
      * @return void
      */
-    static function load()
-    {
+    static function load() {
         // E_DEPRECATED $BDj?t(B (for PHP < 5.3)
         // TODO $B%P!<%8%g%s8_49=hM}$KE}9g$7$?$$!#(B
         if (!defined('E_DEPRECATED')) {
@@ -84,8 +82,7 @@
      * @return void|boolean E_USER_ERROR $B$,H/@8$7$?>l9g$O(B, $B%(%i!<%Z!<%8$X%j%@%$%l%/%H(B;
      *                      E_WARNING, E_USER_WARNING $B$,H/@8$7$?>l9g!"(Btrue $B$rJV$9(B
      */
-    static function handle_warning($errno, $errstr, $errfile, $errline)
-    {
+    static function handle_warning($errno, $errstr, $errfile, $errline) {
         // error_reporting $B ＠ _Dj$K4^$^$l$F$$$J$$%(%i!<%3!<%I$O=hM}$7$J$$(B
         if (!(error_reporting() & $errno)) {
             return;
@@ -128,9 +125,8 @@
      * @return string|void $B%(%i!<$,JaB*$5$l$?>l9g$O(B, $B%(%i!<%Z!<%8$X%j%@%$%l%/%H$9$k(B;
      *                     $B%(%i!<$,JaB*$5$l$J$$>l9g$O(B, $B=PNO%P%C%U%!%j%s%0$NFbMF$rJV$9(B
      */
-    static function &_fatal_error_handler(&$buffer)
-    {
-        if (preg_match('/<b>(Fatal error)<\/b>: +(.+) in <b>(.+)<\/b> on line <b>(\d+)<\/b><br \/>/i', $buffer, $matches)) {
+    static function &_fatal_error_handler(&$buffer) {
+        if (preg_match('/<b>(Fatal error)<\/b>: +(.+) in <b>(.+)<\/b> on line <b>(\d+)<\/b><br \/>/i', $buffer, $matches = array())) {
             $message = "$matches[1]: $matches[2] on [$matches[3]($matches[4])]";
             GC_Utils_Ex::gfPrintLog($message, ERROR_LOG_REALFILE, true);
             if (DEBUG_MODE !== true) {
@@ -153,8 +149,7 @@
      *
      * @return void
      */
-    static function handle_error()
-    {
+    static function handle_error() {
         // $B:G8e$N%(%i!<$r3N<B$KB*$($k$?$a!"@hF,$G8F$S=P$9!#(B
         $arrError = error_get_last();
 
@@ -191,8 +186,7 @@
      * @param string|null $errstr $B%(%i!<%a%C%;!<%8(B
      * @return void
      */
-    static function displaySystemError($errstr = null)
-    {
+    static function displaySystemError($errstr = null) {
         ob_clean();
 
         // $B3(J8;zJQ49!&=|5n%U%#%k%?!<$,M-8z$+I>2A$9$k!#(B

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Holiday.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Holiday.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Holiday.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,158 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B5YF|$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Holiday
-{
-    /**
-     * $B5YF|$N>pJs$r<hF@(B.
-     * 
-     * @param integer $holiday_id $B5YF|(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?5YF|$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function get($holiday_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'holiday_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_holiday', $where, array($holiday_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * $B5YF|0lMw$N<hF@(B.
-     *
-     * @param boolean $has_deleted $B:o=|$5$l$?5YF|$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'holiday_id, title, month, day';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_holiday';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * $B5YF|$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return multiple $BEPO?@.8y(B:$B5YF|(BID, $B<:GT(B:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $holiday_id = $sqlval['holiday_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // $B?75,EPO?(B
-        if ($holiday_id == '') {
-            // INSERT$B$N<B9T(B
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_holiday') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['holiday_id'] = $objQuery->nextVal('dtb_holiday_holiday_id');
-            $ret = $objQuery->insert('dtb_holiday', $sqlval);
-        // $B4{B8JT=8(B
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'holiday_id = ?';
-            $ret = $objQuery->update('dtb_holiday', $sqlval, $where, array($holiday_id));
-        }
-        return ($ret) ? $sqlval['holiday_id'] : FALSE;
-    }
-
-    /**
-     * $B5YF|$N:o=|(B.
-     * 
-     * @param integer $holiday_id $B5YF|(BID
-     * @return void
-     */
-    public function delete($holiday_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
-        $objDb->sfDeleteRankRecord('dtb_holiday', 'holiday_id', $holiday_id, '', true);
-    }
-
-    /**
-     * $B5YF|$NI=<(=g$r$R$H$D>e$2$k(B.
-     * 
-     * @param integer $holiday_id $B5YF|(BID
-     * @return void
-     */
-    public function rankUp($holiday_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_holiday', 'holiday_id', $holiday_id);
-    }
-
-    /**
-     * $B5YF|$NI=<(=g$r$R$H$D2<$2$k(B.
-     * 
-     * @param integer $holiday_id $B5YF|(BID
-     * @return void
-     */
-    public function rankDown($holiday_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_holiday', 'holiday_id', $holiday_id);
-    }
-
-    /**
-     * $BF1$8F|IU$N5YF|$,B8:_$9$k$+3NG'(B.
-     * 
-     * @param integer $month
-     * @param integer $day
-     * @param integer $holiday_id
-     * @return boolean $BF1F|IU$N5YF|$,B8:_(B:true
-     */
-    public function isDateExist($month, $day, $holiday_id = NULL)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'del_flg = 0 AND month = ? AND day = ?';
-        $arrVal = array($month, $day);
-        if (!SC_Utils_Ex::isBlank($holiday_id)) {
-            $where .= ' AND holiday_id <> ?';
-            $arrVal[] = $holiday_id;
-        }
-        $arrRet = $objQuery->select('holiday_id, title', 'dtb_holiday', $where, $arrVal);
-
-        return !SC_Utils_Ex::isBlank($arrRet);
-    }
-}

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Kiyaku.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Kiyaku.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Kiyaku.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,160 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B2q0w5,Ls$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Kiyaku
-{
-    /**
-     * $B2q0w5,Ls$N>pJs$r<hF@(B.
-     * 
-     * @param integer $kiyaku_id $B2q0w5,Ls(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?2q0w5,Ls$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function get($kiyaku_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'kiyaku_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_kiyaku', $where, array($kiyaku_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * $B2q0w5,Ls0lMw$N<hF@(B.
-     *
-     * @param boolean $has_deleted $B:o=|$5$l$?2q0w5,Ls$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'kiyaku_id, kiyaku_title, kiyaku_text';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_kiyaku';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * $B2q0w5,Ls$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return multiple $BEPO?@.8y(B:$B2q0w5,Ls(BID, $B<:GT(B:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $kiyaku_id = $sqlval['kiyaku_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // $B?75,EPO?(B
-        if ($kiyaku_id == '') {
-            // INSERT$B$N<B9T(B
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_kiyaku') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['kiyaku_id'] = $objQuery->nextVal('dtb_kiyaku_kiyaku_id');
-            $ret = $objQuery->insert('dtb_kiyaku', $sqlval);
-        // $B4{B8JT=8(B
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'kiyaku_id = ?';
-            $ret = $objQuery->update('dtb_kiyaku', $sqlval, $where, array($kiyaku_id));
-        }
-        return ($ret) ? $sqlval['kiyaku_id'] : FALSE;
-    }
-
-    /**
-     * $B2q0w5,Ls$N:o=|(B.
-     * 
-     * @param integer $kiyaku_id $B2q0w5,Ls(BID
-     * @return void
-     */
-    public function delete($kiyaku_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
-        $objDb->sfDeleteRankRecord('dtb_kiyaku', 'kiyaku_id', $kiyaku_id);
-    }
-
-    /**
-     * $B2q0w5,Ls$NI=<(=g$r$R$H$D>e$2$k(B.
-     * 
-     * @param integer $kiyaku_id $B2q0w5,Ls(BID
-     * @return void
-     */
-    public function rankUp($kiyaku_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_kiyaku', 'kiyaku_id', $kiyaku_id);
-    }
-
-    /**
-     * $B2q0w5,Ls$NI=<(=g$r$R$H$D2<$2$k(B.
-     * 
-     * @param integer $kiyaku_id $B2q0w5,Ls(BID
-     * @return void
-     */
-    public function rankDown($kiyaku_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_kiyaku', 'kiyaku_id', $kiyaku_id);
-    }
-
-    /**
-     * $BF1$8%?%$%H%k$N5,Ls$,B8:_$9$k$+3NG'(B.
-     * 
-     * @param string $title $B5,Ls%?%$%H%k(B
-     * @param integer $kiyaku_id $B2q0w5,Ls(BID
-     * @return boolean $BF1L>$N%?%$%H%k$,B8:_(B:TRUE
-     */
-    public function isTitleExist($title, $kiyaku_id = NULL)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        
-        $where  = 'del_flg = 0 AND kiyaku_title = ?';
-        $arrVal = array($title);
-        
-        if(!SC_Utils_Ex::isBlank($kiyaku_id)) {
-            $where   .= ' AND kiyaku_id <> ?';
-            $arrVal[] = $kiyaku_id;
-        }
-        
-        $arrRet = $objQuery->select('kiyaku_id, kiyaku_title', 'dtb_kiyaku', $where, $arrVal);
-
-        return !SC_Utils_Ex::isBlank($arrRet);
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_Mail 
-{
+class SC_Helper_Mail {
 
     /** $B%a!<%k%F%s%W%l!<%H$N%Q%9(B */
     var $arrMAILTPLPATH;
@@ -44,8 +43,7 @@
     /**
      * $B%3%s%9%H%i%/%?(B.
      */
-    function __construct()
-    {
+    function __construct() {
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrMAILTPLPATH =  $masterData->getMasterData('mtb_mail_tpl_path');
         $this->arrPref = $masterData->getMasterData('mtb_pref');
@@ -56,8 +54,7 @@
      * 
      * @param LC_Page $objPage
      */
-    function setPage(LC_Page $objPage)
-    {
+    function setPage(LC_Page $objPage) {
         $this->objPage = $objPage;
     }
 
@@ -66,21 +63,20 @@
      * 
      * @return LC_Page
      */
-    function getPage()
-    {
+    function getPage() {
         return $this->objPage;
     }
 
     /* DB$B$KEPO?$5$l$?%F%s%W%l!<%H%a!<%k$NAw?.(B */
-    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '')
-    {
+    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '') {
 
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         // $B%a!<%k%F%s%W%l!<%H>pJs$N<hF@(B
-        $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-        $mailtemplate = $objMailtemplate->get($template_id);
-        $objPage->tpl_header = $mailtemplate['header'];
-        $objPage->tpl_footer = $mailtemplate['footer'];
-        $tmp_subject = $mailtemplate['subject'];
+        $where = 'template_id = ?';
+        $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id));
+        $objPage->tpl_header = $arrRet[0]['header'];
+        $objPage->tpl_footer = $arrRet[0]['footer'];
+        $tmp_subject = $arrRet[0]['subject'];
 
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
 
@@ -104,8 +100,7 @@
     }
 
     /* $B<uCm40N;%a!<%kAw?.(B */
-    function sfSendOrderMail($order_id, $template_id, $subject = '', $header = '', $footer = '', $send = true)
-    {
+    function sfSendOrderMail($order_id, $template_id, $subject = '', $header = '', $footer = '', $send = true) {
 
         $arrTplVar = new stdClass();
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
@@ -115,11 +110,11 @@
 
         if ($subject == '' && $header == '' && $footer == '') {
             // $B%a!<%k%F%s%W%l!<%H>pJs$N<hF@(B
-            $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-            $mailtemplate = $objMailtemplate->get($template_id);
-            $arrTplVar->tpl_header = $mailtemplate['header'];
-            $arrTplVar->tpl_footer = $mailtemplate['footer'];
-            $tmp_subject = $mailtemplate['subject'];
+            $where = 'template_id = ?';
+            $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id));
+            $arrTplVar->tpl_header = $arrRet[0]['header'];
+            $arrTplVar->tpl_footer = $arrRet[0]['footer'];
+            $tmp_subject = $arrRet[0]['subject'];
         } else {
             $arrTplVar->tpl_header = $header;
             $arrTplVar->tpl_footer = $footer;
@@ -217,8 +212,7 @@
     }
 
     // $B%F%s%W%l!<%H$r;HMQ$7$?%a!<%k$NAw?.(B
-    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage)
-    {
+    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage) {
         $objMailView = new SC_SiteView_Ex();
         $objMailView->setPage($this->getPage());
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
@@ -239,8 +233,7 @@
     }
 
     // $BDL>o$N%a!<%kAw?.(B
-    function sfSendMail($to, $tmp_subject, $body)
-    {
+    function sfSendMail($to, $tmp_subject, $body) {
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         // $B%a!<%kAw?.=hM}(B
         $objSendMail = new SC_SendMail_Ex();
@@ -254,8 +247,7 @@
     }
 
     //$B7oL>$K%F%s%W%l!<%H$rMQ$$$k(B
-    function sfMakeSubject($subject, &$objMailView)
-    {
+    function sfMakeSubject($subject, &$objMailView) {
         if (empty($objMailView)) {
             $objMailView = new SC_SiteView_Ex();
             $objMailView->setPage($this->getPage());
@@ -274,8 +266,7 @@
     }
 
     // $B%a!<%kG[?.MzNr$X$NEPO?(B
-    function sfSaveMailHistory($order_id, $template_id, $subject, $body)
-    {
+    function sfSaveMailHistory($order_id, $template_id, $subject, $body) {
         $sqlval = array();
         $sqlval['subject'] = $subject;
         $sqlval['order_id'] = $order_id;
@@ -295,8 +286,7 @@
     }
 
     /* $B2q0wEPO?$,$"$k$+$I$&$+$N%A%'%C%/(B($B2>2q0w$r4^$^$J$$(B) */
-    function sfCheckCustomerMailMaga($email)
-    {
+    function sfCheckCustomerMailMaga($email) {
         $col = 'email, mailmaga_flg, customer_id';
         $from = 'dtb_customer';
         $where = '(email = ? OR email_mobile = ?) AND status = 2 AND del_flg = 0';
@@ -317,8 +307,7 @@
      * @param boolean $is_mobile false(default):PC$B%"%I%l%9$K%a!<%k$rAw$k(B true:$B7HBS%"%I%l%9$K%a!<%k$rAw$k(B
      * @return boolean true:$B ＠ .8y(B false:$B<:GT(B
      */
-    function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false)
-    {
+    function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false) {
         // $B2q0w%G!<%?$N<hF@(B
         if (SC_Utils_Ex::sfIsInt($customer_id)) {
             $arrCustomerData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id);
@@ -381,8 +370,7 @@
      * @return$B!!(Barray $B%a!<%k%F%s%W%l!<%H>pJs$r3JG<$7$?G[Ns(B
      * @todo   $BI=<(=g$b0z?t$GJQ99$G$-$k$h$&$K(B
      */
-    function sfGetMailmagaTemplate($template_id = null)
-    {
+    function sfGetMailmagaTemplate($template_id = null) {
         // $B=i4|2=(B
         $where = '';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -408,8 +396,7 @@
      * @param integer $BFCDj$NAw?.MzNr$r<h$j=P$7$?$$;~$O(Bsend_id$B$r;XDj!#L$;XDj;~$OA47o<hF@(B
      * @return$B!!(Barray $BAw?.MzNr>pJs$r3JG<$7$?G[Ns(B
      */
-    function sfGetSendHistory($send_id = null)
-    {
+    function sfGetSendHistory($send_id = null) {
         // $B=i4|2=(B
         $where = '';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -437,8 +424,7 @@
      * @param integer $send_id dtb_send_history $B$N>pJs(B
      * @return$B!!(Bvoid
      */
-    function sfSendMailmagazine($send_id)
-    {
+    function sfSendMailmagazine($send_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
         $objSite = $objDb->sfGetBasisData();

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Mailtemplate.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Mailtemplate.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mailtemplate.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,102 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B%a!<%k%F%s%W%l!<%H$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Mailtemplate
-{
-    /**
-     * $B%a!<%k%F%s%W%l!<%H$N>pJs$r<hF@(B.
-     * 
-     * @param integer $template_id $B%a!<%k%F%s%W%l!<%H(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?%a!<%k%F%s%W%l!<%H$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function get($template_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'template_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_mailtemplate', $where, array($template_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * $B%a!<%k%F%s%W%l!<%H0lMw$N<hF@(B.
-     *
-     * @param boolean $has_deleted $B:o=|$5$l$?%a!<%k%F%s%W%l!<%H$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_mailtemplate';
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * $B%a!<%k%F%s%W%l!<%H$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return multiple $BEPO?@.8y(B:$B%a!<%k%F%s%W%l!<%H(BID, $B<:GT(B:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $template_id = $sqlval['template_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // $BB8:_3NG'(B
-        $where = 'template_id = ?';
-        $exist = $objQuery->exists('dtb_mailtemplate', $where, array($template_id));
-        // $B?75,EPO?(B
-        if (!$exist) {
-            // INSERT$B$N<B9T(B
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            if (!$sqlval['template_id']) {
-                $sqlval['template_id'] = $objQuery->nextVal('dtb_mailtemplate_template_id');
-            }
-            $ret = $objQuery->insert('dtb_mailtemplate', $sqlval);
-        // $B4{B8JT=8(B
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $ret = $objQuery->update('dtb_mailtemplate', $sqlval, $where, array($template_id));
-        }
-        return ($ret) ? $sqlval['template_id'] : FALSE;
-    }
-}

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Maker.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Maker.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Maker.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,164 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B%a!<%+!<$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Maker
-{
-    /**
-     * $B%a!<%+!<$N>pJs$r<hF@(B.
-     * 
-     * @param integer $maker_id $B%a!<%+!<(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?%a!<%+!<$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function get($maker_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'maker_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_maker', $where, array($maker_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * $BL>A0$+$i%a!<%+!<$N>pJs$r<hF@(B.
-     * 
-     * @param integer $name $B%a!<%+!<L>(B
-     * @param boolean $has_deleted $B:o=|$5$l$?%a!<%+!<$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getByName($name, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $where = 'name = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select('*', 'dtb_maker', $where, array($name));
-        return $arrRet[0];
-    }
-
-    /**
-     * $B%a!<%+!<0lMw$N<hF@(B.
-     *
-     * @param boolean $has_deleted $B:o=|$5$l$?%a!<%+!<$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getList($has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'maker_id, name';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_maker';
-        $objQuery->setOrder('rank DESC');
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * $B%a!<%+!<$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return multiple $BEPO?@.8y(B:$B%a!<%+!<(BID, $B<:GT(B:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $maker_id = $sqlval['maker_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // $B?75,EPO?(B
-        if ($maker_id == '') {
-            // INSERT$B$N<B9T(B
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_maker') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['maker_id'] = $objQuery->nextVal('dtb_maker_maker_id');
-            $ret = $objQuery->insert('dtb_maker', $sqlval);
-        // $B4{B8JT=8(B
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'maker_id = ?';
-            $ret = $objQuery->update('dtb_maker', $sqlval, $where, array($maker_id));
-        }
-        return ($ret) ? $sqlval['maker_id'] : FALSE;
-    }
-
-    /**
-     * $B%a!<%+!<$N:o=|(B.
-     * 
-     * @param integer $maker_id $B%a!<%+!<(BID
-     * @return void
-     */
-    public function delete($maker_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
-        $objDb->sfDeleteRankRecord('dtb_maker', 'maker_id', $maker_id, '', true);
-    }
-
-    /**
-     * $B%a!<%+!<$NI=<(=g$r$R$H$D>e$2$k(B.
-     * 
-     * @param integer $maker_id $B%a!<%+!<(BID
-     * @return void
-     */
-    public function rankUp($maker_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_maker', 'maker_id', $maker_id);
-    }
-
-    /**
-     * $B%a!<%+!<$NI=<(=g$r$R$H$D2<$2$k(B.
-     * 
-     * @param integer $maker_id $B%a!<%+!<(BID
-     * @return void
-     */
-    public function rankDown($maker_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_maker', 'maker_id', $maker_id);
-    }
-
-    /**
-     * $B%a!<%+!<(BID$B$r%-!<(B, $BL>A0$rCM$H$9$kG[Ns$r<hF@(B.
-     * 
-     * @return array
-     */
-    public static function getIDValueList()
-    {
-        return SC_Helper_DB_Ex::sfGetIDValueList('dtb_maker', 'maker_id', 'name');
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_Mobile 
-{
+class SC_Helper_Mobile {
 
     /** $B4pK\(BMimeType */
     var $defaultMimeType = 'application/force-download';
@@ -81,8 +80,7 @@
      *
      * @return void
      */
-    function lfMobileCheckCompatibility()
-    {
+    function lfMobileCheckCompatibility() {
         if (!SC_MobileUserAgent_Ex::isSupported()) {
             header('Location: ' . ROOT_URLPATH . 'unsupported/' . DIR_INDEX_PATH);
             exit;
@@ -95,8 +93,7 @@
      * @param string &$value $BF~NO%G!<%?$X$N;2>H(B
      * @return void
      */
-    function lfMobileConvertInputValue(&$value)
-    {
+    function lfMobileConvertInputValue(&$value) {
         if (is_array($value)) {
             foreach ($value as $key => $val) {
                 $this->lfMobileConvertInputValue($value[$key]);
@@ -115,8 +112,7 @@
      *
      * @return void
      */
-    function lfMobileInitInput()
-    {
+    function lfMobileInitInput() {
         array_walk($_GET, array($this, 'lfMobileConvertInputValue'));
         array_walk($_POST, array($this, 'lfMobileConvertInputValue'));
         array_walk($_REQUEST, array($this, 'lfMobileConvertInputValue'));
@@ -128,9 +124,8 @@
      * @return string|null $B<hF@$7$?%;%C%7%g%s(BID$B$rJV$9!#(B
      *                     $B<hF@$G$-$J$+$C$?>l9g$O(B null $B$rJV$9!#(B
      */
-    function lfMobileGetExtSessionId()
-    {
-        if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
+    function lfMobileGetExtSessionId() {
+        if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches = array())) {
             return null;
         }
 
@@ -156,8 +151,7 @@
      * @return string|false $B<hF@$7$?M-8z$J%;%C%7%g%s(BID$B$rJV$9!#(B
      *                      $B<hF@$G$-$J$+$C$?>l9g$O(B false $B$rJV$9!#(B
      */
-    function lfMobileGetSessionId()
-    {
+    function lfMobileGetSessionId() {
         // $B%Q%i%a!<%?!<$+$i%;%C%7%g%s(BID$B$r<hF@$9$k!#(B
         $sessionId = @$_POST[session_name()];
         if (!isset($sessionId)) {
@@ -186,8 +180,7 @@
      *
      * @return boolean $B%;%C%7%g%s%G!<%?$,M-8z$J>l9g$O(B true$B!"L58z$J>l9g$O(B false $B$rJV$9!#(B
      */
-    function lfMobileValidateSession()
-    {
+    function lfMobileValidateSession() {
         // $BG[Ns(B mobile $B$,EPO?$5$l$F$$$k$+$I$&$+$r%A%'%C%/$9$k!#(B
         if (!is_array(@$_SESSION['mobile'])) {
             return false;
@@ -227,8 +220,7 @@
      *
      * @return void
      */
-    function lfMobileInitOutput()
-    {
+    function lfMobileInitOutput() {
         // $B=PNOMQ$N%(%s%3!<%G%#%s%0$r(B Shift JIS $B$K8GDj$9$k!#(B
         mb_http_output('SJIS-win');
 
@@ -250,8 +242,7 @@
      *
      * @return void
      */
-    function sfMobileInit()
-    {
+    function sfMobileInit() {
         $this->lfMobileInitInput();
 
         if (basename(dirname($_SERVER['SCRIPT_NAME'])) != 'unsupported') {
@@ -266,8 +257,7 @@
      *
      * @return String
      */
-    function gfAddSessionId($url = null)
-    {
+    function gfAddSessionId($url = null) {
         $objURL = new Net_URL($url);
         $objURL->addQueryString(session_name(), session_id());
         return $objURL->getURL();
@@ -279,8 +269,7 @@
      * @param array $array $B85$H$J$kG[Ns(B
      * @param array $B%;%C%7%g%s(B ID $B$rDI2C$7$?G[Ns(B
      */
-    function sessionIdArray($array = array())
-    {
+    function sessionIdArray($array = array()) {
         return array_merge($array, array(session_name() => session_id()));
     }
 
@@ -289,8 +278,7 @@
      *
      * @return string $B ＠ 8@.$7$?%H!<%/%s$rJV$9!#(B
      */
-    function lfGenerateKaraMailToken()
-    {
+    function lfGenerateKaraMailToken() {
         $token_chars = '0123456789abcdefghijklmnopqrstuvwxyz';
         $token_chars_length = strlen($token_chars);
         $token_length = 10;
@@ -311,8 +299,7 @@
      * @param string $session_id $B%;%C%7%g%s(BID ($B>JN,$7$?>l9g$O8=:_$N%;%C%7%g%s(BID)
      * @return string|false $B%H!<%/%s$rJV$9!#%(%i!<$,H/@8$7$?>l9g$O(Bfalse$B$rJV$9!#(B
      */
-    function gfPrepareKaraMail($next_url, $session_id = null)
-    {
+    function gfPrepareKaraMail($next_url, $session_id = null) {
         if (!isset($session_id)) {
             $session_id = session_id();
         }
@@ -358,8 +345,7 @@
      * @param string $email $B%a!<%k%"%I%l%9(B
      * @return boolean $B ＠ .8y$7$?>l9g$O(Btrue$B!"<:GT$7$?>l9g$O(Bfalse$B$rJV$9!#(B
      */
-    function gfRegisterKaraMail($token, $email)
-    {
+    function gfRegisterKaraMail($token, $email) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // GC
@@ -389,8 +375,7 @@
      * @param string $token $B%H!<%/%s(B
      * @return string|false URL$B$rJV$9!#%(%i!<$,H/@8$7$?>l9g$O(Bfalse$B$rJV$9!#(B
      */
-    function gfFinishKaraMail($token)
-    {
+    function gfFinishKaraMail($token) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $arrRow = $objQuery->getRow(
@@ -428,8 +413,7 @@
      * @param string $url URL
      * @return void
      */
-    function sfMobileSetExtSessionId($param_key, $param_value, $url)
-    {
+    function sfMobileSetExtSessionId($param_key, $param_value, $url) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // GC
@@ -452,8 +436,7 @@
      * @param string $address $B%a!<%k%"%I%l%9(B
      * @return boolean $B7HBS$N%a!<%k%"%I%l%9$N>l9g$O(Btrue$B!"$=$l0J30$N>l9g$O(Bfalse$B$rJV$9!#(B
      */
-    function gfIsMobileMailAddress($address)
-    {
+    function gfIsMobileMailAddress($address) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrMobileMailDomains = $masterData->getMasterData('mtb_mobile_domain');
 
@@ -473,8 +456,7 @@
      * @param string $filename $B%U%!%$%kL>(B
      * @return string MIME$B%?%$%W(B
      */
-    function getMimeType($filename)
-    {
+    function getMimeType($filename) {
         //$B%U%!%$%k$N3HD%;R$+$i%3%s%F%s%D%?%$%W$r7hDj$9$k(B
         $file_extension = strtolower(substr(strrchr($filename,'.'),1));
         $mime_type = $this->defaultMimeType;

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_News.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_News.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_News.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,176 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B%K%e!<%9$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_News
-{
-    /**
-     * $B%K%e!<%9$N>pJs$r<hF@(B.
-     * 
-     * @param integer $news_id $B%K%e!<%9(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?%K%e!<%9$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function get($news_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*, cast(news_date as date) as cast_news_date';
-        $where = 'news_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_news', $where, array($news_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * $B%K%e!<%90lMw$N<hF@(B.
-     *
-     * @param integer $dispNumber $BI=<(7o?t(B
-     * @param integer $pageNumber $B%Z!<%8HV9f(B
-     * @param boolean $has_deleted $B:o=|$5$l$?%K%e!<%9$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getList($dispNumber = 0, $pageNumber = 0, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*, cast(news_date as date) as cast_news_date';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_news';
-        $objQuery->setOrder('rank DESC');
-        if ($dispNumber > 0) {
-            if ($pageNumber > 0) {
-                $objQuery->setLimitOffset($dispNumber, (($pageNumber - 1) * $dispNumber));
-            } else {
-                $objQuery->setLimit($dispNumber);
-            }
-        }
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * $B%K%e!<%9$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return multiple $BEPO?@.8y(B:$B%K%e!<%9(BID, $B<:GT(B:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $news_id = $sqlval['news_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // $B?75,EPO?(B
-        if ($news_id == '') {
-            // INSERT$B$N<B9T(B
-            $sqlval['rank'] = $objQuery->max('rank', 'dtb_news') + 1;
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['news_id'] = $objQuery->nextVal('dtb_news_news_id');
-            $ret = $objQuery->insert('dtb_news', $sqlval);
-        // $B4{B8JT=8(B
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'news_id = ?';
-            $ret = $objQuery->update('dtb_news', $sqlval, $where, array($news_id));
-        }
-        return ($ret) ? $sqlval['news_id'] : FALSE;
-    }
-
-    /**
-     * $B%K%e!<%9$N:o=|(B.
-     * 
-     * @param integer $news_id $B%K%e!<%9(BID
-     * @return void
-     */
-    public function delete($news_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
-        $objDb->sfDeleteRankRecord('dtb_news', 'news_id', $news_id);
-    }
-
-    /**
-     * $B%K%e!<%9$NI=<(=g$r$R$H$D>e$2$k(B.
-     * 
-     * @param integer $news_id $B%K%e!<%9(BID
-     * @return void
-     */
-    public function rankUp($news_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankUp('dtb_news', 'news_id', $news_id);
-    }
-
-    /**
-     * $B%K%e!<%9$NI=<(=g$r$R$H$D2<$2$k(B.
-     * 
-     * @param integer $news_id $B%K%e!<%9(BID
-     * @return void
-     */
-    public function rankDown($news_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfRankDown('dtb_news', 'news_id', $news_id);
-    }
-
-    /**
-     * $B%K%e!<%9$NI=<(=g$r;XDj$9$k(B.
-     * 
-     * @param integer $news_id $B%K%e!<%9(BID
-     * @param integer $rank $B0\F0 ＠ h$NI=<(=g(B
-     * @return void
-     */
-    public function moveRank($news_id, $rank)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDb->sfMoveRank('dtb_news', 'news_id', $news_id, $rank);
-    }
-
-    /**
-     * $B%K%e!<%95-;v?t$r7W;;(B.
-     * 
-     * @param boolean $has_deleted $B:o=|$5$l$?%K%e!<%9$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return integer $B%K%e!<%95-;v?t(B
-     */
-    public function getCount($has_deleted = false)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        if (!$has_deleted) {
-            $where = 'del_flg = 0';
-        } else {
-            $where = '';
-        }
-        return $objDb->countRecords('dtb_news', $where);
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Helper_PageLayout.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_PageLayout 
-{
+class SC_Helper_PageLayout {
 
     // }}}
     // {{{ functions
@@ -47,8 +46,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return void
      */
-    function sfGetPageLayout(&$objPage, $preview = false, $url = '', $device_type_id = DEVICE_TYPE_PC)
-    {
+    function sfGetPageLayout(&$objPage, $preview = false, $url = '', $device_type_id = DEVICE_TYPE_PC) {
 
         // URL$B$r85$K%Z!<%8>pJs$r<hF@(B
         if ($preview === false) {
@@ -88,7 +86,7 @@
                     $error = "$B%V%m%C%/$,8+$D$+$j$^$;$s(B\n"
                         . 'tpl_path: ' . $arrBloc['tpl_path'] . "\n"
                         . 'php_path: ' . $arrBloc['php_path'];
-                    trigger_error($error, E_USER_WARNING);
+                    GC_Utils_Ex::gfPrintLog($error);
                 }
             }
         }
@@ -110,8 +108,7 @@
      * @param array $arrParams $BDI2C$N8!:w%Q%i%a!<%?!<(B
      * @return array $B%Z!<%8B0 ＠ -$NG[Ns(B
      */
-    function getPageProperties($device_type_id = DEVICE_TYPE_PC, $page_id = null, $where = '', $arrParams = array())
-    {
+    function getPageProperties($device_type_id = DEVICE_TYPE_PC, $page_id = null, $where = '', $arrParams = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
         if ($page_id === null) {
@@ -135,10 +132,12 @@
      * @param boolean $has_realpath php_path, tpl_path $B$N ＠ dBP%Q%9$r4^$a$k>l9g(B true
      * @return array $B%V%m%C%/>pJs$NG[Ns(B
      */
-    function getBlocs($device_type_id = DEVICE_TYPE_PC, $where = '', $arrParams = array(), $has_realpath = true)
-    {
-        $objBloc = new SC_Helper_Bloc_Ex($device_type_id);
-        $arrBlocs = $objBloc->getWhere($where, $arrParams);
+    function getBlocs($device_type_id = DEVICE_TYPE_PC, $where = '', $arrParams = array(), $has_realpath = true) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
+        $arrParams = array_merge(array($device_type_id), $arrParams);
+        $objQuery->setOrder('bloc_id');
+        $arrBlocs = $objQuery->select('*', 'dtb_bloc', $where, $arrParams);
         if ($has_realpath) {
             $this->setBlocPathTo($device_type_id, $arrBlocs);
         }
@@ -154,8 +153,7 @@
      * @param boolean $has_realpath php_path, tpl_path $B$N ＠ dBP%Q%9$r4^$a$k>l9g(B true
      * @return array $BG[CV>pJs$r4^$a$?%V%m%C%/$NG[Ns(B
      */
-    function getBlocPositions($device_type_id, $page_id, $has_realpath = true)
-    {
+    function getBlocPositions($device_type_id, $page_id, $has_realpath = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = <<< __EOF__
         dtb_blocposition AS pos
@@ -169,18 +167,6 @@
         if ($has_realpath) {
             $this->setBlocPathTo($device_type_id, $arrBlocs);
         }
-        
-        //$BA4%Z!<%8 ＠ _Dj$H3F%Z!<%8$N%V%m%C%/$N=EJ#$r:o=|(B
-        foreach ($arrBlocs as $index => $arrBloc) {
-            if($arrBloc['anywhere'] == 1){
-                $arrUniqBlocIds[] = $arrBloc['bloc_id'];
-            }
-        }
-        foreach ($arrBlocs as $bloc_index => $arrBlocData) {
-            if(in_array($arrBlocData['bloc_id'], $arrUniqBlocIds) && $arrBlocData['anywhere'] == 0){
-                unset($arrBlocs[$bloc_index]);
-            }
-        }
         return $arrBlocs;
     }
 
@@ -194,8 +180,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return integer $B:o=|?t(B
      */
-    function lfDelPageData($page_id, $device_type_id = DEVICE_TYPE_PC)
-    {
+    function lfDelPageData($page_id, $device_type_id = DEVICE_TYPE_PC) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // page_id $B$,6u$G$J$$>l9g$K$O(Bdelete$B$r<B9T(B
         if ($page_id != '') {
@@ -217,8 +202,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return void // TODO boolean $B$K$9$k$Y$-(B?
      */
-    function lfDelFile($filename, $device_type_id)
-    {
+    function lfDelFile($filename, $device_type_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         /*
@@ -250,8 +234,7 @@
      * @param integer $page_id $B%Z!<%8(BID
      * @return $BJT=82DG=%Z!<%8$N>l9g(B true
      */
-    function isEditablePage($device_type_id, $page_id)
-    {
+    function isEditablePage($device_type_id, $page_id) {
         if ($page_id == 0) {
             return false;
         }
@@ -270,8 +253,7 @@
      * @param boolean $isUser USER_REALDIR $B0J2<$N%Q%9$rJV$9>l9g(B true
      * @return string $B%F%s%W%l!<%H$N%Q%9(B
      */
-    function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false)
-    {
+    function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false) {
         $templateName = '';
         switch ($device_type_id) {
             case DEVICE_TYPE_MOBILE:
@@ -308,8 +290,7 @@
      * @param boolean $hasPackage $B%Q%C%1!<%8$N%Q%9$b4^$a$k>l9g(B true
      * @return string $BC<Kv$K1~$8$?(B DocumentRoot $B$+$i(B user_data $B$^$G$N%Q%9(B
      */
-    function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false)
-    {
+    function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false) {
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
             $templateName = MOBILE_TEMPLATE_NAME;
@@ -341,8 +322,7 @@
      * @param array $arrBlocs $B ＠ _Dj$9$k%V%m%C%/$NG[Ns(B
      * @return void
      */
-    function setBlocPathTo($device_type_id = DEVICE_TYPE_PC, &$arrBlocs = array())
-    {
+    function setBlocPathTo($device_type_id = DEVICE_TYPE_PC, &$arrBlocs = array()) {
         foreach ($arrBlocs as $key => $value) {
             $arrBloc =& $arrBlocs[$key];
             $arrBloc['php_path'] = SC_Utils_Ex::isBlank($arrBloc['php_path']) ? '' : HTML_REALDIR . $arrBloc['php_path'];
@@ -358,8 +338,7 @@
      * @param array $arrPageLayout $B%l%$%"%&%H>pJs$NG[Ns(B
      * @return integer $col_num $B%+%i%`?t(B
      */
-    function getColumnNum($arrPageLayout)
-    {
+    function getColumnNum($arrPageLayout) {
         // $B%a%$%s$O3NDj(B
         $col_num = 1;
         // LEFT NAVI

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,16 +34,11 @@
      * $B;YJ'J}K!$N>pJs$r<hF@(B.
      * 
      * @param integer $payment_id $B;YJ'J}K!(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?;YJ'J}K!$b4^$`>l9g(B true; $B=i4|CM(B false
      * @return array
      */
-    public function get($payment_id, $has_deleted = false)
-    {
+    public function get($payment_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'payment_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
         $arrRet = $objQuery->select('*', 'dtb_payment', $where, array($payment_id));
         return $arrRet[0];
     }
@@ -51,17 +46,12 @@
     /**
      * $B;YJ'J}K!0lMw$N<hF@(B.
      *
-     * @param boolean $has_deleted $B:o=|$5$l$?;YJ'J}K!$b4^$`>l9g(B true; $B=i4|CM(B false
      * @return array
      */
-    public function getList($has_deleted = false)
-    {
+    public function getList() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'payment_id, payment_method, payment_image, charge, rule_max, upper_rule, note, fix, charge_flg';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
+        $col = 'payment_id, payment_method, charge, rule_max, upper_rule, note, fix, charge_flg';
+        $where = 'del_flg = 0';
         $table = 'dtb_payment';
         $objQuery->setOrder('rank DESC');
         $arrRet = $objQuery->select($col, $table, $where);
@@ -69,55 +59,15 @@
     }
 
     /**
-     * $B9XF~6b3[$K1~$8$?;YJ'J}K!$r<hF@$9$k(B.
-     *
-     * @param integer $total $B9XF~6b3[(B
-     * @return array $B9XF~6b3[$K1~$8$?;YJ'J}K!$NG[Ns(B
-     */
-    function getByPrice($total)
-    {
-        // $B:o=|$5$l$F$$$J$$;YJ'J}K!$r<hF@(B
-        $payments = $this->getList();
-        $arrPayment = array();
-        foreach ($payments as $data) {
-            // $B2<8B$H>e8B$, ＠ _Dj$5$l$F$$$k(B
-            if (strlen($data['rule_max']) != 0 && strlen($data['upper_rule']) != 0) {
-                if ($data['rule_max'] <= $total && $data['upper_rule'] >= $total) {
-                    $arrPayment[] = $data;
-                }
-            }
-            // $B2<8B$N$_ ＠ _Dj$5$l$F$$$k(B
-            elseif (strlen($data['rule_max']) != 0) {
-                if ($data['rule_max'] <= $total) {
-                    $arrPayment[] = $data;
-                }
-            }
-            // $B>e8B$N$_ ＠ _Dj$5$l$F$$$k(B
-            elseif (strlen($data['upper_rule']) != 0) {
-                if ($data['upper_rule'] >= $total) {
-                    $arrPayment[] = $data;
-                }
-            }
-            // $B$$$:$l$b ＠ _Dj$J$7(B
-            else {
-                $arrPayment[] = $data;
-            }
-        }
-        return $arrPayment;
-    }
-
-    /**
      * $B;YJ'J}K!$NEPO?(B.
      * 
      * @param array $sqlval
      * @return void
      */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
+    public function save($sqlval) {
         $payment_id = $sqlval['payment_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         // $B?75,EPO?(B
         if ($payment_id == '') {
             // INSERT$B$N<B9T(B
@@ -128,7 +78,6 @@
         // $B4{B8JT=8(B
         } else {
             unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
             $where = 'payment_id = ?';
             $objQuery->update('dtb_payment', $sqlval, $where, array($payment_id));
         }
@@ -140,8 +89,7 @@
      * @param integer $payment_id $B;YJ'J}K!(BID
      * @return void
      */
-    public function delete($payment_id)
-    {
+    public function delete($payment_id) {
         $objDb = new SC_Helper_DB_Ex();
         // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
         $objDb->sfDeleteRankRecord('dtb_payment', 'payment_id', $payment_id);
@@ -153,8 +101,7 @@
      * @param integer $payment_id $B;YJ'J}K!(BID
      * @return void
      */
-    public function rankUp($payment_id)
-    {
+    public function rankUp($payment_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankUp('dtb_payment', 'payment_id', $payment_id);
     }
@@ -165,8 +112,7 @@
      * @param integer $payment_id $B;YJ'J}K!(BID
      * @return void
      */
-    public function rankDown($payment_id)
-    {
+    public function rankDown($payment_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankDown('dtb_payment', 'payment_id', $payment_id);
     }
@@ -179,20 +125,9 @@
      * @param integer $payment_id $B;YJ'$$J}K!(BID
      * @return boolean $B7h:Q%b%8%e!<%k$r;HMQ$9$k;YJ'$$J}K!$N>l9g(B true
      */
-    public static function useModule($payment_id)
-    {
+    public static function useModule($payment_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $memo03 = $objQuery->get('memo03', 'dtb_payment', 'payment_id = ?', array($payment_id));
         return !SC_Utils_Ex::isBlank($memo03);
     }
-
-    /**
-     * $B;YJ'J}K!(BID$B$r%-!<(B, $BL>A0$rCM$H$9$kG[Ns$r<hF@(B.
-     * 
-     * @return array
-     */
-    public static function getIDValueList()
-    {
-        return SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
-    }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -27,8 +27,7 @@
  * @package Helper
  * @version $Id$
  */
-class SC_Helper_Plugin 
-{
+class SC_Helper_Plugin {
     // $B%W%i%0%$%s$N%$%s%9%?%s%9$NG[Ns(B.
     var $arrPluginInstances = array();
     // $B%W%i%0%$%s$N%"%/%7%g%s$NG[Ns(B.
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function load($plugin_activate_flg = true)
-    {
+    function load($plugin_activate_flg = true) {
 
         if (!defined('CONFIG_REALFILE') || !file_exists(CONFIG_REALFILE)) return; // $B%$%s%9%H!<%kA0(B
         if (GC_Utils_Ex::isInstallFunction()) return; // $B%$%s%9%H!<%kCf(B
@@ -79,8 +77,7 @@
      *
      * @return object SC_Helper_Plugin$B%*%V%8%'%/%H(B
      */
-    static function getSingletonInstance($plugin_activate_flg = true)
-    {
+    static function getSingletonInstance($plugin_activate_flg = true) {
         if (!isset($GLOBALS['_SC_Helper_Plugin_instance'])) {
             // $B%W%i%0%$%s$N%m!<%@!<$,(BDB$B@\B3$rI,MW$H$9$k$?$a!"(B
             // SC_Query$B%$%s%9%?%s%9 ＠ 8@.8e$N$_%*%V%8%'%/%H$r ＠ 8@.$9$k!#(B
@@ -102,8 +99,7 @@
      * @param array  $arrArgs    $B%3!<%k%P%C%/4X?t$XEO$90z?t(B
      * @return void
      */
-    function doAction($hook_point, $arrArgs = array())
-    {
+    function doAction($hook_point, $arrArgs = array()) {
         if (is_array($arrArgs) === false) {
             array(&$arrArgs);
         }
@@ -157,8 +153,7 @@
      * @param string $function_name $B<B9T$9$k4X?tL>(B
      * @param string $priority $B<B9T=g(B
      */
-    function registerSuperHookPoint($objPlugin, $hook_point, $function_name, $priority)
-    {
+    function registerSuperHookPoint($objPlugin, $hook_point, $function_name, $priority) {
         // $B%9!<%Q!<%W%i%0%$%s4X?t$rDj5A$7$F$$$k$+$r8!>Z(B.
         if (method_exists($objPlugin, $function_name) === true) {
             // $B%"%/%7%g%s$NEPO?(B
@@ -172,8 +167,7 @@
      * @param Object $objPlugin $B%W%i%0%$%s$N%$%s%9%?%s%9(B
      * @param string $priority $B<B9T=g(B
      */
-    function registerLocalHookPoint($objPlugin, $priority)
-    {
+    function registerLocalHookPoint($objPlugin, $priority) {
         // $B%m!<%+%k%W%i%0%$%s4X?t$rDj5A$7$F$$$k$+$r8!>Z(B.
         if (method_exists($objPlugin, 'register') === true) {
             // $B%"%/%7%g%s$NEPO?!J%W%i%0%$%sB&$K5-=R!K(B
@@ -190,8 +184,7 @@
      * @param string   $priority   $BF10l%U%C%/%]%$%s%HFb$G$N<B9TM%@hEY(B
      * @return boolean $B ＠ .8y$9$l$P(Btrue
      */
-    function addAction($hook_point, $function, $priority = 0)
-    {
+    function addAction($hook_point, $function, $priority = 0) {
         if (!is_callable($function)) {
             // TODO $B%(%i!<=hM}(B;$B!!%3!<%k2DG=$J7A<0$G$O$"$j$^$;$s(B
         }
@@ -208,8 +201,7 @@
      * @param integer  $priority   $BF10l%U%C%/%]%$%s%HFb$G$N<B9TM%@hEY(B
      * @return string $B%3!<%k%P%C%/4X?t$r0l0U$K<1JL$9$k(BID
      */
-    function makeActionUniqueId($hook_point, $function, $priority)
-    {
+    function makeActionUniqueId($hook_point, $function, $priority) {
         static $filter_id_count = 0;
 
         if (is_string($function)) {
@@ -248,8 +240,7 @@
      * @param array $arrBlocs $B%W%i%0%$%s$N%$%s%9%H!<%k%G%#%l%/%H%j(B
      * @return array $arrBlocs$B%5%$%H%k!<%H$+$i%a%G%#%"%G%#%l%/%H%j$X$NAjBP%Q%9(B
      */
-    function getEnableBlocs($arrBlocs)
-    {
+    function getEnableBlocs($arrBlocs) {
         foreach ($arrBlocs as $key => $value) {
             // $BM-8z$J(Bplugin$B$N%V%m%C%/0J30(B.
             if (!in_array($value['plugin_id'] , $this->arrPluginIds)) {
@@ -269,8 +260,7 @@
      * @param string $url PHP$B%U%!%$%k$N(BURL
      * @return void
      */
-    function setHeadNavi($url)
-    {
+    function setHeadNavi($url) {
         $this->arrHeadNaviBlocsByPlugin[$url] = TARGET_ID_HEAD;
     }
 
@@ -280,8 +270,7 @@
      * @param array|null $arrBlocs  $BG[CV>pJs$r4^$a$?%V%m%C%/$NG[Ns(B
      * @return void
      */
-    function setHeadNaviBlocs(&$arrBlocs)
-    {
+    function setHeadNaviBlocs(&$arrBlocs) {
         foreach ($this->arrHeadNaviBlocsByPlugin as $key => $value) {
             $arrBlocs[] = array(
                 'target_id' =>$value,
@@ -298,8 +287,7 @@
      * @param boolean   $plugin_activate_flg 
      * @return void
      */
-    public static function hook($hook_point, $arrArgs = array(), $plugin_activate_flg = PLUGIN_ACTIVATE_FLAG)
-    {
+    public static function hook($hook_point, $arrArgs = array(), $plugin_activate_flg = PLUGIN_ACTIVATE_FLAG) {
         $objPlugin = SC_Helper_Plugin::getSingletonInstance($plugin_activate_flg);
         $objPlugin->doAction($hook_point, $arrArgs);
     }

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class SC_Helper_Purchase 
-{
+class SC_Helper_Purchase {
 
     var $arrShippingKey = array(
         'name01', 'name02', 'kana01', 'kana02',
@@ -60,8 +59,7 @@
      * @param integer $orderStatus $B<uCm=hM}$r40N;$9$k:]$K ＠ _Dj$9$kBP1~>u67(B
      * @return void
      */
-    function completeOrder($orderStatus = ORDER_NEW)
-    {
+    function completeOrder($orderStatus = ORDER_NEW) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objSiteSession = new SC_SiteSession_Ex();
         $objCartSession = new SC_CartSession_Ex();
@@ -116,8 +114,7 @@
      * @param boolean $is_delete $B<uCm%G!<%?$rO ＠ M}:o=|$9$k>l9g(B true
      * @return void
      */
-    function cancelOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false)
-    {
+    function cancelOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $in_transaction = $objQuery->inTransaction();
         if (!$in_transaction) {
@@ -159,8 +156,7 @@
      * @param boolean $is_delete $B<uCm%G!<%?$rO ＠ M}:o=|$9$k>l9g(B true
      * @return string $B<uCm0l;~(BID
      */
-    function rollbackOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false)
-    {
+    function rollbackOrder($order_id, $orderStatus = ORDER_CANCEL, $is_delete = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $in_transaction = $objQuery->inTransaction();
         if (!$in_transaction) {
@@ -202,8 +198,7 @@
      * @param SC_CartSession $objCartSession
      * @return void
      */
-    function verifyChangeCart($uniqId, &$objCartSession)
-    {
+    function verifyChangeCart($uniqId, &$objCartSession) {
         $cartKey = $objCartSession->getKey();
 
         // $B%+!<%HFb$,6u$G$J$$$+(B
@@ -238,8 +233,7 @@
      * @param integer $uniqId $B<uCm0l;~>pJs(BID
      * @return array $B<uCm0l;~>pJs$NG[Ns(B
      */
-    function getOrderTemp($uniqId)
-    {
+    function getOrderTemp($uniqId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->getRow('*', 'dtb_order_temp', 'order_temp_id = ?', array($uniqId));
     }
@@ -250,8 +244,7 @@
      * @param integer $order_id $B<uCm(BID
      * @return array $B<uCm0l;~>pJs$NG[Ns(B
      */
-    function getOrderTempByOrderId($order_id)
-    {
+    function getOrderTempByOrderId($order_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->getRow('*', 'dtb_order_temp', 'order_id = ?', array($order_id));
     }
@@ -264,10 +257,9 @@
      * @param integer $uniqId $B<uCm0l;~>pJs(BID
      * @param array $params $BEPO?$9$k<uCm>pJs$NG[Ns(B
      * @param SC_Customer $objCustomer SC_Customer $B%$%s%9%?%s%9(B
-     * @return void
+     * @return array void
      */
-    function saveOrderTemp($uniqId, $params, &$objCustomer = NULL)
-    {
+    function saveOrderTemp($uniqId, $params, &$objCustomer = NULL) {
         if (SC_Utils_Ex::isBlank($uniqId)) {
             return;
         }
@@ -302,8 +294,7 @@
      *
      * @param bool $has_shipment_item $BG[Aw>&IJ$rJ]M-$7$F$$$kG[Aw ＠ h$N$_JV$9!#(B
      */
-    function getShippingTemp($has_shipment_item = false)
-    {
+    function getShippingTemp($has_shipment_item = false) {
         if ($has_shipment_item) {
             $arrReturn = array();
             foreach ($_SESSION['shipping'] as $key => $arrVal) {
@@ -322,8 +313,7 @@
      * @param integer $shipping_id $BG[Aw ＠ h(BID
      * @return void
      */
-    function clearShipmentItemTemp($shipping_id = null)
-    {
+    function clearShipmentItemTemp($shipping_id = null) {
         if (is_null($shipping_id)) {
             foreach ($_SESSION['shipping'] as $key => $value) {
                 $this->clearShipmentItemTemp($key);
@@ -343,8 +333,7 @@
      * @param integer $quantity $B?tNL(B
      * @return void
      */
-    function setShipmentItemTemp($shipping_id, $product_class_id, $quantity)
-    {
+    function setShipmentItemTemp($shipping_id, $product_class_id, $quantity) {
         // $BG[Ns$,D9$/$J$k$N$G(B, $B%j%U%!%l%s%9$r;HMQ$9$k(B
         $arrItems =& $_SESSION['shipping'][$shipping_id]['shipment_item'][$product_class_id];
 
@@ -374,8 +363,7 @@
     /**
      * $BG[Aw ＠ hETF;I\8)$NG[Ns$rJV$9(B.
      */
-    function getShippingPref($is_multiple)
-    {
+    function getShippingPref($is_multiple) {
         $results = array();
         foreach (SC_Helper_Purchase_Ex::getShippingTemp($is_multiple) as $val) {
             $results[] = $val['shipping_pref'];
@@ -388,8 +376,7 @@
      *
      * @return boolean $BJ#?tG[Aw;XDj$N9XF~$N>l9g(B true
      */
-    function isMultiple()
-    {
+    function isMultiple() {
         return count(SC_Helper_Purchase_Ex::getShippingTemp(true)) >= 2;
     }
 
@@ -401,8 +388,7 @@
      * @param integer $shipping_id $BG[Aw ＠ h(BID
      * @return void
      */
-    function saveShippingTemp($arrSrc, $shipping_id = 0)
-    {
+    function saveShippingTemp($arrSrc, $shipping_id = 0) {
         // $BG[Aw>&IJ$O0z$-7Q$,$J$$(B
         unset($arrSrc['shipment_item']);
 
@@ -420,8 +406,7 @@
      * @param integer $shipping_id $BG[Aw ＠ h(BID
      * @return void
      */
-    function unsetShippingTemp()
-    {
+    function unsetShippingTemp() {
         SC_Helper_Purchase_Ex::unsetAllShippingTemp(true);
     }
 
@@ -431,8 +416,7 @@
      * @param bool $multiple_temp $BJ#?t$*FO$1 ＠ h$N2hLLLa$j=hM}MQ$N>pJs$bGK4~$9$k$+(B
      * @return void
      */
-    static function unsetAllShippingTemp($multiple_temp = false)
-    {
+    static function unsetAllShippingTemp($multiple_temp = false) {
         unset($_SESSION['shipping']);
         if ($multiple_temp) {
             unset($_SESSION['multiple_temp']);
@@ -445,8 +429,7 @@
      * @param integer $shipping_id $BG[Aw ＠ h(BID
      * @return void
      */
-    static function unsetOneShippingTemp($shipping_id)
-    {
+    static function unsetOneShippingTemp($shipping_id) {
         unset($_SESSION['shipping'][$shipping_id]);
     }
 
@@ -508,8 +491,7 @@
      * @param string $src_prefix $B%3%T!<85$N@\F,<-(B. $B%G%U%)%k%H(B order
      * @return void
      */
-    function copyFromOrder(&$dest, $src, $prefix = 'shipping', $src_prefix = 'order', $arrKey = null)
-    {
+    function copyFromOrder(&$dest, $src, $prefix = 'shipping', $src_prefix = 'order', $arrKey = null) {
         if (is_null($arrKey)) {
             $arrKey = $this->arrShippingKey;
         }
@@ -532,8 +514,7 @@
      * @param string $arrSrc $B85$H$J$kG[Ns(B
      * @return void
      */
-    function extractShipping($arrSrc)
-    {
+    function extractShipping($arrSrc) {
         $arrKey = array();
         foreach ($this->arrShippingKey as $key) {
             $arrKey[] = 'shipping_' . $key;
@@ -542,10 +523,70 @@
     }
 
     /**
+     * $B9XF~6b3[$K1~$8$?;YJ'J}K!$r<hF@$9$k(B.
+     *
+     * @param integer $total $B9XF~6b3[(B
+     * @param integer $deliv_id $BG[Aw6H<T(BID
+     * @return array $B9XF~6b3[$K1~$8$?;YJ'J}K!$NG[Ns(B
+     */
+    function getPaymentsByPrice($total, $deliv_id) {
+
+        $arrPaymentIds = $this->getPayments($deliv_id);
+        if (SC_Utils_Ex::isBlank($arrPaymentIds)) {
+            return array();
+        }
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // $B:o=|$5$l$F$$$J$$;YJ'J}K!$r<hF@(B
+        $where = 'del_flg = 0 AND payment_id IN (' . SC_Utils_Ex::repeatStrWithSeparator('?', count($arrPaymentIds)) . ')';
+        $objQuery->setOrder('rank DESC');
+        $payments = $objQuery->select('payment_id, payment_method, rule_max, upper_rule, note, payment_image, charge', 'dtb_payment', $where, $arrPaymentIds);
+        $arrPayment = array();
+        foreach ($payments as $data) {
+            // $B2<8B$H>e8B$, ＠ _Dj$5$l$F$$$k(B
+            if (strlen($data['rule_max']) != 0 && strlen($data['upper_rule']) != 0) {
+                if ($data['rule_max'] <= $total && $data['upper_rule'] >= $total) {
+                    $arrPayment[] = $data;
+                }
+            }
+            // $B2<8B$N$_ ＠ _Dj$5$l$F$$$k(B
+            elseif (strlen($data['rule_max']) != 0) {
+                if ($data['rule_max'] <= $total) {
+                    $arrPayment[] = $data;
+                }
+            }
+            // $B>e8B$N$_ ＠ _Dj$5$l$F$$$k(B
+            elseif (strlen($data['upper_rule']) != 0) {
+                if ($data['upper_rule'] >= $total) {
+                    $arrPayment[] = $data;
+                }
+            }
+            // $B$$$:$l$b ＠ _Dj$J$7(B
+            else {
+                $arrPayment[] = $data;
+            }
+        }
+        return $arrPayment;
+    }
+
+    /**
+     * $B;YJ'J}K!$N>\:Y$r<hF@$9$k(B.
+     *
+     * @param integer $payment_id $B$*;YJ'$$J}K!(B
+     * @return array $B;YJ'J}K!>\:Y$NG[Ns(B
+     */
+    function getPaymentsByPaymentsId($payment_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $where = 'payment_id = ? AND del_flg = 0';
+        $arrValues = array($payment_id);
+        return $objQuery->getRow('*', 'dtb_payment', $where, $arrValues);
+    }
+
+    /**
      * $B$*FO$1F|0lMw$r<hF@$9$k(B.
      */
-    function getDelivDate(&$objCartSess, $productTypeId)
-    {
+    function getDelivDate(&$objCartSess, $productTypeId) {
         $cartList = $objCartSess->getCartList($productTypeId);
         $delivDateIds = array();
         foreach ($cartList as $item) {
@@ -603,8 +644,7 @@
     /**
      * $B$*FO$12DG=F|$N%9%?!<%HCM$+$i(B, $B$*FO$1F|$NG[Ns$r<hF@$9$k(B.
      */
-    function getDateArray($start_day, $end_day)
-    {
+    function getDateArray($start_day, $end_day) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrWDAY = $masterData->getMasterData('mtb_wday');
         //$B$*FO$12DG=F|$N%9%?!<%HCM$,%;%C%H$5$l$F$$$l$P(B
@@ -626,6 +666,52 @@
     }
 
     /**
+     * $BG[Aw6H<T(BID$B$+$i$*FO$1;~4V$NG[Ns$r<hF@$9$k(B.
+     *
+     * @param integer $deliv_id $BG[Aw6H<T(BID
+     * @return array $B$*FO$1;~4V$NG[Ns(B
+     */
+    function getDelivTime($deliv_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('time_id');
+        $results = $objQuery->select('time_id, deliv_time',
+                                     'dtb_delivtime',
+                                     'deliv_id = ?', array($deliv_id));
+        $arrDelivTime = array();
+        foreach ($results as $val) {
+            $arrDelivTime[$val['time_id']] = $val['deliv_time'];
+        }
+        return $arrDelivTime;
+    }
+
+    /**
+     * $B>&IJ<oJL(BID $B$+$iG[Aw6H<T$r<hF@$9$k(B.
+     *
+     * @param integer $product_type_id $B>&IJ<oJL(BID
+     * @return array $BG[Aw6H<T$NG[Ns(B
+     */
+    function getDeliv($product_type_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank DESC');
+        return $objQuery->select('*', 'dtb_deliv', 'product_type_id = ? AND del_flg = 0',
+                                 array($product_type_id));
+    }
+
+    /**
+     * $BG[Aw6H<T(BID $B$+$i(B, $BM-8z$J;YJ'J}K!(BID$B$r<hF@$9$k(B.
+     *
+     * @param integer $deliv_id $BG[Aw6H<T(BID
+     * @return array $BM-8z$J;YJ'J}K!(BID$B$NG[Ns(B
+     */
+    function getPayments($deliv_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank');
+        return $objQuery->getCol('payment_id', 'dtb_payment_options',
+                                 'deliv_id = ?',
+                                 array($deliv_id), MDB2_FETCHMODE_ORDERED);
+    }
+
+    /**
      * $BG[Aw>pJs$NEPO?$r9T$&(B.
      *
      * $arrParam $B$N$&$A(B, dtb_shipping $B%F!<%V%k$KB8:_$9$k%+%i%`$N$_$rEPO?$9$k(B.
@@ -637,8 +723,7 @@
      * @param boolean $convert_shipping_date yyyy/mm/dd(EEE) $B7A<0$NG[AwF|IU$rJQ49$9$k>l9g(B true
      * @return void
      */
-    function registerShipping($order_id, $arrParams, $convert_shipping_date = true)
-    {
+    function registerShipping($order_id, $arrParams, $convert_shipping_date = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_shipping';
         $where = 'order_id = ?';
@@ -676,8 +761,7 @@
      * @param array $arrParams $BG[Aw>&IJ$NG[Ns(B
      * @return void
      */
-    function registerShipmentItem($order_id, $shipping_id, $arrParams)
-    {
+    function registerShipmentItem($order_id, $shipping_id, $arrParams) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_shipment_item';
         $where = 'order_id = ? AND shipping_id = ?';
@@ -733,8 +817,7 @@
      * @param integer $cartKey $BEPO?$r9T$&%+!<%H>pJs$N%-!<(B
      * @param integer $B<uCm(BID
      */
-    function registerOrderComplete($orderParams, &$objCartSession, $cartKey)
-    {
+    function registerOrderComplete($orderParams, &$objCartSession, $cartKey) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $BITMW$JJQ?t$r(B unset
@@ -773,8 +856,6 @@
             $arrDetail[$i]['point_rate'] = $item['point_rate'];
             $arrDetail[$i]['price'] = $item['price'];
             $arrDetail[$i]['quantity'] = $item['quantity'];
-            $arrDetail[$i]['tax_rate'] = $orderParams['order_tax_rate'];
-            $arrDetail[$i]['tax_rule'] = $orderParams['order_tax_rule'];
 
             // $B:_8K$N8:>/=hM}(B
             if (!$objProduct->reduceStock($p['product_class_id'], $item['quantity'])) {
@@ -804,8 +885,7 @@
      * @param array $arrParams $B<uCm>pJs$NO"A[G[Ns(B
      * @return integer $B<uCm(BID
      */
-    function registerOrder($order_id, $arrParams)
-    {
+    function registerOrder($order_id, $arrParams) {
         $table = 'dtb_order';
         $where = 'order_id = ?';
         $objQuery = SC_Query_Ex::getSingletonInstance();
@@ -859,8 +939,7 @@
      * @param array $arrParams $B<uCm>pJs$NO"A[G[Ns(B
      * @return void
      */
-    function registerOrderDetail($order_id, $arrParams)
-    {
+    function registerOrderDetail($order_id, $arrParams) {
         $table = 'dtb_order_detail';
         $where = 'order_id = ?';
         $objQuery = SC_Query_Ex::getSingletonInstance();
@@ -881,8 +960,7 @@
      * @param integer $customer_id $B2q0w(BID
      * @return array $B<uCm>pJs$NG[Ns(B
      */
-    function getOrder($order_id, $customer_id = null)
-    {
+    function getOrder($order_id, $customer_id = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'order_id = ?';
         $arrValues = array($order_id);
@@ -900,8 +978,7 @@
      * @param boolean $has_order_status $BBP1~>u67(B, $BF~6bF|$b4^$a$k>l9g(B true
      * @return array $B<uCm>\:Y$NG[Ns(B
      */
-    function getOrderDetail($order_id, $has_order_status = true)
-    {
+    function getOrderDetail($order_id, $has_order_status = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $dbFactory  = SC_DB_DBFactory_Ex::getInstance();
         $col = <<< __EOS__
@@ -915,8 +992,6 @@
             T2.price,
             T2.quantity,
             T2.point_rate,
-            T2.tax_rate,
-            T2.tax_rule,
 __EOS__;
         if ($has_order_status) {
             $col .= 'T1.status AS status, T1.payment_date AS payment_date,';
@@ -958,8 +1033,7 @@
      * @param array $B<uCm>\:Y$NG[Ns(B
      * @return void
      */
-    function setDownloadableFlgTo(&$arrOrderDetail)
-    {
+    function setDownloadableFlgTo(&$arrOrderDetail) {
         foreach ($arrOrderDetail as $key => $value) {
             // $BHNGd2A3J$,(B 0 $B1_(B
             if ($arrOrderDetail[$key]['price'] == '0') {
@@ -982,8 +1056,7 @@
      * @param boolean $has_items $B7k2L$KG[Aw>&IJ$b4^$a$k>l9g(B true
      * @return array $BG[Aw>pJs$NG[Ns(B
      */
-    function getShippings($order_id, $has_items = true)
-    {
+    function getShippings($order_id, $has_items = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrResults = array();
         $objQuery->setOrder('shipping_id');
@@ -1013,8 +1086,7 @@
      * @param boolean $has_detail $B>&IJ>\:Y$b<hF@$9$k>l9g(B true
      * @return array $B>&IJ5,3J(BID$B$r%-!<$K$7$?G[Aw>&IJ$NG[Ns(B
      */
-    function getShipmentItems($order_id, $shipping_id, $has_detail = true)
-    {
+    function getShipmentItems($order_id, $shipping_id, $has_detail = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objProduct = new SC_Product_Ex();
         $arrResults = array();
@@ -1046,8 +1118,7 @@
      * @param integer $orderId $B<uCm(BID
      * @return void
      */
-    function sendOrderMail($orderId)
-    {
+    function sendOrderMail($orderId) {
         $mailHelper = new SC_Helper_Mail_Ex();
         $template_id =
             SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1;
@@ -1066,8 +1137,7 @@
      * @param array $sqlval $B99?78e$NCM$r%j%U%!%l%s%9$5$;$k$?$a$N%Q%i%a!<%?!<(B
      * @return void
      */
-    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array())
-    {
+    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrOrderOld = $objQuery->getRow('status, add_point, use_point, customer_id', 'dtb_order', 'order_id = ?', array($orderId));
 
@@ -1175,8 +1245,7 @@
      * @param boolean $temp_table $B99?7BP>]$O!V<uCm(B_Temp$B!W$+(B
      * @static
      */
-    function sfUpdateOrderNameCol($order_id, $temp_table = false)
-    {
+    function sfUpdateOrderNameCol($order_id, $temp_table = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         if ($temp_table) {
@@ -1214,8 +1283,7 @@
      * @param integer $status $BBP1~>u67(B
      * @return boolean $B;HMQ$9$k$+(B($B2q0w%F!<%V%k$+$i8:;;$9$k$+(B)
      */
-    function isUsePoint($status)
-    {
+    function isUsePoint($status) {
         if ($status == null) {
             return false;
         }
@@ -1235,8 +1303,7 @@
      * @param integer $status $BBP1~>u67(B
      * @return boolean $B2C;;$9$k$+(B
      */
-    function isAddPoint($status)
-    {
+    function isAddPoint($status) {
         switch ($status) {
             case ORDER_NEW:         // $B?75,CmJ8(B
             case ORDER_PAY_WAIT:    // $BF~6bBT$A(B
@@ -1272,8 +1339,7 @@
      * @param SC_Customer $objCustomer SC_Customer $B%$%s%9%?%s%9(B
      * @param integer $cartKey $BEPO?$r9T$&%+!<%H>pJs$N%-!<(B
      */
-    function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey)
-    {
+    function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey) {
         // $B%+!<%H$NFbMF$r:o=|$9$k(B.
         $objCartSession->delAllProducts($cartKey);
         SC_SiteSession_Ex::unsetUniqId();
@@ -1290,8 +1356,7 @@
      * @param integer $shipping_id $BG[Aw ＠ h(BID
      * @return void
      */
-    function setShipmentItemTempForSole(&$objCartSession, $shipping_id = 0)
-    {
+    function setShipmentItemTempForSole(&$objCartSession, $shipping_id = 0) {
         $objCartSess = new SC_CartSession_Ex();
 
         $this->clearShipmentItemTemp();
@@ -1308,8 +1373,7 @@
      *
      * @return integer
      */
-    public function getNextOrderID()
-    {
+    public function getNextOrderID() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->nextVal('dtb_order_order_id');
     }

$B:o=|(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Recommend.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Recommend.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Recommend.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,186 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * $B$*$9$9$a>&IJ$r4IM}$9$k%X%k%Q!<%/%i%9(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Recommend
-{
-    /**
-     * $B$*$9$9$a>&IJ$N>pJs$r<hF@(B.
-     * 
-     * @param integer $best_id $B$*$9$9$a>&IJ(BID
-     * @param boolean $has_deleted $B:o=|$5$l$?$*$9$9$a>&IJ$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function get($best_id, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'best_id = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_best_products', $where, array($best_id));
-        return $arrRet[0];
-    }
-
-    /**
-     * $B$*$9$9$a>&IJ$N>pJs$r%i%s%/$+$i<hF@(B.
-     * 
-     * @param integer $rank $B%i%s%/(B
-     * @param boolean $has_deleted $B:o=|$5$l$?$*$9$9$a>&IJ$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getByRank($rank, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = 'rank = ?';
-        if (!$has_deleted) {
-            $where .= ' AND del_flg = 0';
-        }
-        $arrRet = $objQuery->select($col, 'dtb_best_products', $where, array($rank));
-        return $arrRet[0];
-    }
-
-    /**
-     * $B$*$9$9$a>&IJ0lMw$N<hF@(B.
-     *
-     * @param integer $dispNumber $BI=<(7o?t(B
-     * @param integer $pageNumber $B%Z!<%8HV9f(B
-     * @param boolean $has_deleted $B:o=|$5$l$?$*$9$9$a>&IJ$b4^$`>l9g(B true; $B=i4|CM(B false
-     * @return array
-     */
-    public function getList($dispNumber = 0, $pageNumber = 0, $has_deleted = false)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = '*';
-        $where = '';
-        if (!$has_deleted) {
-            $where .= 'del_flg = 0';
-        }
-        $table = 'dtb_best_products';
-        $objQuery->setOrder('rank');
-        if ($dispNumber > 0) {
-            if ($pageNumber > 0) {
-                $objQuery->setLimitOffset($dispNumber, (($pageNumber - 1) * $dispNumber));
-            } else {
-                $objQuery->setLimit($dispNumber);
-            }
-        }
-        $arrRet = $objQuery->select($col, $table, $where);
-        return $arrRet;
-    }
-
-    /**
-     * $B$*$9$9$a>&IJ$NEPO?(B.
-     * 
-     * @param array $sqlval
-     * @return multiple $BEPO?@.8y(B:$B$*$9$9$a>&IJ(BID, $B<:GT(B:FALSE
-     */
-    public function save($sqlval)
-    {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
-        $best_id = $sqlval['best_id'];
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        // $B?75,EPO?(B
-        if ($best_id == '') {
-            // INSERT$B$N<B9T(B
-            if (!$sqlval['rank']) {
-                $sqlval['rank'] = $objQuery->max('rank', 'dtb_best_products') + 1;
-            }
-            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-            $sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id');
-            $ret = $objQuery->insert('dtb_best_products', $sqlval);
-        // $B4{B8JT=8(B
-        } else {
-            unset($sqlval['creator_id']);
-            unset($sqlval['create_date']);
-            $where = 'best_id = ?';
-            $ret = $objQuery->update('dtb_best_products', $sqlval, $where, array($best_id));
-        }
-        return ($ret) ? $sqlval['best_id'] : FALSE;
-    }
-
-    /**
-     * $B$*$9$9$a>&IJ$N:o=|(B.
-     * 
-     * @param integer $best_id $B$*$9$9$a>&IJ(BID
-     * @return void
-     */
-    public function delete($best_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
-        $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $best_id, TRUE);
-    }
-
-    /**
-     * $B>&IJ(BID$B$NG[Ns$+$i$*$9$9$a>&IJ$r:o=|(B.
-     * 
-     * @param array $productIDs $B>&IJ(BID
-     * @return void
-     */
-    public function deleteByProductIDs($productIDs)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        $arrList = $this->getList();
-        foreach ($arrList as $recommend) {
-            if (in_array($recommend['product_id'], $productIDs)) {
-                $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $recommend['best_id'], TRUE);
-            }
-        }
-    }
-
-    /**
-     * $B$*$9$9$a>&IJ$NI=<(=g$r$R$H$D>e$2$k(B.
-     * 
-     * @param integer $best_id $B$*$9$9$a>&IJ(BID
-     * @return void
-     */
-    public function rankUp($best_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        //$B$*$9$9$a$O%G!<%?%Y!<%9$NEPO?$,>:=g$J$N$G!"(BMode$B$r5U$K$9$k!#(B
-        $objDb->sfRankDown('dtb_best_products', 'best_id', $best_id);
-    }
-
-    /**
-     * $B$*$9$9$a>&IJ$NI=<(=g$r$R$H$D2<$2$k(B.
-     * 
-     * @param integer $best_id $B$*$9$9$a>&IJ(BID
-     * @return void
-     */
-    public function rankDown($best_id)
-    {
-        $objDb = new SC_Helper_DB_Ex();
-        //$B$*$9$9$a$O%G!<%?%Y!<%9$NEPO?$,>:=g$J$N$G!"(BMode$B$r5U$K$9$k!#(B
-        $objDb->sfRankUp('dtb_best_products', 'best_id', $best_id);
-    }
-}

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -12,8 +12,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_Session 
-{
+class SC_Helper_Session {
 
     var $objDb;
 
@@ -25,8 +24,7 @@
      *
      * $B3F4X?t$r%;%C%7%g%s%O%s%I%i$KJ]B8$9$k(B
      */
-    function __construct()
-    {
+    function __construct() {
         $this->objDb = new SC_Helper_DB_Ex();
         session_set_save_handler(array(&$this, 'sfSessOpen'),
                                  array(&$this, 'sfSessClose'),
@@ -50,8 +48,7 @@
      * @param string $session_name $B%;%C%7%g%sL>(B($B;HMQ$7$J$$(B)
      * @return bool $B%;%C%7%g%s$, ＠ 5>o$K3+;O$5$l$?>l9g(B true
      */
-    function sfSessOpen($save_path, $session_name)
-    {
+    function sfSessOpen($save_path, $session_name) {
         return true;
     }
 
@@ -60,8 +57,7 @@
      *
      * @return bool $B%;%C%7%g%s$, ＠ 5>o$K=*N;$7$?>l9g(B true
      */
-    function sfSessClose()
-    {
+    function sfSessClose() {
         return true;
     }
 
@@ -71,8 +67,7 @@
      * @param string $id $B%;%C%7%g%s(BID
      * @return string $B%;%C%7%g%s%G!<%?$NCM(B
      */
-    function sfSessRead($id)
-    {
+    function sfSessRead($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('sess_data', 'dtb_session', 'sess_id = ?', array($id));
         if (empty($arrRet)) {
@@ -89,8 +84,7 @@
      * @param string $sess_data $B%;%C%7%g%s%G!<%?$NCM(B
      * @return bool $B%;%C%7%g%s$N=q$-9~$_$K ＠ .8y$7$?>l9g(B true
      */
-    function sfSessWrite($id, $sess_data)
-    {
+    function sfSessWrite($id, $sess_data) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $exists = $objQuery->exists('dtb_session', 'sess_id = ?', array($id));
         $sqlval = array();
@@ -120,8 +114,7 @@
      * @param string $id $B%;%C%7%g%s(BID
      * @return bool $B%;%C%7%g%s$r ＠ 5>o$KGK4~$7$?>l9g(B true
      */
-    function sfSessDestroy($id)
-    {
+    function sfSessDestroy($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->delete('dtb_session', 'sess_id = ?', array($id));
         return true;
@@ -134,8 +127,7 @@
      *
      * @param integer $maxlifetime $B%;%C%7%g%s$NM-8z4|8B(B($B;HMQ$7$J$$(B)
      */
-    function sfSessGc($maxlifetime)
-    {
+    function sfSessGc($maxlifetime) {
         // MAX_LIFETIME$B0J>e99?7$5$l$F$$$J$$%;%C%7%g%s$r:o=|$9$k!#(B
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = "update_date < current_timestamp + '-". MAX_LIFETIME . " secs'";
@@ -161,8 +153,7 @@
      * @access protected
      * @return string $B%H%i%s%6%/%7%g%s%H!<%/%s$NJ8;zNs(B
      */
-    function getToken()
-    {
+    function getToken() {
         if (empty($_SESSION[TRANSACTION_ID_NAME])) {
             $_SESSION[TRANSACTION_ID_NAME] = SC_Helper_Session_Ex::createToken();
         }
@@ -175,8 +166,7 @@
      * @access private
      * @return string $B%H%i%s%6%/%7%g%s%H!<%/%sMQ$NJ8;zNs(B
      */
-    function createToken()
-    {
+    function createToken() {
         return sha1(uniqid(rand(), true));
     }
 
@@ -198,8 +188,7 @@
      *                          $B%G%U%)%k%HCM$O(B false
      * @return boolean $B%H%i%s%6%/%7%g%s%H!<%/%s$,M-8z$J>l9g(B true
      */
-    function isValidToken($is_unset = false)
-    {
+    function isValidToken($is_unset = false) {
         // token $B$NBEEv ＠ -%A%'%C%/(B
         $ret = $_REQUEST[TRANSACTION_ID_NAME] === $_SESSION[TRANSACTION_ID_NAME];
 
@@ -214,8 +203,7 @@
      *
      * @return void
      */
-    function destroyToken()
-    {
+    function destroyToken() {
         unset($_SESSION[TRANSACTION_ID_NAME]);
     }
 
@@ -226,8 +214,7 @@
      *
      * @return void
      */
-    function adminAuthorization()
-    {
+    function adminAuthorization() {
         $masterData = new SC_DB_MasterData_Ex();
         $arrExcludes = $masterData->getMasterData('mtb_auth_excludes');
         if (preg_match('|^' . ROOT_URLPATH . ADMIN_DIR . '|', $_SERVER['SCRIPT_NAME'])) {

$BJQ99(B: branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -27,8 +27,7 @@
  * @package Helper
  * @version $Id$
  */
-class SC_Helper_Transform 
-{
+class SC_Helper_Transform {
     protected $objDOM;
     protected $arrSmartyTagsOrg;
     protected $arrSmartyTagsSub;
@@ -49,8 +48,7 @@
      * @param string $source $BJQ7ABP>]$N%F%s%W%l!<%H(B
      * @return void
      */
-    public function __construct($source)
-    {
+    public function __construct($source) {
         $this->objDOM = new DOMDocument();
         $this->objDOM->strictErrorChecking = false;
         $this->snip_count      = 0;
@@ -133,8 +131,7 @@
      * @param string  $err_msg       $B%(%i!<%a%C%;!<%8(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function select($selector, $index = NULL, $require = true, $err_msg = NULL)
-    {
+    public function select($selector, $index = NULL, $require = true, $err_msg = NULL) {
         $this->arrSelectElements = array();
         $this->search_depth = 0;
 
@@ -174,8 +171,7 @@
      * @param string  $err_msg       $B%(%i!<%a%C%;!<%8(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function find($selector, $index = NULL, $require = true, $err_msg = NULL)
-    {
+    public function find($selector, $index = NULL, $require = true, $err_msg = NULL) {
         $arrParentElements = $this->arrSelectElements[$this->search_depth];
         $this->search_depth++;
         $this->arrSelectElements[$this->search_depth] = array();
@@ -215,8 +211,7 @@
      * @param int $back_num $BA*Br>uBV$rLa$9?t(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function end($back_num = 1)
-    {
+    public function end($back_num = 1) {
         if ($this->search_depth >= $back_num) {
             $this->search_depth -= $back_num;
         } else {
@@ -233,8 +228,7 @@
      * @param string $html_snip $BA^F~$9$k(BHTML$B$NCGJR(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function insertBefore($html_snip)
-    {
+    public function insertBefore($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('insertBefore', $objElement[0], $html_snip);
         }
@@ -248,8 +242,7 @@
      * @param string $html_snip $BA^F~$9$k(BHTML$B$NCGJR(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function insertAfter($html_snip)
-    {
+    public function insertAfter($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('insertAfter', $objElement[0], $html_snip);
         }
@@ -263,8 +256,7 @@
      * @param string $html_snip $BA^F~$9$k(BHTML$B$NCGJR(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function appendFirst($html_snip)
-    {
+    public function appendFirst($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('appendFirst', $objElement[0], $html_snip);
         }
@@ -278,8 +270,7 @@
      * @param string $html_snip $BA^F~$9$k(BHTML$B$NCGJR(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function appendChild($html_snip)
-    {
+    public function appendChild($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
             $this->lfSetTransform('appendChild', $objElement[0], $html_snip);
         }
@@ -293,8 +284,7 @@
      * @param string $html_snip $BCV498e$N(BHTML$B$NCGJR(B
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function replaceElement($html_snip)
-    {
+    public function replaceElement($html_snip) {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
             $this->lfSetTransform('replaceElement', $objElement[0], $html_snip);
         }
@@ -307,8 +297,7 @@
      *
      * @return SC_Helper_Transform$B%*%V%8%'%/%H(B
      */
-    public function removeElement()
-    {
+    public function removeElement() {
         foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
             $this->lfSetTransform('replaceElement', $objElement[0], '');
         }
@@ -321,8 +310,7 @@
      *
      * @return string $B%H%i%s%9%U%)!<%`:Q$_(BHTML$B!#$^$C$?$/%H%i%s%9%U%)!<%`$,9T$o$l$J$+$C$?>l9g$O85$N(BHTML$B$rJV$9!#!#(B
      */
-    public function getHTML()
-    {
+    public function getHTML() {
         if (count($this->arrErr)) {
             // $B%(%i!<%a%C%;!<%8AH$_N)$F(B
             $err_msg = '';
@@ -369,8 +357,7 @@
      * @param array $arrMatches $B%^%C%A$7$?%?%0$N>pJs(B
      * @return string $BBe$o$j$NJ8;zNs(B
      */
-    protected function lfCaptureSmartyTags2Comment(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Comment(array $arrMatches) {
         $substitute_tag = sprintf('<!--###%08d###-->', $this->smarty_tags_idx);
         $this->arrSmartyTagsOrg[$this->smarty_tags_idx] = $arrMatches[0];
         $this->arrSmartyTagsSub[$this->smarty_tags_idx] = $substitute_tag;
@@ -387,8 +374,7 @@
      * @param array $arrMatches $B%^%C%A$7$?%?%0$N>pJs(B
      * @return string $BBe$o$j$NJ8;zNs(B
      */
-    protected function lfCaptureHeadTags2Comment(array $arrMatches)
-    {
+    protected function lfCaptureHeadTags2Comment(array $arrMatches) {
         $substitute_tag = sprintf('<!--###%08d###-->', $this->smarty_tags_idx);
         $this->arrSmartyTagsOrg[$this->smarty_tags_idx] = $arrMatches[2];
         $this->arrSmartyTagsSub[$this->smarty_tags_idx] = $substitute_tag;
@@ -411,8 +397,7 @@
      * @param array $arrMatches $B%^%C%A$7$?%?%0$N>pJs(B
      * @return string $BBe$o$j$NJ8;zNs(B
      */
-    protected function lfCaptureSmartyTagsInTag(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTagsInTag(array $arrMatches) {
         // Smarty$B%?%0Fb$N%/%)!<%H$r=hM}$7$d$9$$$h$&!"$$$C$?$s%@%_!<$N%?%0$K(B
         $html = preg_replace_callback('/<\!--{.+?\}-->/s', array($this, 'lfCaptureSmartyTags2Temptag'), $arrMatches[0]);
         $html = preg_replace_callback('/\"[^"]*?\"/s', array($this, 'lfCaptureSmartyTagsInQuote'), $html);
@@ -429,8 +414,7 @@
      * @param array $arrMatches $B%^%C%A$7$?%?%0$N>pJs(B
      * @return string $BBe$o$j$NJ8;zNs(B
      */
-    protected function lfCaptureSmartyTags2Temptag(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Temptag(array $arrMatches) {
         $substitute_tag = sprintf('###TEMP%08d###', $this->smarty_tags_idx);
         $this->arrSmartyTagsOrg[$this->smarty_tags_idx] = $arrMatches[0];
         $this->arrSmartyTagsSub[$this->smarty_tags_idx] = $substitute_tag;
@@ -447,8 +431,7 @@
      * @param array $arrMatches $B%^%C%A$7$?%?%0$N>pJs(B
      * @return string $BBe$o$j$NJ8;zNs(B
      */
-    protected function lfCaptureSmartyTagsInQuote(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTagsInQuote(array $arrMatches) {
         $html = preg_replace_callback(
             '/###TEMP(\d{8})###/s',
             array($this, 'lfCaptureSmartyTags2Value'),
@@ -466,8 +449,7 @@
      * @param array $arrMatches $B%^%C%A$7$?%?%0$N>pJs(B
      * @return string $BBe$o$j$NJ8;zNs(B
      */
-    protected function lfCaptureSmartyTags2Value(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Value(array $arrMatches) {
         $tag_idx = (int)$arrMatches[1];
         $substitute_tag = sprintf('###%08d###', $tag_idx);
         $this->arrSmartyTagsSub[$tag_idx] = $substitute_tag;
@@ -483,8 +465,7 @@
      * @param array $arrMatches $B%^%C%A$7$?%?%0$N>pJs(B
      * @return string $BBe$o$j$NJ8;zNs(B
      */
-    protected function lfCaptureSmartyTags2Attr(array $arrMatches)
-    {
+    protected function lfCaptureSmartyTags2Attr(array $arrMatches) {
         $tag_idx = (int)$arrMatches[1];
         $substitute_tag = sprintf('rel%08d="######"', $tag_idx);
         $this->arrSmartyTagsSub[$tag_idx] = $substitute_tag;
@@ -498,8 +479,7 @@
      * @param  DOMNode $objDOMElement DOMNode$B%*%V%8%'%/%H(B
      * @return void
      */
-    protected function lfScanChild(DOMNode $objDOMElement, $parent_selector = '')
-    {
+    protected function lfScanChild(DOMNode $objDOMElement, $parent_selector = '') {
         $objNodeList = $objDOMElement->childNodes;
         if (is_null($objNodeList)) return;
 
@@ -535,8 +515,7 @@
      * @param string $parent_index  $B%;%l%/%?8!:w;~$N?FMWAG$N0LCV!J;RB9MWAG8!:w$N$?$a!K(B
      * @return string $B ＠ 55,I=8=J8;zNs(B
      */
-    protected function lfSelector2Regex($selector, $parent_index = NULL)
-    {
+    protected function lfSelector2Regex($selector, $parent_index = NULL){
         // jQuery$B%i%$%/$J%;%l%/%?$r ＠ 55,I=8=$K(B
         $selector = preg_replace('/ *> */', ' >', $selector);   // $B;R%;%l%/%?$r%D%j!<8!:wMQ$K(B $B!V(BA >B$B!W$N5-K!$K$9$k(B
         $regex = '/';
@@ -571,8 +550,7 @@
      * @param array   $arrElement $B%$%s%G%C%/%9$H(BDOM$B%*%V%8%'%/%H$r%Z%"$H$7$?G[Ns(B
      * @return void
      */
-    protected function lfAddElement($elementNo, array &$arrElement)
-    {
+    protected function lfAddElement($elementNo, array &$arrElement) {
         if (is_array($this->arrSelectElements[$this->search_depth]) && array_key_exists($arrElement[0], $this->arrSelectElements[$this->search_depth])) {
             //nop
         } else {
@@ -590,8 +568,7 @@
      * @param string $html_snip  HTML$B%3!<%I(B
      * @return boolean
      */
-    protected function lfSetTransform($mode, $target_key, $html_snip)
-    {
+    protected function lfSetTransform($mode, $target_key, $html_snip) {
 
         $substitute_tag = sprintf('<!--###%08d###-->', $this->smarty_tags_idx);
         $this->arrSmartyTagsOrg[$this->smarty_tags_idx] = $html_snip;
@@ -657,8 +634,7 @@
      * @param string  $err_msg     $B%(%i!<%a%C%;!<%8(B
      * @return void
      */
-    protected function lfSetError($selector, $type, $err_msg = NULL)
-    {
+    protected function lfSetError($selector, $type, $err_msg = NULL) {
         $this->arrErr[] = array(
             'selector'    => $selector,
             'type'        => $type,

$BJQ99(B: branches/version-2_12-dev/data/class/pages/LC_Page.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/LC_Page.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page 
-{
+class LC_Page {
 
     // {{{ properties
 
@@ -84,8 +83,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         // $B3+;O;~9o$r ＠ _Dj$9$k!#(B
         $this->timeStart = microtime(true);
 
@@ -118,16 +116,14 @@
      *
      * @return void
      */
-    function process()
-    {}
+    function process() {}
 
     /**
      * Page $B$N%l%9%]%s%9Aw?.(B.
      *
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         // $B%m!<%+%k%U%C%/%]%$%s%H$r<B9T(B.
         $this->doLocalHookpointAfter($objPlugin);
@@ -154,8 +150,7 @@
      *
      * @return void
      */
-    function sendResponseCSV($file_name, $data)
-    {
+    function sendResponseCSV($file_name, $data) {
         $this->objDisplay->prepare($this);
         $this->objDisplay->addHeader('Content-disposition', "attachment; filename=${file_name}");
         $this->objDisplay->addHeader('Content-type', "application/octet-stream; name=${file_name}");
@@ -172,8 +167,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         // $B0lDj;~4V0J>e$+$+$C$?%Z!<%8$N>l9g!"%m%0=PNO$9$k!#(B
         // $B%(%i!<2hLL$NI=<($G$O(B $this->timeStart $B$,=PNO$5$l$J$$(B
         if (defined('PAGE_DISPLAY_TIME_LOG_MODE') && PAGE_DISPLAY_TIME_LOG_MODE == true && isset($this->timeStart)) {
@@ -192,8 +186,7 @@
      * @param SC_Helper_Plugin_Ex $objPlugin 
      * @return void
      */
-    function doLocalHookpointBefore(SC_Helper_Plugin_Ex $objPlugin)
-    {
+    function doLocalHookpointBefore(SC_Helper_Plugin_Ex $objPlugin) {
         // $B%m!<%+%k%U%C%/%]%$%s%H$r<B9T(B
         $parent_class_name = get_parent_class($this);
         if ($parent_class_name != 'LC_Page') {
@@ -211,8 +204,7 @@
      * @param SC_Helper_Plugin_Ex $objPlugin 
      * @return void
      */
-    function doLocalHookpointAfter(SC_Helper_Plugin_Ex $objPlugin)
-    {
+    function doLocalHookpointAfter(SC_Helper_Plugin_Ex $objPlugin) {
         // $B%m!<%+%k%U%C%/%]%$%s%H$r<B9T(B
         $parent_class_name = get_parent_class($this);
         if ($parent_class_name != 'LC_Page') {
@@ -228,8 +220,7 @@
      * $B%F%s%W%l!<%H<hF@(B
      *
      */
-    function getTemplate()
-    {
+    function getTemplate() {
         return $this->template;
     }
 
@@ -237,8 +228,7 @@
      * $B%F%s%W%l!<%H ＠ _Dj(B($B%]%C%W%"%C%W$J$I$N>l9g(B)
      *
      */
-    function setTemplate($template)
-    {
+    function setTemplate($template) {
         $this->template = $template;
     }
 
@@ -262,8 +252,7 @@
      * @return string $path $B$NB8:_$9$k(B http(s):// $B$+$i;O$^$k ＠ dBP%Q%9(B
      * @see Net_URL
      */
-    function getLocation($path, $param = array(), $useSSL = 'escape')
-    {
+    function getLocation($path, $param = array(), $useSSL = 'escape') {
         $rootPath = $this->getRootPath($path);
 
         // $B%9%-!<%^$rDj5A(B
@@ -296,8 +285,7 @@
      * @param string $path $B7k2L$r<hF@$9$k$?$a$N%Q%9(B
      * @return string EC-CUBE $B$N(BWEB$B%k!<%H(B(/html/)$B$r(B / $B$H$7$?%Q%9(B
      */
-    function getRootPath($path)
-    {
+    function getRootPath($path) {
         // Windows$B$N>l9g$O(B, $B%G%#%l%/%H%j$N6h ＠ Z$jJ8;z$r(B\$B$+$i(B/$B$KJQ49$9$k(B
         $path = str_replace('\\', '/', $path);
         $htmlPath = str_replace('\\', '/', HTML_REALDIR);
@@ -335,8 +323,7 @@
      * @return void
      * @deprecated $B7h:Q%b%8%e!<%k8_49$N$?$a(B
      */
-    function allowClientCache()
-    {
+    function allowClientCache() {
         $this->httpCacheControl('private');
     }
 
@@ -347,8 +334,7 @@
      * @param string $mode (nocache/private)
      * @return void
      */
-    function httpCacheControl($mode = '')
-    {
+    function httpCacheControl($mode = '') {
         switch ($mode) {
             case 'nocache':
                 header('Pragma: no-cache');
@@ -383,8 +369,7 @@
      * @access protected
      * @return string $_GET['mode'] $BKt$O(B $_POST['mode'] $B$NJ8;zNs(B
      */
-    function getMode()
-    {
+    function getMode() {
         $pattern = '/^[a-zA-Z0-9_]+$/';
         $mode = null;
         if (isset($_GET['mode']) && preg_match($pattern, $_GET['mode'])) {
@@ -410,8 +395,7 @@
      * @param boolean $is_admin $B4IM}2hLL$G%(%i!<I=<($r$9$k>l9g(B true
      * @return void
      */
-    function doValidToken($is_admin = false)
-    {
+    function doValidToken($is_admin = false) {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if (!SC_Helper_Session_Ex::isValidToken(false)) {
                 if ($is_admin) {
@@ -430,8 +414,7 @@
      * @access protected
      * @return void
      */
-    function setTokenTo()
-    {
+    function setTokenTo() {
         $this->transactionid = SC_Helper_Session_Ex::getToken();
     }
 
@@ -440,8 +423,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog $B$r;HMQ$9$k$3$H(B
      */
-    function log($mess, $log_level)
-    {
+    function log($mess, $log_level) {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         // $B%m%0%l%Y%k(B=Debug$B$N>l9g$O!"(BDEBUG_MODE$B$,(Btrue$B$N>l9g$N$_%m%0=PNO$9$k(B
         if ($log_level === 'Debug' && DEBUG_MODE === false) {
@@ -461,8 +443,7 @@
      * @param mixed $val $B%G%P%C%/$9$kMWAG(B
      * @return void
      */
-    function p($val)
-    {
+    function p($val) {
         SC_Utils_Ex::sfPrintR($val);
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/LC_Page_Index.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page_Index.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_Index.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Index extends LC_Page_Ex 
-{
+class LC_Page_Index extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $this->tpl_title = '';
         $objCustomer = new SC_Customer_Ex();
         $this->isLogin = $objCustomer->isLoginSuccess(true);
@@ -76,8 +72,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_InputZip extends LC_Page_Ex 
-{
+class LC_Page_InputZip extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_message = '$B=;=j$r8!:w$7$F$$$^$9!#(B';
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $objView = new SC_SiteView_Ex(false);
 
         // $BF~NO%(%i!<%A%'%C%/(B
@@ -92,8 +89,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -103,8 +99,7 @@
      * @param array $arrRequest $B%j%/%(%9%HCM(B($_GET)
      * @return array $arrErr $B%(%i!<%a%C%;!<%8G[Ns(B
      */
-    function fnErrorCheck($arrRequest)
-    {
+    function fnErrorCheck($arrRequest) {
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
         // $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
@@ -131,8 +126,7 @@
      * @param string $value
      * @return $B%(%i!<$J$7!'(Btrue $B%(%i!<!'(Bfalse
      */
-    function lfInputNameCheck($value)
-    {
+    function lfInputNameCheck($value) {
         // $BH>3Q1Q?t;z$H(B_$B!J%"%s%@!<%P!<!K(B, []$B0J30$NJ8;z$r;HMQ$7$F$$$?$i%(%i!<(B
         if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
             return false;

$BJQ99(B: branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_ResizeImage extends LC_Page_Ex 
-{
+class LC_Page_ResizeImage extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
         $objFormParam->setParam($_GET);
@@ -93,13 +89,11 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B2hA|%U%!%$%kL>(B', 'image', STEXT_LEN, 'a',  array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B2hA|$NI}(B', 'width', STEXT_LEN, 'n',  array('NUM_CHECK'));
         $objFormParam->addParam('$B2hA|$N9b$5(B', 'height', STEXT_LEN, 'n',  array('NUM_CHECK'));
@@ -110,8 +104,7 @@
      *
      * @return boolean $B ＠ 5>o$J7A<0(B:true $BIT ＠ 5$J7A<0(B:false
      */
-    function lfCheckFileName()
-    {
+    function lfCheckFileName() {
         //$pattern = '|^[0-9]+_[0-9a-z]+\.[a-z]{3}$|';
         $pattern = '|\./|';
         $file    = trim($_GET['image']);
@@ -131,8 +124,7 @@
      * 
      * @return void
      */
-    function lfOutputImage($file, $width, $height)
-    {
+    function lfOutputImage($file, $width, $height) {
         $objThumb = new gdthumb();
         $objThumb->Main($file, $width, $height, '', true);
     }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -50,8 +50,7 @@
  * :TODO: $B3F%Z!<%8$N(B changefreq $B$d(B priority $B$r;XDj$G$-$k$h$&$K$9$k(B
  * :TODO: filemtime $B4X?t$r;H$($P!"@EE*$J%Z!<%8$N99?7;~4V$b<hF@$G$-$=$&(B
  */
-class LC_Page_Sitemap extends LC_Page_Ex 
-{
+class LC_Page_Sitemap extends LC_Page_Ex {
 
     // }}}
     // {{{ properties
@@ -70,8 +69,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->staticURL = array();
@@ -84,8 +82,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         // $B%Z!<%8$N%G!<%?$r<hF@(B
         // FIXME PC$B%5%$%H$N$_$K8BDj$7$F$$$k!#$"$kDxEYBEEv$@$H$O;W$&$,!"$h$j%Y%?!<$JJ}K!$O$J$$$@$m$&$+!#(B
         $this->arrPageList = $this->getPageData('device_type_id = ?', DEVICE_TYPE_PC);
@@ -142,8 +139,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -158,8 +154,7 @@
      * @see https://www.google.com/webmasters/tools/docs/ja/protocol.html#xmlTagDefinitions
      * TODO Smarty $B$K0\9T$9$Y$-(B?
      */
-    function createSitemap($loc, $lastmod = '', $changefreq = '', $priority = '')
-    {
+    function createSitemap($loc, $lastmod = '', $changefreq = '', $priority = '') {
         printf("\t<url>\n");
         printf("\t\t<loc>%s</loc>\n", htmlentities($loc, ENT_QUOTES, 'UTF-8'));
         if (!empty($lastmod)) {
@@ -180,8 +175,7 @@
      * @param array $arrPageList $B$9$Y$F$N%Z!<%8>pJs$NG[Ns(B
      * @return array TOP$B%Z!<%8$N>pJs(B
      */
-    function getTopPage($arrPageList)
-    {
+    function getTopPage($arrPageList) {
         $arrRet = array();
         foreach ($arrPageList as $arrPage) {
             if ($arrPage['page_id'] == '1') {
@@ -197,8 +191,7 @@
      * @param array $arrPageList $B$9$Y$F$N%Z!<%8>pJs$NG[Ns(B
      * @return array $BJT=82DG=%Z!<%8(B
      */
-    function getEditablePage($arrPageList)
-    {
+    function getEditablePage($arrPageList) {
         $arrRet = array();
         foreach ($arrPageList as $arrPage) {
             if ($arrPage['page_id'] > 4) {
@@ -213,8 +206,7 @@
      *
      * @return array $B8!:w%(%s%8%s$+$i%"%/%;%92DG=$J>&IJ0lMw%Z!<%8$N>pJs(B
      */
-    function getAllProducts()
-    {
+    function getAllProducts() {
 
         // XXX: $B>&IJEPO?$NL5$$%+%F%4%j$O=|30$9$kJ}$,NI$$5$$b$9$k(B
         $objQuery = SC_Query_Ex::getSingletonInstance();
@@ -236,8 +228,7 @@
      *
      * @return array $B8!:w%(%s%8%s$+$i%"%/%;%92DG=$J>&IJ>\:Y%Z!<%8$N>pJs(B
      */
-    function getAllDetail()
-    {
+    function getAllDetail() {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         $sql = 'SELECT product_id, update_date FROM dtb_products WHERE del_flg = 0 AND status = 1';
         $result = $objQuery->getAll($sql);
@@ -260,8 +251,7 @@
      * @param array  $arrVal WHERE$B6g$NCM$r3JG<$7$?G[Ns(B
      * @return array $arrPageList $B%V%m%C%/>pJs(B
      */
-    function getPageData($where = '', $arrVal = '')
-    {
+    function getPageData($where = '', $arrVal = '') {
         $objQuery = SC_Query_Ex::getSingletonInstance();     // DB$BA`:n%*%V%8%'%/%H(B
         $sql = '';                      // $B%G!<%?<hF@(BSQL$B ＠ 8@.MQ(B
         $arrRet = array();              // $B%G!<%?<hF ＠ MQ(B
@@ -311,8 +301,7 @@
      * @param date $date $BJQ49$9$kF|IU(B
      * @return void
      */
-    function date2W3CDatetime($date)
-    {
+    function date2W3CDatetime($date) {
         $arr = array();
         // $B ＠ 55,I=8=$GJ8;zNs$rCj=P(B
         preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $date, $arr);

$BJQ99(B: branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Abouts.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Abouts extends LC_Page_Ex 
-{
+class LC_Page_Abouts extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_page_category = 'abouts';
         $this->tpl_title = '$BEv%5%$%H$K$D$$$F(B';
@@ -56,8 +54,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->objSiteInfo->data = SC_Helper_DB_Ex::sfGetBasisData();
         $this->objSiteInfo->data['pref'] =
@@ -84,8 +80,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin extends LC_Page_Ex 
-{
+class LC_Page_Admin extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->template = MAIN_FRAME;
 
         //IP$B@)8B%A%'%C%/(B
@@ -88,8 +86,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
     }
 
     /**
@@ -97,8 +94,7 @@
      *
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         // $B%m!<%+%k%U%C%/%]%$%s%H$r<B9T(B
         $parent_class_name = get_parent_class($this);
@@ -123,8 +119,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -133,8 +128,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog $B$r;HMQ$9$k$3$H(B
      */
-    function log($mess, $log_level='Info')
-    {
+    function log($mess, $log_level='Info') {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         // $B%m%0%l%Y%k(B=Debug$B$N>l9g$O!"(BDEBUG_MODE$B$,(Btrue$B$N>l9g$N$_%m%0=PNO$9$k(B
         if ($log_level === 'Debug' && DEBUG_MODE === false) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Home extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Home extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'home.tpl';
         $this->tpl_subtitle = '$B%[!<%`(B';
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // DB$B%P!<%8%g%s$N<hF@(B
         $this->db_version = $this->lfGetDBVersion();
@@ -115,8 +111,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -125,8 +120,7 @@
      *
      * @return string PHP$B%P!<%8%g%s>pJs(B
      */
-    function lfGetPHPVersion()
-    {
+    function lfGetPHPVersion() {
         return 'PHP ' . phpversion();
     }
 
@@ -135,8 +129,7 @@
      *
      * @return mixed DB$B%P!<%8%g%s>pJs(B
      */
-    function lfGetDBVersion()
-    {
+    function lfGetDBVersion() {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         return $dbFactory->sfGetDBVersion();
     }
@@ -146,8 +139,7 @@
      *
      * @return integer $B2q0w?t(B
      */
-    function lfGetCustomerCnt()
-    {
+    function lfGetCustomerCnt() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'COUNT(customer_id)';
         $table = 'dtb_customer';
@@ -161,8 +153,7 @@
      * @param string $method $B<hF@%?%$%W(B $B7o?t(B:'COUNT' or $B6b3[(B:'SUM'
      * @return integer $B7k2L?tCM(B
      */
-    function lfGetOrderYesterday($method)
-    {
+    function lfGetOrderYesterday($method) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // TODO: DBFactory$B;H$o$J$$$G$b6&DL2=$G$-$=$&$J5$$b$7$^$9$,(B
@@ -177,8 +168,7 @@
      * @param string $method $B<hF@%?%$%W(B $B7o?t(B:'COUNT' or $B6b3[(B:'SUM'
      * @return integer $B7k2L?tCM(B
      */
-    function lfGetOrderMonth($method)
-    {
+    function lfGetOrderMonth($method) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $month = date('Y/m', mktime());
 
@@ -193,8 +183,7 @@
      *
      * @return integer $B2q0w$NJ];}%]%$%s%H9g7W(B
      */
-    function lfGetTotalCustomerPoint()
-    {
+    function lfGetTotalCustomerPoint() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $col = 'SUM(point)';
@@ -208,8 +197,7 @@
      *
      * @return integer $B:rF|$N%l%S%e!<=q$-9~$_?t(B
      */
-    function lfGetReviewYesterday()
-    {
+    function lfGetReviewYesterday() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // TODO: DBFactory$B;H$o$J$$$G$b6&DL2=$G$-$=$&$J5$$b$7$^$9$,(B
@@ -223,8 +211,7 @@
      *
      * @return integer $B%l%S%e!<=q$-9~$_HsI=<(?t(B
      */
-    function lfGetReviewNonDisp()
-    {
+    function lfGetReviewNonDisp() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $table = 'dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id';
@@ -237,15 +224,14 @@
      *
      * @return array $BIJ ＠ Z$l>&IJ0lMw(B
      */
-    function lfGetSoldOut()
-    {
+    function lfGetSoldOut() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $cols = 'product_id, name';
         $table = 'dtb_products';
         $where = 'product_id IN ('
                . 'SELECT product_id FROM dtb_products_class '
-               . 'WHERE del_flg = 0 AND stock_unlimited = ? AND stock <= 0)'
+               . 'WHERE stock_unlimited = ? AND stock <= 0)'
                . ' AND del_flg = 0';
         return $objQuery->select($cols, $table, $where, array(UNLIMITED_FLG_LIMITED));
     }
@@ -255,8 +241,7 @@
      *
      * @return array $B?75,<uIU0lMwG[Ns(B
      */
-    function lfGetNewOrder()
-    {
+    function lfGetNewOrder() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $sql = <<< __EOS__
@@ -313,8 +298,7 @@
      *
      * @return array $B<hF@$7$?>pJsG[Ns(B
      */
-    function lfGetInfo()
-    {
+    function lfGetInfo() {
         // $B99?7>pJs$N<hF@(BON/OFF$B3NG'(B
         if (!ECCUBE_INFO) return array();
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Index extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Index extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'login.tpl';
         $this->httpCacheControl('nocache');
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -114,8 +109,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('ID', 'login_id', ID_MAX_LEN, '', array('EXIST_CHECK', 'ALNUM_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('PASSWORD', 'password', ID_MAX_LEN, '', array('EXIST_CHECK', 'ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
     }
@@ -128,8 +122,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $arrErr $B%(%i!<G[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $B=q<0%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
         if (SC_Utils_Ex::isBlank($arrErr)) {
@@ -150,8 +143,7 @@
      * @param string $pass $B%m%0%$%s%Q%9%o!<%IJ8;zNs(B
      * @return boolean $B%m%0%$%s>pJs$,M-8z$J>l9g(B true
      */
-    function lfIsLoginMember($login_id, $pass)
-    {
+    function lfIsLoginMember($login_id, $pass) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //$B%Q%9%o!<%I!"(Bsalt$B$N<hF@(B
         $cols = 'password, salt';
@@ -174,8 +166,7 @@
      * @param string $login_id $B%m%0%$%s(BID$BJ8;zNs(B
      * @return void
      */
-    function lfDoLogin($login_id)
-    {
+    function lfDoLogin($login_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //$B%a%s%P!<>pJs<hF@(B
         $cols = 'member_id, authority, login_date, name';
@@ -198,8 +189,7 @@
      * @param string $last_login $B:G=*%m%0%$%sF|;~(B(YYYY/MM/DD HH:ii:ss$B7A<0(B) $B$^$?$O(BNULL
      * @return string $sid $B ＠ _Dj$7$?%;%C%7%g%s$N%;%C%7%g%s(BID
      */
-    function lfSetLoginSession($member_id, $login_id, $authority, $login_name, $last_login)
-    {
+    function lfSetLoginSession($member_id, $login_id, $authority, $login_name, $last_login) {
         $objSess = new SC_Session_Ex();
         // $BG'>Z:Q$_$N ＠ _Dj(B
         $objSess->SetSession('cert', CERT_STRING);
@@ -226,8 +216,7 @@
      * @param string $last_login $B:G=*%m%0%$%sF|;~(B(YYYY/MM/DD HH:ii:ss$B7A<0(B) $B$^$?$O(BNULL
      * @return void
      */
-    function lfSetLoginData($sid, $member_id, $login_id, $authority, $last_login)
-    {
+    function lfSetLoginData($sid, $member_id, $login_id, $authority, $last_login) {
         // $B%m%0%$%s5-O?%m%0=PNO(B
         $str_log = "login: user=$login_id($member_id) auth=$authority "
                     . "lastlogin=$last_login sid=$sid";
@@ -250,8 +239,7 @@
      * @param string $login_id $B%m%0%$%s<:GT;~$KEjF~$5$l$?(Blogin_id$BJ8;zNs(B
      * @return void
      */
-    function lfSetIncorrectData($error_login_id)
-    {
+    function lfSetIncorrectData($error_login_id) {
         GC_Utils_Ex::gfPrintLog($error_login_id . ' password incorrect.');
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Logout extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Logout extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
     }
 
@@ -62,8 +59,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->lfDoLogout();
 
@@ -76,8 +72,7 @@
      *
      * @return void
      */
-    function lfDoLogout()
-    {
+    function lfDoLogout() {
         $objSess = new SC_Session_Ex();
         $objSess->logout();
     }
@@ -87,8 +82,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/index.tpl';
         $this->tpl_subno = 'index';
@@ -69,8 +67,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -80,38 +77,59 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
+
         $objDb = new SC_Helper_DB_Ex();
-        $objFormParam = new SC_FormParam_Ex();
 
+        if ($objDb->sfGetBasisExists()) {
+            $this->tpl_mode = 'update';
+        } else {
+            $this->tpl_mode = 'insert';
+        }
 
-        $this->lfInitParam($objFormParam, $_POST);
-        $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "');";
+        if (!empty($_POST)) {
 
-        if ($this->getMode() === 'confirm') {
+            $objFormParam = new SC_FormParam_Ex();
+            $this->lfInitParam($objFormParam, $_POST);
             $objFormParam->setParam($_POST);
             $objFormParam->convParam();
 
             $this->arrErr = $this->lfCheckError($objFormParam);
+            $post = $objFormParam->getHashArray();
 
-            if (!empty($this->arrErr)) {
-                $this->arrForm = $objFormParam->getHashArray();
-                return;
+            $this->arrForm = $post;
+
+            if (count($this->arrErr) == 0) {
+                switch ($this->getMode()) {
+                    // $B4{B8JT=8(B
+                    case 'update':
+                        $this->lfUpdateData($this->arrForm);
+                        break;
+                    // $B?75,:n ＠ .(B
+                    case 'insert':
+                        $this->lfInsertData($this->arrForm);
+                        break;
+                    default:
+                        break;
+                }
+                $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "'); window.alert('SHOP$B%^%9%?!<$NEPO?$,40N;$7$^$7$?!#(B');";
             }
+            if (empty($this->arrForm['regular_holiday_ids'])) {
+                $this->arrSel = array();
+            } else {
+                $this->arrSel = $this->arrForm['regular_holiday_ids'];
+            }
+        } else {
+            $arrCol = $this->lfGetCol();
+            $col    = SC_Utils_Ex::sfGetCommaList($arrCol);
+            $arrRet = $objDb->sfGetBasisData(true, $col);
+            $this->arrForm = $arrRet;
 
-            $arrData = $objFormParam->getDbArray();
-            SC_Helper_DB_Ex::registerBasisData($arrData);
-
-            // $B%-%c%C%7%e%U%!%$%k99?7(B
-            $objDb->sfCreateBasisDataCache();
-            $this->tpl_onload .= "window.alert('SHOP$B%^%9%?!<$NEPO?$,40N;$7$^$7$?!#(B');";
+            $regular_holiday_ids = explode('|', $this->arrForm['regular_holiday_ids']);
+            $this->arrForm['regular_holiday_ids'] = $regular_holiday_ids;
+            $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "');";
         }
 
-        $arrRet = $objDb->sfGetBasisData(true);
-        $objFormParam->setParam($arrRet);
-        $this->arrForm = $objFormParam->getHashArray();
-        $this->arrForm['regular_holiday_ids'] = explode('|', $this->arrForm['regular_holiday_ids']);
     }
 
     /**
@@ -119,35 +137,81 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    /**
-     * $BA0J}8_49MQ(B
-     *
-     * @deprecated 2.12.4
-     */
-    function lfUpdateData($arrData)
-    {
-        trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
-        SC_Helper_DB_Ex::registerBasisData($arrData);
+    // $B4pK\>pJsMQ$N%+%i%`$r<h$j=P$9!#(B
+    function lfGetCol() {
+        $arrCol = array(
+            'company_name',
+            'company_kana',
+            'shop_name',
+            'shop_kana',
+            'shop_name_eng',
+            'zip01',
+            'zip02',
+            'pref',
+            'addr01',
+            'addr02',
+            'tel01',
+            'tel02',
+            'tel03',
+            'fax01',
+            'fax02',
+            'fax03',
+            'business_hour',
+            'email01',
+            'email02',
+            'email03',
+            'email04',
+            'tax',
+            'tax_rule',
+            'free_rule',
+            'good_traded',
+            'message',
+            'regular_holiday_ids',
+            'latitude',
+            'longitude',
+            'downloadable_days',
+            'downloadable_days_unlimited'
+        );
+        return $arrCol;
     }
 
-    /**
-     * $BA0J}8_49MQ(B
-     *
-     * @deprecated 2.12.4
-     */
-    function lfInsertData($arrData)
-    {
-        trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
-        SC_Helper_DB_Ex::registerBasisData($arrData);
+    function lfUpdateData($array) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $arrCol = $this->lfGetCol();
+        foreach ($arrCol as $val) {
+            //$BG[Ns$N>l9g$O!"%Q%$%W6h ＠ Z$j$NJ8;zNs$KJQ49(B
+            if (is_array($array[$val])) {
+                $sqlval[$val] = implode('|', $array[$val]);
+            } else {
+                $sqlval[$val] = $array[$val];
+            }
+        }
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        // UPDATE$B$N<B9T(B
+        $ret = $objQuery->update('dtb_baseinfo', $sqlval);
+
+        GC_Utils_Ex::gfPrintLog('dtb_baseinfo $B$K(B UPDATE $B$r<B9T$7$^$7$?!#(B');
     }
 
-    function lfInitParam(&$objFormParam, $post)
-    {
+    function lfInsertData($array) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $arrCol = $this->lfGetCol();
+        foreach ($arrCol as $val) {
+            $sqlval[$val] = $array[$val];
+        }
+        $sqlval['id'] = 1;
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        // INSERT$B$N<B9T(B
+        $ret = $objQuery->insert('dtb_baseinfo', $sqlval);
+
+        GC_Utils_Ex::gfPrintLog('dtb_baseinfo $B$K(B INSERT $B$r<B9T$7$^$7$?!#(B');
+    }
+
+    function lfInitParam(&$objFormParam, $post) {
         $objFormParam->addParam('$B2q<RL>(B', 'company_name', STEXT_LEN, 'KVa',  array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B2q<RL>(B($B%U%j%,%J(B)', 'company_kana', STEXT_LEN, 'KVC',  array('KANA_CHECK','MAX_LENGTH_CHECK'));
 
@@ -191,15 +255,14 @@
         } else {
             $objFormParam->addParam('$B%@%&%s%m!<%IL5@)8B(B', 'downloadable_days_unlimited', array('EXIST_CHECK'));
         }
-        $objFormParam->addParam('$B0^EY(B', 'latitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
-        $objFormParam->addParam('$B7ZEY(B', 'longitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK', 'NUM_POINT_CHECK'));
+        $objFormParam->addParam('$B0^EY(B', 'latitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B7ZEY(B', 'longitude', STEXT_LEN, '',  array('MAX_LENGTH_CHECK'));
 
         $objFormParam->addParam('$BDj5YF|(B', 'regular_holiday_ids', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));
     }
 
     // $BF~NO%(%i!<%A%'%C%/(B
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $arrErr = $objFormParam->checkError();
         $post = $objFormParam->getHashArray();
 
@@ -210,6 +273,9 @@
         $objErr->doFunc(array('TEL', 'tel01', 'tel02', 'tel03'), array('TEL_CHECK'));
         $objErr->doFunc(array('FAX', 'fax01', 'fax02', 'fax03'), array('TEL_CHECK'));
 
+        $objErr->doFunc(array('$B0^EY(B', 'latitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK'));
+        $objErr->doFunc(array('$B7PEY(B', 'longitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK'));
+
         return array_merge((array)$arrErr, (array)$objErr->arrErr);
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Delivery extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Delivery extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/delivery.tpl';
         $this->tpl_subno = 'delivery';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,10 +68,9 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
-        $objDeliv = new SC_Helper_Delivery_Ex();
+        $objDb = new SC_Helper_DB_Ex();
         $mode = $this->getMode();
 
         if (!empty($_POST)) {
@@ -91,35 +87,50 @@
         switch ($mode) {
             case 'delete':
                 // $B%i%s%/IU$-%l%3!<%I$N:o=|(B
-                $objDeliv->delete($_POST['deliv_id']);
+                $objDb->sfDeleteRankRecord('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
 
                 $this->objDisplay->reload(); // PRG pattern
                 break;
             case 'up':
-                $objDeliv->rankUp($_POST['deliv_id']);
+                $objDb->sfRankUp('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
 
                 $this->objDisplay->reload(); // PRG pattern
                 break;
             case 'down':
-                $objDeliv->rankDown($_POST['deliv_id']);
+                $objDb->sfRankDown('dtb_deliv', 'deliv_id', $_POST['deliv_id']);
 
                 $this->objDisplay->reload(); // PRG pattern
                 break;
             default:
                 break;
         }
-        $this->arrDelivList = $objDeliv->getList();
+        $this->arrDelivList = $this->lfGetDelivList();
 
     }
 
     /**
+     * $BG[Aw6H<T0lMw$N<hF@(B
+     *
+     * @return array
+     */
+    function lfGetDelivList() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $col = 'deliv_id, name, service_name';
+        $where = 'del_flg = 0';
+        $table = 'dtb_deliv';
+        $objQuery->setOrder('rank DESC');
+
+        return $objQuery->select($col, $table, $where);
+    }
+
+    /**
      * $BF~NO%(%i!<%A%'%C%/(B
      *
      * @param string $mode
      * @return array
      */
-    function lfCheckError($mode, &$objFormParam)
-    {
+    function lfCheckError($mode, &$objFormParam) {
         $arrErr = array();
         switch ($mode) {
             case 'delete':
@@ -142,8 +153,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_DeliveryInput extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_DeliveryInput extends LC_Page_Admin_Ex {
     // }}}
     // {{{ functions
 
@@ -41,8 +40,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/delivery_input.tpl';
         $this->tpl_subno = 'delivery';
@@ -50,7 +48,7 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrProductType = $masterData->getMasterData('mtb_product_type');
-        $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         $this->tpl_maintitle = '$B4pK\>pJs4IM}(B';
         $this->tpl_subtitle = '$BG[AwJ}K!@_Dj(B';
         $this->mode = $this->getMode();
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -72,9 +69,8 @@
      *
      * @return void
      */
-    function action()
-    {
-        $objFormParam = new SC_FormParam_Ex();
+    function action() {
+
         $this->lfInitParam($this->mode, $objFormParam);
         $objFormParam->setParam($_POST);
 
@@ -108,14 +104,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B%Q%i%a!<%?!<>pJs$N=i4|2=(B */
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfInitParam($mode, &$objFormParam) {
         $objFormParam = new SC_FormParam_Ex();
 
         switch ($mode) {
@@ -153,91 +147,159 @@
      *
      * @return $deliv_id
      */
-    function lfRegistData($arrRet, $member_id)
-    {
-        $objDelivery = new SC_Helper_Delivery_Ex();
+    function lfRegistData($arrRet, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->begin();
 
         // $BF~NO%G!<%?$rEO$9!#(B
-        $sqlval['deliv_id'] = $arrRet['deliv_id'];
         $sqlval['name'] = $arrRet['name'];
         $sqlval['service_name'] = $arrRet['service_name'];
         $sqlval['remark'] = $arrRet['remark'];
         $sqlval['confirm_url'] = $arrRet['confirm_url'];
         $sqlval['product_type_id'] = $arrRet['product_type_id'];
         $sqlval['creator_id'] = $member_id;
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
 
-        // $B$*FO$1;~4V(B
-        $sqlval['deliv_time'] = array();
-        for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
-            $keyname = "deliv_time$cnt";
-            if ($arrRet[$keyname] != '') {
-                $sqlval['deliv_time'][$cnt] = $arrRet[$keyname];
+        // deliv_id $B$,7h$^$C$F$$$?>l9g(B
+        if ($arrRet['deliv_id'] != '') {
+            $deliv_id = $arrRet['deliv_id'];
+            $where = 'deliv_id = ?';
+            $objQuery->update('dtb_deliv', $sqlval, $where, array($deliv_id));
+
+            // $B$*FO$1;~4V$NEPO?(B
+            $table = 'dtb_delivtime';
+            $where = 'deliv_id = ? AND time_id = ?';
+            for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
+                $sqlval = array();
+                $keyname = 'deliv_time'.$cnt;
+                $arrWhereVal = array($deliv_id, $cnt);
+                // $B4{B8%G!<%?$NM-L5$r3NG'(B
+                $curData = $objQuery->select('*', $table, $where, $arrWhereVal);
+
+                if (strcmp($arrRet[$keyname], '') != 0) {
+                    $sqlval['deliv_time'] = $arrRet[$keyname];
+
+                    // $BF~NO$,6u$G$O$J$/!"(BDB$B$K>pJs$,$"$l$P99?7(B
+                    if (count($curData)) {
+                        $objQuery->update($table, $sqlval, $where, $arrWhereVal);
+                    }
+                    // DB$B$K>pJs$,$J$1$l$PEPO?(B
+                    else {
+                        $sqlval['deliv_id'] = $deliv_id;
+                        $sqlval['time_id'] = $cnt;
+                        $objQuery->insert($table, $sqlval);
+                    }
+                }
+                // $BF~NO$,6u$G!"(BDB$B$K>pJs$,$"$k>l9g$O:o=|(B
+                else if (count($curData)) {
+                    $objQuery->delete($table, $where, $arrWhereVal);
+                }
             }
-        }
 
-        // $BG[AwNA(B
-        if (INPUT_DELIV_FEE) {
-            $sqlval['deliv_fee'] = array();
-            // $BG[AwNA6b$N ＠ _Dj(B
-            for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
-                $keyname = "fee$cnt";
+            // $BG[AwNA$NEPO?(B
+            if (INPUT_DELIV_FEE) {
+                for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
+                    $keyname = 'fee'.$cnt;
+                    if (strcmp($arrRet[$keyname], '') != 0) {
+                        $sqlval = array('fee' => $arrRet[$keyname]);
+                        $objQuery->update('dtb_delivfee', $sqlval, 'deliv_id = ? AND fee_id = ?', array($deliv_id, $cnt));
+                    }
+                }
+            }
+        } else {
+            // $BEPO?$9$kG[Aw6H<T(BID$B$N<hF@(B
+            $deliv_id = $objQuery->nextVal('dtb_deliv_deliv_id');
+            $sqlval['deliv_id'] = $deliv_id;
+            $sqlval['rank'] = $objQuery->max('rank', 'dtb_deliv') + 1;
+            $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+            // INSERT$B$N<B9T(B
+            $objQuery->insert('dtb_deliv', $sqlval);
+
+            $sqlval = array();
+            // $B$*FO$1;~4V$N ＠ _Dj(B
+            for ($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
+                $keyname = "deliv_time$cnt";
                 if ($arrRet[$keyname] != '') {
-                    $fee = array();
-                    $fee['fee_id'] = $cnt;
-                    $fee['fee'] = $arrRet[$keyname];
-                    $fee['pref'] = $cnt;
-                    $sqlval['deliv_fee'][$cnt] = $fee;
+                    $sqlval['deliv_id'] = $deliv_id;
+                    $sqlval['time_id'] = $cnt;
+                    $sqlval['deliv_time'] = $arrRet[$keyname];
+                    // INSERT$B$N<B9T(B
+                    $objQuery->insert('dtb_delivtime', $sqlval);
                 }
             }
+
+            if (INPUT_DELIV_FEE) {
+                $sqlval = array();
+                // $BG[AwNA6b$N ＠ _Dj(B
+                for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
+                    $keyname = "fee$cnt";
+                    if ($arrRet[$keyname] != '') {
+                        $sqlval['deliv_id'] = $deliv_id;
+                        $sqlval['fee'] = $arrRet[$keyname];
+                        $sqlval['pref'] = $cnt;
+                        // INSERT$B$N<B9T(B
+                        $sqlval['fee_id'] = $cnt;
+                        $objQuery->insert('dtb_delivfee', $sqlval);
+                    }
+                }
+            }
         }
 
-        // $B;YJ'$$J}K!(B
-        $sqlval['payment_ids'] = array();
-        foreach ($arrRet['payment_ids'] as $payment_id) {
-            $sqlval['payment_ids'][] = $payment_id;
+        $objQuery->delete('dtb_payment_options', 'deliv_id = ?', array($arrRet['deliv_id']));
+        $sqlval = array();
+        $i = 1;
+        foreach ($arrRet['payment_ids'] as $val) {
+            $sqlval['deliv_id'] = $deliv_id;
+            $sqlval['payment_id'] = $val;
+            $sqlval['rank'] = $i;
+            $objQuery->insert('dtb_payment_options', $sqlval);
+            $i++;
         }
-
-        $deliv_id = $objDelivery->save($sqlval);
-
+        $objQuery->commit();
         return $deliv_id;
     }
 
     /* $BG[Aw6H<T>pJs$N<hF@(B */
-    function lfGetDelivData(&$objFormParam)
-    {
-        $objDelivery = new SC_Helper_Delivery_Ex();
+    function lfGetDelivData(&$objFormParam) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $deliv_id = $objFormParam->getValue('deliv_id');
 
         // $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
         $this->lfInitParam('edit', $objFormParam);
 
-        $arrDeliv = $objDelivery->get($deliv_id);
-
-        // $B$*FO$1;~4V(B
-        $deliv_times = array();
-        foreach ($arrDeliv['deliv_time'] as $value) {
-            $deliv_times[]['deliv_time'] = $value;
+        // $BG[Aw6H<T0lMw$N<hF@(B
+        $col = 'deliv_id, name, service_name, remark, confirm_url, product_type_id';
+        $where = 'deliv_id = ?';
+        $table = 'dtb_deliv';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $objFormParam->setParam($arrRet[0]);
+        // $B$*FO$1;~4V$N<hF@(B
+        $col = 'deliv_time';
+        $where = 'deliv_id = ?  ORDER BY time_id';
+        $table = 'dtb_delivtime';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $objFormParam->setParamList($arrRet, 'deliv_time');
+        // $BG[AwNA6b$N<hF@(B
+        $col = 'fee';
+        $where = 'deliv_id = ? ORDER BY pref';
+        $table = 'dtb_delivfee';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $objFormParam->setParamList($arrRet, 'fee');
+        // $B;YJ'J}K!(B
+        $col = 'payment_id';
+        $where = 'deliv_id = ? ORDER BY rank';
+        $table = 'dtb_payment_options';
+        $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
+        $arrPaymentIds = array();
+        foreach ($arrRet as $val) {
+            $arrPaymentIds[] = $val['payment_id'];
         }
-        $objFormParam->setParamList($deliv_times, 'deliv_time');
-        unset($arrDeliv['deliv_time']);
-        // $BG[AwNA6b(B
-        $deliv_fee = array();
-        foreach ($arrDeliv['deliv_fee'] as $value) {
-            $deliv_fee[]['fee'] = $value['fee'];
-        }
-        $objFormParam->setParamList($deliv_fee, 'fee');
-        unset($arrDeliv['deliv_fee']);
-        // $B;YJ'J}K!(B
-        $objFormParam->setValue('payment_ids', $arrDeliv['payment_ids']);
-        unset($arrDeliv['payment_ids']);
-        // $BG[Aw6H<T(B
-        $objFormParam->setParam($arrDeliv);
+        $objFormParam->setValue('payment_ids', $arrPaymentIds);
     }
 
     /* $BF~NOFbMF$N%A%'%C%/(B */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrRet =  $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrRet);
@@ -245,8 +307,14 @@
 
         if (!isset($objErr->arrErr['name'])) {
             // $B4{B8%A%'%C%/(B
-            $objDelivery = new SC_Helper_Delivery_Ex();
-            if ($objDelivery->checkExist($arrRet)) {
+            $objDb = new SC_Helper_DB_Ex();
+            if ($arrRet['deliv_id'] == '') {
+                $ret = $objDb->sfIsRecord('dtb_deliv', 'service_name', array($arrRet['service_name']));
+            } else {
+                $objQuery =& SC_Query_Ex::getSingletonInstance();
+                $ret = (($objQuery->count('dtb_deliv', 'deliv_id != ? AND service_name = ? ', array($arrRet['deliv_id'], $arrRet['service_name'])) > 0)? true : false);
+            }
+            if ($ret) {
                 $objErr->arrErr['service_name'] = '$B"((B $BF1$8L>>N$NAH$_9g$o$;$OEPO?$G$-$^$;$s!#(B<br>';
             }
         }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Holiday extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Holiday extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/holiday.tpl';
         $this->tpl_subno = 'holiday';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,10 +65,9 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
-        $objHoliday = new SC_Helper_Holiday_Ex();
+        $objDb = new SC_Helper_DB_Ex();
 
         $objDate = new SC_Date_Ex();
         $this->arrMonth = $objDate->getMonth();
@@ -79,59 +75,74 @@
 
         $mode = $this->getMode();
 
-        $objFormParam = new SC_FormParam_Ex();
-        $this->lfInitParam($mode, $objFormParam);
-        $objFormParam->setParam($_POST);
-        $objFormParam->convParam();
+        if (!empty($_POST)) {
 
-        $holiday_id = $objFormParam->getValue('holiday_id');
+            $objFormParam = new SC_FormParam_Ex();
+            $this->lfInitParam($mode, $objFormParam);
+            $objFormParam->setParam($_POST);
+            $objFormParam->convParam();
+            $holiday_id = $objFormParam->getValue('holiday_id');
 
+            $this->arrErr = $this->lfCheckError($mode, $objFormParam);
+            if (!empty($this->arrErr['holiday_id'])) {
+                trigger_error('', E_USER_ERROR);
+                return;
+            }
+
+            $post = $objFormParam->getHashArray();
+        }
+
         // $BMW5aH=Dj(B
         switch ($mode) {
             // $BJT=8=hM}(B
             case 'edit':
-                $this->arrErr = $this->lfCheckError($objFormParam, $objHoliday);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['holiday_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
-                }
+                // POST$BCM$N0z$-7Q$.(B
+                $this->arrForm = $this->arrForm = $_POST;
 
                 if (count($this->arrErr) <= 0) {
-                    // POST$BCM$N0z$-7Q$.(B
-                    $arrParam = $objFormParam->getHashArray();
-                    // $BEPO?<B9T(B
-                    $res_holiday_id = $this->doRegist($holiday_id, $arrParam, $objHoliday);
-                    if ($res_holiday_id !== FALSE) {
-                        // $B40N;%a%C%;!<%8(B
-                        $holiday_id = $res_holiday_id;
-                        $this->tpl_onload = "alert('$BEPO?$,40N;$7$^$7$?!#(B');";
+                    // $B?75,:n ＠ .(B
+                    if ($post['holiday_id'] == '') {
+                        $this->lfInsertClass($this->arrForm, $_SESSION['member_id']);
                     }
+                    // $B4{B8JT=8(B
+                    else {
+                        $this->lfUpdateClass($this->arrForm, $post['holiday_id']);
+                    }
+
+                    // $B:FI=<((B
+                    $this->objDisplay->reload();
+                } else {
+                    // POST$B%G!<%?$r0z$-7Q$0(B
+                    $this->tpl_holiday_id = $post['holiday_id'];
                 }
-                // POST$B%G!<%?$r0z$-7Q$0(B
-                $this->tpl_holiday_id = $holiday_id;
-
                 break;
             // $B:o=|(B
             case 'delete':
-                $objHoliday->delete($holiday_id);
+                $objDb->sfDeleteRankRecord('dtb_holiday', 'holiday_id', $post['holiday_id'], '', true);
+
+                // $B:FI=<((B
+                $this->objDisplay->reload();
                 break;
             // $BJT=8A0=hM}(B
             case 'pre_edit':
                 // $BJT=89`L\$r<hF@$9$k!#(B
-                $arrHolidayData = $objHoliday->get($holiday_id);
-                $objFormParam->setParam($arrHolidayData);
+                $arrHolidayData = $this->lfGetHolidayDataByHolidayID($post['holiday_id']);
 
+                // $BF~NO9`L\$K%+%F%4%jL>$rF~NO$9$k!#(B
+                $this->arrForm['title'] = $arrHolidayData[0]['title'];
+                $this->arrForm['month'] = $arrHolidayData[0]['month'];
+                $this->arrForm['day'] = $arrHolidayData[0]['day'];
                 // POST$B%G!<%?$r0z$-7Q$0(B
-                $this->tpl_holiday_id = $holiday_id;
+                $this->tpl_holiday_id = $post['holiday_id'];
                 break;
             case 'down':
-                $objHoliday->rankDown($holiday_id);
+                $objDb->sfRankDown('dtb_holiday', 'holiday_id', $post['holiday_id']);
 
                 // $B:FI=<((B
                 $this->objDisplay->reload();
                 break;
             case 'up':
-                $objHoliday->rankUp($holiday_id);
+                $objDb->sfRankUp('dtb_holiday', 'holiday_id', $post['holiday_id']);
 
                 // $B:FI=<((B
                 $this->objDisplay->reload();
@@ -140,9 +151,10 @@
                 break;
         }
 
-        $this->arrForm = $objFormParam->getFormParamList();
+        $this->arrHoliday = $this->lfGetHolidayList();
+        // POST$B%G!<%?$r0z$-7Q$0(B
+        $this->tpl_holiday_id = $holiday_id;
 
-        $this->arrHoliday = $objHoliday->getList();
     }
 
     /**
@@ -150,60 +162,99 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    /**
-     * $BEPO?=hM}$r<B9T(B.
-     * 
-     * @param integer $holiday_id
-     * @param array $sqlval
-     * @param object $objHoliday
-     * @return multiple
-     */
-    function doRegist($holiday_id, $sqlval, SC_Helper_Holiday_Ex $objHoliday)
-    {
-        $sqlval['holiday_id'] = $holiday_id;
-        $sqlval['creator_id'] = $_SESSION['member_id'];
-        return $objHoliday->save($sqlval);
+    function lfGetHolidayDataByHolidayID($holiday_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'holiday_id = ?';
+        return $objQuery->select('title, month, day', 'dtb_holiday', $where, array($holiday_id));
     }
 
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfGetHolidayList() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'del_flg <> 1';
+        $objQuery->setOrder('rank DESC');
+        return $objQuery->select('holiday_id, title, month, day', 'dtb_holiday', $where);
+    }
+
+    /* DB$B$X$NA^F~(B */
+    function lfInsertClass($arrData, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // INSERT$B$9$kCM$r:n ＠ .$9$k!#(B
+        $sqlval['title'] = $arrData['title'];
+        $sqlval['month'] = $arrData['month'];
+        $sqlval['day'] = $arrData['day'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['rank'] = $objQuery->max('rank', 'dtb_holiday') + 1;
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        // INSERT$B$N<B9T(B
+        $sqlval['holiday_id'] = $objQuery->nextVal('dtb_holiday_holiday_id');
+        $ret = $objQuery->insert('dtb_holiday', $sqlval);
+        return $ret;
+    }
+
+    /* DB$B$X$N99?7(B */
+    function lfUpdateClass($arrData) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // UPDATE$B$9$kCM$r:n ＠ .$9$k!#(B
+        $sqlval['title'] = $arrData['title'];
+        $sqlval['month'] = $arrData['month'];
+        $sqlval['day'] = $arrData['day'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'holiday_id = ?';
+        // UPDATE$B$N<B9T(B
+        $ret = $objQuery->update('dtb_holiday', $sqlval, $where, array($arrData['holiday_id']));
+        return $ret;
+    }
+
+    function lfInitParam($mode, &$objFormParam) {
         switch ($mode) {
             case 'edit':
-            case 'pre_edit':
                 $objFormParam->addParam('$B%?%$%H%k(B', 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('$B7n(B', 'month', INT_LEN, 'n', array('SELECT_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('$BF|(B', 'day', INT_LEN, 'n', array('SELECT_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('$BDj5YF|(BID', 'holiday_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-                break;
+                // break$B$7$J$$(B
             case 'delete':
+            case 'pre_edit':
             case 'down':
             case 'up':
-            default:
                 $objFormParam->addParam('$BDj5YF|(BID', 'holiday_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 break;
+            default:
+                break;
         }
     }
 
     /**
      * $BF~NO%(%i!<%A%'%C%/(B
      *
-     * @param object $objFormParam
-     * @param object $objHoliday
+     * @param string $mode
      * @return array
      */
-    function lfCheckError(&$objFormParam, SC_Helper_Holiday_Ex &$objHoliday)
-    {
+    function lfCheckError($mode, &$objFormParam) {
+        $objFormParam->convParam();
         $arrErr = $objFormParam->checkError();
-        $arrForm = $objFormParam->getHashArray();
+        $post = $objFormParam->getHashArray();
 
-        // $BJT=8Cf$N%l%3!<%I0J30$KF1$8F|IU$,B8:_$9$k>l9g(B
-        if ($objHoliday->isDateExist($arrForm['month'], $arrForm['day'], $arrForm['holiday_id'])) {
-            $arrErr['date'] = '$B"((B $B4{$KF1$8F|IU$NEPO?$,B8:_$7$^$9!#(B<br>';
+        if (!isset($arrErr['date'])) {
+            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $where = 'del_flg = 0 AND month = ? AND day = ?';
+            $arrWhereVal = array($post['month'], $post['day']);
+            if (!empty($post['holiday_id'])) {
+                $where .= ' AND holiday_id <> ?';
+                $arrWhereVal[] = $post['holiday_id'];
+            }
+            $arrRet = $objQuery->select('count(holiday_id) as count', 'dtb_holiday', $where, $arrWhereVal);
+
+            // $BJT=8Cf$N%l%3!<%I0J30$KF1$8F|IU$,B8:_$9$k>l9g(B
+            if ($arrRet[0]['count'] > 0) {
+                $arrErr['date'] = '$B"((B $B4{$KF1$8F|IU$NEPO?$,B8:_$7$^$9!#(B<br>';
+            }
         }
         return $arrErr;
     }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Kiyaku extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Kiyaku extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/kiyaku.tpl';
         $this->tpl_subno = 'kiyaku';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,119 +65,159 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
-        $objKiyaku = new SC_Helper_Kiyaku_Ex();
+        $objDb = new SC_Helper_DB_Ex();
 
         $mode = $this->getMode();
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($mode, $objFormParam);
-        $objFormParam->setParam($_POST);
+        $objFormParam->setParam($_REQUEST);
         $objFormParam->convParam();
+        $this->arrErr = $this->lfCheckError($mode, $objFormParam);
+        $is_error = (!SC_Utils_Ex::isBlank($this->arrErr));
 
-        $kiyaku_id = $objFormParam->getValue('kiyaku_id');
+        $this->kiyaku_id = $objFormParam->getValue('kiyaku_id');
+        if ($is_error) {
+            trigger_error('', E_USER_ERROR);
+            return;
+        }
 
         // $BMW5aH=Dj(B
         switch ($mode) {
             // $BJT=8=hM}(B
             case 'confirm':
-                // $B%(%i!<%A%'%C%/(B
-                $this->arrErr = $this->lfCheckError($objFormParam, $objKiyaku);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['kiyaku_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
-                }
+                // POST$BCM$N0z$-7Q$.(B
+                $this->arrForm = $_POST;
 
-                if (SC_Utils_Ex::isBlank($this->arrErr)) {
-                    // POST$BCM$N0z$-7Q$.(B
-                    $arrParam = $objFormParam->getHashArray();
-                    // $BEPO?<B9T(B
-                    $res_kiyaku_id = $this->doRegist($kiyaku_id, $arrParam, $objKiyaku);
-                    if ($res_kiyaku_id !== FALSE) {
-                        // $B40N;%a%C%;!<%8(B
-                        $kiyaku_id = $res_kiyaku_id;
-                        $this->tpl_onload = "alert('$BEPO?$,40N;$7$^$7$?!#(B');";
+                if (!$is_error) {
+                    if ($this->kiyaku_id == '') {
+                        $result = $this->lfInsertClass($this->arrForm, $_SESSION['member_id']);    // $B?75,:n ＠ .(B
+                    } else {
+                        $result = $this->lfUpdateClass($this->arrForm, $this->kiyaku_id);    // $B4{B8JT=8(B
                     }
+
+                    if ($result !== FALSE) {
+                        $arrPram = array(
+                            'kiyaku_id' => $result,
+                            'msg' => 'on',
+                        );
+
+                        SC_Response_Ex::reload($arrPram, true);
+                        SC_Response_Ex::actionExit();
+                    }
                 }
-
-                // $BJT=8Cf$N5,Ls(BID$B$rEO$9(B
-                $this->tpl_kiyaku_id = $kiyaku_id;
                 break;
             // $B:o=|(B
             case 'delete':
-                $objKiyaku->delete($kiyaku_id);
-                break;
+                $objDb->sfDeleteRankRecord('dtb_kiyaku', 'kiyaku_id', $this->kiyaku_id, '', true);
 
-            // $BJT=8A0=hM}(B
-            case 'pre_edit':
-                // $BJT=89`L\$r<hF@$9$k!#(B
-                $arrKiyakuData = $objKiyaku->get($kiyaku_id);
-                $objFormParam->setParam($arrKiyakuData);
-
-                // $BJT=8Cf$N5,Ls(BID$B$rEO$9(B
-                $this->tpl_kiyaku_id = $kiyaku_id;
+                // $B:FI=<((B
+                $this->objDisplay->reload();
                 break;
-
             case 'down':
-                $objKiyaku->rankDown($kiyaku_id);
+                $objDb->sfRankDown('dtb_kiyaku', 'kiyaku_id', $this->kiyaku_id);
 
                 // $B:FI=<((B
                 $this->objDisplay->reload();
                 break;
-
             case 'up':
-                $objKiyaku->rankUp($kiyaku_id);
+                $objDb->sfRankUp('dtb_kiyaku', 'kiyaku_id', $this->kiyaku_id);
 
                 // $B:FI=<((B
                 $this->objDisplay->reload();
                 break;
-
             default:
+                if (isset($_GET['msg']) && $_GET['msg'] == 'on') {
+                    // $B40N;%a%C%;!<%8(B
+                    $this->tpl_onload = "alert('$BEPO?$,40N;$7$^$7$?!#(B');";
+                }
                 break;
         }
 
         $this->arrForm = $objFormParam->getFormParamList();
 
-        // $B5,Ls0lMw$r<hF@(B
-        $this->arrKiyaku = $objKiyaku->getList();
-}
+        if (!$is_error) {
+            // $B5,Ls0lMw$r<hF@(B
+            $this->arrKiyaku = $this->lfGetKiyakuList();
+            // kiyaku_id $B$,;XDj$5$l$F$$$k>l9g$K$O5,Ls%G!<%?$N<hF@(B
+            if (!SC_Utils_Ex::isBlank($this->kiyaku_id)) {
+                // $BJT=89`L\$r<hF@$9$k!#(B
+                $arrKiyakuData = $this->lfGetKiyakuDataByKiyakuID($this->kiyaku_id);
 
+                // $BF~NO9`L\$K%+%F%4%jL>$rF~NO$9$k!#(B
+                $this->arrForm['kiyaku_title'] = $arrKiyakuData[0]['kiyaku_title'];
+                $this->arrForm['kiyaku_text'] = $arrKiyakuData[0]['kiyaku_text'];
+                // POST$B%G!<%?$r0z$-7Q$0(B
+                $this->tpl_kiyaku_id = $this->kiyaku_id;
+            }
+        } else {
+            // $B2hLL$K%(%i!<I=<($7$J$$$?$a(B, $B%m%0=PNO(B
+            GC_Utils_Ex::gfPrintLog('Error: ' . print_r($this->arrErr, true));
+        }
+    }
+
     /**
      * $B%G%9%H%i%/%?(B.
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    /**
-     * $BEPO?=hM}$r<B9T(B.
-     * 
-     * @param integer $kiyaku_id
-     * @param array $sqlval
-     * @param object $objKiyaku
-     * @return multiple
-     */
-    function doRegist($kiyaku_id, $sqlval, SC_Helper_Kiyaku_Ex &$objKiyaku)
-    {
-        $sqlval['kiyaku_id'] = $kiyaku_id;
-        $sqlval['creator_id'] = $_SESSION['member_id'];
-        return $objKiyaku->save($sqlval);
+    /* DB$B$X$NA^F~(B */
+    function lfInsertClass($arrData, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // INSERT$B$9$kCM$r:n ＠ .$9$k!#(B
+        $sqlval = array();
+        $sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
+        $sqlval['kiyaku_text'] = $arrData['kiyaku_text'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['rank'] = $objQuery->max('rank', 'dtb_kiyaku') + 1;
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        // INSERT$B$N<B9T(B
+        $sqlval['kiyaku_id'] = $objQuery->nextVal('dtb_kiyaku_kiyaku_id');
+        $ret = $objQuery->insert('dtb_kiyaku', $sqlval);
+        return ($ret) ? $sqlval['kiyaku_id'] : FALSE;
     }
 
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfGetKiyakuDataByKiyakuID($kiyaku_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'kiyaku_id = ?';
+        return $objQuery->select('kiyaku_text, kiyaku_title', 'dtb_kiyaku', $where, array($kiyaku_id));
+    }
+
+    function lfGetKiyakuList() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $where = 'del_flg <> 1';
+        $objQuery->setOrder('rank DESC');
+        return $objQuery->select('kiyaku_title, kiyaku_text, kiyaku_id', 'dtb_kiyaku', $where);
+    }
+
+    /* DB$B$X$N99?7(B */
+    function lfUpdateClass($arrData, $kiyaku_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        // UPDATE$B$9$kCM$r:n ＠ .$9$k!#(B
+        $sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
+        $sqlval['kiyaku_text'] = $arrData['kiyaku_text'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'kiyaku_id = ?';
+        // UPDATE$B$N<B9T(B
+        $ret = $objQuery->update('dtb_kiyaku', $sqlval, $where, array($kiyaku_id));
+        return ($ret) ? $kiyaku_id : FALSE;
+    }
+
+    function lfInitParam($mode, &$objFormParam) {
         switch ($mode) {
             case 'confirm':
-            case 'pre_edit':
                 $objFormParam->addParam('$B5,Ls%?%$%H%k(B', 'kiyaku_title', SMTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('$B5,LsFbMF(B', 'kiyaku_text', MLTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('$B5,Ls(BID', 'kiyaku_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-                break;
             case 'delete':
+            case 'pre_edit':
             case 'down':
             case 'up':
             default:
@@ -193,18 +230,18 @@
      * $BF~NO%(%i!<%A%'%C%/(B
      *
      * @param string $mode
-     * @param object $objKiyaku
      * @return array
      */
-    function lfCheckError($objFormParam, SC_Helper_Kiyaku_Ex &$objKiyaku)
-    {
+    function lfCheckError($mode, $objFormParam) {
         $arrErr = $objFormParam->checkError();
-        $arrForm = $objFormParam->getHashArray();
-
-        $isTitleExist = $objKiyaku->isTitleExist($arrForm['kiyaku_title'], $arrForm['kiyaku_id']);
-        // $BJT=8Cf$N%l%3!<%I0J30$KF1$8L>>N$,B8:_$9$k>l9g(B
-        if ($isTitleExist) {
-            $arrErr['name'] = '$B"((B $B4{$KF1$8FbMF$NEPO?$,B8:_$7$^$9!#(B<br />';
+        if (!isset($arrErr['name']) && $mode == 'confirm') {
+            $post = $objFormParam->getHashArray();
+            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $arrRet = $objQuery->select('kiyaku_id, kiyaku_title', 'dtb_kiyaku', 'del_flg = 0 AND kiyaku_title = ?', array($post['kiyaku_title']));
+            // $BJT=8Cf$N%l%3!<%I0J30$KF1$8L>>N$,B8:_$9$k>l9g(B
+            if ($arrRet[0]['kiyaku_id'] != $post['kiyaku_id'] && $arrRet[0]['kiyaku_title'] == $post['kiyaku_title']) {
+                $arrErr['name'] = '$B"((B $B4{$KF1$8FbMF$NEPO?$,B8:_$7$^$9!#(B<br>';
+            }
         }
         return $arrErr;
     }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Mail extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Mail extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/mail.tpl';
         $this->tpl_mainno = 'basis';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,11 +65,9 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $masterData = new SC_DB_MasterData_Ex();
-        $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
 
         $mode = $this->getMode();
 
@@ -90,9 +85,9 @@
 
         switch ($mode) {
             case 'id_set':
-                    $mailtemplate = $objMailtemplate->get($post['template_id']);
-                    if ($mailtemplate) {
-                        $this->arrForm = $mailtemplate;
+                    $result = $this->lfGetMailTemplateByTemplateID($post['template_id']);
+                    if ($result) {
+                        $this->arrForm = $result[0];
                     } else {
                         $this->arrForm['template_id'] = $post['template_id'];
                     }
@@ -106,7 +101,7 @@
 
                     } else {
                         // $B ＠ 5>o(B
-                        $this->lfRegistMailTemplate($this->arrForm, $_SESSION['member_id'], $objMailtemplate);
+                        $this->lfRegistMailTemplate($this->arrForm, $_SESSION['member_id']);
 
                         // $B40N;%a%C%;!<%8(B
                         $this->tpl_onload = "window.alert('$B%a!<%k ＠ _Dj$,40N;$7$^$7$?!#%F%s%W%l!<%H$rA*Br$7$FFbMF$r$43NG'$/$@$5$$!#(B');";
@@ -124,24 +119,40 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function lfRegistMailTemplate($post, $member_id, SC_Helper_Mailtemplate_Ex $objMailtemplate)
-    {
+    function lfGetMailTemplateByTemplateID($template_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $sql = 'SELECT * FROM dtb_mailtemplate WHERE template_id = ?';
+        return $objQuery->getAll($sql, array($template_id));
+    }
+
+    function lfRegistMailTemplate($post, $member_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
         $post['creator_id'] = $member_id;
-        $objMailtemplate->save($post);
+        $post['update_date'] = 'CURRENT_TIMESTAMP';
+
+        $sql = 'SELECT * FROM dtb_mailtemplate WHERE template_id = ?';
+        $template_data = $objQuery->getAll($sql, array($post['template_id']));
+        if ($template_data) {
+            $sql_where = 'template_id = ?';
+            $objQuery->update('dtb_mailtemplate', $post, $sql_where, array(addslashes($post['template_id'])));
+        } else {
+            $objQuery->insert('dtb_mailtemplate', $post);
+        }
+
     }
 
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfInitParam($mode, &$objFormParam) {
         switch ($mode) {
             case 'regist':
                 $objFormParam->addParam('$B%a!<%k%?%$%H%k(B', 'subject', MTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('$B%X%C%@!<(B', 'header', LTEXT_LEN, 'KVa', array('SPTAB_CHECK','MAX_LENGTH_CHECK'));
-                $objFormParam->addParam('$B%U%C%?!<(B', 'footer', LTEXT_LEN, 'KVa', array('SPTAB_CHECK','MAX_LENGTH_CHECK'));
+                $objFormParam->addParam('$B%X%C%@!<(B', 'header', LTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
+                $objFormParam->addParam('$B%U%C%?!<(B', 'footer', LTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
                 $objFormParam->addParam('$B%F%s%W%l!<%H(B', 'template_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
             case 'id_set':
                 $objFormParam->addParam('$B%F%s%W%l!<%H(B', 'template_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Payment extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Payment extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/payment.tpl';
         $this->tpl_mainno = 'basis';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPayment = new SC_Helper_Payment_Ex();
 
@@ -117,8 +113,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_PaymentInput extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_PaymentInput extends LC_Page_Admin_Ex {
 
     // {{{ properties
 
@@ -47,8 +46,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/payment_input.tpl';
         $this->tpl_mainno = 'basis';
@@ -62,8 +60,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -73,8 +70,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPayment = new SC_Helper_Payment_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -163,21 +159,18 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B%U%!%$%k>pJs$N=i4|2=(B */
-    function lfInitFile()
-    {
+    function lfInitFile() {
         $this->objUpFile->addFile('$B%m%42hA|(B', 'payment_image', array('gif','jpeg','jpg','png'), IMAGE_SIZE, false, CLASS_IMAGE_WIDTH, CLASS_IMAGE_HEIGHT);
         return $this->objUpFile;
     }
 
     /* $B%Q%i%a!<%?!<>pJs$N=i4|2=(B */
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfInitParam($mode, &$objFormParam) {
 
         switch ($mode) {
             case 'edit':
@@ -218,10 +211,10 @@
     }
 
     /* DB$B$X%G!<%?$rEPO?$9$k(B */
-    function lfRegistData(&$objFormParam, SC_Helper_Payment_Ex $objPayment, $member_id, $payment_id = '')
-    {
+    function lfRegistData(&$objFormParam, SC_Helper_Payment_Ex $objPayment, $member_id, $payment_id = '') {
 
         $sqlval = array_merge($objFormParam->getHashArray(), $this->objUpFile->getDBFileList());
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $sqlval['payment_id'] = $payment_id;
         $sqlval['creator_id'] = $member_id;
 
@@ -235,8 +228,7 @@
     /*$B!!MxMQ>r7o$N?tCM%A%'%C%/(B */
 
     /* $BF~NOFbMF$N%A%'%C%/(B */
-    function lfCheckError($post, $objFormParam, SC_Helper_Payment_Ex $objPayment)
-    {
+    function lfCheckError($post, $objFormParam, SC_Helper_Payment_Ex $objPayment) {
 
         // DB$B$N%G!<%?$r<hF@(B
         $arrPaymentData = $objPayment->get($post['payment_id']);

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Point extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Point extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/point.tpl';
         $this->tpl_subno = 'point';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
@@ -119,20 +115,17 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B%Q%i%a!<%?!<>pJs$N=i4|2=(B */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%]%$%s%HIUM?N((B', 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B2q0wEPO?;~IUM?%]%$%s%H(B', 'welcome_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
 
-    function lfUpdateData($post)
-    {
+    function lfUpdateData($post) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $sqlval = $post;
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
@@ -141,8 +134,7 @@
         $ret = $objQuery->update('dtb_baseinfo', $sqlval);
     }
 
-    function lfInsertData($post)
-    {
+    function lfInsertData($post) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $sqlval = $post;
         $sqlval['id'] = 1;

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Seo extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Seo extends LC_Page_Admin_Ex {
 
     // {{{ properties
 
@@ -47,8 +46,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/seo.tpl';
         $this->tpl_subno = 'seo';
@@ -68,8 +66,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -79,8 +76,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%G!<%?$N<hF@(B
         $this->arrPageData = $this->lfGetSeoPageData();
@@ -135,8 +131,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -146,8 +141,7 @@
      * @param array $arrUpdData $B99?7%G!<%?(B
      * @return integer $B99?77k2L(B
      */
-    function lfUpdPageData($arrUpdData = array())
-    {
+    function lfUpdPageData($arrUpdData = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $table = 'dtb_pagelayout';
@@ -165,8 +159,7 @@
         return $objQuery->update($table, $sqlval, $where, $arrWhereVal);
     }
 
-    function lfInitParam($mode, &$objFormParam)
-    {
+    function lfInitParam($mode, &$objFormParam) {
         $objFormParam->addParam('$B%G%P%$%9(BID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%Z!<%8(BID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%a%?%?%0(B:Author', 'author', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -181,8 +174,7 @@
      * @param array $BI=<(%G!<%?(B
      * @return array $BI=<(%G!<%?(B
      */
-    function lfSetData($arrPageData, $arrDispData)
-    {
+    function lfSetData($arrPageData, $arrDispData) {
 
         foreach ($arrPageData as $device_key => $arrVal) {
             foreach ($arrVal as $key => $val) {
@@ -203,8 +195,7 @@
      * @param void
      * @return array $arrRet $B%Z!<%8%G!<%?(B($arrRet[$B%G%P%$%9%?%$%W(BID])
      */
-    function lfGetSeoPageData()
-    {
+    function lfGetSeoPageData() {
         $objLayout = new SC_Helper_PageLayout_Ex();
 
         return array(

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Tradelaw extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_Tradelaw extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/tradelaw.tpl';
         $this->tpl_subno = 'tradelaw';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
 
@@ -120,14 +116,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B%Q%i%a!<%?!<>pJs$N=i4|2=(B */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BHNGd6H<T(B', 'law_company', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B1?1D ＠ UG$<T(B', 'law_manager', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BM9JXHV9f(B1', 'law_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -143,24 +137,22 @@
         $objFormParam->addParam('FAX$BHV9f(B3', 'law_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
         $objFormParam->addParam('$B%a!<%k%"%I%l%9(B', 'law_email', null, 'KVa', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
         $objFormParam->addParam('URL', 'law_url', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'URL_CHECK'));
-        $objFormParam->addParam('$BI,MWNA6b(B', 'law_term01', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('$BCmJ8J}K!(B', 'law_term02', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('$B;YJ'J}K!(B', 'law_term03', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('$B;YJ'4|8B(B', 'law_term04', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('$B0z$-EO$7;~4|(B', 'law_term05', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('$BJVIJ!&8r49$K$D$$$F(B', 'law_term06', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BI,MWNA6b(B', 'law_term01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BCmJ8J}K!(B', 'law_term02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B;YJ'J}K!(B', 'law_term03', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B;YJ'4|8B(B', 'law_term04', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B0z$-EO$7;~4|(B', 'law_term05', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BJVIJ!&8r49$K$D$$$F(B', 'law_term06', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    function lfUpdateData($sqlval)
-    {
+    function lfUpdateData($sqlval) {
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATE$B$N<B9T(B
         $ret = $objQuery->update('dtb_baseinfo', $sqlval);
     }
 
-    function lfInsertData($sqlval)
-    {
+    function lfInsertData($sqlval) {
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // INSERT$B$N<B9T(B
@@ -168,8 +160,7 @@
     }
 
     /* $BF~NOFbMF$N%A%'%C%/(B */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrRet =  $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrRet);

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -43,8 +43,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Admin_Basis_ZipInstall.php 16741 2007-11-08 00:43:24Z adachi $
  */
-class LC_Page_Admin_Basis_ZipInstall extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Basis_ZipInstall extends LC_Page_Admin_Ex {
 
     /** CSV$B$N9T?t(B */
     var $tpl_line = 0;
@@ -66,8 +65,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'basis/zip_install.tpl';
         $this->tpl_subno = 'zip_install';
@@ -85,8 +83,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -96,8 +93,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -168,13 +164,11 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function lfAutoCommitZip()
-    {
+    function lfAutoCommitZip() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // DB$B99?7(B
@@ -189,8 +183,7 @@
      *
      * @return void
      */
-    function lfDeleteZip()
-    {
+    function lfDeleteZip() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // DB
@@ -205,8 +198,7 @@
      *
      * @return void
      */
-    function lfInitParam($tpl_mode, &$objFormParam)
-    {
+    function lfInitParam($tpl_mode, &$objFormParam) {
         if ($tpl_mode == 'manual') {
             $objFormParam->addParam('$B3+;O9T(B', 'startRowNum', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         }
@@ -217,8 +209,7 @@
      *
      * @return void
      */
-    function insertMtbZip($start = 1)
-    {
+    function insertMtbZip($start = 1) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $img_path = USER_URL . USER_PACKAGE_DIR . 'admin/img/basis/'; // $B2hA|%Q%9$O(B admin $B8GDj(B
@@ -282,8 +273,7 @@
         <script type='text/javascript' language='javascript'>
             <!--
                 // $B40N;2hLL(B
-                function complete()
-                {
+                function complete() {
                     document.open('text/html','replace');
                     document.clear();
                     document.write('<p>$B40N;$7$^$7$?!#(B<br />');
@@ -300,8 +290,7 @@
         <?php
     }
 
-    function openZipCsv()
-    {
+    function openZipCsv() {
         $this->convertZipCsv();
         $fp = fopen(ZIP_CSV_UTF8_REALFILE, 'r');
         if (!$fp) {
@@ -310,8 +299,7 @@
         return $fp;
     }
 
-    function convertZipCsv()
-    {
+    function convertZipCsv() {
         if (file_exists(ZIP_CSV_UTF8_REALFILE)) return;
 
         $fpr = fopen(ZIP_CSV_REALFILE, 'r');
@@ -332,14 +320,12 @@
         fclose($fpr);
     }
 
-    function countMtbZip()
-    {
+    function countMtbZip() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->count('mtb_zip');
     }
 
-    function countZipCsv()
-    {
+    function countZipCsv() {
         $line = 0;
         $fp = $this->openZipCsv();
 
@@ -364,8 +350,7 @@
      *
      * @return void
      */
-    function lfDownloadZipFileFromJp()
-    {
+    function lfDownloadZipFileFromJp() {
         // Proxy$B7PM3$r2DG=$H$9$k!#(B
         // TODO Proxy$B$N ＠ _Dj$O!V(Bdata/module/HTTP/Request.php$B!WFb$N!V(Bfunction HTTP_Request$B!W$X5-=R$9$k!#$$$:$l$O!"30It ＠ _Dj$H$7$?$$!#(B
         $req = new HTTP_Request();
@@ -394,8 +379,7 @@
      *
      * @return void
      */
-    function lfExtractZipFile()
-    {
+    function lfExtractZipFile() {
         $zip = zip_open($this->zip_csv_temp_realfile);
         if (!is_resource($zip)) {
             trigger_error($this->zip_csv_temp_realfile . ' $B$r%*!<%W%s$G$-$^$;$s!#(B', E_USER_ERROR);
@@ -448,8 +432,7 @@
      *
      * @return string CSV $B$N99?7F|;~(B ($B ＠ 07A:Q$_%F%-%9%H(B)
      */
-    function lfGetCsvDatetime()
-    {
+    function lfGetCsvDatetime() {
         return date('Y/m/d H:i:s', filemtime(ZIP_CSV_REALFILE));
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/index.tpl';
         $this->tpl_subno = 'index';
@@ -67,8 +65,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -78,90 +75,85 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
-        $objNews = new SC_Helper_News_Ex();
-
+        $objDb = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
         $objFormParam->setParam($_POST);
         $objFormParam->convParam();
-
         $news_id = $objFormParam->getValue('news_id');
 
         //---- $B?75,EPO?(B/$BJT=8EPO?(B
         switch ($this->getMode()) {
-            case 'edit':
+            case 'regist':
+                $arrPost = $objFormParam->getHashArray();
                 $this->arrErr = $this->lfCheckError($objFormParam);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['news_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
-                }
-
-                if (count($this->arrErr) <= 0) {
-                    // POST$BCM$N0z$-7Q$.(B
-                    $arrParam = $objFormParam->getHashArray();
-                    // $BEPO?<B9T(B
-                    $res_news_id = $this->doRegist($news_id, $arrParam, $objNews);
-                    if ($res_news_id !== FALSE) {
-                        // $B40N;%a%C%;!<%8(B
-                        $news_id = $res_news_id;
-                        $this->tpl_onload = "alert('$BEPO?$,40N;$7$^$7$?!#(B');";
+                if (SC_Utils_Ex::isBlank($this->arrErr)) {
+                    // $B%K%e!<%9(BID$B$NCM$,(BPOST$B$5$l$FMh$?>l9g$O4{B8%G!<%?$NJT=8$H$_$J$7!"(B
+                    // $B99?7%a%=%C%I$r8F$S=P$9!#(B
+                    // $B%K%e!<%9(BID$B$,B8:_$7$J$$>l9g$O?75,EPO?$r9T$&!#(B
+                    $arrPost['link_method'] = $this->checkLinkMethod($arrPost['link_method']);
+                    $arrPost['news_date'] = $this->getRegistDate($arrPost);
+                    $member_id = $_SESSION['member_id'];
+                    if (strlen($news_id) > 0 && is_numeric($news_id)) {
+                        $this->lfNewsUpdate($arrPost,$member_id);
+                    } else {
+                        $this->lfNewsInsert($arrPost,$member_id);
                     }
+                    $news_id = '';
+                    $this->tpl_onload = "window.alert('$BJT=8$,40N;$7$^$7$?(B');";
+                } else {
+                    $this->arrForm = $arrPost;
                 }
-                // POST$B%G!<%?$r0z$-7Q$0(B
-                $this->tpl_news_id = $news_id;
                 break;
-
-            case 'pre_edit':
-                $news = $objNews->get($news_id);
-                list($news['year'],$news['month'],$news['day']) = $this->splitNewsDate($news['cast_news_date']);
-                $objFormParam->setParam($news);
-
-                // POST$B%G!<%?$r0z$-7Q$0(B
-                $this->tpl_news_id = $news_id;
+            case 'search':
+                if (is_numeric($news_id)) {
+                    list($this->arrForm) = $this->getNews($news_id);
+                    list($this->arrForm['year'],$this->arrForm['month'],$this->arrForm['day']) = $this->splitNewsDate($this->arrForm['cast_news_date']);
+                    $this->edit_mode = 'on';
+                }
                 break;
-
             case 'delete':
             //----$B!!%G!<%?:o=|(B
-                $objNews->delete($news_id);
-                //$B<+J,$K%j%@%$%l%/%H!J:FFI9~$K$h$k8mF0:nKI;_!K(B
-                SC_Response_Ex::reload();
+                if (is_numeric($news_id)) {
+                    $pre_rank = $this->getRankByNewsId($news_id);
+                    $this->computeRankForDelete($news_id,$pre_rank);
+
+                    SC_Response_Ex::reload();             //$B<+J,$K%j%@%$%l%/%H!J:FFI9~$K$h$k8mF0:nKI;_!K(B
+                }
                 break;
-
+            case 'move':
             //----$B!!I=<(=g0L0\F0(B
-            case 'up':
-                $objNews->rankUp($news_id);
+                if (strlen($news_id) > 0 && is_numeric($news_id) == true) {
+                    $term = $objFormParam->getValue('term');
+                    if ($term == 'up') {
+                        $objDb->sfRankUp('dtb_news', 'news_id', $news_id);
+                    } else if ($term == 'down') {
+                        $objDb->sfRankDown('dtb_news', 'news_id', $news_id);
+                    }
 
-                // $B%j%m!<%I(B
-                SC_Response_Ex::reload();
+                    $this->objDisplay->reload();
+                }
                 break;
-
-            case 'down':
-                $objNews->rankDown($news_id);
-
-                // $B%j%m!<%I(B
-                SC_Response_Ex::reload();
-                break;
-
             case 'moveRankSet':
             //----$B!!;XDjI=<(=g0L0\F0(B
                 $input_pos = $this->getPostRank($news_id);
                 if (SC_Utils_Ex::sfIsInt($input_pos)) {
-                    $objNews->moveRank($news_id, $input_pos);
+                    $objDb->sfMoveRank('dtb_news', 'news_id', $news_id, $input_pos);
+
+                    $this->objDisplay->reload();
                 }
-                SC_Response_Ex::reload();
                 break;
-
             default:
                 break;
         }
 
-        $this->arrNews = $objNews->getList();
+        $this->arrNews = $this->getNews();
+        $this->tpl_news_id = $news_id;
         $this->line_max = count($this->arrNews);
+        $this->max_rank = $this->getRankMax();
 
-        $this->arrForm = $objFormParam->getFormParamList();
     }
 
     /**
@@ -169,8 +161,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -179,8 +170,7 @@
      * @param Object $objFormParam
      * @return Array $B%(%i!<FbMF(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
         $objErr->doFunc(array('$BF|IU(B', 'year', 'month', 'day'), array('CHECK_DATE'));
@@ -191,8 +181,7 @@
      * $B%Q%i%a!<%?!<$N=i4|2=$r9T$&(B
      * @param Object $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('news_id', 'news_id');
         $objFormParam->addParam('$BF|IU(B($BG/(B)', 'year', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BF|IU(B($B7n(B)', 'month', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -201,33 +190,60 @@
         $objFormParam->addParam('URL', 'news_url', URL_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BK\J8(B', 'news_comment', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BJL%&%#%s%I%&$G3+$/(B', 'link_method', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B%i%s%/0\F0(B', 'term', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
     /**
-     * $BEPO?=hM}$r<B9T(B.
-     * 
-     * @param integer $news_id
-     * @param array $sqlval
-     * @param object $objNews
-     * @return multiple
+     * $B?7Ce5-;v$N%G!<%?$NEPO?$r9T$&(B
+     * @param Array $arrPost POST$B%G!<%?$NG[Ns(B
+     * @param Integer $member_id $BEPO?$7$?4IM}<T$N(BID
      */
-    function doRegist($news_id, $sqlval, SC_Helper_News_Ex $objNews)
-    {
+    function lfNewsInsert($arrPost,$member_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // rank$B$N:GBg(B+1$B$r<hF@$9$k(B
+        $rank_max = $this->getRankMax();
+        $rank_max = $rank_max + 1;
+
+        $table = 'dtb_news';
+        $sqlval = array();
+        $news_id = $objQuery->nextVal('dtb_news_news_id');
         $sqlval['news_id'] = $news_id;
-        $sqlval['creator_id'] = $_SESSION['member_id'];
-        $sqlval['link_method'] = $this->checkLinkMethod($sqlval['link_method']);
-        $sqlval['news_date'] = $this->getRegistDate($sqlval);
-        unset($sqlval['year'], $sqlval['month'], $sqlval['day']);
-        return $objNews->save($sqlval);
+        $sqlval['news_date'] = $arrPost['news_date'];
+        $sqlval['news_title'] = $arrPost['news_title'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['news_url'] = $arrPost['news_url'];
+        $sqlval['link_method'] = $arrPost['link_method'];
+        $sqlval['news_comment'] = $arrPost['news_comment'];
+        $sqlval['rank'] = $rank_max;
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $objQuery->insert($table, $sqlval);
     }
 
+    function lfNewsUpdate($arrPost,$member_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $table = 'dtb_news';
+        $sqlval = array();
+        $sqlval['news_date'] = $arrPost['news_date'];
+        $sqlval['news_title'] = $arrPost['news_title'];
+        $sqlval['creator_id'] = $member_id;
+        $sqlval['news_url'] = $arrPost['news_url'];
+        $sqlval['news_comment'] = $arrPost['news_comment'];
+        $sqlval['link_method'] = $arrPost['link_method'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'news_id = ?';
+        $arrValIn = array($arrPost['news_id']);
+        $objQuery->update($table, $sqlval, $where, $arrValIn);
+    }
+
     /**
      * $B%G!<%?$NEPO?F|$rJV$9!#(B
      * @param Array $arrPost POST$B$N%0%m!<%P%kJQ?t(B
      * @return string $BEPO?F|$r<($9J8;zNs(B
      */
-    function getRegistDate($arrPost)
-    {
+    function getRegistDate($arrPost) {
         $registDate = $arrPost['year'] .'/'. $arrPost['month'] .'/'. $arrPost['day'];
         return $registDate;
     }
@@ -237,8 +253,7 @@
      * @param int $link_method
      * @return int
      */
-    function checkLinkMethod($link_method)
-    {
+    function checkLinkMethod($link_method) {
         if (strlen($link_method) == 0) {
             $link_method = 1;
         }
@@ -246,21 +261,75 @@
     }
 
     /**
+     * $B%K%e!<%95-;v$r<hF@$9$k!#(B
+     * @param Integer news_id $B%K%e!<%9(BID
+     */
+    function getNews($news_id = '') {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = '*, cast(news_date as date) as cast_news_date';
+        $table = 'dtb_news';
+        $order = 'rank DESC';
+        if (strlen($news_id) == 0) {
+            $where = 'del_flg = 0';
+            $arrWhereVal = array();
+        } else {
+            $where = 'del_flg = 0 AND news_id = ?';
+            $arrWhereVal = array($news_id);
+        }
+        $objQuery->setOrder($order);
+        return $objQuery->select($col, $table, $where, $arrWhereVal);
+    }
+
+    /**
+     * $B;XDj$5$l$?%K%e!<%9$N%i%s%/$NCM$r<hF@$9$k!#(B
+     * @param Integer $news_id
+     */
+    function getRankByNewsId($news_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = 'rank';
+        $table = 'dtb_news';
+        $where = 'del_flg = 0 AND news_id = ?';
+        $arrWhereVal = array($news_id);
+        list($rank) = $objQuery->select($col, $table, $where, $arrWhereVal);
+        return $rank['rank'];
+    }
+
+    /**
+     * $B:o=|$9$k?7Ce>pJs0J9_$N(Brank$B$r(B1$B$D7+$j>e$2$k!#(B
+     * @param Integer $news_id
+     * @param Integer $rank
+     */
+    function computeRankForDelete($news_id,$rank) {
+        SC_Helper_DB_Ex::sfDeleteRankRecord('dtb_news', 'news_id', $news_id);
+    }
+
+    /**
      * $B%K%e!<%9$NF|IU$NCM$r%U%m%s%H$G$NI=<(7A<0$K9g$o$;$k$?$a$KJ,3d(B
      * @param String $news_date
      */
-    function splitNewsDate($news_date)
-    {
+    function splitNewsDate($news_date) {
         return explode('-', $news_date);
     }
 
     /**
+     * $B%i%s%/$N:GBgCM$NCM$rJV$9!#(B
+     * @return Intger $max $B%i%s%/$N:GBgCM$NCM(B
+     */
+    function getRankMax() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = 'MAX(rank) as max';
+        $table = 'dtb_news';
+        $where = 'del_flg = 0';
+        list($result) = $objQuery->select($col, $table, $where);
+        return $result['max'];
+    }
+
+    /**
      * POST$B$5$l$?%i%s%/$NCM$r<hF@$9$k(B
      * @param Object $objFormParam
      * @param Integer $news_id
      */
-    function getPostRank($news_id)
-    {
+    function getPostRank($news_id) {
         if (strlen($news_id) > 0 && is_numeric($news_id) == true) {
             $key = 'pos-' . $news_id;
             $input_pos = $_POST[$key];

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CSV extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_CSV extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/csv.tpl';
         $this->tpl_subno = 'csv';
@@ -62,8 +60,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -73,8 +70,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -120,8 +116,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BJT=8<oJL(B', 'tpl_subno_csv', STEXT_LEN, 'a', array('ALNUM_CHECK', 'MAX_LENGTH_CHECK'), 'product');
         $objFormParam->addParam('$B=PNO ＠ _Dj%j%9%H(B', 'output_list', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK', 'EXIST_CHECK'));
         //$B%G%U%)%k%HCM$G>e=q$-(B
@@ -135,8 +130,7 @@
      * @param integer $csv_status_flg $BFI$_9~$`BP>]$N%U%i%0(B CSV_COLUMN_STATUS_FLG_ENABLE or ''
      * @return array SwapArray$B$7$?%+%i%`@_Dj(B
      */
-    function lfGetCSVColumn($csv_id, $csv_status_flg = '', $order ='rank, no')
-    {
+    function lfGetCSVColumn($csv_id, $csv_status_flg = '', $order ='rank, no') {
         $objCSV = new SC_Helper_CSV_Ex();
         if (SC_Utils_Ex::sfIsInt($csv_id)) {
             if ($csv_status_flg !='') {
@@ -157,8 +151,7 @@
      * @param integer $csv_id CSV ID
      * @return array $BA*Br:Q$_%+%i%`Ns>pJs(B
      */
-    function lfGetSelected($csv_id)
-    {
+    function lfGetSelected($csv_id) {
         $arrData = $this->lfGetCSVColumn($csv_id, CSV_COLUMN_STATUS_FLG_ENABLE);
         if (!isset($arrData['no'])) {
             $arrData['no'] = array();
@@ -172,8 +165,7 @@
      * @param integer $csv_id CSV ID
      * @return array $BA*Br:Q$_%+%i%`Ns>pJs(B
      */
-    function lfGetOptions($csv_id)
-    {
+    function lfGetOptions($csv_id) {
         $arrData = $this->lfGetCSVColumn($csv_id);
         if (!isset($arrData['no'])) {
             $arrData['no'] = array();
@@ -188,8 +180,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -199,8 +190,7 @@
      * @param string $subno_csv CSV$BL>(B
      * @return integer CSV_ID
      */
-    function lfGetCsvId($subno_csv)
-    {
+    function lfGetCsvId($subno_csv) {
         $objCSV = new SC_Helper_CSV_Ex();
         $arrKey = array_keys($objCSV->arrSubnavi,$subno_csv);
         $csv_id = $arrKey[0];
@@ -218,8 +208,7 @@
      * @param integer $csv_id CSV_ID
      * @return boolean $B ＠ .8y(B:true
      */
-    function lfSetDefaultCsvOutput($csv_id)
-    {
+    function lfSetDefaultCsvOutput($csv_id) {
         $arrData = $this->lfGetCSVColumn($csv_id, '', $order = 'no');
         if (!isset($arrData['no'])) {
             $arrData['no'] = array();
@@ -234,8 +223,7 @@
      * @param array $arrData $BM-8z$K$9$k(BCSV$BNs%G!<%?G[Ns(B
      * @return boolean $B ＠ .8y(B:true
      */
-    function lfUpdCsvOutput($csv_id, $arrData = array())
-    {
+    function lfUpdCsvOutput($csv_id, $arrData = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // $B$R$H$^$:!"A4It;HMQ$7$J$$$G99?7$9$k(B
         $table = 'dtb_csv';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CsvSql extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_CsvSql extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/csv_sql.tpl';
         $this->tpl_subno = 'csv';
@@ -58,8 +56,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -69,8 +66,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
         // $B%Q%i%a!<%?!<@_Dj(B
@@ -145,8 +141,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('SQL ID', 'sql_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('CSV$B=PNOBP>](BSQL ID', 'csv_output_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'), '', false);
         $objFormParam->addParam('$BA*Br%F!<%V%k(B', 'select_table', STEXT_LEN, 'KVa', array('GRAPH_CHECK','MAX_LENGTH_CHECK'), '', false);
@@ -160,8 +155,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckConfirmError(&$objFormParam)
-    {
+    function lfCheckConfirmError(&$objFormParam) {
         // $B%Q%i%a!<%?!<$N4pK\%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
         // $B3HD%%(%i!<%A%'%C%/(B
@@ -188,8 +182,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckPreviewError(&$objFormParam)
-    {
+    function lfCheckPreviewError(&$objFormParam) {
         // $B%Q%i%a!<%?!<$N4pK\%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
         // $B3HD%%(%i!<%A%'%C%/(B
@@ -208,8 +201,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckDeleteError(&$objFormParam)
-    {
+    function lfCheckDeleteError(&$objFormParam) {
         // $B%Q%i%a!<%?!<$N4pK\%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
         // $B3HD%%(%i!<%A%'%C%/(B
@@ -227,8 +219,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckOutputError(&$objFormParam)
-    {
+    function lfCheckOutputError(&$objFormParam) {
         // $B%Q%i%a!<%?!<$N4pK\%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
         // $B3HD%%(%i!<%A%'%C%/(B
@@ -245,8 +236,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -255,8 +245,7 @@
      *
      * @return array $B%F!<%V%kL>0lMw(B
      */
-    function lfGetTableList()
-    {
+    function lfGetTableList() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // $B<B%F!<%V%k>e$N%+%i%`@_Dj$r8+$K9T$/;EMM$KJQ99(B ref #476
         $arrTable = $objQuery->listTables();
@@ -280,8 +269,7 @@
      * @param string $selectTable $B%F!<%V%kL>(B
      * @return array $B%+%i%`0lMw$NG[Ns(B
      */
-    function lfGetColList($table)
-    {
+    function lfGetColList($table) {
         if (SC_Utils_Ex::isBlank($table)) {
             return array();
         }
@@ -299,8 +287,7 @@
      * @param array $arrVal $B9J$j9~$_%G!<%?(B
      * @return array $B<hF ＠ 7k2L$NG[Ns(B
      */
-    function lfGetSqlList($where = '' , $arrVal = array())
-    {
+    function lfGetSqlList($where = '' , $arrVal = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_csv_sql';
         $objQuery->setOrder('sql_id');
@@ -313,8 +300,7 @@
      * @param string SQL$BJ8%G!<%?(B($BF,$K(BSELECT$B$OF~$l$J$$(B)
      * @return string $B%(%i!<FbMF(B
      */
-    function lfCheckSQL($sql)
-    {
+    function lfCheckSQL($sql) {
         // FIXME: $B0U?^E*$K(B new SC_Query $B$7$F$$$^$9!#(B force_run$B$r(Btrue$B$K$9$kI,MW$,$"$k$N$G(B.$BK\Ev$O(Bquery$B$N0z?t$G@)8f$7$?$$!#(Bref SC_Query
         $objQuery = new SC_Query_Ex('', true);
         $err = '';
@@ -332,8 +318,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return mixed $BI=<(MQ%Q%i%a!<%?!<(B
      */
-    function lfGetSqlData(&$objFormParam)
-    {
+    function lfGetSqlData(&$objFormParam) {
         // $BJT=8Cf%G!<%?$,$"$k>l9g(B
         if (!SC_Utils_Ex::isBlank($objFormParam->getValue('sql_name'))
             || !SC_Utils_Ex::isBlank($objFormParam->getValue('csv_sql'))
@@ -354,8 +339,7 @@
      * @param integer $sql_id $B=PNO$9$k%G!<%?$N(BSQL_ID
      * @return void
      */
-    function lfDoCsvOutput($sql_id)
-    {
+    function lfDoCsvOutput($sql_id) {
         $arrData = $this->lfGetSqlList('sql_id = ?', array($sql_id));
         $sql = 'SELECT ' . $arrData[0]['csv_sql'] . ' ';
 
@@ -386,8 +370,7 @@
      * @param array $arrSqlVal $B99?7%G!<%?$NG[Ns(B
      * @return integer $sql_id SQL_ID$B$rJV$9(B
      */
-    function lfUpdData($sql_id, $arrSqlVal)
-    {
+    function lfUpdData($sql_id, $arrSqlVal) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_csv_sql';
         $arrSqlVal['update_date'] = 'CURRENT_TIMESTAMP';
@@ -411,8 +394,7 @@
      * @param integer $sql_id $B:o=|$9$k%G!<%?$N(BSQL_ID
      * @return boolean $B<B9T7k2L(B true$B!'@.8y(B
      */
-    function lfDelData($sql_id)
-    {
+    function lfDelData($sql_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_csv_sql';
         $where = 'sql_id = ?';
@@ -431,8 +413,7 @@
      *
      * @return array $BIT5v2D%o!<%IG[Ns(B
      */
-    function lfGetSqlDenyList()
-    {
+    function lfGetSqlDenyList() {
         $arrList = array(';'
             ,'CREATE\s'
             ,'INSERT\s'

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileManager extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_FileManager extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/file_manager.tpl';
         $this->tpl_mainno = 'contents';
@@ -58,8 +56,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -69,8 +66,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%U%)!<%`A`:n%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -208,8 +204,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -219,8 +214,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // $B6&DLDj5A(B
         $this->lfInitParamCommon($objFormParam);
     }
@@ -231,8 +225,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParamModeMove(&$objFormParam)
-    {
+    function lfInitParamModeMove(&$objFormParam) {
         // $B6&DLDj5A(B
         $this->lfInitParamCommon($objFormParam);
         $objFormParam->addParam('$BA*Br%U%!%$%k(B', 'select_file', MTEXT_LEN, 'a', array());
@@ -244,8 +237,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParamModeView(&$objFormParam)
-    {
+    function lfInitParamModeView(&$objFormParam) {
         // $B6&DLDj5A(B
         $this->lfInitParamCommon($objFormParam);
         $objFormParam->addParam('$BA*Br%U%!%$%k(B', 'select_file', MTEXT_LEN, 'a', array('SELECT_CHECK'));
@@ -257,8 +249,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParamModeCreate(&$objFormParam)
-    {
+    function lfInitParamModeCreate(&$objFormParam) {
         // $B6&DLDj5A(B
         $this->lfInitParamCommon($objFormParam);
         $objFormParam->addParam('$BA*Br%U%!%$%k(B', 'select_file', MTEXT_LEN, 'a', array());
@@ -271,8 +262,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParamCommon(&$objFormParam)
-    {
+    function lfInitParamCommon(&$objFormParam) {
         $objFormParam->addParam('$B%k!<%H%G%#%l%/%H%j(B', 'top_dir', MTEXT_LEN, 'a', array());
         $objFormParam->addParam('$B8=:_$N3,AX%G%#%l%/%H%j(B', 'now_dir', MTEXT_LEN, 'a', array());
         $objFormParam->addParam('$B8=:_$N3,AX%U%!%$%k(B', 'now_file', MTEXT_LEN, 'a', array());
@@ -286,8 +276,7 @@
      * @param object $objUpFile SC_UploadFile$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('$B%U%!%$%k(B', 'upload_file', array(), FILE_SIZE, true, 0, 0, false);
     }
 
@@ -297,8 +286,7 @@
      * @param array $arrVal $_POST
      * @return array $setParam $B%F%s%W%l!<%H$KEO$9CM(B
      */
-    function createSetParam($arrVal)
-    {
+    function createSetParam($arrVal) {
         $setParam = $arrVal;
         // Windows$B$N>l9g$O(B, $B%G%#%l%/%H%j$N6h ＠ Z$jJ8;z$r(B\$B$+$i(B/$B$KJQ49$9$k(B
         $setParam['top_dir'] = (strpos(PHP_OS, 'WIN') === false) ? USER_REALDIR : str_replace('\\', '/', USER_REALDIR);
@@ -316,8 +304,7 @@
      * @param string $val $BCM(B
      * @return void
      */
-    function setDispParam($key, $val)
-    {
+    function setDispParam($key, $val) {
         $this->$key = $val;
     }
 
@@ -328,8 +315,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return boolean $B%G%#%l%/%H%j:n ＠ .$G$-$?$+$I$&$+(B
      */
-    function tryCreateDir($objFileManager, $objFormParam)
-    {
+    function tryCreateDir($objFileManager, $objFormParam) {
         $create_dir_flg = false;
         $create_dir = rtrim($objFormParam->getValue('now_dir'), '/');
         // $B%U%!%$%k:n ＠ .(B
@@ -345,8 +331,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return boolean $B%U%!%$%kI=<($9$k$+$I$&$+(B
      */
-    function tryView(&$objFormParam)
-    {
+    function tryView(&$objFormParam) {
         $view_flg = false;
         $now_dir = $this->lfCheckSelectDir($objFormParam, dirname($objFormParam->getValue('select_file')));
         $objFormParam->setValue('now_dir', $now_dir);
@@ -362,8 +347,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function setParentDir($objFormParam)
-    {
+    function setParentDir($objFormParam) {
         $parent_dir = $this->lfGetParentDir($objFormParam->getValue('now_dir'));
         $this->setDispParam('tpl_parent_dir', $parent_dir);
     }
@@ -374,8 +358,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function setDispPath($objFormParam)
-    {
+    function setDispPath($objFormParam) {
         $tpl_now_dir = '';
         // Windows $B4D6-$G(B DIRECTORY_SEPARATOR $B$,(B JavaScript $B$KEO$k$H%(%9%1!<%WJ8;z$H4*0c$$$9$k$N$GCV49(B
         $html_realdir = str_replace(DIRECTORY_SEPARATOR, '/', HTML_REALDIR);
@@ -391,8 +374,7 @@
      * @param string $value $B%(%i!<FbMF(B
      * @return void
      */
-    function setDispError($key, $value)
-    {
+    function setDispError($key, $value) {
         // $B4{$K%(%i!<$,$"$k>l9g$O!"=hM}$7$J$$(B
         if (SC_Utils_Ex::isBlank($this->arrErr[$key])) {
             $this->arrErr[$key] = $value;
@@ -405,8 +387,7 @@
      * @param string $tpl_onload javascript
      * @return void
      */
-    function setTplOnLoad($tpl_onload)
-    {
+    function setTplOnLoad($tpl_onload) {
         $this->tpl_onload .= $tpl_onload;
     }
 
@@ -417,8 +398,7 @@
      * @param string $dir $B%G%#%l%/%H%j(B
      * @return string $select_dir $BA*Br%G%#%l%/%H%j(B
      */
-    function lfCheckSelectDir($objFormParam, $dir)
-    {
+    function lfCheckSelectDir($objFormParam, $dir) {
         $select_dir = '';
         $top_dir = $objFormParam->getValue('top_dir');
         // USER_REALDIR$B0J2<$N>l9g(B
@@ -443,8 +423,7 @@
      * @param string $dir $B8=:_$$$k%G%#%l%/%H%j(B
      * @return string $parent_dir $B?F%G%#%l%/%H%j(B
      */
-    function lfGetParentDir($dir)
-    {
+    function lfGetParentDir($dir) {
         $parent_dir = '';
         $dir = rtrim($dir, '/');
         $arrDir = explode('/', $dir);
@@ -463,8 +442,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function setDispTree($objFileManager, $objFormParam)
-    {
+    function setDispTree($objFileManager, $objFormParam) {
         $tpl_onload = '';
         // $B%D%j!<$rI=<($9$k(B div$B%?%0(Bid, $B%D%j!<G[NsJQ?tL>(B, $B8=:_%G%#%l%/%H%j(B, $BA*Br%D%j!<(Bhidden$BL>(B, $B%D%j!<>uBV(Bhidden$BL>(B, mode hidden$BL>(B
         $now_dir = $objFormParam->getValue('now_dir');
@@ -496,8 +474,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function setIsTopDir($objFormParam)
-    {
+    function setIsTopDir($objFormParam) {
         // $B%H%C%W%G%#%l%/%H%j$+D4::(B
         $is_top_dir = false;
         // $BKvHx$N(B/$B$r$H$k(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileView extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_FileView extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
             default:
@@ -92,8 +88,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -103,8 +98,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%U%!%$%kL>(B', 'file', MTEXT_LEN, 'a', array('EXIST_CHECK'));
     }
 
@@ -114,8 +108,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return boolen $file_check_flg $B%(%i!<%A%'%C%/$N7k2L(B
      */
-    function checkErrorDispFile($objFormParam)
-    {
+    function checkErrorDispFile($objFormParam) {
         $file_check_flg = false;
 
         // FIXME $B%Q%9$N%A%'%C%/4X?t$,I,MW(B
@@ -133,8 +126,7 @@
      *
      * @return void
      */
-    function execFileView($objFormParam)
-    {
+    function execFileView($objFormParam) {
         $file = $objFormParam->getValue('file');
 
         // $B%=!<%9$H$7$FI=<($9$k%U%!%$%k$rDj5A(B($BD>@\<B9T$7$J$$%U%!%$%k(B)

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_Recommend extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_Recommend extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'contents/recommend.tpl';
         $this->tpl_mainno = 'contents';
@@ -59,8 +57,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -70,34 +67,39 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
         $objFormParam->setParam($_POST);
         $objFormParam->convParam();
-        $arrPost = $objFormParam->getHashArray();
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objDb = new SC_Helper_DB_Ex();
 
-        $objRecommend = new SC_Helper_Recommend_Ex();
-
         switch ($this->getMode()) {
-            case 'down': //$B>&IJ$NJB$SBX$($r$9$k!#(B
-                $objRecommend->rankDown($arrPost['best_id']);
-                $arrItems = $this->getRecommendProducts($objRecommend);
+            case 'down': //$B>&IJ$NJB$SBX$($r$9$k!#$*$9$9$a$O%G!<%?%Y!<%9$NEPO?$,>:=g$J$N$G!"(BMode$B$r5U$K$9$k!#(B
+                $arrRet = $objQuery->select('best_id', 'dtb_best_products', 'rank = ?', array($_POST['rank'])); //$B$*$9$9$a(Bid$B$N<hF@(B
+                $best_id = $arrRet[0]['best_id'];
+                $objDb->sfRankUp('dtb_best_products','best_id',$best_id);
+                $arrPost = $objFormParam->getHashArray();
+                $arrItems = $this->getRecommendProducts();
                 break;
 
-            case 'up': //$B>&IJ$NJB$SBX$($r$9$k!#(B
-                $objRecommend->rankUp($arrPost['best_id']);
-                $arrItems = $this->getRecommendProducts($objRecommend);
+            case 'up': //$B>&IJ$NJB$SBX$($r$9$k!#$*$9$9$a$N$_%G!<%?%Y!<%9$NEPO?$,>:=g$J$N$G!"(BMode$B$r5U$K$9$k!#(B
+                $arrRet = $objQuery->select('best_id', 'dtb_best_products', 'rank = ?', array($_POST['rank'])); //$B$*$9$9$a(Bid$B$N<hF@(B
+                $best_id = $arrRet[0]['best_id'];
+                $objDb->sfRankDown('dtb_best_products','best_id',$best_id);
+                $arrPost = $objFormParam->getHashArray();
+                $arrItems = $this->getRecommendProducts();
                 break;
 
             case 'regist': // $B>&IJ$rEPO?$9$k!#(B
                 $this->arrErr = $this->lfCheckError($objFormParam);
+                $arrPost = $objFormParam->getHashArray();
                 // $BEPO?=hM}$K%(%i!<$,$"$C$?>l9g$O>&IJA*Br$N;~$HF1$8=hM}$r9T$&!#(B
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     $member_id = $_SESSION['member_id'];
-                    $this->insertRecommendProduct($arrPost,$member_id,$objRecommend);
-                    $arrItems = $this->getRecommendProducts($objRecommend);
+                    $this->insertRecommendProduct($arrPost,$member_id);
+                    $arrItems = $this->getRecommendProducts();
                 } else {
                     $arrItems = $this->setProducts($arrPost, $arrItems);
                     $this->checkRank = $arrPost['rank'];
@@ -106,9 +108,10 @@
                 break;
             case 'delete': // $B>&IJ$r:o=|$9$k!#(B
                 $this->arrErr = $this->lfCheckError($objFormParam);
+                $arrPost = $objFormParam->getHashArray();
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
-                    $this->deleteProduct($arrPost, $objRecommend);
-                    $arrItems = $this->getRecommendProducts($objRecommend);
+                    $this->deleteProduct($arrPost);
+                    $arrItems = $this->getRecommendProducts();
                 }
                 $this->tpl_onload = "window.alert('$B:o=|$7$^$7$?(B');";
                 break;
@@ -116,12 +119,12 @@
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 $arrPost = $objFormParam->getHashArray();
                 if (SC_Utils_Ex::isBlank($this->arrErr['rank']) && SC_Utils_Ex::isBlank($this->arrErr['product_id'])) {
-                    $arrItems = $this->setProducts($arrPost, $this->getRecommendProducts($objRecommend));
+                    $arrItems = $this->setProducts($arrPost, $this->getRecommendProducts());
                     $this->checkRank = $arrPost['rank'];
                 }
                 break;
             default:
-                $arrItems = $this->getRecommendProducts($objRecommend);
+                $arrItems = $this->getRecommendProducts();
                 break;
         }
 
@@ -139,8 +142,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -148,9 +150,7 @@
      * $B%Q%i%a!<%?!<$N=i4|2=$r9T$&(B
      * @param Object $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
-        $objFormParam->addParam('$B$*$9$9$a>&IJ(BID', 'best_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%+%F%4%j(BID', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%i%s%/(B', 'rank', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -162,8 +162,7 @@
      * @param Object $objFormParam
      * @return Array $B%(%i!<FbMF(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
         return $objErr->arrErr;
@@ -171,26 +170,19 @@
 
     /**
      * $B4{$KEPO?$5$l$F$$$kFbMF$r<hF@$9$k(B
-     * @param Object $objRecommend
      * @return Array $arrReturnProducts $B%G!<%?%Y!<%9$KEPO?$5$l$F$$$k$*$9$9$a>&IJ$NG[Ns(B
      */
-    function getRecommendProducts(SC_Helper_Recommend_Ex &$objRecommend)
-    {
-        $arrList = $objRecommend->getList();
-        // product_id $B$N0lMw$r:n ＠ .(B
-        $product_ids = array();
-        foreach ($arrList as $value) {
-            $product_ids[] = $value['product_id'];
-        }
-
-        $objProduct = new SC_Product_Ex;
+    function getRecommendProducts() {
         $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $arrProducts = $objProduct->getListByProductIds($objQuery, $product_ids);
+        $col = 'dtb_products.name,dtb_products.main_list_image,dtb_best_products.*';
+        $table = 'dtb_best_products INNER JOIN dtb_products ON dtb_best_products.product_id = dtb_products.product_id';
+        $where = 'dtb_best_products.del_flg = 0';
+        $order = 'rank';
+        $objQuery->setOrder($order);
+        $arrProducts = $objQuery->select($col, $table, $where);
 
         $arrReturnProducts = array();
-        foreach ($arrList as $data) {
-            $data['main_list_image'] = $arrProducts[$data['product_id']]['main_list_image'];
-            $data['name'] = $arrProducts[$data['product_id']]['name'];
+        foreach ($arrProducts as $data) {
             $arrReturnProducts[$data['rank']] = $data;
         }
         return $arrReturnProducts;
@@ -200,12 +192,11 @@
      * $B$*$9$9$a>&IJ$N?75,EPO?$r9T$&!#(B
      * @param Array $arrPost POST$B$NCM$r3JG<$7$?G[Ns(B
      * @param Integer $member_id $BEPO?$7$?4IM}<T$r<($9(BID
-     * @param Object $objRecommend
      */
-    function insertRecommendProduct($arrPost,$member_id, SC_Helper_Recommend_Ex &$objRecommend)
-    {
+    function insertRecommendProduct($arrPost,$member_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
         // $B8E$$$*$9$9$a>&IJ$N%G!<%?$r:o=|$9$k!#(B
-        $this->deleteProduct($arrPost, $objRecommend);
+        $this->deleteProduct($arrPost);
 
         $sqlval = array();
         $sqlval['product_id'] = $arrPost['product_id'];
@@ -213,41 +204,37 @@
         $sqlval['rank'] = $arrPost['rank'];
         $sqlval['comment'] = $arrPost['comment'];
         $sqlval['creator_id'] = $member_id;
-        $objRecommend->save($sqlval);
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id');
+        $objQuery->insert('dtb_best_products', $sqlval);
     }
 
     /**
      * $B%G!<%?$r:o=|$9$k(B
      * @param Array $arrPost POST$B$NCM$r3JG<$7$?G[Ns(B
-     * @param Object $objRecommend
-     * @return void
      */
-    function deleteProduct($arrPost, SC_Helper_Recommend_Ex &$objRecommend)
-    {
-        if ($arrPost['best_id']) {
-            $target = $arrPost['best_id'];
-        } else {
-            $recommend = $objRecommend->getByRank($arrPost['rank']);
-            $target = $recommend['best_id'];
-        }
-        $objRecommend->delete($target);
+    function deleteProduct($arrPost) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $table = 'dtb_best_products';
+        $where = 'category_id = ? AND rank = ?';
+        $arrWhereVal = array($arrPost['category_id'],$arrPost['rank']);
+        $objQuery->delete($table, $where, $arrWhereVal);
     }
 
     /**
      * $B>&IJ>pJs$r<hF@$9$k(B
      * @param Integer $product_id $B>&IJ(BID
-     * @return Array $return $B>&IJ$N%G!<%?$r3JG<$7$?G[Ns(B
+     * @return Array $arrProduct $B>&IJ$N%G!<%?$r3JG<$7$?G[Ns(B
      */
-    function getProduct($product_id)
-    {
-        $objProduct = new SC_Product_Ex();
-        $arrProduct = $objProduct->getDetail($product_id);
-        $return = array(
-            'product_id' => $arrProduct['product_id'],
-            'main_list_image' => $arrProduct['main_list_image'],
-            'name' => $arrProduct['name']
-        );
-        return $return;
+    function getProduct($product_id) {
+        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $col = 'product_id,main_list_image,name';
+        $table = 'dtb_products';
+        $where = 'product_id = ? AND del_flg = 0';
+        $arrWhereVal = array($product_id);
+        $arrProduct = $objQuery->select($col, $table, $where, $arrWhereVal);
+        return $arrProduct[0];
     }
 
     /**
@@ -255,8 +242,7 @@
      * @param Array $arrPost POST$B$N%G!<%?$r3JG<$7$?G[Ns(B
      * @param Array $arrItems $B%U%m%s%H$KI=<($5$l$k>&IJ$N>pJs$r3JG<$7$?G[Ns(B
      */
-    function setProducts($arrPost,$arrItems)
-    {
+    function setProducts($arrPost,$arrItems) {
         $arrProduct = $this->getProduct($arrPost['product_id']);
         if (count($arrProduct) > 0) {
             $rank = $arrPost['rank'];

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_RecommendSearch extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Contents_RecommendSearch extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainno = 'contents';
         $this->tpl_subno = '';
@@ -56,8 +54,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -67,8 +64,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -116,8 +112,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -125,12 +120,10 @@
      * $B%Q%i%a!<%?!<$N=i4|2=$r9T$&(B
      * @param Object $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B>&IJ(BID', 'search_name', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B>&IJ(BID', 'search_category_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK'));
         $objFormParam->addParam('$B>&IJ%3!<%I(B', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('$B>&IJ%9%F!<%?%9(B', 'search_status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B%Z!<%8HV9f(B', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK'));
     }
 
@@ -139,8 +132,7 @@
      * @param Object $objFormParam
      * @return Array $B%(%i!<FbMF(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
         return $objErr->arrErr;
@@ -152,8 +144,7 @@
      * @return array ('where' => where string, 'bind' => databind array)
      * @param SC_FormParam $objFormParam
      */
-    function createWhere(&$objFormParam,&$objDb)
-    {
+    function createWhere(&$objFormParam,&$objDb) {
         $arrForm = $objFormParam->getHashArray();
         $where = 'alldtl.del_flg = 0';
         $bind = array();
@@ -178,10 +169,6 @@
                     $where .=    ' AND alldtl.product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? GROUP BY product_id)';
                     $bind[] = '%'.$val.'%';
                     break;
-                case 'search_status':
-                    $where .= ' AND alldtl.status = ?';
-                    $bind[] = $val;
-                    break;
                 default:
                     break;
             }
@@ -198,8 +185,7 @@
      * @param array $whereAndBind
      * @param SC_Product $objProduct
      */
-    function getLineCount($whereAndBind,&$objProduct)
-    {
+    function getLineCount($whereAndBind,&$objProduct) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
         // $B8!:w7k2LBP>]$H$J$k>&IJ$N?t$r<hF@(B
@@ -214,8 +200,7 @@
      * @param array $whereAndBind string where$B$H(B array bind$B$NO"A[G[Ns(B
      * @param SC_Product $objProduct
      */
-    function getProducts($whereAndBind,&$objProduct, $page_max, $startno)
-    {
+    function getProducts($whereAndBind,&$objProduct, $page_max, $startno) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -232,8 +217,7 @@
      * @param array $arrProductId
      * @param SC_Product $objProduct
      */
-    function getProductList($arrProductId, &$objProduct)
-    {
+    function getProductList($arrProductId, &$objProduct) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $BI=<(=g=x(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Customer extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Customer extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'customer/index.tpl';
         $this->tpl_mainno = 'customer';
@@ -87,8 +85,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -98,8 +95,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -150,8 +146,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -161,8 +156,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
         $objFormParam->addParam('$BJT=8BP>]2q0w(BID', 'edit_customer_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
     }
@@ -173,8 +167,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
     }
 
@@ -184,9 +177,18 @@
      * @param integer $customer_id $B2q0w(BID
      * @return boolean true:$B ＠ .8y(B false:$B<:GT(B
      */
-    function lfDoDeleteCustomer($customer_id)
-    {
-        return SC_Helper_Customer_Ex::delete($customer_id);
+    function lfDoDeleteCustomer($customer_id) {
+        $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, 'del_flg = 0');
+        if (SC_Utils_Ex::isBlank($arrData)) {
+            //$BBP>]$H$J$k%G!<%?$,8+$D$+$i$J$$!#(B
+            return false;
+        }
+        // XXXX: $B2>2q0w$OJ*M}:o=|$H$J$C$F$$$?$,O ＠ M}:o=|$KJQ99!#(B
+        $arrVal = array(
+            'del_flg' => '1',
+        );
+        SC_Helper_Customer_Ex::sfEditCustomerData($arrVal, $customer_id);
+        return true;
     }
 
     /**
@@ -195,8 +197,7 @@
      * @param integer $customer_id $B2q0w(BID
      * @return boolean true:$B ＠ .8y(B false:$B<:GT(B
      */
-    function lfDoResendMail($customer_id)
-    {
+    function lfDoResendMail($customer_id) {
         $arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id);
         if (SC_Utils_Ex::isBlank($arrData) or $arrData['del_flg'] == 1) {
             //$BBP>]$H$J$k%G!<%?$,8+$D$+$i$J$$!"$^$?$O:o=|:Q$_(B
@@ -215,8 +216,7 @@
      * @param array $arrParam $B8!:w%Q%i%a!<%?!<O"A[G[Ns(B
      * @return array( integer $BA4BN7o?t(B, mixed $B2q0w%G!<%?0lMwG[Ns(B, mixed SC_PageNavi$B%*%V%8%'%/%H(B)
      */
-    function lfDoSearch($arrParam)
-    {
+    function lfDoSearch($arrParam) {
         return SC_Helper_Customer_Ex::sfGetSearchData($arrParam);
     }
 
@@ -226,8 +226,7 @@
      * @param array $arrParam $B8!:w%Q%i%a!<%?!<O"A[G[Ns(B
      * @return boolean true:$B ＠ .8y(B false:$B<:GT(B
      */
-    function lfDoCSV($arrParam)
-    {
+    function lfDoCSV($arrParam) {
         $objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
         $order = 'update_date DESC, customer_id DESC';
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Edit extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Customer_Edit extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'customer/edit.tpl';
         $this->tpl_mainno = 'customer';
@@ -67,7 +65,8 @@
         $this->arrDay = $objDate->getDay();
 
         // $B;YJ'$$J}K!<oJL(B
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $objDb = new SC_Helper_DB_Ex();
+        $this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
     }
 
     /**
@@ -75,8 +74,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -86,8 +84,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -200,8 +197,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -211,8 +207,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // $B2q0w9`L\$N%Q%i%a!<%?!<<hF@(B
         SC_Helper_Customer_Ex::sfCustomerEntryParam($objFormParam, true);
         // $B8!:w7k2L0lMw2hLL$X$NLa$jMQ%Q%i%a!<%?!<(B
@@ -227,8 +222,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitSearchParam(&$objFormParam)
-    {
+    function lfInitSearchParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
         // $B=i2s<u$1F~$l;~MQ(B
         $objFormParam->addParam('$BJT=8BP>]2q0w(BID', 'edit_customer_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -240,8 +234,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckErrorSearchParam(&$objFormParam)
-    {
+    function lfCheckErrorSearchParam(&$objFormParam) {
         return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
     }
 
@@ -251,8 +244,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam, true);
 
         // $B%a%"%I=EJ#%A%'%C%/(B($B6&DL%k!<%A%s$O;H$($J$$(B)
@@ -291,8 +283,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfRegistData(&$objFormParam)
-    {
+    function lfRegistData(&$objFormParam) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         // $BEPO?MQ%G!<%?<hF@(B
         $arrData = $objFormParam->getDbArray();
@@ -321,8 +312,7 @@
      * @param array $arrParam $B8!:w%Q%i%a!<%?!<O"A[G[Ns(B
      * @return array( integer $BA4BN7o?t(B, mixed $B2q0w%G!<%?0lMwG[Ns(B, mixed SC_PageNavi$B%*%V%8%'%/%H(B)
      */
-    function lfPurchaseHistory($customer_id, $pageno = 0)
-    {
+    function lfPurchaseHistory($customer_id, $pageno = 0) {
         if (SC_Utils_Ex::isBlank($customer_id)) {
             return array('0', array(), NULL);
         }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Customer_SearchCustomer extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Customer_SearchCustomer extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'customer/search_customer.tpl';
         $this->tpl_subtitle = '$B2q0w8!:w(B';
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -101,8 +97,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -112,8 +107,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
     }
 
@@ -123,8 +117,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
     }
 
@@ -134,8 +127,7 @@
      * @param array $arrParam $B8!:w%Q%i%a!<%?!<O"A[G[Ns(B
      * @return array( integer $BA4BN7o?t(B, mixed $B2q0w%G!<%?0lMwG[Ns(B, mixed SC_PageNavi$B%*%V%8%'%/%H(B)
      */
-    function lfDoSearch($arrParam)
-    {
+    function lfDoSearch($arrParam) {
         return SC_Helper_Customer_Ex::sfGetSearchData($arrParam);
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/index.tpl';
         $this->tpl_subno = 'layout';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objLayout = new SC_Helper_PageLayout_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -151,8 +147,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -163,8 +158,7 @@
      * @param integer $bloc_cnt $B%V%m%C%/?t(B
      * @return void
      */
-    function lfInitParam(&$objFormParam, $bloc_cnt = 0)
-    {
+    function lfInitParam(&$objFormParam, $bloc_cnt = 0) {
         $objFormParam->addParam('$B%Z!<%8(BID', 'page_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$BC<Kv<oJL(BID', 'device_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B%V%m%C%/?t(B', 'bloc_cnt', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -186,8 +180,7 @@
      * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout $B%$%s%9%?%s%9(B
      * @return array $B%l%$%"%&%H>pJs$NG[Ns(B
      */
-    function getLayout($device_type_id, $page_id, &$objLayout)
-    {
+    function getLayout($device_type_id, $page_id, &$objLayout) {
         $arrResults = array();
         $i = 0;
 
@@ -218,8 +211,7 @@
      * @param integer $cnt $BG[NsHV9f(B
      * @return void
      */
-    function copyBloc(&$arrDest, $arrFrom, $cnt)
-    {
+    function copyBloc(&$arrDest, $arrFrom, $cnt) {
         $arrDest[$cnt]['target_id'] = $this->arrTarget[$arrFrom['target_id']];
         $arrDest[$cnt]['bloc_id'] = $arrFrom['bloc_id'];
         $arrDest[$cnt]['bloc_row'] = $arrFrom['bloc_row'];
@@ -234,8 +226,7 @@
      * @param array $arrToBlocs $B%A%'%C%/$r9T$&%G!<%?G[Ns(B
      * @return bool $BB8:_$9$k>l9g(B true
      */
-    function existsBloc($arrBloc, $arrToBlocs)
-    {
+    function existsBloc($arrBloc, $arrToBlocs) {
         foreach ($arrToBlocs as $arrToBloc) {
             if ($arrBloc['bloc_id'] === $arrToBloc['bloc_id']) {
                 return true;
@@ -251,8 +242,7 @@
      * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout $B%$%s%9%?%s%9(B
      * @return string $B%W%l%S%e!<$r9T$&(B tpl_mainpage $B%U%!%$%kL>(B
      */
-    function savePreviewData($page_id, &$objLayout)
-    {
+    function savePreviewData($page_id, &$objLayout) {
         $arrPageData = $objLayout->getPageProperties(DEVICE_TYPE_PC, $page_id);
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrPageData[0]['page_id'] = 0;
@@ -267,8 +257,7 @@
      * @param boolean $is_preview $B%W%l%S%e!<;~$N>l9g(B true
      * @return void
      */
-    function placingBlocs(&$objFormParam, $is_preview = false)
-    {
+    function placingBlocs(&$objFormParam, $is_preview = false) {
         $page_id = $is_preview ? 0 : $objFormParam->getValue('page_id');
         $device_type_id = $objFormParam->getValue('device_type_id');
         $bloc_cnt = $objFormParam->getValue('bloc_cnt');

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_Bloc extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_Bloc extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/bloc.tpl';
         $this->tpl_subno_edit = 'bloc';
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -72,8 +69,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
@@ -85,16 +81,15 @@
         $this->bloc_id = $objFormParam->getValue('bloc_id');
         $this->device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC);
 
-        $objBloc = new SC_Helper_Bloc_Ex($this->device_type_id);
         $objLayout = new SC_Helper_PageLayout_Ex();
 
         switch ($this->getMode()) {
             // $BEPO?(B/$B99?7(B
             case 'confirm':
                 if (!$is_error) {
-                    $this->arrErr = $this->lfCheckError($objFormParam, $this->arrErr, $objBloc);
+                    $this->arrErr = $this->lfCheckError($objFormParam, $this->arrErr, $objLayout);
                     if (SC_Utils_Ex::isBlank($this->arrErr)) {
-                        $result = $this->doRegister($objFormParam, $objBloc);
+                        $result = $this->doRegister($objFormParam, $objLayout);
                         if ($result !== false) {
                             $arrPram = array(
                                 'bloc_id' => $result,
@@ -112,7 +107,7 @@
             // $B:o=|(B
             case 'delete':
                 if (!$is_error) {
-                    if ($this->doDelete($objFormParam, $objBloc)) {
+                    if ($this->doDelete($objFormParam, $objLayout)) {
                         $arrPram = array(
                             'device_type_id' => $this->device_type_id,
                             'msg' => 'on',
@@ -134,10 +129,10 @@
 
         if (!$is_error) {
             // $B%V%m%C%/0lMw$r<hF@(B
-            $this->arrBlocList = $objBloc->getList();
+            $this->arrBlocList = $objLayout->getBlocs($this->device_type_id);
             // bloc_id $B$,;XDj$5$l$F$$$k>l9g$K$O%V%m%C%/%G!<%?$N<hF@(B
             if (!SC_Utils_Ex::isBlank($this->bloc_id)) {
-                $arrBloc = $this->getBlocTemplate($this->bloc_id, $objBloc);
+                $arrBloc = $this->getBlocTemplate($this->device_type_id, $this->bloc_id, $objLayout);
                 $objFormParam->setParam($arrBloc);
             }
         } else {
@@ -154,8 +149,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -165,8 +159,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%V%m%C%/(BID', 'bloc_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BC<Kv<oJL(BID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%V%m%C%/L>(B', 'bloc_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -177,14 +170,22 @@
     /**
      * $B%V%m%C%/$N%F%s%W%l!<%H$r<hF@$9$k(B.
      *
+     * @param integer $device_type_id $BC<Kv<oJL(BID
      * @param integer $bloc_id $B%V%m%C%/(BID
-     * @param SC_Helper_Bloc_Ex $objBloc SC_Helper_Bloc_Ex $B%$%s%9%?%s%9(B
+     * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout $B%$%s%9%?%s%9(B
      * @return array $B%V%m%C%/>pJs$NG[Ns(B
      */
-    function getBlocTemplate($bloc_id, SC_Helper_Bloc_Ex &$objBloc)
-    {
-        $arrBloc = $objBloc->get($bloc_id);
-        return $arrBloc;
+    function getBlocTemplate($device_type_id, $bloc_id, &$objLayout) {
+        $arrBloc = $objLayout->getBlocs($device_type_id, 'bloc_id = ?', array($bloc_id));
+        if (SC_Utils_Ex::isAbsoluteRealPath($arrBloc[0]['tpl_path'])) {
+            $tpl_path = $arrBloc[0]['tpl_path'];
+        } else {
+            $tpl_path = SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id) . BLOC_DIR . $arrBloc[0]['tpl_path'];
+        }
+        if (file_exists($tpl_path)) {
+            $arrBloc[0]['bloc_html'] = file_get_contents($tpl_path);
+        }
+        return $arrBloc[0];
     }
 
     /**
@@ -194,39 +195,101 @@
      * $B%G!<%?%Y!<%9$r%m!<%k%P%C%/$9$k(B.
      *
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @param SC_Helper_Bloc $objBloc SC_Helper_Bloc $B%$%s%9%?%s%9(B
+     * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout $B%$%s%9%?%s%9(B
      * @return integer|boolean $BEPO?$, ＠ .8y$7$?>l9g(B, $BEPO?$7$?%V%m%C%/(BID;
      *                         $B<:GT$7$?>l9g(B false
      */
-    function doRegister(&$objFormParam, SC_Helper_Bloc_Ex &$objBloc)
-    {
+    function doRegister(&$objFormParam, &$objLayout) {
         $arrParams = $objFormParam->getHashArray();
-        $result = $objBloc->save($arrParams);
 
-        if (!$result) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->begin();
+
+        // blod_id $B$,6u$N>l9g$O?75,EPO?(B
+        $is_new = SC_Utils_Ex::isBlank($arrParams['bloc_id']);
+        $bloc_dir = $objLayout->getTemplatePath($arrParams['device_type_id']) . BLOC_DIR;
+        // $B4{B8%G!<%?$N=EJ#%A%'%C%/(B
+        if (!$is_new) {
+            $arrExists = $objLayout->getBlocs($arrParams['device_type_id'], 'bloc_id = ?', array($arrParams['bloc_id']));
+
+            // $B4{B8$N%U%!%$%k$,B8:_$9$k>l9g$O:o=|$7$F$*$/(B
+            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
+            if (file_exists($exists_file)) {
+                unlink($exists_file);
+            }
+        }
+
+        $table = 'dtb_bloc';
+        $arrValues = $objQuery->extractOnlyColsOf($table, $arrParams);
+        $arrValues['tpl_path'] = $arrParams['filename'] . '.tpl';
+        $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
+
+        // $B?75,EPO?(B
+        if ($is_new || SC_Utils_Ex::isBlank($arrExists)) {
+            $objQuery->setOrder('');
+            $arrValues['bloc_id'] = 1 + $objQuery->max('bloc_id', $table, 'device_type_id = ?',
+                                                       array($arrValues['device_type_id']));
+            $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
+            $objQuery->insert($table, $arrValues);
+        }
+        // $B99?7(B
+        else {
+            $objQuery->update($table, $arrValues, 'bloc_id = ? AND device_type_id = ?',
+                              array($arrValues['bloc_id'], $arrValues['device_type_id']));
+        }
+
+        $bloc_path = $bloc_dir . $arrValues['tpl_path'];
+        if (!SC_Helper_FileManager_Ex::sfWriteFile($bloc_path, $arrParams['bloc_html'])) {
             $this->arrErr['err'] = '$B"((B $B%V%m%C%/$N=q$-9~$_$K<:GT$7$^$7$?(B<br />';
+            $objQuery->rollback();
+            return false;
         }
 
-        return $result;
+        $objQuery->commit();
+        return $arrValues['bloc_id'];
     }
 
     /**
      * $B:o=|$r<B9T$9$k(B.
      *
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @param SC_Helper_Bloc $objBloc SC_Helper_Bloc $B%$%s%9%?%s%9(B
+     * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout $B%$%s%9%?%s%9(B
      * @return boolean $BEPO?$, ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doDelete(&$objFormParam, SC_Helper_Bloc_Ex &$objBloc)
-    {
+    function doDelete(&$objFormParam, &$objLayout) {
         $arrParams = $objFormParam->getHashArray();
-        $result = $objBloc->delete($arrParams['bloc_id']);
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->begin();
 
-        if (!$result) {
+        $arrExists = $objLayout->getBlocs($arrParams['device_type_id'], 'bloc_id = ? AND deletable_flg = 1',
+                                          array($arrParams['bloc_id']));
+        $is_error = false;
+        if (!SC_Utils_Ex::isBlank($arrExists)) {
+            $objQuery->delete('dtb_bloc', 'bloc_id = ? AND device_type_id = ?',
+                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
+            $objQuery->delete('dtb_blocposition', 'bloc_id = ? AND device_type_id = ?',
+                              array($arrExists[0]['bloc_id'], $arrExists[0]['device_type_id']));
+
+            $bloc_dir = $objLayout->getTemplatePath($arrParams['device_type_id']) . BLOC_DIR;
+            $exists_file = $bloc_dir . $arrExists[0]['filename'] . '.tpl';
+
+            // $B%U%!%$%k$N:o=|(B
+            if (file_exists($exists_file)) {
+                if (!unlink($exists_file)) {
+                    $is_error = true;
+                }
+            }
+        } else {
+            $is_error = true;
+        }
+
+        if ($is_error) {
             $this->arrErr['err'] = '$B"((B $B%V%m%C%/$N:o=|$K<:GT$7$^$7$?(B<br />';
+            $objQuery->rollback();
+            return false;
         }
-
-        return $result;
+        $objQuery->commit();
+        return true;
     }
 
     /**
@@ -235,8 +298,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<%a%C%;!<%8$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam, &$arrErr, SC_Helper_Bloc_Ex &$objBloc)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr, &$objLayout) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
         $objErr->arrErr =& $arrErr;
@@ -251,7 +313,7 @@
             $where .= ' AND bloc_id <> ?';
             $arrValues[] = $arrParams['bloc_id'];
         }
-        $arrBloc = $objBloc->getWhere($where, $arrValues);
+        $arrBloc = $objLayout->getBlocs($arrParams['device_type_id'], $where, $arrValues);
         if (!SC_Utils_Ex::isBlank($arrBloc)) {
             $objErr->arrErr['filename'] = '$B"((B $BF1$8%U%!%$%kL>$N%G!<%?$,B8:_$7$F$$$^$9!#JL$N%U%!%$%kL>$rF~NO$7$F$/$@$5$$!#(B<br />';
         }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_CSS extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_CSS extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/css.tpl';
         $this->area_row = 30;
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objLayout = new SC_Helper_PageLayout_Ex();
 
@@ -145,8 +141,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -156,8 +151,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BC<Kv<oJL(BID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('CSS$B%U%!%$%kL>(B', 'css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B5l(BCSS$B%U%!%$%kL>(B', 'old_css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
@@ -177,8 +171,7 @@
      * @param string $css_data $B=q$-9~$_$r9T$&%G!<%?(B
      * @return boolean $BEPO?$, ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doRegister($css_dir, $css_name, $old_css_name, $css_path, $css_data)
-    {
+    function doRegister($css_dir, $css_name, $old_css_name, $css_path, $css_data) {
         $objFileManager = new SC_Helper_FileManager_Ex();
 
         if (!SC_Utils_Ex::isBlank($old_css_name)
@@ -202,8 +195,7 @@
      * @param string $css_path CSS$B%U%!%$%k$N ＠ dBP%Q%9(B
      * @return boolean $B:o=|$, ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doDelete($css_path)
-    {
+    function doDelete($css_path) {
         if (!unlink($css_path)) {
             $this->arrErr['err'] = '$B"((B CSS$B$N:o=|$K<:GT$7$^$7$?(B<br />';
             return false;
@@ -217,8 +209,7 @@
      * @param array $css_dir CSS$B%G%#%l%/%H%j(B
      * @return array $B%U%!%$%k%j%9%H(B
      */
-    function getCSSList($css_dir)
-    {
+    function getCSSList($css_dir) {
         $objFileManager = new SC_Helper_FileManager_Ex();
 
         $arrFileList = $objFileManager->sfGetFileList($css_dir);
@@ -239,8 +230,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<%a%C%;!<%8$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam, &$arrErr)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
         $objErr->arrErr =& $arrErr;
@@ -275,8 +265,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return string CSS$B%G%#%l%/%H%j(B
      */
-    function getCSSDir($device_type_id)
-    {
+    function getCSSDir($device_type_id) {
         return SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id, true) . 'css/';
     }
 
@@ -285,8 +274,7 @@
      * @param string $str
      * @return boolean 
      */
-    function checkPath($str)
-    {
+    function checkPath($str) {
         // $B4^$`>l9g$O(Bfalse
         if (preg_match('|\./|', $str)) {
             return false;

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_Header extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_Header extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/header.tpl';
         $this->header_row = 13;
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -72,8 +69,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
@@ -124,8 +120,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -135,8 +130,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BC<Kv<oJL(BID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('division', 'division', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%X%C%@%G!<%?(B', 'header');
@@ -149,8 +143,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<%a%C%;!<%8$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam, &$arrErr)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
         $objErr->arrErr =& $arrErr;
@@ -166,8 +159,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return integer|boolean $BEPO?$, ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doRegister(&$objFormParam)
-    {
+    function doRegister(&$objFormParam) {
         $division = $objFormParam->getValue('division');
         $contents = $objFormParam->getValue($division);
         $tpl_path = $this->getTemplatePath($objFormParam->getValue('device_type_id'), $division);
@@ -186,8 +178,7 @@
      * @param string $division 'header' or 'footer'
      * @return string|boolean $B ＠ .8y$7$?>l9g(B, $B%F%s%W%l!<%H$N%Q%9(B; $B<:GT$7$?>l9g(B false
      */
-    function getTemplatePath($device_type_id, $division)
-    {
+    function getTemplatePath($device_type_id, $division) {
         $tpl_path = SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id) . '/' . $division . '.tpl';
         if (file_exists($tpl_path)) {
             return $tpl_path;

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_MainEdit extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_MainEdit extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/main_edit.tpl';
         $this->text_row     = 13;
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objLayout = new SC_Helper_PageLayout_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -144,8 +140,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -157,8 +152,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%Z!<%8(BID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BC<Kv<oJL(BID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BL>>N(B', 'page_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -177,8 +171,7 @@
      * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout $B%$%s%9%?%s%9(B
      * @return array $B%Z!<%8%G!<%?$NG[Ns(B
      */
-    function getTplMainpage($device_type_id, $page_id, &$objLayout)
-    {
+    function getTplMainpage($device_type_id, $page_id, &$objLayout) {
         $arrPageData = $objLayout->getPageProperties($device_type_id, $page_id);
 
         $templatePath = $objLayout->getTemplatePath($device_type_id);
@@ -202,8 +195,7 @@
      * @return integer|boolean $BEPO?$, ＠ .8y$7$?>l9g(B, $BEPO?$7$?%Z!<%8(BID;
      *                         $B<:GT$7$?>l9g(B false
      */
-    function doRegister(&$objFormParam, &$objLayout)
-    {
+    function doRegister(&$objFormParam, &$objLayout) {
         $filename = $objFormParam->getValue('filename');
         $arrParams['device_type_id'] = $objFormParam->getValue('device_type_id');
         $arrParams['page_id'] = $objFormParam->getValue('page_id');
@@ -258,8 +250,7 @@
      * @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout $B%$%s%9%?%s%9(B
      * @return integer $B%Z!<%8(BID
      */
-    function registerPage($arrParams, &$objLayout)
-    {
+    function registerPage($arrParams, &$objLayout) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B%Z!<%8(BID$B$,6u$N>l9g$O?75,EPO?(B
@@ -303,8 +294,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<%a%C%;!<%8$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam, &$arrErr)
-    {
+    function lfCheckError(&$objFormParam, &$arrErr) {
         $arrParams = $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrParams);
         $objErr->arrErr =& $arrErr;
@@ -353,8 +343,7 @@
      * @param string $filename $B%U%)!<%`%Q%i%a!<%?!<$N(B filename
      * @return boolean $B:n ＠ .$K ＠ .8y$7$?>l9g(B true
      */
-    function createPHPFile($filename)
-    {
+    function createPHPFile($filename) {
         $path = USER_REALDIR . $filename . '.php';
 
         if (file_exists($path)) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_Template extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_Template extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -41,8 +40,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/template.tpl';
         $this->tpl_subno    = 'template';
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -72,8 +69,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
@@ -141,8 +137,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -152,8 +147,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BC<Kv<oJL(BID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('template_code', 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK'));
     }
@@ -167,8 +161,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return void
      */
-    function doUpdateMasterData($template_code, $device_type_id)
-    {
+    function doUpdateMasterData($template_code, $device_type_id) {
         $masterData = new SC_DB_MasterData_Ex();
 
         $defineName = 'TEMPLATE_NAME';
@@ -203,8 +196,7 @@
      * @param string $filepath SQL$B$N%U%!%$%k%Q%9(B
      * @return void
      */
-    function updateBloc($filepath)
-    {
+    function updateBloc($filepath) {
         $sql = file_get_contents($filepath);
         if ($sql !== false) {
             // $B2~9T!"%?%V$r(B1$B%9%Z!<%9$KJQ49(B
@@ -226,8 +218,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return boolean $B ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doDelete($template_code, $device_type_id)
-    {
+    function doDelete($template_code, $device_type_id) {
         if ($template_code == $this->getTemplateName($device_type_id)
                 || $template_code == $this->getTemplateName($device_type_id, true)) {
             $this->arrErr['err'] = '$B"((B $B%G%U%)%k%H%F%s%W%l!<%H$H!"A*BrCf$N%F%s%W%l!<%H$O:o=|=PMh$^$;$s(B<br />';
@@ -275,8 +266,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return boolean $B ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doRegister($template_code, $device_type_id)
-    {
+    function doRegister($template_code, $device_type_id) {
 
         $tpl_dir = USER_TEMPLATE_REALDIR . $template_code . '/';
         if (!is_dir($tpl_dir)) {
@@ -306,8 +296,7 @@
      * @param string $template_code $B%F%s%W%l!<%H%3!<%I(B
      * @return boolean $B ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doDownload($template_code)
-    {
+    function doDownload($template_code) {
         $from_dir = USER_TEMPLATE_REALDIR . $template_code . '/';
         $to_dir = SMARTY_TEMPLATES_REALDIR . $template_code . '/_packages/';
         if (SC_Utils_Ex::recursiveMkdir($to_dir) === false) {
@@ -328,8 +317,7 @@
      * @param integer $device_type_id $BC<Kv<oJL(BID
      * @return array $B%F%s%W%l!<%H>pJs$NG[Ns(B
      */
-    function getAllTemplates($device_type_id)
-    {
+    function getAllTemplates($device_type_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->select('*', 'dtb_templates', 'device_type_id = ?', array($device_type_id));
     }
@@ -341,8 +329,7 @@
      * @param boolean $isDefault $B%G%U%)%k%H%F%s%W%l!<%HL>$rJV$9>l9g(B true
      * @return string $B%F%s%W%l!<%HL>(B
      */
-    function getTemplateName($device_type_id, $isDefault = false)
-    {
+    function getTemplateName($device_type_id, $isDefault = false) {
         switch ($device_type_id) {
             case DEVICE_TYPE_MOBILE:
                 return $isDefault ? MOBILE_DEFAULT_TEMPLATE_NAME : MOBILE_TEMPLATE_NAME;

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_UpDown extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Design_UpDown extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'design/up_down.tpl';
         $this->tpl_subno    = 'up_down';
@@ -62,8 +60,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -75,8 +72,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
@@ -113,8 +109,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -124,8 +119,7 @@
      * @param object $objForm SC_FormParam$B$N%$%s%9%?%s%9(B
      * @return object SC_UploadFile$B$N%$%s%9%?%s%9(B
      */
-    function lfInitUploadFile($objForm)
-    {
+    function lfInitUploadFile($objForm) {
         $pkg_dir = SMARTY_TEMPLATES_REALDIR . $objForm->getValue('template_code');
         $objUpFile = new SC_UploadFile_Ex(TEMPLATE_TEMP_REALDIR, $pkg_dir);
         $objUpFile->addFile('$B%F%s%W%l!<%H%U%!%$%k(B', 'template_file', array(), TEMPLATE_SIZE, true, 0, 0, false);
@@ -138,8 +132,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam$B$N%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%F%s%W%l!<%H%3!<%I(B', 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK'));
         $objFormParam->addParam('$B%F%s%W%l!<%HL>(B', 'template_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BC<Kv<oJL(BID', 'device_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -152,8 +145,7 @@
      * @param object $objUpFile SC_UploadFile$B$N%$%s%9%?%s%9(B
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B, $B%(%i!<$,L5$1$l$P(B($BB?J,(B)null$B$rJV$9(B
      */
-    function lfCheckError(&$objFormParam, &$objUpFile)
-    {
+    function lfCheckError(&$objFormParam, &$objUpFile) {
         $arrErr = $objFormParam->checkError();
         $template_code = $objFormParam->getValue('template_code');
 
@@ -204,8 +196,7 @@
      * @param object $objUpFile SC_UploadFile$B$N%$%s%9%?%s%9(B
      * @return boolean $B ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      */
-    function doUpload($objFormParam, $objUpFile)
-    {
+    function doUpload($objFormParam, $objUpFile) {
         $template_code = $objFormParam->getValue('template_code');
         $template_name = $objFormParam->getValue('template_name');
         $device_type_id = $objFormParam->getValue('device_type_id');

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/index.tpl';
         $this->tpl_mainno = 'mail';
@@ -84,8 +82,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -95,8 +92,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -184,8 +180,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -195,8 +190,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitParamSearchCustomer(&$objFormParam)
-    {
+    function lfInitParamSearchCustomer(&$objFormParam) {
         SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
         $objFormParam->addParam('$BG[?.7A<0(B', 'search_htmlmail', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BG[?.%a!<%k%"%I%l%9<oJL(B', 'search_mail_type', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
@@ -208,8 +202,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfAddParamSelectTemplate(&$objFormParam)
-    {
+    function lfAddParamSelectTemplate(&$objFormParam) {
         $objFormParam->addParam('$B%a!<%k7A<0(B', 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK'));
         $objFormParam->addParam('Subject', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BK\J8(B', 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -222,8 +215,7 @@
      * @param array $arrTemplate SC_Helper_Mail_Ex::sfGetMailmagaTemplate()$B$NLa$jCM(B
      * @return array key:template_id value:$B%5%V%8%'%/%H!ZG[?.7A<0![(B
      */
-    function lfGetMailTemplateList($arrTemplate)
-    {
+    function lfGetMailTemplateList($arrTemplate) {
         if (is_array($arrTemplate)) {
             foreach ($arrTemplate as $line) {
                 $return[$line['template_id']] = '$B!Z(B' . $this->arrHtmlmail[$line['mail_method']] . '$B![(B' . $line['subject'];
@@ -239,8 +231,7 @@
      * @param array $template_id $B%F%s%W%l!<%H(BID
      * @return void
      */
-    function lfGetTemplateData(&$objFormParam, $template_id)
-    {
+    function lfGetTemplateData(&$objFormParam, $template_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setOrder('template_id DESC');
         $where = 'template_id = ?';
@@ -253,8 +244,7 @@
      *
      * @return integer $BEPO?$7$?9T$N(B dtb_send_history.send_id $B$NCM(B
      */
-    function lfRegisterData(&$objFormParam)
-    {
+    function lfRegisterData(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         list($linemax, $arrSendCustomer, $objNavi) = SC_Helper_Customer_Ex::sfGetSearchData($objFormParam->getHashArray(), 'All');
@@ -298,8 +288,7 @@
      * @param integer $send_id$B!!G[?.MzNrHV9f(B
      * @return array
      */
-    function lfGetMailQuery($send_id)
-    {
+    function lfGetMailQuery($send_id) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_History extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_History extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/history.tpl';
         $this->tpl_mainno = 'mail';
@@ -58,8 +56,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -69,8 +66,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
             case 'delete':
@@ -94,8 +90,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -105,8 +100,7 @@
      * @param integer $search_pageno $BI=<($7$?$$%Z!<%8HV9f(B
      * @return array( integer $BA4BN7o?t(B, mixed $B%a!<%kG[?.%G!<%?0lMwG[Ns(B, mixed SC_PageNavi$B%*%V%8%'%/%H(B)
      */
-    function lfDoSearch($search_pageno = 1)
-    {
+    function lfDoSearch($search_pageno = 1) {
 
         // $B0z?t$N=i4|2=(B
         if (SC_Utils_Ex::sfIsInt($search_pageno)===false) {
@@ -145,8 +139,7 @@
      * @param integer $send_id$B!!:o=|$7$?$$Aw?.MzNr$N(BID
      * @return void
      */
-    function lfDeleteHistory($send_id)
-    {
+    function lfDeleteHistory($send_id) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
             $objQuery->update('dtb_send_history',
                               array('del_flg' =>1),

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Preview extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_Preview extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -41,8 +40,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '$B%W%l%S%e!<(B';
         $this->tpl_mainpage = 'mail/preview.tpl';
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objMailHelper = new SC_Helper_Mail_Ex();
 
@@ -97,8 +93,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Template extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_Template extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/template.tpl';
         $this->tpl_mainno = 'mail';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objMailHelper = new SC_Helper_Mail_Ex();
 
@@ -96,8 +92,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -106,8 +101,7 @@
      * @param integer $B:o=|$7$?$$%F%s%W%l!<%H$N(BID
      * @return void
      */
-    function lfDeleteMailTemplate($template_id)
-    {
+    function lfDeleteMailTemplate($template_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->update('dtb_mailmaga_template',
                           array('del_flg' =>1),

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_TemplateInput extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Mail_TemplateInput extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'mail/template_input.tpl';
         $this->tpl_mainno = 'mail';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objMailHelper = new SC_Helper_Mail_Ex();
 
@@ -118,8 +114,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -130,8 +125,7 @@
      * @param integer template_id $B99?7;~$O;XDj(B
      * @return void
      */
-    function lfRegistData(&$objFormParam, $template_id = null)
-    {
+    function lfRegistData(&$objFormParam, $template_id = null) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sqlval = $objFormParam->getDbArray();
@@ -159,8 +153,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%a!<%k7A<0(B', 'mail_method', INT_LEN, 'n', array('EXIST_CHECK','ALNUM_CHECK'));
         $objFormParam->addParam('Subject', 'subject', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BK\J8(B', 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/index.tpl';
         $this->tpl_mainno = 'order';
@@ -72,7 +70,7 @@
         $this->arrDay = $objDate->getDay();
 
         // $B;YJ'$$J}K!$N<hF@(B
-        $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         $this->httpCacheControl('nocache');
     }
@@ -82,8 +80,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -93,8 +90,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
@@ -102,13 +98,11 @@
         $this->arrHidden = $objFormParam->getSearchArray();
         $this->arrForm = $objFormParam->getFormParamList();
 
-        $objPurchase = new SC_Helper_Purchase_Ex();
-
         switch ($this->getMode()) {
             // $B:o=|(B
             case 'delete':
-                $order_id = $objFormParam->getValue('order_id');
-                $objPurchase->cancelOrder($order_id, ORDER_CANCEL, true);
+                $this->doDelete('order_id = ?',
+                                array($objFormParam->getValue('order_id')));
                 // $B:o=|8e$K8!:w7k2L$rI=<($9$k$?$a(B break$B$7$J$$(B
 
             // $B8!:w%Q%i%a!<%?!<@8 ＠ .8e$K=hM}<B9T$9$k$?$a(B break$B$7$J$$(B
@@ -147,12 +141,7 @@
 
                         // $BA47o:o=|(B(ADMIN_MODE)
                         case 'delete_all':
-                            $page_max = 0;
-                            $arrResults = $this->findOrders($where, $arrWhereVal,
-                                                           $page_max, 0, $order);
-                            foreach ($arrResults as $element) {
-                                $objPurchase->cancelOrder($element['order_id'], ORDER_CANCEL, true);
-                            }
+                            $this->doDelete($where, $arrWhereVal);
                             break;
 
                         // $B8!:w<B9T(B
@@ -185,8 +174,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -196,8 +184,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BCmJ8HV9f(B1', 'search_order_id1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$BCmJ8HV9f(B2', 'search_order_id2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$BBP1~>u67(B', 'search_order_status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -244,8 +231,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
 
@@ -283,8 +269,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function buildQuery($key, &$where, &$arrValues, &$objFormParam)
-    {
+    function buildQuery($key, &$where, &$arrValues, &$objFormParam) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         switch ($key) {
 
@@ -294,11 +279,11 @@
                 break;
             case 'search_order_name':
                 $where .= ' AND ' . $dbFactory->concatColumn(array('order_name01', 'order_name02')) . ' LIKE ?';
-                $arrValues[] = sprintf('%%%s%%', preg_replace('/[ $B!!(B]/u', '', $objFormParam->getValue($key)));
+                $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key));
                 break;
             case 'search_order_kana':
                 $where .= ' AND ' . $dbFactory->concatColumn(array('order_kana01', 'order_kana02')) . ' LIKE ?';
-                $arrValues[] = sprintf('%%%s%%', preg_replace('/[ $B!!(B]/u', '', $objFormParam->getValue($key)));
+                $arrValues[] = sprintf('%%%s%%', $objFormParam->getValue($key));
                 break;
             case 'search_order_id1':
                 $where .= ' AND order_id >= ?';
@@ -418,8 +403,7 @@
      * @param array $arrParam $B:o=|BP>]$NCM(B
      * @return void
      */
-    function doDelete($where, $arrParam = array())
-    {
+    function doDelete($where, $arrParam = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sqlval['del_flg']     = 1;
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
@@ -437,8 +421,7 @@
      * @param string $order $B8!:w7k2L$NJB$S=g(B
      * @return void
      */
-    function doOutputCSV($where, $arrVal, $order)
-    {
+    function doOutputCSV($where, $arrVal, $order) {
         if ($where != '') {
             $where = " WHERE $where ";
         }
@@ -454,8 +437,7 @@
      * @param array $arrValues $B8!:w>r7o$N%Q%i%a!<%?!<(B
      * @return integer $B8!:w7k2L$N9T?t(B
      */
-    function getNumberOfLines($where, $arrValues)
-    {
+    function getNumberOfLines($where, $arrValues) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->count('dtb_order', $where, $arrValues);
     }
@@ -470,12 +452,9 @@
      * @param string $order $B8!:w7k2L$NJB$S=g(B
      * @return array $B<uCm$N8!:w7k2L(B
      */
-    function findOrders($where, $arrValues, $limit, $offset, $order)
-    {
+    function findOrders($where, $arrValues, $limit, $offset, $order) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        if ($limit != 0) {
-            $objQuery->setLimitOffset($limit, $offset);
-        }
+        $objQuery->setLimitOffset($limit, $offset);
         $objQuery->setOrder($order);
         return $objQuery->select('*', 'dtb_order', $where, $arrValues);
     }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id: LC_Page_Admin_Order_Disp.php 20767 2011-03-22 10:07:32Z nanasess $
  */
-class LC_Page_Admin_Order_Disp extends LC_Page_Admin_Order_Ex 
-{
+class LC_Page_Admin_Order_Disp extends LC_Page_Admin_Order_Ex {
 
     var $arrShippingKeys = array(
         'shipping_id',
@@ -75,8 +74,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/disp.tpl';
         $this->tpl_mainno = 'order';
@@ -90,10 +88,10 @@
         $this->arrDeviceType = $masterData->getMasterData('mtb_device_type');
 
         // $B;YJ'$$J}K!$N<hF@(B
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         // $BG[Aw6H<T$N<hF@(B
-        $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList();
+        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name');
     }
 
     /**
@@ -101,8 +99,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -112,8 +109,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPurchase = new SC_Helper_Purchase_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -129,7 +125,7 @@
 
         $this->arrForm = $objFormParam->getFormParamList();
         $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
-        $this->arrDelivTime = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
+        $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
 
         $this->setTemplate($this->tpl_mainpage);
@@ -140,8 +136,7 @@
      * $B%G%9%H%i%/%?(B.
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -151,8 +146,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // $B8!:w>r7o$N%Q%i%a!<%?$r=i4|2=(B
         parent::lfInitParam($objFormParam);
 
@@ -199,8 +193,6 @@
         $objFormParam->addParam('$B5,3JL>(B2', 'classcategory_name2');
         $objFormParam->addParam('$B%a%b(B', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B:o=|MQ9`HV(B', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam('$B>CHq ＠ GN((B', 'tax_rate');
-        $objFormParam->addParam('$B2]@G5,B'(B', 'tax_rule');
 
         // DB$BFI9~MQ(B
         $objFormParam->addParam('$B>.7W(B', 'subtotal');
@@ -264,8 +256,7 @@
      * @param integer $order_id $B<hF ＠ 85$N<uCm(BID
      * @return void
      */
-    function setOrderToFormParam(&$objFormParam, $order_id)
-    {
+    function setOrderToFormParam(&$objFormParam, $order_id) {
         $objPurchase = new SC_Helper_Purchase_Ex();
 
         // $B<uCm>\:Y$r ＠ _Dj(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Edit extends LC_Page_Admin_Order_Ex 
-{
+class LC_Page_Admin_Order_Edit extends LC_Page_Admin_Order_Ex {
 
     var $arrShippingKeys = array(
         'shipping_id',
@@ -67,21 +66,6 @@
         'shipment_quantity',
     );
 
-    var $arrProductKeys = array(
-        'product_id',
-        'product_class_id',
-        'product_type_id',
-        'point_rate',
-        'product_code',
-        'product_name',
-        'classcategory_name1',
-        'classcategory_name2',
-        'quantity',
-        'price',
-        'tax_rate',
-        'tax_rule'
-    );
-
     // }}}
     // {{{ functions
 
@@ -90,8 +74,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/edit.tpl';
         $this->tpl_mainno = 'order';
@@ -109,13 +92,11 @@
         $this->arrDayShippingDate = $objDate->getDay(true);
 
         // $B;YJ'$$J}K!$N<hF@(B
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         // $BG[Aw6H<T$N<hF@(B
-        $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList();
+        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name');
 
-        $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
-
         $this->httpCacheControl('nocache');
     }
 
@@ -124,8 +105,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -135,8 +115,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPurchase = new SC_Helper_Purchase_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -184,8 +163,6 @@
             case 'edit':
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
-                //$BJ#?tG[Aw;~$K3F>&IJ$NAmNL$r ＠ _Dj(B
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     $message = '$B<uCm$rJT=8$7$^$7$?!#(B';
@@ -201,8 +178,6 @@
                 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                     $objFormParam->setParam($_POST);
                     $objFormParam->convParam();
-                    //$BJ#?tG[Aw;~$K3F>&IJ$NAmNL$r ＠ _Dj(B
-                    $this->setProductsQuantity($objFormParam);
                     $this->arrErr = $this->lfCheckError($objFormParam);
                     if (SC_Utils_Ex::isBlank($this->arrErr)) {
                         $message = '$B<uCm$rEPO?$7$^$7$?!#(B';
@@ -226,8 +201,6 @@
             case 'deliv':
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
-                //$BJ#?tG[Aw;~$K3F>&IJ$NAmNL$r ＠ _Dj(B
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
 
@@ -237,8 +210,6 @@
                 $objFormParam->convParam();
                 $delete_no = $objFormParam->getValue('delete_no');
                 $this->doDeleteProduct($delete_no, $objFormParam);
-                //$BJ#?tG[Aw;~$K3F>&IJ$NAmNL$r ＠ _Dj(B
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
 
@@ -247,8 +218,6 @@
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
                 $this->doRegisterProduct($objFormParam);
-                //$BJ#?tG[Aw;~$K3F>&IJ$NAmNL$r ＠ _Dj(B
-                $this->setProductsQuantity($objFormParam);
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
 
@@ -256,33 +225,19 @@
             case 'search_customer':
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
-                $customer_birth = $this->setCustomerTo($objFormParam->getValue('edit_customer_id'),
+                $this->setCustomerTo($objFormParam->getValue('edit_customer_id'),
                                      $objFormParam);
-                // $B2C;;%]%$%s%H$N7W;;(B
-                if (USE_POINT === true && $this->tpl_mode == 'add'){
-                    $birth_point = 0;
-                    if ($customer_birth){
-                        $arrRet = preg_split('|[- :/]|', $customer_birth);
-                        $birth_date = intval($arrRet[1]);
-                        $now_date   = intval(date('m'));
-                        // $BCB ＠ 8F|7n$G$"$C$?>l9g(B
-                        if ($birth_date == $now_date) {
-                            $birth_point = BIRTH_MONTH_POINT;
-                        }
-                    }
-                    $objFormParam->setValue("birth_point",$birth_point);
-                }
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
 
-                // $BJ#?tG[Aw ＠ _DjI=<((B
+            // $BJ#?tG[Aw ＠ _DjI=<((B
             case 'multiple':
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
                 $this->arrErr = $this->lfCheckError($objFormParam);
                 break;
 
-                // $BJ#?tG[Aw ＠ _Dj$rH?1G(B
+            // $BJ#?tG[Aw ＠ _Dj$rH?1G(B
             case 'multiple_set_to':
                 $this->lfInitMultipleParam($objFormParam);
                 $objFormParam->setParam($_POST);
@@ -290,7 +245,7 @@
                 $this->setMultipleItemTo($objFormParam);
                 break;
 
-                // $B$*FO$1 ＠ h$NDI2C(B
+            // $B$*FO$1 ＠ h$NDI2C(B
             case 'append_shipping':
                 $objFormParam->setParam($_POST);
                 $objFormParam->convParam();
@@ -301,393 +256,382 @@
                 break;
         }
 
-        $this->arrForm        = $objFormParam->getFormParamList();
+        $this->arrForm = $objFormParam->getFormParamList();
         $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
-        $this->top_shipping_id      = array_shift((array_keys($this->arrAllShipping)));
-        $this->arrDelivTime   = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
+        $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
         $this->tpl_onload .= $this->getAnchorKey($objFormParam);
+        $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         if ($arrValuesBefore['payment_id'])
             $this->arrPayment[$arrValuesBefore['payment_id']] = $arrValuesBefore['payment_method'];
+
     }
 
-/**
- * $B%G%9%H%i%/%?(B.
- *
- * @return void
- */
-function destroy()
-{
-    parent::destroy();
-}
-
-/**
- * $B%Q%i%a!<%?!<>pJs$N=i4|2=$r9T$&(B.
- *
- * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
- * @return void
- */
-function lfInitParam(&$objFormParam)
-{
-    // $B8!:w>r7o$N%Q%i%a!<%?!<$r=i4|2=(B
-    parent::lfInitParam($objFormParam);
-
-    // $B$*5RMM>pJs(B
-    $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($B ＠ +(B)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($BL>(B)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($B%U%j%,%J!&@+(B)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($B%U%j%,%J!&L>(B)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$B%a!<%k%"%I%l%9(B', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
-    $objFormParam->addParam('$BM9JXHV9f(B1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('$BM9JXHV9f(B2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('$BETF;I\8)(B', 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B=;=j(B1', 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$B=;=j(B2', 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$BEEOCHV9f(B1', 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('$BEEOCHV9f(B2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('$BEEOCHV9f(B3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX$BHV9f(B1', 'order_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX$BHV9f(B2', 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX$BHV9f(B3', 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-
-    // $B<uCm>&IJ>pJs(B
-    $objFormParam->addParam('$BCM0z$-(B', 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$BAwNA(B', 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B<j?tNA(B', 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-
-    // $B%]%$%s%H5!G=(BON$B;~$N$_(B
-    if (USE_POINT !== false) {
-        $objFormParam->addParam('$BMxMQ%]%$%s%H(B', 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+    /**
+     * $B%G%9%H%i%/%?(B.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
     }
 
-    $objFormParam->addParam('$BG[Aw6H<T(B', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B$*;YJ'$$J}K!(B', 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$BBP1~>u67(B', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B$*;YJ'J}K!L>>N(B', 'payment_method');
+    /**
+     * $B%Q%i%a!<%?!<>pJs$N=i4|2=$r9T$&(B.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
+     * @return void
+     */
+    function lfInitParam(&$objFormParam) {
+        // $B8!:w>r7o$N%Q%i%a!<%?!<$r=i4|2=(B
+        parent::lfInitParam($objFormParam);
 
+        // $B$*5RMM>pJs(B
+        $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($B ＠ +(B)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($BL>(B)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($B%U%j%,%J!&@+(B)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BCmJ8<T(B $B$*L>A0(B($B%U%j%,%J!&L>(B)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B%a!<%k%"%I%l%9(B', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
+        $objFormParam->addParam('$BM9JXHV9f(B1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('$BM9JXHV9f(B2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('$BETF;I\8)(B', 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B=;=j(B1', 'order_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B=;=j(B2', 'order_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BEEOCHV9f(B1', 'order_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('$BEEOCHV9f(B2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('$BEEOCHV9f(B3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX$BHV9f(B1', 'order_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX$BHV9f(B2', 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX$BHV9f(B3', 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
 
-    // $B<uCm>\:Y>pJs(B
-    $objFormParam->addParam('$B>&IJ<oJL(BID', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$BC12A(B', 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B?tNL(B', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B>&IJ5,3J(BID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B%]%$%s%HIUM?N((B', 'point_rate');
-    $objFormParam->addParam('$B>&IJ%3!<%I(B', 'product_code');
-    $objFormParam->addParam('$B>&IJL>(B', 'product_name');
-    $objFormParam->addParam('$B5,3JL>(B1', 'classcategory_name1');
-    $objFormParam->addParam('$B5,3JL>(B2', 'classcategory_name2');
-    $objFormParam->addParam('$B ＠ GN((B', 'tax_rate');
-    $objFormParam->addParam('$B2]@G5,B'(B', 'tax_rule');
-    $objFormParam->addParam('$B%a%b(B', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$B:o=|MQ9`HV(B', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        // $B<uCm>&IJ>pJs(B
+        $objFormParam->addParam('$BCM0z$-(B', 'discount', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$BAwNA(B', 'deliv_fee', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B<j?tNA(B', 'charge', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
 
-    // DB$BFI9~MQ(B
-    $objFormParam->addParam('$B>.7W(B', 'subtotal');
-    $objFormParam->addParam('$B9g7W(B', 'total');
-    $objFormParam->addParam('$B;YJ'$$9g7W(B', 'payment_total');
-    $objFormParam->addParam('$B2C;;%]%$%s%H(B', 'add_point');
-    $objFormParam->addParam('$B$*CB ＠ 8F|%]%$%s%H(B', 'birth_point', null, 'n', array(), 0);
-    $objFormParam->addParam('$B>CHq ＠ G9g7W(B', 'tax');
-    $objFormParam->addParam('$B:G=*J];}%]%$%s%H(B', 'total_point');
-    $objFormParam->addParam('$B2q0w(BID', 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B2q0w(BID', 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B8=:_$N%]%$%s%H(B', 'customer_point');
-    $objFormParam->addParam('$B<uCmA0%]%$%s%H(B', 'point');
-    $objFormParam->addParam('$BCmJ8HV9f(B', 'order_id');
-    $objFormParam->addParam('$B<uCmF|(B', 'create_date');
-    $objFormParam->addParam('$BH/AwF|(B', 'commit_date');
-    $objFormParam->addParam('$BHw9M(B', 'message');
-    $objFormParam->addParam('$BF~6bF|(B', 'payment_date');
-    $objFormParam->addParam('$BC<Kv<oJL(B', 'device_type_id');
-    $objFormParam->addParam('$B ＠ GN((B', 'order_tax_rate');
-    $objFormParam->addParam('$B2]@G5,B'(B', 'order_tax_rule');
+        // $B%]%$%s%H5!G=(BON$B;~$N$_(B
+        if (USE_POINT !== false) {
+            $objFormParam->addParam('$BMxMQ%]%$%s%H(B', 'use_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        }
 
-    // $BJ#?t>pJs(B
-    $objFormParam->addParam('$BG[Aw?t(B', 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('$BG[Aw(BID', 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0);
-    $objFormParam->addParam('$B$*L>A0(B($B ＠ +(B)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$B$*L>A0(B($BL>(B)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$B$*L>A0(B($B%U%j%,%J!&@+(B)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$B$*L>A0(B($B%U%j%,%J!&L>(B)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$BM9JXHV9f(B1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('$BM9JXHV9f(B2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
-    $objFormParam->addParam('$BETF;I\8)(B', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B=;=j(B1', 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$B=;=j(B2', 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$BEEOCHV9f(B1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('$BEEOCHV9f(B2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('$BEEOCHV9f(B3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX$BHV9f(B1', 'shipping_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX$BHV9f(B2', 'shipping_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('FAX$BHV9f(B3', 'shipping_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
-    $objFormParam->addParam('$B$*FO$1;~4V(BID', 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B$*FO$1F|(B($BG/(B)', 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B$*FO$1F|(B($B7n(B)', 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B$*FO$1F|(B($BF|(B)', 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B$*FO$1F|(B', 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-    $objFormParam->addParam('$BG[Aw>&IJ?tNL(B', 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$BG[Aw6H<T(B', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B$*;YJ'$$J}K!(B', 'payment_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$BBP1~>u67(B', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B$*;YJ'J}K!L>>N(B', 'payment_method');
 
-    $objFormParam->addParam('$B>&IJ5,3J(BID', 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B>&IJ%3!<%I(B', 'shipment_product_code');
-    $objFormParam->addParam('$B>&IJL>(B', 'shipment_product_name');
-    $objFormParam->addParam('$B5,3JL>(B1', 'shipment_classcategory_name1');
-    $objFormParam->addParam('$B5,3JL>(B2', 'shipment_classcategory_name2');
-    $objFormParam->addParam('$BC12A(B', 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
-    $objFormParam->addParam('$B?tNL(B', 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        // $B<uCm>\:Y>pJs(B
+        $objFormParam->addParam('$B>&IJ<oJL(BID', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$BC12A(B', 'price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B?tNL(B', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B>&IJ5,3J(BID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B%]%$%s%HIUM?N((B', 'point_rate');
+        $objFormParam->addParam('$B>&IJ%3!<%I(B', 'product_code');
+        $objFormParam->addParam('$B>&IJL>(B', 'product_name');
+        $objFormParam->addParam('$B5,3JL>(B1', 'classcategory_name1');
+        $objFormParam->addParam('$B5,3JL>(B2', 'classcategory_name2');
+        $objFormParam->addParam('$B%a%b(B', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B:o=|MQ9`HV(B', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
 
-    $objFormParam->addParam('$B>&IJ9`HV(B', 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$BDI2C>&IJ5,3J(BID', 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B=$@5>&IJ5,3J(BID', 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$BBP>]FO$1 ＠ h(BID', 'select_shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B%"%s%+!<%-!<(B', 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
-}
+        // DB$BFI9~MQ(B
+        $objFormParam->addParam('$B>.7W(B', 'subtotal');
+        $objFormParam->addParam('$B9g7W(B', 'total');
+        $objFormParam->addParam('$B;YJ'$$9g7W(B', 'payment_total');
+        $objFormParam->addParam('$B2C;;%]%$%s%H(B', 'add_point');
+        $objFormParam->addParam('$B$*CB ＠ 8F|%]%$%s%H(B', 'birth_point', null, 'n', array(), 0);
+        $objFormParam->addParam('$B>CHq ＠ G9g7W(B', 'tax');
+        $objFormParam->addParam('$B:G=*J];}%]%$%s%H(B', 'total_point');
+        $objFormParam->addParam('$B2q0w(BID', 'customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B2q0w(BID', 'edit_customer_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B8=:_$N%]%$%s%H(B', 'customer_point');
+        $objFormParam->addParam('$B<uCmA0%]%$%s%H(B', 'point');
+        $objFormParam->addParam('$BCmJ8HV9f(B', 'order_id');
+        $objFormParam->addParam('$B<uCmF|(B', 'create_date');
+        $objFormParam->addParam('$BH/AwF|(B', 'commit_date');
+        $objFormParam->addParam('$BHw9M(B', 'message');
+        $objFormParam->addParam('$BF~6bF|(B', 'payment_date');
+        $objFormParam->addParam('$BC<Kv<oJL(B', 'device_type_id');
 
-/**
- * $BJ#?tG[AwMQ%U%)!<%`$N=i4|2=$r9T$&(B.
- *
- * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
- * @return void
- */
-function lfInitMultipleParam(&$objFormParam)
-{
-    $objFormParam->addParam('$B>&IJ5,3J(BID', 'multiple_product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-    $objFormParam->addParam('$B>&IJ%3!<%I(B', 'multiple_product_code', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('$B>&IJL>(B', 'multiple_product_name', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('$B5,3J(B1', 'multiple_classcategory_name1', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('$B5,3J(B2', 'multiple_classcategory_name2', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('$BC12A(B', 'multiple_price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('$B?tNL(B', 'multiple_quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
-    $objFormParam->addParam('$B$*FO$1 ＠ h(B', 'multiple_shipping_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
-}
+        // $BJ#?t>pJs(B
+        $objFormParam->addParam('$BG[Aw?t(B', 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('$BG[Aw(BID', 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0);
+        $objFormParam->addParam('$B$*L>A0(B($B ＠ +(B)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B$*L>A0(B($BL>(B)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B$*L>A0(B($B%U%j%,%J!&@+(B)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B$*L>A0(B($B%U%j%,%J!&L>(B)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BM9JXHV9f(B1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('$BM9JXHV9f(B2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
+        $objFormParam->addParam('$BETF;I\8)(B', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B=;=j(B1', 'shipping_addr01', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$B=;=j(B2', 'shipping_addr02', MTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BEEOCHV9f(B1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('$BEEOCHV9f(B2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('$BEEOCHV9f(B3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX$BHV9f(B1', 'shipping_fax01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX$BHV9f(B2', 'shipping_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('FAX$BHV9f(B3', 'shipping_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('$B$*FO$1;~4V(BID', 'time_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B$*FO$1F|(B($BG/(B)', 'shipping_date_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B$*FO$1F|(B($B7n(B)', 'shipping_date_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B$*FO$1F|(B($BF|(B)', 'shipping_date_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B$*FO$1F|(B', 'shipping_date', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+        $objFormParam->addParam('$BG[Aw>&IJ?tNL(B', 'shipping_product_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
 
-/**
- * $BJ#?tG[AwF~NO%U%)!<%`$GF~NO$5$l$?CM$r(B SC_FormParam $B$X ＠ _Dj$9$k(B.
- *
- * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
- * @return void
- */
-function setMultipleItemTo(&$objFormParam)
-{
-    $arrMultipleKey = array('multiple_shipping_id',
-            'multiple_product_class_id',
-            'multiple_product_name',
-            'multiple_product_code',
-            'multiple_classcategory_name1',
-            'multiple_classcategory_name2',
-            'multiple_price',
-            'multiple_quantity');
-    $arrMultipleParams = $objFormParam->getSwapArray($arrMultipleKey);
+        $objFormParam->addParam('$B>&IJ5,3J(BID', 'shipment_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B>&IJ%3!<%I(B', 'shipment_product_code');
+        $objFormParam->addParam('$B>&IJL>(B', 'shipment_product_name');
+        $objFormParam->addParam('$B5,3JL>(B1', 'shipment_classcategory_name1');
+        $objFormParam->addParam('$B5,3JL>(B2', 'shipment_classcategory_name2');
+        $objFormParam->addParam('$BC12A(B', 'shipment_price', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
+        $objFormParam->addParam('$B?tNL(B', 'shipment_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), '0');
 
-    /*
-     * $BJ#?tG[Aw%U%)!<%`$NF~NOCM$r(B shipping_id $B$4$H$K%^!<%8(B
+        $objFormParam->addParam('$B>&IJ9`HV(B', 'no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$BDI2C>&IJ5,3J(BID', 'add_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B=$@5>&IJ5,3J(BID', 'edit_product_class_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B%"%s%+!<%-!<(B', 'anchor_key', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+    }
+
+    /**
+     * $BJ#?tG[AwMQ%U%)!<%`$N=i4|2=$r9T$&(B.
      *
-     * $arrShipmentItem[$B$*FO$1 ＠ h(BID][$B>&IJ5,3J(BID]['shipment_(key)'] = $BCM(B
+     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
+     * @return void
      */
-    $arrShipmentItem = array();
-    foreach ($arrMultipleParams as $arrMultiple) {
-        $shipping_id = $arrMultiple['multiple_shipping_id'];
-        $product_class_id = $arrMultiple['multiple_product_class_id'];
-        foreach ($arrMultiple as $key => $val) {
-            if ($key == 'multiple_quantity') {
-                $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] += $val;
-            } else {
-                $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] = $val;
-            }
-        }
+    function lfInitMultipleParam(&$objFormParam) {
+        $objFormParam->addParam('$B>&IJ5,3J(BID', 'multiple_product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        $objFormParam->addParam('$B>&IJ%3!<%I(B', 'multiple_product_code', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('$B>&IJL>(B', 'multiple_product_name', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('$B5,3J(B1', 'multiple_classcategory_name1', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('$B5,3J(B2', 'multiple_classcategory_name2', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('$BC12A(B', 'multiple_price', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('$B?tNL(B', 'multiple_quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
+        $objFormParam->addParam('$B$*FO$1 ＠ h(B', 'multiple_shipping_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
 
-    /*
-     * $B%U%)!<%`$N$*FO$1 ＠ h$4$H$NG[Ns$r ＠ 8@.(B
+    /**
+     * $BJ#?tG[AwF~NO%U%)!<%`$GF~NO$5$l$?CM$r(B SC_FormParam $B$X ＠ _Dj$9$k(B.
      *
-     * $arrShipmentForm['(key)'][$shipping_id][$item_index] = $BCM(B
-     * $arrProductQuantity[$shipping_id] = $B$*FO$1 ＠ h$4$H$NG[Aw>&IJ?tNL(B
+     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
+     * @return void
      */
-    $arrShipmentForm = array();
-    $arrProductQuantity = array();
-    $arrShippingIds = $objFormParam->getValue('shipping_id');
-    foreach ($arrShippingIds as $shipping_id) {
-        $item_index = 0;
-        foreach ($arrShipmentItem[$shipping_id] as $product_class_id => $shipment_item) {
-            foreach ($shipment_item as $key => $val) {
-                $arrShipmentForm[$key][$shipping_id][$item_index] = $val;
+    function setMultipleItemTo(&$objFormParam) {
+        $arrMultipleKey = array('multiple_shipping_id',
+                                'multiple_product_class_id',
+                                'multiple_product_name',
+                                'multiple_product_code',
+                                'multiple_classcategory_name1',
+                                'multiple_classcategory_name2',
+                                'multiple_price',
+                                'multiple_quantity');
+        $arrMultipleParams = $objFormParam->getSwapArray($arrMultipleKey);
+
+        /*
+         * $BJ#?tG[Aw%U%)!<%`$NF~NOCM$r(B shipping_id $B$4$H$K%^!<%8(B
+         *
+         * $arrShipmentItem[$B$*FO$1 ＠ h(BID][$B>&IJ5,3J(BID]['shipment_(key)'] = $BCM(B
+         */
+        $arrShipmentItem = array();
+        foreach ($arrMultipleParams as $arrMultiple) {
+            $shipping_id = $arrMultiple['multiple_shipping_id'];
+            $product_class_id = $arrMultiple['multiple_product_class_id'];
+            foreach ($arrMultiple as $key => $val) {
+                if ($key == 'multiple_quantity') {
+                    $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] += $val;
+                } else {
+                    $arrShipmentItem[$shipping_id][$product_class_id][str_replace('multiple', 'shipment', $key)] = $val;
+                }
             }
-            // $B<uCm>&IJ$N?tNL$r ＠ _Dj(B
-            $arrQuantity[$product_class_id] += $shipment_item['shipment_quantity'];
-            $item_index++;
         }
-        // $B$*FO$1 ＠ h$4$H$NG[Aw>&IJ?tNL$r ＠ _Dj(B
-        $arrProductQuantity[$shipping_id] = count($arrShipmentItem[$shipping_id]);
-    }
 
-    $objFormParam->setParam($arrShipmentForm);
-    $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
+        /*
+         * $B%U%)!<%`$N$*FO$1 ＠ h$4$H$NG[Ns$r ＠ 8@.(B
+         *
+         * $arrShipmentForm['(key)'][$shipping_id][$item_index] = $BCM(B
+         * $arrProductQuantity[$shipping_id] = $B$*FO$1 ＠ h$4$H$NG[Aw>&IJ?tNL(B
+         */
+        $arrShipmentForm = array();
+        $arrProductQuantity = array();
+        $arrShippingIds = $objFormParam->getValue('shipping_id');
+        foreach ($arrShippingIds as $shipping_id) {
+            $item_index = 0;
+            foreach ($arrShipmentItem[$shipping_id] as $product_class_id => $shipment_item) {
+                foreach ($shipment_item as $key => $val) {
+                    $arrShipmentForm[$key][$shipping_id][$item_index] = $val;
+                }
+                // $B<uCm>&IJ$N?tNL$r ＠ _Dj(B
+                $arrQuantity[$product_class_id] += $shipment_item['shipment_quantity'];
+                $item_index++;
+            }
+            // $B$*FO$1 ＠ h$4$H$NG[Aw>&IJ?tNL$r ＠ _Dj(B
+            $arrProductQuantity[$shipping_id] = count($arrShipmentItem[$shipping_id]);
+        }
 
-    // $B<uCm>&IJ$N?tNL$rJQ99(B
-    $arrDest = array();
-    foreach ($objFormParam->getValue('product_class_id') as $n => $order_product_class_id) {
-        $arrDest['quantity'][$n] = 0;
-    }
-    foreach ($arrQuantity as $product_class_id => $quantity) {
+        $objFormParam->setParam($arrShipmentForm);
+        $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
+
+        // $B<uCm>&IJ$N?tNL$rJQ99(B
+        $arrDest = array();
         foreach ($objFormParam->getValue('product_class_id') as $n => $order_product_class_id) {
-            if ($product_class_id == $order_product_class_id) {
-                $arrDest['quantity'][$n] = $quantity;
+            $arrDest['quantity'][$n] = 0;
+        }
+        foreach ($arrQuantity as $product_class_id => $quantity) {
+            foreach ($objFormParam->getValue('product_class_id') as $n => $order_product_class_id) {
+                if ($product_class_id == $order_product_class_id) {
+                    $arrDest['quantity'][$n] = $quantity;
+                }
             }
         }
+        $objFormParam->setParam($arrDest);
     }
-    $objFormParam->setParam($arrDest);
-}
 
-/**
- * $B<uCm%G!<%?$r<hF@$7$F(B, SC_FormParam $B$X ＠ _Dj$9$k(B.
- *
- * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
- * @param integer $order_id $B<hF ＠ 85$N<uCm(BID
- * @return void
- */
-function setOrderToFormParam(&$objFormParam, $order_id)
-{
-    $objPurchase = new SC_Helper_Purchase_Ex();
+    /**
+     * $B<uCm%G!<%?$r<hF@$7$F(B, SC_FormParam $B$X ＠ _Dj$9$k(B.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
+     * @param integer $order_id $B<hF ＠ 85$N<uCm(BID
+     * @return void
+     */
+    function setOrderToFormParam(&$objFormParam, $order_id) {
+        $objPurchase = new SC_Helper_Purchase_Ex();
 
-    // $B<uCm>\:Y$r ＠ _Dj(B
-    $arrOrderDetail = $objPurchase->getOrderDetail($order_id, false);
-    $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrOrderDetail));
+        // $B<uCm>\:Y$r ＠ _Dj(B
+        $arrOrderDetail = $objPurchase->getOrderDetail($order_id, false);
+        $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrOrderDetail));
 
-    $arrShippingsTmp = $objPurchase->getShippings($order_id);
-    $arrShippings = array();
-    foreach ($arrShippingsTmp as $row) {
-        // $B$*FO$1F|$N=hM}(B
-        if (!SC_Utils_Ex::isBlank($row['shipping_date'])) {
-            $ts = strtotime($row['shipping_date']);
-            $row['shipping_date_year'] = date('Y', $ts);
-            $row['shipping_date_month'] = date('n', $ts);
-            $row['shipping_date_day'] = date('j', $ts);
+        $arrShippingsTmp = $objPurchase->getShippings($order_id);
+        $arrShippings = array();
+        foreach ($arrShippingsTmp as $row) {
+            // $B$*FO$1F|$N=hM}(B
+            if (!SC_Utils_Ex::isBlank($row['shipping_date'])) {
+                $ts = strtotime($row['shipping_date']);
+                $row['shipping_date_year'] = date('Y', $ts);
+                $row['shipping_date_month'] = date('n', $ts);
+                $row['shipping_date_day'] = date('j', $ts);
+            }
+            $arrShippings[$row['shipping_id']] = $row;
         }
-        $arrShippings[$row['shipping_id']] = $row;
-    }
-    $objFormParam->setValue('shipping_quantity', count($arrShippings));
-    $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrShippings));
+        $objFormParam->setValue('shipping_quantity', count($arrShippings));
+        $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrShippings));
 
-    /*
-     * $BG[Aw>&IJ$r ＠ _Dj(B
-     *
-     * $arrShipmentItem['shipment_(key)'][$shipping_id][$item_index] = $BCM(B
-     * $arrProductQuantity[$shipping_id] = $B$*FO$1 ＠ h$4$H$NG[Aw>&IJ?tNL(B
-     */
-    $arrProductQuantity = array();
-    $arrShipmentItem = array();
-    foreach ($arrShippings as $shipping_id => $arrShipping) {
-        $arrProductQuantity[$shipping_id] = count($arrShipping['shipment_item']);
-        foreach ($arrShipping['shipment_item'] as $item_index => $arrItem) {
-            foreach ($arrItem as $item_key => $item_val) {
-                $arrShipmentItem['shipment_' . $item_key][$shipping_id][$item_index] = $item_val;
+        /*
+         * $BG[Aw>&IJ$r ＠ _Dj(B
+         *
+         * $arrShipmentItem['shipment_(key)'][$shipping_id][$item_index] = $BCM(B
+         * $arrProductQuantity[$shipping_id] = $B$*FO$1 ＠ h$4$H$NG[Aw>&IJ?tNL(B
+         */
+        $arrProductQuantity = array();
+        $arrShipmentItem = array();
+        foreach ($arrShippings as $shipping_id => $arrShipping) {
+            $arrProductQuantity[$shipping_id] = count($arrShipping['shipment_item']);
+            foreach ($arrShipping['shipment_item'] as $item_index => $arrItem) {
+                foreach ($arrItem as $item_key => $item_val) {
+                    $arrShipmentItem['shipment_' . $item_key][$shipping_id][$item_index] = $item_val;
+                }
             }
         }
-    }
-    $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
-    $objFormParam->setParam($arrShipmentItem);
+        $objFormParam->setValue('shipping_product_quantity', $arrProductQuantity);
+        $objFormParam->setParam($arrShipmentItem);
 
-    /*
-     * $B<uCm>pJs$r ＠ _Dj(B
-     * $arrOrderDetail $B$H9`L\$,=EJ#$7$F$*$j(B, $arrOrderDetail $B$OO"A[G[Ns$NCM(B
-     * $B$,EO$C$F$/$k$?$a(B, $arrOrder $B$G>e=q$-$9$k(B.
-     */
-    $arrOrder = $objPurchase->getOrder($order_id);
-    $objFormParam->setParam($arrOrder);
+        /*
+         * $B<uCm>pJs$r ＠ _Dj(B
+         * $arrOrderDetail $B$H9`L\$,=EJ#$7$F$*$j(B, $arrOrderDetail $B$OO"A[G[Ns$NCM(B
+         * $B$,EO$C$F$/$k$?$a(B, $arrOrder $B$G>e=q$-$9$k(B.
+         */
+        $arrOrder = $objPurchase->getOrder($order_id);
+        $objFormParam->setParam($arrOrder);
 
-    // $B%]%$%s%H$r ＠ _Dj(B
-    list($db_point, $rollback_point) = SC_Helper_DB_Ex::sfGetRollbackPoint(
+        // $B%]%$%s%H$r ＠ _Dj(B
+        list($db_point, $rollback_point) = SC_Helper_DB_Ex::sfGetRollbackPoint(
             $order_id, $arrOrder['use_point'], $arrOrder['add_point'], $arrOrder['status']
-            );
-    $objFormParam->setValue('total_point', $db_point);
-    $objFormParam->setValue('point', $rollback_point);
+        );
+        $objFormParam->setValue('total_point', $db_point);
+        $objFormParam->setValue('point', $rollback_point);
 
-    if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) {
-        $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($objFormParam->getValue('customer_id'));
-        $objFormParam->setValue('customer_point', $arrCustomer['point']);
+        if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) {
+            $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($objFormParam->getValue('customer_id'));
+            $objFormParam->setValue('customer_point', $arrCustomer['point']);
+        }
     }
-}
 
-/**
- * $BF~NOFbMF$N%A%'%C%/$r9T$&(B.
- *
- * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
- * @return array $B%(%i!<%a%C%;!<%8$NG[Ns(B
- */
-function lfCheckError(&$objFormParam)
-{
-    $objProduct = new SC_Product_Ex();
+    /**
+     * $BF~NOFbMF$N%A%'%C%/$r9T$&(B.
+     *
+     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
+     * @return array $B%(%i!<%a%C%;!<%8$NG[Ns(B
+     */
+    function lfCheckError(&$objFormParam) {
+        $objProduct = new SC_Product_Ex();
 
-    $arrErr = $objFormParam->checkError();
+        $arrErr = $objFormParam->checkError();
 
-    if (!SC_Utils_Ex::isBlank($objErr->arrErr)) {
-        return $arrErr;
-    }
+        if (!SC_Utils_Ex::isBlank($objErr->arrErr)) {
+            return $arrErr;
+        }
 
-    $arrValues = $objFormParam->getHashArray();
+        $arrValues = $objFormParam->getHashArray();
 
-    // $B>&IJ$N<oN`?t(B
-    $max = count($arrValues['quantity']);
-    $subtotal = 0;
-    $totalpoint = 0;
-    $totaltax = 0;
-    for ($i = 0; $i < $max; $i++) {
-        // $B>.7W$N7W;;(B
-        $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i];
-        // $B>.7W$N7W;;(B
-        $totaltax += SC_Utils_Ex::sfTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i];
-        // $B2C;;%]%$%s%H$N7W;;(B
-        $totalpoint += SC_Utils_Ex::sfPrePoint($arrValues['price'][$i], $arrValues['point_rate'][$i]) * $arrValues['quantity'][$i];
+        // $B>&IJ$N<oN`?t(B
+        $max = count($arrValues['quantity']);
+        $subtotal = 0;
+        $totalpoint = 0;
+        $totaltax = 0;
+        for ($i = 0; $i < $max; $i++) {
+            // $B>.7W$N7W;;(B
+            $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i]) * $arrValues['quantity'][$i];
+            // $B>.7W$N7W;;(B
+            $totaltax += SC_Helper_DB_Ex::sfTax($arrValues['price'][$i]) * $arrValues['quantity'][$i];
+            // $B2C;;%]%$%s%H$N7W;;(B
+            $totalpoint += SC_Utils_Ex::sfPrePoint($arrValues['price'][$i], $arrValues['point_rate'][$i]) * $arrValues['quantity'][$i];
 
-        // $B:_8K?t$N%A%'%C%/(B
-        $arrProduct = $objProduct->getDetailAndProductsClass($arrValues['product_class_id'][$i]);
+            // $B:_8K?t$N%A%'%C%/(B
+            $arrProduct = $objProduct->getDetailAndProductsClass($arrValues['product_class_id'][$i]);
 
-        // $BJT=8A0$NCM$HHf3S$9$k$?$a<uCm>\:Y$r<hF@(B
-        $objPurchase = new SC_Helper_Purchase_Ex();
-        $arrOrderDetail = SC_Utils_Ex::sfSwapArray($objPurchase->getOrderDetail($objFormParam->getValue('order_id'), false));
+            // $BJT=8A0$NCM$HHf3S$9$k$?$a<uCm>\:Y$r<hF@(B
+            $objPurchase = new SC_Helper_Purchase_Ex();
+            $arrOrderDetail = SC_Utils_Ex::sfSwapArray($objPurchase->getOrderDetail($objFormParam->getValue('order_id'), false));
 
-        if ($arrProduct['stock_unlimited'] != '1'
+            if ($arrProduct['stock_unlimited'] != '1'
                 && $arrProduct['stock'] < $arrValues['quantity'][$i] - $arrOrderDetail['quantity'][$i]) {
-            $class_name1 = $arrValues['classcategory_name1'][$i];
-            $class_name1 = SC_Utils_Ex::isBlank($class_name1) ? '$B$J$7(B' : $class_name1;
-            $class_name2 = $arrValues['classcategory_name2'][$i];
-            $class_name2 = SC_Utils_Ex::isBlank($class_name2) ? '$B$J$7(B' : $class_name2;
-            $arrErr['quantity'][$i] .= $arrValues['product_name'][$i]
-                . '/(' . $class_name1 . ')/(' . $class_name2 . ') $B$N:_8K$,ITB-$7$F$$$^$9!#(B $B ＠ _Dj$G$-$k?tNL$O!V(B'
-                . ($arrOrderDetail['quantity'][$i] + $arrProduct['stock']) . '$B!W$^$G$G$9!#(B<br />';
+                $class_name1 = $arrValues['classcategory_name1'][$i];
+                $class_name1 = SC_Utils_Ex::isBlank($class_name1) ? '$B$J$7(B' : $class_name1;
+                $class_name2 = $arrValues['classcategory_name2'][$i];
+                $class_name2 = SC_Utils_Ex::isBlank($class_name2) ? '$B$J$7(B' : $class_name2;
+                $arrErr['quantity'][$i] .= $arrValues['product_name'][$i]
+                    . '/(' . $class_name1 . ')/(' . $class_name2 . ') $B$N:_8K$,ITB-$7$F$$$^$9!#(B $B ＠ _Dj$G$-$k?tNL$O!V(B'
+                    . ($arrOrderDetail['quantity'][$i] + $arrProduct['stock']) . '$B!W$^$G$G$9!#(B<br />';
+            }
         }
-    }
 
-    // $B>CHq ＠ G(B
-    $arrValues['tax'] = $totaltax;
-    // $B>.7W(B
-    $arrValues['subtotal'] = $subtotal;
-    // $B9g7W(B
-    $arrValues['total'] = $subtotal - $arrValues['discount'] + $arrValues['deliv_fee'] + $arrValues['charge'];
-    // $B$*;YJ'$$9g7W(B
-    $arrValues['payment_total'] = $arrValues['total'] - ($arrValues['use_point'] * POINT_VALUE);
+        // $B>CHq ＠ G(B
+        $arrValues['tax'] = $totaltax;
+        // $B>.7W(B
+        $arrValues['subtotal'] = $subtotal;
+        // $B9g7W(B
+        $arrValues['total'] = $subtotal - $arrValues['discount'] + $arrValues['deliv_fee'] + $arrValues['charge'];
+        // $B$*;YJ'$$9g7W(B
+        $arrValues['payment_total'] = $arrValues['total'] - ($arrValues['use_point'] * POINT_VALUE);
 
-    // $B2C;;%]%$%s%H(B
-    $arrValues['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($totalpoint, $arrValues['use_point']) + $arrValues['birth_point'];
+        // $B2C;;%]%$%s%H(B
+        $arrValues['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($totalpoint, $arrValues['use_point']);
 
-    // $B:G=*J];}%]%$%s%H(B
-    $arrValues['total_point'] = $objFormParam->getValue('point') - $arrValues['use_point'];
+        // $B:G=*J];}%]%$%s%H(B
+        $arrValues['total_point'] = $objFormParam->getValue('point') - $arrValues['use_point'];
 
-    if ($arrValues['total'] < 0) {
-        $arrErr['total'] = '$B9g7W3[$,%^%$%J%9I=<($K$J$i$J$$$h$&$KD4 ＠ 0$7$F2<$5$$!#(B<br />';
-    }
+        if ($arrValues['total'] < 0) {
+            $arrErr['total'] = '$B9g7W3[$,%^%$%J%9I=<($K$J$i$J$$$h$&$KD4 ＠ 0$7$F2<$5$$!#(B<br />';
+        }
 
-    if ($arrValues['payment_total'] < 0) {
-        $arrErr['payment_total'] = '$B$*;YJ'$$9g7W3[$,%^%$%J%9I=<($K$J$i$J$$$h$&$KD4 ＠ 0$7$F2<$5$$!#(B<br />';
-    }
+        if ($arrValues['payment_total'] < 0) {
+            $arrErr['payment_total'] = '$B$*;YJ'$$9g7W3[$,%^%$%J%9I=<($K$J$i$J$$$h$&$KD4 ＠ 0$7$F2<$5$$!#(B<br />';
+        }
 
-    if ($arrValues['total_point'] < 0) {
-        $arrErr['use_point'] = '$B:G=*J];}%]%$%s%H$,%^%$%J%9I=<($K$J$i$J$$$h$&$KD4 ＠ 0$7$F2<$5$$!#(B<br />';
+        if ($arrValues['total_point'] < 0) {
+            $arrErr['use_point'] = '$B:G=*J];}%]%$%s%H$,%^%$%J%9I=<($K$J$i$J$$$h$&$KD4 ＠ 0$7$F2<$5$$!#(B<br />';
+        }
+
+        $objFormParam->setParam($arrValues);
+        return $arrErr;
     }
 
-    $objFormParam->setParam($arrValues);
-    return $arrErr;
-}
-
     /**
      * DB$B99?7=hM}(B
      *
@@ -700,8 +644,7 @@
      *
      * $B%(%i!<H/@8;~$OIi?t$rJV$9!#(B
      */
-    function doRegister($order_id, &$objPurchase, &$objFormParam, &$message, &$arrValuesBefore)
-    {
+    function doRegister($order_id, &$objPurchase, &$objFormParam, &$message, &$arrValuesBefore) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrValues = $objFormParam->getDbArray();
@@ -728,8 +671,6 @@
                 'point_rate',
                 'classcategory_name1',
                 'classcategory_name2',
-                'tax_rate',
-                'tax_rule'
         ));
 
         // $BJQ99$7$h$&$H$7$F$$$k>&IJ>pJs$H(BDB$B$KEPO?$7$F$"$k>&IJ>pJs$rHf3S$9$k$3$H$G!"99?7$9$Y$-?tNL$r7W;;(B
@@ -780,10 +721,9 @@
         $arrAllShipping = $objFormParam->getSwapArray($this->arrShippingKeys);
         $arrAllShipmentItem = $objFormParam->getSwapArray($this->arrShipmentItemKeys);
 
-        $arrDelivTime = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
-        //$B>&IJC12A$rJ#?tG[Aw$K$bE,1~(B
+        $arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
+
         $arrShippingValues = array();
-        $arrIsNotQuantityUp = array();
         foreach ($arrAllShipping as $shipping_index => $arrShipping) {
             $shipping_id = $arrShipping['shipping_id'];
             $arrShippingValues[$shipping_index] = $arrShipping;
@@ -793,14 +733,6 @@
                                               $arrShipping['shipping_date_month'],
                                               $arrShipping['shipping_date_day']);
 
-            //$B>&IJC12A$rJ#?tG[Aw$K$bH?1G$9$k(B
-            foreach ($arrDetail as $product_detail) {
-                foreach ($arrAllShipmentItem[$shipping_index]['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) {
-                    if($product_detail['product_class_id'] == $shipment_product_class_id){
-                        $arrAllShipmentItem[$shipping_index]['shipment_price'][$relation_index] = $product_detail['price'];
-                    }
-                }
-            }
             // $BG[Aw6H<T(BID$B$r<hF@(B
             $arrShippingValues[$shipping_index]['deliv_id'] = $objFormParam->getValue('deliv_id');
 
@@ -822,7 +754,6 @@
                                                    $arrShipmentValues[$shipping_index]);
             }
         }
-
         $objPurchase->registerShipping($order_id, $arrShippingValues, false);
         $objQuery->commit();
         return $order_id;
@@ -836,16 +767,75 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function doRegisterProduct(&$objFormParam)
-    {
+    function doRegisterProduct(&$objFormParam) {
         $product_class_id = $objFormParam->getValue('add_product_class_id');
         if (SC_Utils_Ex::isBlank($product_class_id)) {
             $product_class_id = $objFormParam->getValue('edit_product_class_id');
             $changed_no = $objFormParam->getValue('no');
-            $this->shipmentEditProduct($objFormParam, $product_class_id, $changed_no);
-        }else{
-            $this->shipmentAddProduct($objFormParam, $product_class_id);
         }
+        // FXIME $B%P%j%G!<%7%g%s$rDL$5$:(B $objFormParam $B$NCM$G(B DB $BLd$$9g$o$;$7$F$$$k!#(B($B4IM}5!G=$?$a!"$5$[$ILdBj$OL5$$$H;W$&$b$N$N!D(B)
+
+        // $B>&IJ5,3J(BID$B$,;XDj$5$l$F$$$J$$>l9g!"Nc30%(%i!<$rH/@8(B
+        if (strlen($product_class_id) === 0) {
+            trigger_error('$B>&IJ5,3J;XDj$J$7(B', E_USER_ERROR);
+        }
+
+        // $BA*Br:Q$_$N>&IJ$G$"$l$P?tNL$r(B1$BA}$d$9(B
+        $exists = false;
+        $arrExistsProductClassIds = $objFormParam->getValue('product_class_id');
+        foreach ($arrExistsProductClassIds as $key => $value) {
+            $exists_product_class_id = $arrExistsProductClassIds[$key];
+            if ($exists_product_class_id == $product_class_id) {
+                $exists = true;
+                $exists_no = $key;
+                $arrExistsQuantity = $objFormParam->getValue('quantity');
+                $arrExistsQuantity[$key]++;
+                $objFormParam->setValue('quantity', $arrExistsQuantity);
+            }
+        }
+
+        // $B?7$7$/>&IJ$rDI2C$7$?>l9g$O%U%)!<%`$KEPO?(B
+        // $B>&IJ$rJQ99$7$?>l9g$O!"3:Ev9T$rJQ99(B
+        if (!$exists) {
+            $objProduct = new SC_Product_Ex();
+            $arrProduct = $objProduct->getDetailAndProductsClass($product_class_id);
+
+            // $B0lCW$9$k>&IJ5,3J$,$J$$>l9g!"Nc30%(%i!<$rH/@8(B
+            if (empty($arrProduct)) {
+                trigger_error('$B>&IJ5,3J0lCW$J$7(B', E_USER_ERROR);
+            }
+
+            $arrProduct['quantity'] = 1;
+            $arrProduct['price'] = $arrProduct['price02'];
+            $arrProduct['product_name'] = $arrProduct['name'];
+
+            $arrUpdateKeys = array(
+                'product_id', 'product_class_id', 'product_type_id', 'point_rate',
+                'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2',
+                'quantity', 'price',
+            );
+            foreach ($arrUpdateKeys as $key) {
+                $arrValues = $objFormParam->getValue($key);
+                // FIXME getValue$B$GJ8;zNs$,JV$k>l9g$,$"$k$N$GG[Ns$G$"$k$+$r%A%'%C%/(B
+                if (!is_array($arrValues)) {
+                    $arrValues = array();
+                }
+
+                if (isset($changed_no)) {
+                    $arrValues[$changed_no] = $arrProduct[$key];
+                } else {
+                    $added_no = 0;
+                    if (is_array($arrExistsProductClassIds)) {
+                        $added_no = count($arrExistsProductClassIds);
+                    }
+                    $arrValues[$added_no] = $arrProduct[$key];
+                }
+                $objFormParam->setValue($key, $arrValues);
+            }
+        } elseif (isset($changed_no) && $exists_no != $changed_no) {
+            // $BJQ99$7$?$,!"A*Br:Q$_$N>&IJ$@$C$?>l9g$O!"JQ99BP>]9T$r:o=|!#(B
+            $this->doDeleteProduct($changed_no, $objFormParam);
+        }
     }
 
     /**
@@ -855,34 +845,22 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function doDeleteProduct($delete_no, &$objFormParam)
-    {
-
-        $select_shipping_id    = $objFormParam->getValue('select_shipping_id');
-
-        //$BJQ99A0$N(Bproduct_class_id$B$,B>$NFO$1 ＠ h$K$bB8:_$9$k$+(B
-        $arrPreShipmentProductClassIds = $objFormParam->getValue('shipment_product_class_id');
-        $arrPreProductClassIds         = $objFormParam->getValue('product_class_id');
-        $delete_product_class_id       = $arrPreShipmentProductClassIds[$select_shipping_id][$delete_no];
-
-        //$BG[Aw ＠ h%G!<%?:o=|(B
-        $arrNewShipments = $this->deleteShipment($objFormParam, $this->arrShipmentItemKeys , $select_shipping_id, $delete_no);
-        $objFormParam->setParam($arrNewShipments);
-
-        $is_product_delete = true;
-        foreach ($arrNewShipments['shipment_product_class_id'] as $shipping_id => $arrShipmentProductClassIds) {
-            foreach ($arrShipmentProductClassIds as $relation_index => $shipment_product_class_id) {
-                if(in_array($delete_product_class_id, $arrShipmentProductClassIds)){
-                    $is_product_delete = false;
-                    break;
+    function doDeleteProduct($delete_no, &$objFormParam) {
+        $arrDeleteKeys = array(
+            'product_id', 'product_class_id', 'product_type_id', 'point_rate',
+            'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2',
+            'quantity', 'price',
+        );
+        foreach ($arrDeleteKeys as $key) {
+            $arrNewValues = array();
+            $arrValues = $objFormParam->getValue($key);
+            foreach ($arrValues as $index => $val) {
+                if ($index != $delete_no) {
+                    $arrNewValues[] = $val;
                 }
             }
+            $objFormParam->setValue($key, $arrNewValues);
         }
-
-        //$B>&IJ>pJs$+$i:o=|(B
-        if($is_product_delete){
-            $this->checkDeleteProducts($objFormParam, $arrPreProductClassIds, $delete_product_class_id, $this->arrProductKeys);
-        }
     }
 
     /**
@@ -891,8 +869,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function addShipping(&$objFormParam)
-    {
+    function addShipping(&$objFormParam) {
         $objFormParam->setValue('shipping_quantity',
                                 $objFormParam->getValue('shipping_quantity') + 1);
         $arrShippingIds = $objFormParam->getValue('shipping_id');
@@ -907,16 +884,13 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function setCustomerTo($customer_id, &$objFormParam)
-    {
+    function setCustomerTo($customer_id, &$objFormParam) {
         $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id);
         foreach ($arrCustomer as $key => $val) {
             $objFormParam->setValue('order_' . $key, $val);
         }
         $objFormParam->setValue('customer_id', $customer_id);
         $objFormParam->setValue('customer_point', $arrCustomer['point']);
-
-        return $arrCustomer['birth'];
     }
 
     /**
@@ -925,256 +899,11 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return $B%"%s%+!<%-!<$NJ8;zNs(B
      */
-    function getAnchorKey(&$objFormParam)
-    {
+    function getAnchorKey(&$objFormParam) {
         $ancor_key = $objFormParam->getValue('anchor_key');
         if (!SC_Utils_Ex::isBlank($ancor_key)) {
             return "location.hash='#" . htmlentities(urlencode($ancor_key), ENT_QUOTES) . "'";
         }
         return '';
     }
-
-    /**
-     * $B>&IJ$rDI2C(B
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @param integer $add_product_class_id $BDI2C>&IJ5,3J(BID
-     * @return void
-     */
-    function shipmentAddProduct(&$objFormParam, $add_product_class_id)
-    {
-
-        //$BJ#?tG[Aw$K>&IJ>pJsDI2C(B
-        $select_shipping_id = $objFormParam->getValue('select_shipping_id');
-
-        //$BFO$1 ＠ h$KA*Br:Q$_$N>&IJ$,$"$k>l9g(B
-        $arrShipmentProducts = $this->getShipmentProducts($objFormParam);
-
-        if(in_array($add_product_class_id, $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id])){
-            foreach ($arrShipmentProducts['shipment_product_class_id'][$select_shipping_id] as $relation_index => $shipment_product_class_id) {
-                if($shipment_product_class_id == $add_product_class_id){
-                    $arrShipmentProducts['shipment_quantity'][$select_shipping_id][$relation_index]++;
-                    break;
-                }
-            }
-        }else{
-
-            //$BFO$1 ＠ h$KA*Br>&IJ$,$J$$>l9g(B
-            $objProduct = new SC_Product_Ex();
-            $arrAddProductInfo = $objProduct->getDetailAndProductsClass($add_product_class_id);
-
-            $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id][] = $add_product_class_id;
-            $arrShipmentProducts['shipment_product_code'][$select_shipping_id][]     = $arrAddProductInfo['product_code'];
-            $arrShipmentProducts['shipment_product_name'][$select_shipping_id][]     = $arrAddProductInfo['name'];
-            $arrShipmentProducts['shipment_price'][$select_shipping_id][]            = $arrAddProductInfo['price02'];
-            $arrShipmentProducts['shipment_quantity'][$select_shipping_id][]         = 1;
-
-            //$B<uCm>&IJ>pJs$KDI2C(B
-            $arrPreProductClassIds = $objFormParam->getValue('product_class_id');
-            $arrProducts = $this->checkInsertOrderProducts($objFormParam, $arrPreProductClassIds, $add_product_class_id, $arrAddProductInfo);
-            $objFormParam->setParam($arrProducts);
-        }
-        $objFormParam->setParam($arrShipmentProducts);
-    }
-
-    /**
-     * $B>&IJ$rJQ99(B
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @param integer $add_product_class_id $BJQ99>&IJ5,3J(BID
-     * @param integer $change_no $BJQ99BP>](B
-     * @return void
-     */
-    function shipmentEditProduct(&$objFormParam, $edit_product_class_id, $change_no)
-    {
-        $arrPreProductClassIds = $objFormParam->getValue('product_class_id');
-        $select_shipping_id    = $objFormParam->getValue('select_shipping_id');
-
-        $arrShipmentProducts = $this->getShipmentProducts($objFormParam);
-
-        //$B4{$K$"$k%G!<%?$O#1$D$@$1?tNL$r#1A}$d$9(B
-        $pre_shipment_product_class_id = $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id][$change_no];
-        if($pre_shipment_product_class_id == $edit_product_class_id) {
-            $arrShipmentProducts['shipment_quantity'][$select_shipping_id][$change_no] ++;
-        }elseif(in_array($edit_product_class_id, $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id])){
-            //$BG[Aw ＠ h%G!<%?:o=|(B
-            $arrShipmentProducts = $this->deleteShipment($objFormParam, $this->arrShipmentItemKeys , $select_shipping_id, $change_no);
-            foreach ($arrShipmentProducts['shipment_product_class_id'][$select_shipping_id] as $relation_index => $shipment_product_class_id) {
-                if($shipment_product_class_id == $edit_product_class_id){
-                    $arrShipmentProducts['shipment_quantity'][$select_shipping_id][$relation_index] ++;
-                    break;
-                }
-            }
-        }else{
-            $objProduct = new SC_Product_Ex();
-            $arrAddProductInfo = $objProduct->getDetailAndProductsClass($edit_product_class_id);
-
-            //$B>e=q$-(B
-            $this->changeShipmentProducts($arrShipmentProducts, $arrAddProductInfo, $select_shipping_id, $change_no);
-            //$B<uCm>&IJ>pJs$KDI2C(B
-            $arrProducts = $this->checkInsertOrderProducts($objFormParam, $arrPreProductClassIds, $edit_product_class_id, $arrAddProductInfo);
-            $objFormParam->setParam($arrProducts);
-        }
-        $objFormParam->setParam($arrShipmentProducts);
-
-        //$B99?7$N$_$N>l9g!"A4G[Ns$r;}$C$F$$$J$$$N$G!"?7$7$$G[Ns$r<hF@(B
-        $arrNewShipmentProducts = $this->getShipmentProducts($objFormParam);
-        $is_product_delete = true;
-        //$BJQ99A0$N(Bproduct_class_id$B$,B>$NFO$1 ＠ h$K$bB8:_$9$k$+(B
-        foreach ($arrNewShipmentProducts['shipment_product_class_id'] as $shipping_id => $arrShipmentProductClassIds) {
-            if(in_array($pre_shipment_product_class_id, $arrShipmentProductClassIds)){
-                $is_product_delete = false;
-                break;
-            }
-        }
-
-        //$B>&IJ>pJs$+$i:o=|(B
-        if($is_product_delete){
-            $this->checkDeleteProducts($objFormParam, $arrPreProductClassIds, $pre_shipment_product_class_id, $this->arrProductKeys);
-        }
-    }
-
-    /**
-     * $BJ#?tG[Aw$N%Q%i%a!<%?$r<h$j=P$9(B 
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @return array $BG[Aw%G!<%?(B
-     */
-    function getShipmentProducts(&$objFormParam)
-    {
-        $arrShipmentProducts['shipment_product_class_id']    = $objFormParam->getValue('shipment_product_class_id');
-        $arrShipmentProducts['shipment_product_code']        = $objFormParam->getValue('shipment_product_code');
-        $arrShipmentProducts['shipment_product_name']        = $objFormParam->getValue('shipment_product_name');
-        $arrShipmentProducts['shipment_classcategory_name1'] = $objFormParam->getValue('shipment_classcategory_name1');
-        $arrShipmentProducts['shipment_classcategory_name2'] = $objFormParam->getValue('shipment_classcategory_name2');
-        $arrShipmentProducts['shipment_price']               = $objFormParam->getValue('shipment_price');
-        $arrShipmentProducts['shipment_quantity']            = $objFormParam->getValue('shipment_quantity');
-
-        return $arrShipmentProducts;
-    }
-
-    /**
-     * $BJQ99BP>]$N%G!<%?$r>e=q$-$9$k(B
-     *
-     * @param array   $arrShipmentProducts  $BJQ99BP>]G[Ns(B
-     * @param array   $arrProductInfo       $B>e=q$-%G!<%?(B
-     * @param integer $shipping_id          $BG[Aw ＠ h(BID
-     * @param array   $no                   $BJQ99BP>](B
-     * @return void
-     */
-    function changeShipmentProducts(&$arrShipmentProducts, $arrProductInfo, $shipping_id, $no)
-    {
-        $arrShipmentProducts['shipment_product_class_id'][$shipping_id][$no]    = $arrProductInfo['product_class_id'];
-        $arrShipmentProducts['shipment_product_code'][$shipping_id][$no]        = $arrProductInfo['product_code'];
-        $arrShipmentProducts['shipment_product_name'][$shipping_id][$no]        = $arrProductInfo['name'];
-        $arrShipmentProducts['shipment_classcategory_name1'][$shipping_id][$no] = $arrProductInfo['classcategory_name1'];
-        $arrShipmentProducts['shipment_classcategory_name2'][$shipping_id][$no] = $arrProductInfo['classcategory_name2'];
-        $arrShipmentProducts['shipment_price'][$shipping_id][$no]               = $arrProductInfo['price02'];
-        $arrShipmentProducts['shipment_quantity'][$shipping_id][$no]            = 1;
-    }
-
-    /**
-     * $B>&IJB&$NAmNL7W;;(B&$B%;%C%H(B
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @return void
-     */
-    function setProductsQuantity(&$objFormParam)
-    {
-        $arrShipmentsItems = $objFormParam->getSwapArray(array('shipment_product_class_id','shipment_quantity'));
-        foreach ($arrShipmentsItems as $arritems) {
-            foreach ($arritems['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) {
-                $arrUpdateQuantity[$shipment_product_class_id] += $arritems['shipment_quantity'][$relation_index];
-            }
-        }
-
-        $arrProductsClass = $objFormParam->getValue('product_class_id');
-        $arrProductsQuantity = $objFormParam->getValue('quantity');
-        foreach ($arrProductsClass as $relation_key => $product_class_id) {
-            $arrQuantity['quantity'][$relation_key] = $arrUpdateQuantity[$product_class_id];
-        }
-        $objFormParam->setParam($arrQuantity);
-    }
-
-    /**
-     * $B:o=|BP>]$N3NG'!":o=|$r$9$k(B
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @param array   $arrProductClassIds$B!!(B     $B:o=|BP>]G[Ns$N>&IJ5,3J(BID
-     * @param integer $delete_product_class_id$B!!:o=|>&IJ5,3J(BID
-     * @param array   $arrDeleteKeys            $B:o=|9`L\(B
-     * @return void
-     */
-    function checkDeleteProducts(&$objFormParam, $arrProductClassIds, $delete_product_class_id, $arrDeleteKeys)
-    {
-        foreach ($arrProductClassIds as $relation_index => $product_class_id) {
-            //product_class_id$B$N=EJ#$O$J$$$N$G!"#1$D:o=|$7$?$i40N;(B
-            if($product_class_id == $delete_product_class_id){
-                foreach ($arrDeleteKeys as $delete_key) {
-                    $arrProducts = $objFormParam->getValue($delete_key);
-                    foreach ($arrProducts as $index => $product_info) {
-                        if($index != $relation_index){
-                            $arrUpdateParams[$delete_key][] = $product_info;
-                        }
-                    }
-                    $objFormParam->setParam($arrUpdateParams);
-                }
-                break;
-            }
-        }
-    }
-
-    /**
-     * $BG[Aw ＠ h>&IJ$N:o=|$N:o=|(B
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @param array   $arrShipmentDeleteKeys   $B:o=|9`L\(B
-     * @param integer $delete_shipping_id$B!!(B    $B:o=|G[Aw(BID
-     * @param array   $delete_no               $B:o=|BP>](B
-     * @return void
-     */
-    function deleteShipment(&$objFormParam, $arrShipmentDeletKeys, $delete_shipping_id, $delete_no)
-    {
-            foreach ($arrShipmentDeletKeys as $delete_key) {
-                $arrShipments = $objFormParam->getValue($delete_key);
-                foreach ($arrShipments as $shipp_id => $arrKeyData){
-                    foreach ($arrKeyData as $relation_index => $shipment_info) {
-                        if($relation_index != $delete_no || $shipp_id != $delete_shipping_id){
-                            $arrUpdateParams[$delete_key][$shipp_id][] = $shipment_info;
-                        }
-                    }
-                }
-            }
-            //$objFormParam->setParam($arrUpdateParams);
-            return $arrUpdateParams;
-        }
-
-
-    /**
-     * $B<uCm>&IJ0lMwB&$K>&IJ$rDI2C(B
-     *
-     * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
-     * @param array   $arrProductClassIds$B!!(B     $BBP>]G[Ns$N>&IJ5,3J(BID
-     * @param integer $indert_product_class_id$B!!DI2C>&IJ5,3J(BID
-     * @param array   $arrAddProductInfo        $BDI2C%G!<%?(B
-     * @return array  $arrAddProducts           $B99?7%G!<%?(B
-     */
-    function checkInsertOrderProducts(&$objFormParam, $arrProductClassIds, $insert_product_class_id, $arrAddProductInfo)
-    {
-        if(!in_array($insert_product_class_id, $arrProductClassIds)){
-            $arrAddProductInfo['product_name'] = ($arrAddProductInfo['product_name'])? $arrAddProductInfo['product_name']:$arrAddProductInfo['name'];
-            $arrAddProductInfo['price']        = ($arrAddProductInfo['price'])? $arrAddProductInfo['price']:$arrAddProductInfo['price02'];
-            $arrAddProductInfo['quantity']     = 1;
-            $arrAddProductInfo['tax_rate']     = ($objFormParam->getValue('order_tax_rate') == '')? $this->arrInfo['tax']     :$objFormParam->getValue('order_tax_rate');
-            $arrAddProductInfo['tax_rule']     = ($objFormParam->getValue('order_tax_rule') == '')? $this->arrInfo['tax_rule']:$objFormParam->getValue('order_tax_rule');
-            foreach ($this->arrProductKeys as $insert_key) {
-                $arrAddProducts[$insert_key]   = $objFormParam->getValue($insert_key);
-                $arrAddProducts[$insert_key][] = $arrAddProductInfo[$insert_key];
-            }
-            return $arrAddProducts;
-        }else{
-            //$B<uCm>&IJ$N?tNL$O!"J#?tG[AwB&$N=87W$G=P$7$F$$$k$N$G!"=EJ#$7$F$b?tNL$rA}$d$5$J$$!#(B
-            return null;
-        }
-    }
-}
\ No newline at end of file
+}

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Mail extends LC_Page_Admin_Order_Ex 
-{
+class LC_Page_Admin_Order_Mail extends LC_Page_Admin_Order_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/mail.tpl';
         $this->tpl_mainno = 'order';
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -72,8 +69,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $post = $_POST;
         //$B0l3gAw?.MQ$N=hM}(B
         if (array_key_exists('mail_order_id',$post) and $post['mode'] == 'mail_select'){
@@ -156,8 +152,7 @@
      * $B;XDj$5$l$?CmJ8HV9f$N%a!<%kMzNr$r<hF@$9$k!#(B
      * @var int order_id
      */
-    function getMailHistory($order_id)
-    {
+    function getMailHistory($order_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'send_date, subject, template_id, send_id';
         $where = 'order_id = ?';
@@ -170,8 +165,7 @@
      * $B%a!<%k$rAw$k!#(B
      * @param SC_FormParam $objFormParam
      */
-    function doSend(&$objFormParam)
-    {
+    function doSend(&$objFormParam) {
         $arrErr = $objFormParam->checkerror();
 
         // $B%a!<%k$NAw?.(B
@@ -196,8 +190,7 @@
      * $B3NG'2hLL$rI=<($9$k0Y$N=`Hw(B
      * @param SC_FormParam $objFormParam
      */
-    function confirm(&$objFormParam)
-    {
+    function confirm(&$objFormParam) {
         $arrErr = $objFormParam->checkerror();
         // $B%a!<%k$NAw?.(B
         if (count($arrErr) == 0) {
@@ -224,24 +217,16 @@
      * $B%F%s%W%l!<%H$NJ88@$r%U%)!<%`$KF~$l$k!#(B
      * @param SC_FormParam $objFormParam
      */
-    function changeData(&$objFormParam)
-    {
-        $template_id = $objFormParam->getValue('template_id');
+    function changeData(&$objFormParam) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-        // $BL$A*Br;~(B
-        if (strlen($template_id) === 0) {
-            $mailTemplates = null;
+        if (!SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
+            trigger_error('$B%F%s%W%l!<%H$,;XDj$5$l$F$$$^$;$s!#(B', E_USER_ERROR);
         }
-        // $BM-8zA*Br;~(B
-        elseif (SC_Utils_Ex::sfIsInt($template_id)) {
-            $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-            $mailTemplates = $objMailtemplate->get($template_id);
-        }
-        // $BIT ＠ 5A*Br;~(B
-        else {
-            trigger_error('$B%F%s%W%l!<%H$N;XDj$,IT ＠ 5!#(B', E_USER_ERROR);
-        }
 
+        $where = 'template_id = ?';
+        $arrWhereVal = array($objFormParam->getValue('template_id'));
+        $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
         if (empty($mailTemplates)) {
             foreach (array('subject','header','footer') as $key) {
                 $objFormParam->setValue($key, '');
@@ -258,8 +243,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -267,8 +251,7 @@
      * $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
      * @param SC_FormParam $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // $B8!:w>r7o$N%Q%i%a!<%?!<$r=i4|2=(B
         parent::lfInitParam($objFormParam);
         $objFormParam->addParam('$B%F%s%W%l!<%H(B', 'template_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_MailView extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_MailView extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/mail_view.tpl';
         $this->tpl_subtitle = '$B<uCm4IM}%a!<%k3NG'(B';
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $send_id = $_GET['send_id'];
         if (SC_Utils_Ex::sfIsInt($send_id)) {
@@ -84,8 +80,7 @@
      * $B%a!<%k$NMzNr$r<h$j=P$9!#(B
      * @param int $send_id
      */
-    function getMailHistory($send_id)
-    {
+    function getMailHistory($send_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'subject, mail_body';
         $where = 'send_id = ?';
@@ -98,8 +93,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class LC_Page_Admin_Order_Multiple extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_Multiple extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/multiple.tpl';
         $this->tpl_mainno = 'order';
@@ -58,8 +56,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -69,8 +66,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->setTemplate($this->tpl_mainpage);
 
@@ -81,8 +77,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Pdf extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_Pdf extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/pdf_input.tpl';
         $this->tpl_mainno = 'order';
@@ -66,8 +64,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -77,8 +74,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
         $objDate = new SC_Date_Ex(1901);
@@ -119,8 +115,7 @@
      *
      * PDF$B:n ＠ .%U%)!<%`$N%G%U%)%k%HCM$N ＠ 8@.(B
      */
-    function createFromValues($order_id,$pdf_order_id)
-    {
+    function createFromValues($order_id,$pdf_order_id) {
         // $B$3$3$,(B$arrForm$B$N=iEP>l$H$$$&$3$H$rL@<($9$k$?$a ＠ k8@$9$k!#(B
         $arrForm = array();
         // $B%?%$%H%k$r%;%C%H(B
@@ -154,8 +149,7 @@
      * PDF$B$N:n ＠ .(B
      * @param SC_FormParam $objFormParam
      */
-    function createPdf(&$objFormParam)
-    {
+    function createPdf(&$objFormParam) {
 
         $arrErr = $this->lfCheckError($objFormParam);
         $arrRet = $objFormParam->getHashArray();
@@ -181,8 +175,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -190,8 +183,7 @@
      *  $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
      *  @param SC_FormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BCmJ8HV9f(B', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$BCmJ8HV9f(B', 'pdf_order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$BH/9TF|(B', 'year', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -214,12 +206,10 @@
      *  @var SC_FormParam
      */
 
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
-        $arrParams = $objFormParam->getHashArray();
+        $arrRet = $objFormParam->getHashArray();
         $arrErr = $objFormParam->checkError();
-        $objError = new SC_CheckError_Ex($arrParams);
 
         $year = $objFormParam->getValue('year');
         if (!is_numeric($year)) {
@@ -241,10 +231,7 @@
 
             $arrErr['day'] = '$BH/9TF|$O(B1$B!A(B31$B$N4V$GF~NO$7$F$/$@$5$$!#(B';
         }
-        
-        $objError->doFunc(array('$BH/9TF|(B', 'year', 'month', 'day'), array('CHECK_DATE'));
-        $arrErr = array_merge($arrErr, $objError->arrErr);
-        
+
         return $arrErr;
     }
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_ProductSelect extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_ProductSelect extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/product_select.tpl';
         $this->tpl_mainno = 'order';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -81,7 +77,6 @@
         $objFormParam->convParam();
 
         $this->tpl_no = $this->getNo(array($_GET,$_POST));
-        $this->shipping_id = $this->getShippingId(array($_GET,$_POST));
 
         switch ($this->getMode()) {
             case 'search':
@@ -105,8 +100,7 @@
                 $objProduct->setProductsClassByProductIds($arrProduct_id);
                 $this->tpl_javascript .= $this->getTplJavascript($objProduct);
                 $js_fnOnLoad = $this->getFnOnload($this->arrProducts);
-                $this->tpl_javascript .= 'function fnOnLoad()
-                {' . $js_fnOnLoad . '}';
+                $this->tpl_javascript .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
                 $this->tpl_onload .= 'fnOnLoad();';
                 // $B5,3J(B1$B%/%i%9L>(B
                 $this->tpl_class_name1 = $objProduct->className1;
@@ -137,8 +131,7 @@
      * @param array $arrProductId
      * @param SC_Product $objProduct
      */
-    function getProductList($arrProductId, &$objProduct)
-    {
+    function getProductList($arrProductId, &$objProduct) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $BI=<(=g=x(B
@@ -152,8 +145,7 @@
      * $B%m!<%I;~$K<B9T$9$k(BJavascript$B$r ＠ 8@.(B
      * @param array $arrProducts
      */
-    function getFnOnload($arrProducts)
-    {
+    function getFnOnload($arrProducts) {
         foreach ($arrProducts as $arrProduct) {
             $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});";
         }
@@ -164,8 +156,7 @@
      * $B5,3J%/%i%9MQ(BJavaScript$B ＠ 8@.(B
      * @param SC_Product $objProduct
      */
-    function getTplJavascript(&$objProduct)
-    {
+    function getTplJavascript(&$objProduct) {
         return 'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
     }
 
@@ -174,8 +165,7 @@
      * @param array $whereAndBind string where$B$H(B array bind$B$NO"A[G[Ns(B
      * @param SC_Product $objProduct
      */
-    function getProducts($whereAndBind,&$objProduct, $page_max, $startno)
-    {
+    function getProducts($whereAndBind,&$objProduct, $page_max, $startno) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -195,8 +185,7 @@
      * @param array $whereAndBind
      * @param SC_Product $objProduct
      */
-    function getLineCount($whereAndBind,&$objProduct)
-    {
+    function getLineCount($whereAndBind,&$objProduct) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
         // $B8!:w7k2LBP>]$H$J$k>&IJ$N?t$r<hF@(B
@@ -212,8 +201,7 @@
      * @return array ('where' => where string, 'bind' => databind array)
      * @param SC_FormParam $objFormParam
      */
-    function createWhere(&$objFormParam,&$objDb)
-    {
+    function createWhere(&$objFormParam,&$objDb) {
         $arrForm = $objFormParam->getHashArray();
         $where = 'alldtl.del_flg = 0';
         $bind = array();
@@ -253,8 +241,7 @@
      * $B%j%/%(%9%H%Q%i%a!<%?!<(Bno$B$r<h$C$F$/$k!#(B
      * @param unknown_type $globalParams
      */
-    function getNo($globalParams)
-    {
+    function getNo($globalParams) {
         foreach ($globalParams as $params) {
             if (isset($params['no']) && $params['no']!= '') {
                 return intval($params['no']);
@@ -264,27 +251,11 @@
     }
 
     /**
-     * $B%j%/%(%9%H%Q%i%a!<%?!<(B shipping_id $B$r<h$C$F$/$k!#(B
-     * @param unknown_type $globalParams
-     */
-    function getShippingId($globalParams)
-    {
-        foreach ($globalParams as $params) {
-            if (isset($params['shipping_id']) && $params['shipping_id']!= '') {
-                return intval($params['shipping_id']);
-            }
-        }
-        return null;
-    }
-
-
-    /**
      * $B<hF@$7$F$$$kJB$S=g$GJB$SBX$((B
      * @param $arrProduct_id
      * @param $productList
      */
-    function sortProducts($arrProduct_id,$productList)
-    {
+    function sortProducts($arrProduct_id,$productList) {
         $products  = array();
         foreach ($productList as $item) {
             $products[ $item['product_id'] ] = $item;
@@ -300,8 +271,7 @@
      * $B%G%9%H%i%/%?(B.
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -309,13 +279,11 @@
      * $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
      * @param SC_FormParam $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%*!<%@!<(BID', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B>&IJL>(B', 'search_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%+%F%4%j(BID', 'search_category_id', STEXT_LEN, 'KVa',  array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('$B>&IJ%3!<%I(B', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('$B%U%C%?!<(B', 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
-        $objFormParam->addParam('$BFO$1 ＠ h(BID', 'shipping_id', LTEXT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Status extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_Status extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/status.tpl';
         $this->tpl_mainno = 'order';
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -72,8 +69,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
 
@@ -88,7 +84,7 @@
         $this->arrForm = $objFormParam->getHashArray();
 
         //$B;YJ'J}K!$N<hF@(B
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         switch ($this->getMode()) {
             case 'update':
@@ -125,8 +121,7 @@
      *  $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
      *  @param SC_FormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BCmJ8HV9f(B', 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$BJQ99A0BP1~>u67(B', 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B%Z!<%8HV9f(B', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -140,8 +135,7 @@
      *  $BF~NOFbMF$N%A%'%C%/(B
      *  @param SC_FormParam
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrRet = $objFormParam->getHashArray();
         $arrErr = $objFormParam->checkError();
@@ -155,14 +149,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // $BBP1~>u670lMw$NI=<((B
-    function lfStatusDisp($status,$pageno)
-    {
+    function lfStatusDisp($status,$pageno) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $select ='*';
@@ -197,8 +189,7 @@
     /**
      * $BBP1~>u67$N99?7(B
      */
-    function lfStatusMove($statusId, $arrOrderId)
-    {
+    function lfStatusMove($statusId, $arrOrderId) {
         $objPurchase = new SC_Helper_Purchase_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -223,19 +214,26 @@
     /**
      * $B<uCm%F!<%V%k$NO ＠ M}:o=|(B
      */
-    function lfDelete($arrOrderId)
-    {
+    function lfDelete($arrOrderId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         if (!isset($arrOrderId) || !is_array($arrOrderId)) {
             return false;
         }
 
-        $objPurchase = new SC_Helper_Purchase_Ex();
+        $arrUpdate = array(
+            'del_flg'      => 1,
+            'update_date'  => 'CURRENT_TIMESTAMP',
+        );
+
+        $objQuery->begin();
+
         foreach ($arrOrderId as $orderId) {
-            $objPurchase->cancelOrder($orderId, ORDER_CANCEL, true);
+            $objQuery->update('dtb_order', $arrUpdate, 'order_id = ?', array($orderId));
         }
 
+        $objQuery->commit();
+
         $this->tpl_onload = "window.alert('$BA*Br9`L\$r:o=|$7$^$7$?!#(B');";
         return true;
     }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'ownersstore/plugin.tpl';
         $this->tpl_subno    = 'index';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
         $mode = $this->getMode();
@@ -216,8 +212,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -228,8 +223,7 @@
      * @param string $mode $B%b!<%I(B
      * @return void
      */
-    function initParam(&$objFormParam, $mode)
-    {
+    function initParam(&$objFormParam, $mode) {
         $objFormParam->addParam('mode', 'mode', INT_LEN, '', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('plugin_id', 'plugin_id', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         if ($mode === 'priority') {
@@ -244,8 +238,7 @@
      * @param string $key $BEPO?$9$k%-!<(B.
      * @return void
      */
-    function initUploadFile(&$objUpFile, $key)
-    {
+    function initUploadFile(&$objUpFile, $key) {
         $objUpFile->addFile('$B%W%i%0%$%s%U%!%$%k(B', $key, explode(',', PLUGIN_EXTENSION), FILE_SIZE, true, 0, 0, false);
     }
 
@@ -256,8 +249,7 @@
      * @param string $file_key $B%U%!%$%k%-!<(B
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function checkUploadFile($file_key)
-    {
+    function checkUploadFile($file_key) {
         $objErr = new SC_CheckError_Ex();
         // $B3HD%;R%A%'%C%/(B
         $objErr->doFunc(array('$B%W%i%0%$%s%U%!%$%k(B', $file_key, explode(',', PLUGIN_EXTENSION)), array('FILE_EXT_CHECK'));
@@ -275,8 +267,7 @@
      * @param string $plugin_code $B%W%i%0%$%s%3!<%I(B
      * @return boolean $B%$%s%9%H!<%k:Q$N>l9g(Btrue $B%$%s%9%H!<%k$5$l$F$$$J$$>l9g(Bfalse
      */
-    function isInstalledPlugin($plugin_code)
-    {
+    function isInstalledPlugin($plugin_code) {
         $plugin = SC_Plugin_Util_Ex::getPluginByPluginCode($plugin_code);
         if (!empty($plugin)) {
             return true;
@@ -293,8 +284,7 @@
      * @param string $file_name $B%U%!%$%kL>(B
      * @return string $plugin_code $B%W%i%0%$%s%3!<%I(B.
      */
-    function getPluginCode($file_name)
-    {
+    function getPluginCode($file_name) {
         // $BJ,2r(B
         $array_ext = explode('.', $file_name);
         $array_file_name = array_diff($array_ext, array('tar','gz'));
@@ -309,8 +299,7 @@
      * @param string $plugin_code $B%W%i%0%$%s%3!<%I(B
      * @return string $plugin_dir_path $B%W%i%0%$%sJ]B8%G%#%l%/%H%j$N%Q%9(B.
      */
-    function getPluginDir($plugin_code)
-    {
+    function getPluginDir($plugin_code) {
         $plugin_dir_path = PLUGIN_UPLOAD_REALDIR . $plugin_code . '/';
         return $plugin_dir_path;
     }
@@ -321,8 +310,7 @@
      * @param string $plugin_code $B%W%i%0%$%s%3!<%I(B
      * @return string $plugin_dir_path $B%W%i%0%$%sJ]B8%G%#%l%/%H%j$N%Q%9(B.
      */
-    function getHtmlPluginDir($plugin_code)
-    {
+    function getHtmlPluginDir($plugin_code) {
         $plugin_html_dir_path = PLUGIN_HTML_REALDIR . $plugin_code . '/';
         return $plugin_html_dir_path;
     }
@@ -334,8 +322,7 @@
      * @param string $plugin_class $B%W%i%0%$%s%/%i%9L>(B
      * @return string $plugin_file_path $B%/%i%9%U%!%$%k$N%Q%9(B.
      */
-    function getPluginFilePath($plugin_code , $plugin_class)
-    {
+    function getPluginFilePath($plugin_code , $plugin_class) {
         $plugin_file_path = $this->getPluginDir($plugin_code) . $plugin_class . '.php';
         return $plugin_file_path;
     }
@@ -347,8 +334,7 @@
      * @param string $key $B%-!<(B.
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function installPlugin($archive_file_name, $key)
-    {
+    function installPlugin($archive_file_name, $key) {
         // $B0l;~E83+%G%#%l%/%H%j$K%U%!%$%k$,$"$k>l9g$O;vA0$K:o=|(B.
         $arrFileHash = SC_Helper_FileManager_Ex::sfGetFileList(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR);
         if (count($arrFileHash) > 0) {
@@ -438,8 +424,7 @@
      * @param string $plugin_id $B%W%i%0%$%s(BID.
      * @param string $plugin_html_dir_path $B%W%i%0%$%sKh$K ＠ 8@.$5$l$k(Bhtml$B%G%#%l%/%H%j$N%Q%9(B.
      */
-    function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir_path ='')
-    {
+    function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir_path ='') {
         // $B0l;~%G%#%l%/%H%j$r:o=|(B.
         SC_Helper_FileManager_Ex::deleteFile($temp_dir, false);
         // DB$B$+$i%W%i%0%$%s>pJs$r:o=|(B
@@ -458,8 +443,7 @@
      * @param ReflectionClass $objReflection
      * @return array $B%W%i%0%$%s>pJs$NG[Ns(B
      */
-    function getPluginInfo(ReflectionClass $objReflection)
-    {
+    function getPluginInfo(ReflectionClass $objReflection) {
         $arrStaticProps = $objReflection->getStaticProperties();
         $arrConstants   = $objReflection->getConstants();
 
@@ -497,8 +481,7 @@
      * @param string $dir_path $B%A%'%C%/$9$k%W%i%0%$%s%G%#%l%/%H%j(B
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function checkPluginConstants(ReflectionClass $objReflection, $dir_path)
-    {
+    function checkPluginConstants(ReflectionClass $objReflection, $dir_path) {
         $arrErr = array();
         // $B%W%i%0%$%s>pJs$r<hF@(B
         $arrPluginInfo = $this->getPluginInfo($objReflection);
@@ -567,8 +550,7 @@
      * @param string $upload_file_name $B%"%C%W%m!<%I%U%!%$%kL>(B.
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function updatePlugin($target_plugin, $upload_file_name)
-    {
+    function updatePlugin($target_plugin, $upload_file_name) {
         // $B%"%C%W%G!<%HA0$KITMW$J%U%!%$%k$r>C$7$F$*$-$^$9(B.
         SC_Helper_FileManager_Ex::deleteFile(DOWNLOADS_TEMP_PLUGIN_UPDATE_DIR, false);
 
@@ -616,8 +598,7 @@
      * @param string $file_key $B%U%!%$%k%-!<(B
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function unpackPluginFile($unpack_file_name, $unpack_dir_path, $file_key)
-    {
+    function unpackPluginFile($unpack_file_name, $unpack_dir_path, $file_key) {
         $arrErr = array();
         // $B2rE`%G%#%l%/%H%j%G%#%l%/%H%j$r:n ＠ .$7!"0l;~%G%#%l%/%H%j$+$i%U%!%$%k$r0\F0(B
         $objUpFile = new SC_UploadFile_Ex(PLUGIN_TEMP_REALDIR, $unpack_dir_path);
@@ -648,8 +629,7 @@
      * @param array $plugin $B%W%i%0%$%s>pJs$r3NG'$7$?O"A[G[Ns(B.
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function uninstallPlugin($plugin)
-    {
+    function uninstallPlugin($plugin) {
         $arrErr = array();
         // $B%W%i%0%$%s%U%!%$%k$rFI$_9~$_$^$9(B.
         $plugin_class_file_path = $this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
@@ -683,8 +663,7 @@
      * @param array $plugin $B%W%i%0%$%s>pJs$r3NG'$7$?O"A[G[Ns(B.
      * @return array $arrErr $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function enablePlugin($plugin)
-    {
+    function enablePlugin($plugin) {
         $arrErr = array();
         // $B%/%i%9%U%!%$%k$rFI$_9~$_(B.
         $plugin_class_file_path = $this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
@@ -709,8 +688,7 @@
      * @param array $plugin $B%W%i%0%$%s>pJs$r3NG'$7$?O"A[G[Ns(B.
      * @return array $arrErr $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function disablePlugin($plugin)
-    {
+    function disablePlugin($plugin) {
         $arrErr = array();
         // $B%/%i%9%U%!%$%k$rFI$_9~$_(B.
         $plugin_class_file_path =$this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
@@ -737,8 +715,7 @@
      * @param int $priority $BM%@hEY(B
      * @return integer $B99?77o?t(B
      */
-    function updatePriority($plugin_id, $priority)
-    {
+    function updatePriority($plugin_id, $priority) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATE$B$9$kCM$r:n ＠ .$9$k!#(B
         $sqlval['priority'] = $priority;
@@ -755,8 +732,7 @@
      * @param array $arrPluginInfo $B%W%i%0%$%s>pJs$r3JG<$7$?O"A[G[Ns(B.
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function registerData($arrPluginInfo)
-    {
+    function registerData($arrPluginInfo) {
 
         // $B%W%i%0%$%s>pJs$r(BDB$BEPO?(B.
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -828,8 +804,7 @@
      * @param string $key $B%(%i!<>pJs$N%-!<(B.
      * @return array $arrErr $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function requirePluginFile($file_path, $key)
-    {
+    function requirePluginFile($file_path, $key) {
         $arrErr = array();
         if (file_exists($file_path)) {
             require_once $file_path; 
@@ -848,8 +823,7 @@
      * @return array $arrErr $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      *
      */
-    function execPlugin($obj, $class_name, $exec_func)
-    {
+    function execPlugin($obj, $class_name, $exec_func) {
         $arrErr = array();
         if (method_exists($class_name, $exec_func) === true) {
             $ret = call_user_func(array($class_name, $exec_func), $obj);
@@ -868,8 +842,7 @@
      * @param string $path $B%"!<%+%$%V%Q%9(B
      * @return boolean Archive_Tar::extractModify()$B$N%(%i!<(B
      */
-    function unpackPluginArchive($path)
-    {
+    function unpackPluginArchive($path) {
         // $B05=L%U%i%0(BTRUE$B$O(Bgzip$B2rE`$r$*$3$J$&(B
         $tar = new Archive_Tar($path, true);
 
@@ -895,8 +868,7 @@
      * @param int $enable_flg $BM-8z%U%i%0(B
      * @return integer $B99?77o?t(B
      */
-    function updatePluginEnable($plugin_id, $enable_flg)
-    {
+    function updatePluginEnable($plugin_id, $enable_flg) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATE$B$9$kCM$r:n ＠ .$9$k!#(B
         $sqlval['enable'] = $enable_flg;
@@ -914,8 +886,7 @@
      * @param string $plugin_code $B%W%i%0%$%s%3!<%I(B.
      * @return array $arrErr $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function deletePlugin($plugin_id, $plugin_code)
-    {
+    function deletePlugin($plugin_id, $plugin_code) {
         $arrErr = array();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
@@ -942,8 +913,7 @@
      * @param string $file_name $B%U%!%$%kL>(B.
      * @return boolean
      */
-    function isContainsFile($plugin_dir, $file_name)
-    {
+    function isContainsFile($plugin_dir, $file_name) {
         if (file_exists($plugin_dir) && is_dir($plugin_dir)) {
             if ($handle = opendir($plugin_dir)) {
                 while (($item = readdir($handle)) !== false) {
@@ -962,8 +932,7 @@
      * @param string $file_path $BH=Dj$9$k%U%!%$%k%Q%9(B
      * @return boolean
      */
-    function checkContainsFile($tar_obj, $file_path)
-    {
+    function checkContainsFile($tar_obj, $file_path) {
         // $B%U%!%$%k0lMw$r<hF@(B
         $arrayFile = $tar_obj->listContent();
         foreach ($arrayFile as  $value) {
@@ -978,8 +947,7 @@
      * @param string $dir_path $B:n ＠ .$9$k%G%#%l%/%H%j$N%Q%9(B
      * @return void
      */
-    function makeDir($dir_path)
-    {
+    function makeDir($dir_path) {
         // $B%G%#%l%/%H%j:n ＠ .(B
         if (!file_exists($dir_path)) {
             mkdir($dir_path);
@@ -992,8 +960,7 @@
      * @param int $plugin_id $B%W%i%0%$%s(BID
      * @return string $conflict_alert_message $B%a%C%;!<%8(B
      */
-    function checkConflictPlugin($plugin_id)
-    {
+    function checkConflictPlugin($plugin_id) {
         // $B%U%C%/%]%$%s%H$r<hF@$7$^$9(B.
         $hookPoints = $this->getHookPoint($plugin_id);
 
@@ -1028,8 +995,7 @@
      * @param array $arrErr $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      * @return boolean.
      */
-    function isError($error)
-    {
+    function isError($error) {
         if (is_array($error) && count($error) > 0) {
             return true;
         }
@@ -1042,8 +1008,7 @@
      * @param string $plugin_id $B%W%i%0%$%s(BID
      * @return array $B%U%C%/%]%$%s%H$NO"A[G[Ns(B.
      */
-    function getHookPoint($plugin_id)
-    {
+    function getHookPoint($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $table = 'dtb_plugin_hookpoint';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Log extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore_Log extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->tpl_mainpage = 'ownersstore/log.tpl';
@@ -58,8 +56,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -69,8 +66,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         switch ($this->getMode()) {
             case 'detail':
                 $objForm = $this->initParam();
@@ -94,13 +90,11 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function getLogs()
-    {
+    function getLogs() {
         $sql =<<<END
 SELECT
     *
@@ -119,16 +113,14 @@
         return isset($arrRet) ? $arrRet : array();
     }
 
-    function initParam()
-    {
+    function initParam() {
         $objForm = new SC_FormParam_Ex();
         $objForm->addParam('log_id', 'log_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objForm->setParam($_GET);
         return $objForm;
     }
 
-    function getLogDetail($log_id)
-    {
+    function getLogDetail($log_id) {
             $sql =<<<END
 SELECT
     *

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Module extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore_Module extends LC_Page_Admin_Ex {
 
     var $tpl_subno = 'index';
     // }}}
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->tpl_mainpage = 'ownersstore/module.tpl';
@@ -59,8 +57,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -70,8 +67,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         // nothing.
     }
 
@@ -80,8 +76,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Settings extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_OwnersStore_Settings extends LC_Page_Admin_Ex {
 
     /** SC_FormParam$B$N%$%s%9%?%s%9(B */
     var $objForm;
@@ -51,8 +50,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->tpl_mainpage = 'ownersstore/settings.tpl';
@@ -68,8 +66,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -79,8 +76,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         switch ($this->getMode()) {
             // $BF~NOFbMF$r(BDB$B$XEPO?$9$k(B
             case 'register':
@@ -97,8 +93,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -109,8 +104,7 @@
      * @param void
      * @return void
      */
-    function execRegisterMode()
-    {
+    function execRegisterMode() {
         // $B%Q%i%a!<%?!<%*%V%8%'%/%H$N=i4|2=(B
         $this->initRegisterMode();
         // POST$B$5$l$?%Q%i%a!<%?!<$N8!>Z(B
@@ -139,8 +133,7 @@
      * @param void
      * @return void
      */
-    function initRegisterMode()
-    {
+    function initRegisterMode() {
         // $BA08e$N6uGr$r:o=|(B
         if (isset($_POST['public_key'])) {
             $_POST['public_key'] = trim($_POST['public_key']);
@@ -159,8 +152,7 @@
      * @param void
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B
      */
-    function validateRegistermode()
-    {
+    function validateRegistermode() {
         return $this->objForm->checkError();
     }
 
@@ -171,8 +163,7 @@
      * @param void
      * @return void
      */
-    function execDefaultMode()
-    {
+    function execDefaultMode() {
         $this->arrForm = $this->getOwnersStoreSettings();
     }
 
@@ -182,8 +173,7 @@
      * @param array $arrSettingsData $B%*!<%J!<%:%9%H%"@_Dj$NO"A[G[Ns(B
      * @return void
      */
-    function registerOwnersStoreSettings($arrSettingsData)
-    {
+    function registerOwnersStoreSettings($arrSettingsData) {
         $table = 'dtb_ownersstore_settings';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $exists = $objQuery->exists($table);
@@ -201,8 +191,7 @@
      * @param void
      * @return array
      */
-    function getOwnersStoreSettings()
-    {
+    function getOwnersStoreSettings() {
         $table   = 'dtb_ownersstore_settings';
         $colmuns = '*';
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/index.tpl';
         $this->tpl_mainno = 'products';
@@ -58,7 +56,7 @@
         $this->arrSTATUS = $masterData->getMasterData('mtb_status');
         $this->arrPRODUCTSTATUS_COLOR = $masterData->getMasterData('mtb_product_status_color');
 
-        $objDate = new SC_Date_Ex();
+        $objDate = new SC_Date();
         // $BEPO?!&99?78!:w3+;OG/(B
         $objDate->setStartYear(RELEASE_YEAR);
         $objDate->setEndYear(DATE('Y'));
@@ -79,8 +77,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -90,8 +87,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -190,8 +186,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -201,8 +196,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
 
         // POST$B$5$l$kCM(B
         $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -233,8 +227,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
 
@@ -244,8 +237,7 @@
     }
 
     // $B%+%F%4%j(BID$B$r%-!<!"%+%F%4%jL>$rCM$K$9$kG[Ns$rJV$9!#(B
-    function lfGetIDName($arrCatKey, $arrCatVal)
-    {
+    function lfGetIDName($arrCatKey, $arrCatVal) {
         $max = count($arrCatKey);
         for ($cnt = 0; $cnt < $max; $cnt++) {
             $key = isset($arrCatKey[$cnt]) ? $arrCatKey[$cnt] : '';
@@ -262,23 +254,14 @@
      * @param array $arrParam $B:o=|BP>]$NCM(B
      * @return void
      */
-    function doDelete($where, $arrParam = array())
-    {
+    function doDelete($where, $arrParam = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $arrRet = $objQuery->getCol('product_id', "dtb_products", $where, $arrParam);
-        $product_ids = array();
-        foreach ($arrRet as $value) {
-            $product_ids[] = $value['product_id'];
-        }
         $sqlval['del_flg']     = 1;
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
         $objQuery->begin();
         $objQuery->update('dtb_products_class', $sqlval, "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
         $objQuery->delete('dtb_customer_favorite_products', "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
-
-        $objRecomment = new SC_Helper_Recommend_Ex();
-        $objRecomment->deleteByProductIDs($product_ids);
-
+        $objQuery->delete('dtb_best_products', "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
         $objQuery->update('dtb_products', $sqlval, $where, $arrParam);
         $objQuery->commit();
     }
@@ -298,8 +281,7 @@
      * @param SC_FormParam $objDb SC_Helper_DB_Ex $B%$%s%9%?%s%9(B
      * @return void
      */
-    function buildQuery($key, &$where, &$arrValues, &$objFormParam, &$objDb)
-    {
+    function buildQuery($key, &$where, &$arrValues, &$objFormParam, &$objDb) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         switch ($key) {
             // $B>&IJ(BID
@@ -384,8 +366,7 @@
      * @param array $arrValues $B8!:w>r7o$N%Q%i%a!<%?!<(B
      * @return integer $B8!:w7k2L$N9T?t(B
      */
-    function getNumberOfLines($where, $arrValues)
-    {
+    function getNumberOfLines($where, $arrValues) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->count('dtb_products', $where, $arrValues);
     }
@@ -401,8 +382,7 @@
      * @param SC_Product $objProduct SC_Product $B%$%s%9%?%s%9(B
      * @return array $B>&IJ$N8!:w7k2L(B
      */
-    function findProducts($where, $arrValues, $limit, $offset, $order, &$objProduct)
-    {
+    function findProducts($where, $arrValues, $limit, $offset, $order, &$objProduct) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $BFI$_9~$`Ns$H%F!<%V%k$N;XDj(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Category extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Category extends LC_Page_Admin_Ex {
 
     // {{{ properties
 
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_maintitle = '$B>&IJ4IM}(B';
         $this->tpl_subtitle = '$B%+%F%4%jEPO?(B';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,12 +68,10 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb      = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
-        $objCategory = new SC_Helper_Category_Ex();
 
         // $BF~NO%Q%i%a!<%?!<=i4|2=(B
         $this->initParam($objFormParam);
@@ -183,11 +178,11 @@
         // $B%+%F%4%j0lMw$r<hF@(B
         $this->arrList = $this->findCategoiesByParentCategoryId($parent_category_id);
         // $B%+%F%4%j%D%j!<$r<hF@(B
-        $this->arrTree = $objCategory->getTree();
-        $this->arrParentID = $objCategory->getTreeTrail($parent_category_id);
+        $this->arrTree = $objDb->sfGetCatTree($parent_category_id);
         // $B$Q$s$/$:$N ＠ 8@.(B
-        $arrBread = $objCategory->getTreeTrail($this->arrForm['parent_category_id'], FALSE);
-        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode(array_reverse($arrBread));
+        $arrBread = array();
+        $objDb->findTree($this->arrTree, $parent_category_id, $arrBread);
+        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode($arrBread);
 
     }
 
@@ -205,8 +200,7 @@
      * @param SC_Helper_Db $objDb
      * @return void
      */
-    function doDelete(&$objFormParam, &$objDb)
-    {
+    function doDelete(&$objFormParam, &$objDb) {
         $category_id = $objFormParam->getValue('category_id');
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -236,13 +230,15 @@
      * @param SC_FormParam $objFormParam
      * @return void
      */
-    function doPreEdit(&$objFormParam)
-    {
+    function doPreEdit(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
-        $objCategory = new SC_Helper_Category_Ex();
-        $arrRes = $objCategory->get($category_id);
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
 
+        // $BJT=8BP>]$N%+%F%4%jL>$r(BDB$B$h$j<hF@$9$k(B
+        $where = 'category_id = ?';
+        $arrRes = $objQuery->getRow('*', 'dtb_category', $where, array($category_id));
+
         $objFormParam->setParam($arrRes);
 
         $this->arrForm = $objFormParam->getHashArray();
@@ -260,8 +256,7 @@
      * @param SC_FormParam $objFormParam
      * @return void
      */
-    function doEdit(&$objFormParam)
-    {
+    function doEdit(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
         // $BDI2C$+(B
@@ -297,8 +292,7 @@
      * @param boolean $add $BDI2C$+(B
      * @return void
      */
-    function checkError(&$objFormParam, $add)
-    {
+    function checkError(&$objFormParam, $add) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $BF~NO9`L\%A%'%C%/(B
@@ -353,8 +347,7 @@
      * @param SC_FormParam $objFormParam
      * @return void
      */
-    function doUp(&$objFormParam)
-    {
+    function doUp(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -381,8 +374,7 @@
      * @param SC_FormParam $objFormParam
      * @return void
      */
-    function doDown(&$objFormParam)
-    {
+    function doDown(&$objFormParam) {
         $category_id = $objFormParam->getValue('category_id');
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -409,8 +401,7 @@
      * @param SC_FormParam $objFormParam
      * @return void
      */
-    function initParam(&$objFormParam)
-    {
+    function initParam(&$objFormParam) {
         $objFormParam->addParam('$B?F%+%F%4%j(BID', 'parent_category_id', null, null, array());
         $objFormParam->addParam('$B%+%F%4%j(BID', 'category_id', null, null, array());
         $objFormParam->addParam('$B%+%F%4%jL>(B', 'category_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -426,8 +417,7 @@
      * @param int $parent_category_id $B?F%+%F%4%j(BID
      * @return array $B%+%F%4%j$NG[Ns(B
      */
-    function findCategoiesByParentCategoryId($parent_category_id)
-    {
+    function findCategoiesByParentCategoryId($parent_category_id) {
         if (!$parent_category_id) {
             $parent_category_id = 0;
         }
@@ -444,8 +434,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function updateCategory($category_id, $arrCategory)
-    {
+    function updateCategory($category_id, $arrCategory) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $arrCategory['update_date']   = 'CURRENT_TIMESTAMP';
@@ -462,8 +451,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function registerCategory($arrCategory)
-    {
+    function registerCategory($arrCategory) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $parent_category_id = $arrCategory['parent_category_id'];
@@ -509,8 +497,7 @@
      * @param integer $B?F%+%F%4%j(BID
      * @param $BD6$($F$$$k>l9g(B true
      */
-    function isOverLevel($parent_category_id)
-    {
+    function isOverLevel($parent_category_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $level = $objQuery->get('level', 'dtb_category', 'category_id = ?', array($parent_category_id));
         return $level >= LEVEL_MAX;
@@ -521,14 +508,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // $BJB$S$,(B1$B$D2<$N(BID$B$r<hF@$9$k!#(B
-    function lfGetDownRankID($objQuery, $table, $pid_name, $id_name, $id)
-    {
+    function lfGetDownRankID($objQuery, $table, $pid_name, $id_name, $id) {
         // $B?F(BID$B$r<hF@$9$k!#(B
         $col = "$pid_name";
         $where = "$id_name = ?";
@@ -549,8 +534,7 @@
     }
 
     // $BJB$S$,(B1$B$D>e$N(BID$B$r<hF@$9$k!#(B
-    function lfGetUpRankID($objQuery, $table, $pid_name, $id_name, $id)
-    {
+    function lfGetUpRankID($objQuery, $table, $pid_name, $id_name, $id) {
         // $B?F(BID$B$r<hF@$9$k!#(B
         $col = "$pid_name";
         $where = "$id_name = ?";
@@ -570,16 +554,14 @@
         return $up_id;
     }
 
-    function lfCountChilds($objQuery, $table, $pid_name, $id_name, $id)
-    {
+    function lfCountChilds($objQuery, $table, $pid_name, $id_name, $id) {
         $objDb = new SC_Helper_DB_Ex();
         // $B;R(BID$B0lMw$r<hF@(B
         $arrRet = $objDb->sfGetChildrenArray($table, $pid_name, $id_name, $id);
         return count($arrRet);
     }
 
-    function lfUpRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count)
-    {
+    function lfUpRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count) {
         $objDb = new SC_Helper_DB_Ex();
         // $B;R(BID$B0lMw$r<hF@(B
         $arrRet = $objDb->sfGetChildrenArray($table, $pid_name, $id_name, $id);
@@ -591,8 +573,7 @@
         return $objQuery->update($table, array(), $where, array(), $arrRawVal);
     }
 
-    function lfDownRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count)
-    {
+    function lfDownRankChilds($objQuery, $table, $pid_name, $id_name, $id, $count) {
         $objDb = new SC_Helper_DB_Ex();
         // $B;R(BID$B0lMw$r<hF@(B
         $arrRet = $objDb->sfGetChildrenArray($table, $pid_name, $id_name, $id);

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Class extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Class extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/class.tpl';
         $this->tpl_subno = 'class';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
 
@@ -142,8 +138,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -153,8 +148,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B5,3JL>(B', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B5,3J(BID', 'class_id', INT_LEN, 'n', array('NUM_CHECK'));
     }
@@ -164,8 +158,7 @@
      *
      * @return array $B5,3J>pJs(B
      */
-    function lfGetClass()
-    {
+    function lfGetClass() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $where = 'del_flg <> 1';
@@ -180,8 +173,7 @@
      * @param integer $class_id $B5,3J(BID
      * @return string $B5,3JL>(B
      */
-    function lfGetClassName($class_id)
-    {
+    function lfGetClassName($class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'class_id = ?';
         $class_name = $objQuery->get('name', 'dtb_class', $where, array($class_id));
@@ -194,8 +186,7 @@
      * @param array $arrForm $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return integer $B99?77o?t(B
      */
-    function lfInsertClass($arrForm)
-    {
+    function lfInsertClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // INSERT$B$9$kCM$r:n ＠ .$9$k!#(B
         $sqlval['name'] = $arrForm['name'];
@@ -215,8 +206,7 @@
      * @param array $arrForm $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return integer $B99?77o?t(B
      */
-    function lfUpdateClass($arrForm)
-    {
+    function lfUpdateClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATE$B$9$kCM$r:n ＠ .$9$k!#(B
         $sqlval['name'] = $arrForm['name'];
@@ -234,8 +224,7 @@
      * @param SC_Helper_DB $objDb SC_Helper_DB$B$N%$%s%9%?%s%9(B
      * @return integer $B:o=|7o?t(B
      */
-    function lfDeleteClass($class_id)
-    {
+    function lfDeleteClass($class_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -251,8 +240,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrForm = $objFormParam->getHashArray();
         // $B%Q%i%a!<%?!<$N4pK\%A%'%C%/(B
@@ -278,8 +266,7 @@
      * @param string $arrForm $B%U%)!<%`$NF~NOCM(B
      * @return boolean $B?75,>&IJDI2C$N>l9g(B true
      */
-    function lfCheckInsert($arrForm)
-    {
+    function lfCheckInsert($arrForm) {
         //class_id $B$N$"$k$J$7$G?75,>&IJ$+$I$&$+$rH=Dj(B
         if (empty($arrForm['class_id'])) {
             return true;
@@ -293,8 +280,7 @@
      * @param integer $class_id $B5,3J(BID
      * @return void
      */
-    function lfUpRank($class_id)
-    {
+    function lfUpRank($class_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankUp('dtb_class', 'class_id', $class_id);
     }
@@ -304,8 +290,7 @@
      * @param integer $class_id $B5,3J(BID
      * @return void
      */
-    function lfDownRank($class_id)
-    {
+    function lfDownRank($class_id) {
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfRankDown('dtb_class', 'class_id', $class_id);
     }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Admin_Products_ClassCategory.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_Products_ClassCategory extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ClassCategory extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/classcategory.tpl';
         $this->tpl_subno = 'class';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
 
@@ -145,8 +141,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -156,8 +151,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B5,3J(BID', 'class_id', INT_LEN, 'n', array('NUM_CHECK'));
         $objFormParam->addParam('$B5,3JJ,N`L>(B', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B5,3JJ,N`(BID', 'classcategory_id', INT_LEN, 'n', array('NUM_CHECK'));
@@ -169,8 +163,7 @@
      * @param integer $class_id $B5,3J(BID
      * @return array $B5,3JJ,N`>pJs(B
      */
-    function lfGetClassCat($class_id)
-    {
+    function lfGetClassCat($class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $where = 'del_flg <> 1 AND class_id = ?';
@@ -185,8 +178,7 @@
      * @param integer $class_id $B5,3J(BID
      * @return string $B5,3JL>(B
      */
-    function lfGetClassName($class_id)
-    {
+    function lfGetClassName($class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $where = 'class_id = ?';
@@ -200,8 +192,7 @@
      * @param integer $classcategory_id $B5,3JJ,N`(BID
      * @return string $B5,3JJ,N`L>(B
      */
-    function lfGetClassCatName($classcategory_id)
-    {
+    function lfGetClassCatName($classcategory_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'classcategory_id = ?';
         $name = $objQuery->get('name', 'dtb_classcategory', $where, array($classcategory_id));
@@ -214,8 +205,7 @@
      * @param array $arrForm $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return integer $B99?77o?t(B
      */
-    function lfInsertClass($arrForm)
-    {
+    function lfInsertClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
         // $B?F5,3J(BID$B$NB8:_%A%'%C%/(B
@@ -243,8 +233,7 @@
      * @param array $arrForm $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return integer $B99?77o?t(B
      */
-    function lfUpdateClass($arrForm)
-    {
+    function lfUpdateClass($arrForm) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // UPDATE$B$9$kCM$r:n ＠ .$9$k!#(B
         $sqlval['name'] = $arrForm['name'];
@@ -261,8 +250,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrForm = $objFormParam->getHashArray();
         // $B%Q%i%a!<%?!<$N4pK\%A%'%C%/(B
@@ -288,8 +276,7 @@
      * @param integer $classcategory_id $B5,3JJ,N`(BID
      * @return boolean $B?75,>&IJDI2C$N>l9g(B true
      */
-    function lfCheckInsert($classcategory_id)
-    {
+    function lfCheckInsert($classcategory_id) {
         //classcategory_id $B$N$"$k$J$7$G?75,5,3JJ,N`2=$+$I$&$+$rH=Dj(B
         if (empty($classcategory_id)) {
             return true;
@@ -305,8 +292,7 @@
      * @param integer $classcategory_id $B5,3JJ,N`(BID
      * @return void
      */
-    function lfDeleteClassCat($class_id, $classcategory_id)
-    {
+    function lfDeleteClassCat($class_id, $classcategory_id) {
         $objDb = new SC_Helper_DB_Ex();
         $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id);
         $objDb->sfDeleteRankRecord('dtb_classcategory', 'classcategory_id', $classcategory_id, $where, true);
@@ -318,8 +304,7 @@
      * @param integer $classcategory_id $B5,3JJ,N`(BID
      * @return void
      */
-    function lfUpRank($class_id, $classcategory_id)
-    {
+    function lfUpRank($class_id, $classcategory_id) {
         $objDb = new SC_Helper_DB_Ex();
         $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id);
         $objDb->sfRankUp('dtb_classcategory', 'classcategory_id', $classcategory_id, $where);
@@ -331,8 +316,7 @@
      * @param integer $classcategory_id $B5,3JJ,N`(BID
      * @return void
      */
-    function lfDownRank($class_id, $classcategory_id)
-    {
+    function lfDownRank($class_id, $classcategory_id) {
         $objDb = new SC_Helper_DB_Ex();
         $where = 'class_id = ' . SC_Utils_Ex::sfQuoteSmart($class_id);
         $objDb->sfRankDown('dtb_classcategory', 'classcategory_id', $classcategory_id, $where);

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Maker extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Maker extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/maker.tpl';
         $this->tpl_subno = 'maker';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,10 +65,8 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
-        $objMaker = new SC_Helper_Maker_Ex();
         $objFormParam = new SC_FormParam_Ex();
 
         // $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
@@ -86,52 +81,45 @@
         //maker_id$B$rJQ?t$K%;%C%H(B
         $maker_id = $objFormParam->getValue('maker_id');
 
+        // $BJQ498e$N(BPOST$BCM$r<hF@(B
+        $this->arrForm  = $objFormParam->getHashArray();
+
         // $B%b!<%I$K$h$k=hM}@Z$jBX$((B
         switch ($this->getMode()) {
 
             // $BJT=8=hM}(B
             case 'edit':
+            // $BF~NOJ8;z$NJQ49(B
+
                 // $B%(%i!<%A%'%C%/(B
-                $this->arrErr = $this->lfCheckError($objFormParam, $objMaker);
-                if (!SC_Utils_Ex::isBlank($this->arrErr['maker_id'])) {
-                    trigger_error('', E_USER_ERROR);
-                    return;
-                }
-
+                $this->arrErr = $this->lfCheckError($this->arrForm, $objFormParam);
                 if (count($this->arrErr) <= 0) {
-                    // POST$BCM$N0z$-7Q$.(B
-                    $arrParam = $objFormParam->getHashArray();
-                    // $BEPO?<B9T(B
-                    $res_maker_id = $this->doRegist($maker_id, $arrParam, $objMaker);
-                    if ($res_maker_id !== FALSE) {
-                        // $B40N;%a%C%;!<%8(B
-                        $maker_id = $res_maker_id;
-                        $this->tpl_onload = "alert('$BEPO?$,40N;$7$^$7$?!#(B');";
+                    if ($this->arrForm['maker_id'] == '') {
+                        // $B%a!<%+!<>pJs?75,EPO?(B
+                        $this->lfInsert($this->arrForm);
+                    } else {
+                        // $B%a!<%+!<>pJsJT=8(B
+                        $this->lfUpdate($this->arrForm);
                     }
+
+                    // $B:FI=<((B
+                    $this->objDisplay->reload();
+                } else {
+                    // POST$B%G!<%?$r0z$-7Q$0(B
+                    $this->tpl_maker_id = $this->arrForm['maker_id'];
                 }
-                // POST$B%G!<%?$r0z$-7Q$0(B
-                $this->tpl_maker_id = $maker_id;
                 break;
 
             // $BJT=8A0=hM}(B
             case 'pre_edit':
-                $maker = $objMaker->get($maker_id);
-                $objFormParam->setParam($maker);
-
-                // POST$B%G!<%?$r0z$-7Q$0(B
-                $this->tpl_maker_id = $maker_id;
+                $this->arrForm = $this->lfPreEdit($this->arrForm, $this->arrForm['maker_id']);
+                $this->tpl_maker_id = $this->arrForm['maker_id'];
                 break;
 
             // $B%a!<%+!<=gJQ99(B
             case 'up':
-                $objMaker->rankUp($maker_id);
-
-                // $B%j%m!<%I(B
-                SC_Response_Ex::reload();
-                break;
-
             case 'down':
-                $objMaker->rankDown($maker_id);
+                $this->lfRankChange($this->arrForm['maker_id'], $this->getMode());
 
                 // $B%j%m!<%I(B
                 SC_Response_Ex::reload();
@@ -139,7 +127,7 @@
 
             // $B:o=|(B
             case 'delete':
-                $objMaker->delete($maker_id);
+                $this->lfDelete($this->arrForm['maker_id']);
 
                 // $B%j%m!<%I(B
                 SC_Response_Ex::reload();
@@ -149,10 +137,11 @@
                 break;
         }
 
-        $this->arrForm = $objFormParam->getFormParamList();
+        // $B%a!<%+!<>pJsFI$_9~$_(B
+        $this->arrMaker = $this->lfDisp();
+        // POST$B%G!<%?$r0z$-7Q$0(B
+        $this->tpl_maker_id = $maker_id;
 
-        // $B%a!<%+!<>pJsFI$_9~$_(B
-        $this->arrMaker = $objMaker->getList();
     }
 
     /**
@@ -160,8 +149,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -171,57 +159,151 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%a!<%+!<(BID', 'maker_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%a!<%+!<L>(B', 'name', SMTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
     }
 
     /**
-     * $BEPO?=hM}$r<B9T(B.
-     * 
-     * @param integer $maker_id
-     * @param array $sqlval
-     * @param object $objMaker
-     * @return multiple
+     * $B%a!<%+!<>pJsI=<((B.
+     *
+     * @return array $arrMaker $B%a!<%+!<>pJs(B
      */
-    function doRegist($maker_id, $sqlval, SC_Helper_Maker_Ex $objMaker)
-    {
-        $sqlval['maker_id'] = $maker_id;
+    function lfDisp() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // $B:o=|$5$l$F$$$J$$%a!<%+!<>pJs$rI=<($9$k(B
+        $where = 'del_flg = 0';
+        $objQuery->setOrder('rank DESC');
+        $arrMaker = array();
+        $arrMaker = $objQuery->select('maker_id, name', 'dtb_maker', $where);
+        return $arrMaker;
+    }
+
+    /**
+     * $B%a!<%+!<>pJs?75,EPO?(B.
+     *
+     * @param array $arrForm $B%a!<%+!<>pJs(B
+     * @return void
+     */
+    function lfInsert(&$arrForm) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // INSERT$B$9$kCM$r:n ＠ .$9$k(B
+        $sqlval['name'] = $arrForm['name'];
+        $sqlval['rank'] = $objQuery->max('rank', 'dtb_maker') + 1;
         $sqlval['creator_id'] = $_SESSION['member_id'];
-        return $objMaker->save($sqlval);
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+        $sqlval['maker_id'] = $objQuery->nextVal('dtb_maker_maker_id');
+
+        // INSERT$B$N<B9T(B
+        $objQuery->insert('dtb_maker', $sqlval);
     }
 
     /**
+     * $B%a!<%+!<>pJs99?7(B.
+     *
+     * @param array $arrForm $B%a!<%+!<>pJs(B
+     * @return void
+     */
+    function lfUpdate(&$arrForm) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // UPDATE$B$9$kCM$r:n ＠ .$9$k(B
+        $sqlval['name'] = $arrForm['name'];
+        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+        $where = 'maker_id = ?';
+
+        // UPDATE$B$N<B9T(B
+        $objQuery->update('dtb_maker', $sqlval, $where, array($arrForm['maker_id']));
+    }
+
+    /**
+     * $B%a!<%+!<>pJs:o=|(B.
+     *
+     * @param integer $maker_id $B%a!<%+!<(BID
+     * @return void
+     */
+    function lfDelete($maker_id) {
+        $objDb = new SC_Helper_DB_Ex();
+        $objDb->sfDeleteRankRecord('dtb_maker', 'maker_id', $maker_id, '', true);
+    }
+
+    /**
+     * $B%a!<%+!<>pJs=gHVJQ99(B.
+     *
+     * @param  integer $maker_id $B%a!<%+!<(BID
+     * @param  string  $mode up $B$+(B down $B$N%b!<%I$r<($9J8;zNs(B
+     * @return void
+     */
+    function lfRankChange($maker_id, $mode) {
+        $objDb = new SC_Helper_DB_Ex();
+
+        switch ($mode) {
+            case 'up':
+                $objDb->sfRankUp('dtb_maker', 'maker_id', $maker_id);
+                break;
+
+            case 'down':
+                $objDb->sfRankDown('dtb_maker', 'maker_id', $maker_id);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * $B%a!<%+!<>pJsJT=8A0=hM}(B.
+     *
+     * @param array   $arrForm $B%a!<%+!<>pJs(B
+     * @param integer $maker_id $B%a!<%+!<(BID
+     * @return array  $arrForm $B%a!<%+!<L>$rDI2C(B
+     */
+    function lfPreEdit(&$arrForm, $maker_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        // $BJT=89`L\$r<hF@$9$k(B
+        $where = 'maker_id = ?';
+        $arrMaker = array();
+        $arrMaker = $objQuery->select('name', 'dtb_maker', $where, array($maker_id));
+        $arrForm['name'] = $arrMaker[0]['name'];
+
+        return $arrForm;
+    }
+
+    /**
      * $BF~NO%(%i!<%A%'%C%/(B.
      *
+     * @param  array $arrForm $B%a!<%+!<>pJs(B
      * @return array $objErr->arrErr $B%(%i!<FbMF(B
      */
-    function lfCheckError(&$objFormParam, SC_Helper_Maker_Ex &$objMaker)
-    {
+    function lfCheckError(&$arrForm, &$objFormParam) {
 
         $arrErr = $objFormParam->checkError();
-        $arrForm = $objFormParam->getHashArray();
+        if (!empty($arrErr)) {
+            return $arrErr;
+        }
 
         // maker_id $B$N ＠ 5Ev@-%A%'%C%/(B
         if (!empty($arrForm['maker_id'])) {
+            $objDb = new SC_Helper_DB_Ex();
             if (!SC_Utils_Ex::sfIsInt($arrForm['maker_id'])
                 || SC_Utils_Ex::sfIsZeroFilling($arrForm['maker_id'])
-                || !$objMaker->get($arrForm['maker_id'])
+                || !$objDb->sfIsRecord('dtb_maker', 'maker_id', array($arrForm['maker_id']))
             ) {
                 // maker_id$B$,;XDj$5$l$F$$$F!"3n$D$=$NCM$,IT ＠ 5$H;W$o$l$k>l9g$O%(%i!<(B
                 $arrErr['maker_id'] = '$B"((B $B%a!<%+!<(BID$B$,IT ＠ 5$G$9(B<br />';
             }
         }
         if (!isset($arrErr['name'])) {
-            $arrMaker = $objMaker->getByName($arrForm['name']);
+            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $arrMaker = array();
+            $arrMaker = $objQuery->select('maker_id, name', 'dtb_maker', 'del_flg = 0 AND name = ?', array($arrForm['name']));
 
             // $BJT=8Cf$N%l%3!<%I0J30$KF1$8L>>N$,B8:_$9$k>l9g(B
-            if (
-                    !SC_Utils_Ex::isBlank($arrMaker)
-                    && $arrMaker['maker_id'] != $arrForm['maker_id']
-                    && $arrMaker['name'] == $arrForm['name']
-                ) {
+            if ($arrMaker[0]['maker_id'] != $arrForm['maker_id'] && $arrMaker[0]['name'] == $arrForm['name']) {
                 $arrErr['name'] = '$B"((B $B4{$KF1$8FbMF$NEPO?$,B8:_$7$^$9!#(B<br />';
             }
         }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Product extends LC_Page_Admin_Products_Ex 
-{
+class LC_Page_Admin_Products_Product extends LC_Page_Admin_Products_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product.tpl';
         $this->tpl_mainno = 'products';
@@ -57,7 +55,7 @@
         $this->arrSTATUS = $masterData->getMasterData('mtb_status');
         $this->arrSTATUS_IMAGE = $masterData->getMasterData('mtb_status_image');
         $this->arrDELIVERYDATE = $masterData->getMasterData('mtb_delivery_date');
-        $this->arrMaker = SC_Helper_Maker_Ex::getIDValueList();
+        $this->arrMaker = SC_Helper_DB_Ex::sfGetIDValueList('dtb_maker', 'maker_id', 'name');
         $this->arrAllowedTag = $masterData->getMasterData('mtb_allowed_tag');
     }
 
@@ -66,8 +64,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -77,8 +74,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
 
@@ -297,8 +293,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -310,8 +305,7 @@
      * @param array $arrPost $_POST$B%G!<%?(B
      * @return void
      */
-    function lfInitFormParam_PreEdit(&$objFormParam, $arrPost)
-    {
+    function lfInitFormParam_PreEdit(&$objFormParam, $arrPost) {
         $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->setParam($arrPost);
         $objFormParam->convParam();
@@ -324,8 +318,7 @@
      * @param array $arrPost $_POST$B%G!<%?(B
      * @return void
      */
-    function lfInitFormParam(&$objFormParam, $arrPost)
-    {
+    function lfInitFormParam(&$objFormParam, $arrPost) {
         $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B>&IJL>(B', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B>&IJ%+%F%4%j(B', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -393,8 +386,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitFormParam_UploadImage(&$objFormParam)
-    {
+    function lfInitFormParam_UploadImage(&$objFormParam) {
         $objFormParam->addParam('image_key', 'image_key', '', '', array());
     }
 
@@ -405,8 +397,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitFormParam_UploadDown(&$objFormParam)
-    {
+    function lfInitFormParam_UploadDown(&$objFormParam) {
         $objFormParam->addParam('down_key', 'down_key', '', '', array());
     }
 
@@ -417,8 +408,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitFormParam_RecommendSelect(&$objFormParam)
-    {
+    function lfInitFormParam_RecommendSelect(&$objFormParam) {
         $objFormParam->addParam('anchor_key', 'anchor_key', '', '', array());
         $objFormParam->addParam('select_recommend_no', 'select_recommend_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
     }
@@ -430,8 +420,7 @@
      * @param object $objUpFile SC_UploadFile$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('$B0lMw(B-$B%a%$%s2hA|(B', 'main_list_image', array('jpg', 'gif', 'png'),IMAGE_SIZE, false, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
         $objUpFile->addFile('$B>\:Y(B-$B%a%$%s2hA|(B', 'main_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT);
         $objUpFile->addFile('$B>\:Y(B-$B%a%$%s3HBg2hA|(B', 'main_large_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, LARGE_IMAGE_WIDTH, LARGE_IMAGE_HEIGHT);
@@ -448,8 +437,7 @@
      * @param object $objDownFile SC_UploadFile$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitDownFile(&$objDownFile)
-    {
+    function lfInitDownFile(&$objDownFile) {
         $objDownFile->addFile('$B%@%&%s%m!<%IHNGdMQ%U%!%$%k(B', 'down_file', explode(',', DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0);
     }
 
@@ -462,8 +450,7 @@
      * @param array $arrForm $B%U%)!<%`F~NO%Q%i%a!<%?!<G[Ns(B
      * @return array $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B
      */
-    function lfCheckError_Edit(&$objFormParam, &$objUpFile, &$objDownFile, $arrForm)
-    {
+    function lfCheckError_Edit(&$objFormParam, &$objUpFile, &$objDownFile, $arrForm) {
         $objErr = new SC_CheckError_Ex($arrForm);
         $arrErr = array();
 
@@ -505,8 +492,7 @@
      * @param array $arrErr $B%(%i!<%a%C%;!<%8$NG[Ns(B
      * @return void
      */
-    function lfCheckError_RecommendSelect(&$arrForm, &$arrErr)
-    {
+    function lfCheckError_RecommendSelect(&$arrForm, &$arrErr) {
         $select_recommend_no = $arrForm['select_recommend_no'];
         $select_recommend_id = $arrForm['recommend_id' . $select_recommend_no];
 
@@ -515,8 +501,8 @@
                 if ($select_recommend_no == preg_replace('/^recommend_id/', '', $key)) {
                     continue;
                 }
-                $delete_key = 'recommend_delete'.intval(str_replace('recommend_id','',$key));
-                if ($select_recommend_id == $arrForm[$key] && $arrForm[$delete_key] != 1) {
+
+                if ($select_recommend_id == $arrForm[$key]) {
                     // $B=EJ#$7$?>l9g!"A*Br$5$l$?%G!<%?$r%j%;%C%H$9$k(B
                     $arrForm['recommend_id' . $select_recommend_no] = '';
                     $arrErr['recommend_comment' . $select_recommend_no] = '$B"((B $B$9$G$KEPO?$5$l$F$$$k4XO">&IJ$G$9!#(B<br />';
@@ -532,8 +518,7 @@
      * @param array $arrPost $_POST$B%G!<%?(B
      * @return array $B8!:w%Q%i%a!<%?!<G[Ns(B
      */
-    function lfGetSearchParam($arrPost)
-    {
+    function lfGetSearchParam($arrPost) {
         $arrSearchParam = array();
         $objFormParam = new SC_FormParam_Ex();
 
@@ -553,8 +538,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return array $B%U%)!<%`%Q%i%a!<%?!<G[Ns(B
      */
-    function lfGetFormParam_PreEdit(&$objUpFile, &$objDownFile, $product_id)
-    {
+    function lfGetFormParam_PreEdit(&$objUpFile, &$objDownFile, $product_id) {
         $arrForm = array();
 
         // DB$B$+$i>&IJ%G!<%?<hF@(B
@@ -574,8 +558,7 @@
      * @param object $objFormParam SC_FormParam$B%$%s%9%?%s%9(B
      * @return array $B%U%)!<%`%Q%i%a!<%?!<G[Ns(B
      */
-    function lfGetFormParam_Complete(&$objFormParam)
-    {
+    function lfGetFormParam_Complete(&$objFormParam) {
         $arrForm = $objFormParam->getHashArray();
         $arrForm['category_id'] = unserialize($arrForm['category_id']);
         $objFormParam->setValue('category_id', $arrForm['category_id']);
@@ -592,8 +575,7 @@
      * @param array $arrForm $B%U%)!<%`F~NO%Q%i%a!<%?!<G[Ns(B
      * @return array $BI=<(MQ%U%)!<%`%Q%i%a!<%?!<G[Ns(B
      */
-    function lfSetViewParam_InputPage(&$objUpFile, &$objDownFile, &$arrForm)
-    {
+    function lfSetViewParam_InputPage(&$objUpFile, &$objDownFile, &$arrForm) {
         // $B%+%F%4%j%^%9%?!<%G!<%?<hF@(B
         $objDb = new SC_Helper_DB_Ex();
         list($this->arrCatVal, $this->arrCatOut) = $objDb->sfGetLevelCatList(false);
@@ -635,8 +617,7 @@
      * @param array $arrForm $B%U%)!<%`F~NO%Q%i%a!<%?!<G[Ns(B
      * @return array $BI=<(MQ%U%)!<%`%Q%i%a!<%?!<G[Ns(B
      */
-    function lfSetViewParam_ConfirmPage(&$objUpFile, &$objDownFile, &$arrForm)
-    {
+    function lfSetViewParam_ConfirmPage(&$objUpFile, &$objDownFile, &$arrForm) {
         // $B%+%F%4%jI=<(MQ(B
         $arrForm['arrCategoryId'] = $arrForm['category_id'];
         // hidden $B$KEO$9CM$O(B serialize $B$9$k(B
@@ -656,8 +637,7 @@
      * @param string $image_key $B2hA|%U%!%$%k%-!<(B
      * @return void
      */
-    function lfSetScaleImage(&$objUpFile, $image_key)
-    {
+    function lfSetScaleImage(&$objUpFile, $image_key) {
         $subno = str_replace('sub_large_image', '', $image_key);
         switch ($image_key) {
         case 'main_large_image':
@@ -682,8 +662,7 @@
      * @param object $objUpFile SC_UploadFile$B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfCopyProductImageFiles(&$objUpFile)
-    {
+    function lfCopyProductImageFiles(&$objUpFile) {
         $arrKey = $objUpFile->keyname;
         $arrSaveFile = $objUpFile->save_file;
 
@@ -701,8 +680,7 @@
      * @param boolean $forced
      * @return void
      */
-    function lfMakeScaleImage(&$objUpFile, $from_key, $to_key, $forced = false)
-    {
+    function lfMakeScaleImage(&$objUpFile, $from_key, $to_key, $forced = false) {
         $arrImageKey = array_flip($objUpFile->keyname);
         $from_path = '';
 
@@ -740,8 +718,7 @@
      * @param string $image_key $B2hA|%U%!%$%k%-!<(B
      * @return void
      */
-    function lfDeleteTempFile(&$objUpFile, $image_key)
-    {
+    function lfDeleteTempFile(&$objUpFile, $image_key) {
         // TODO: SC_UploadFile::deleteFile$B$N2hA|:o=|>r7o8+D>$7MW(B
         $arrTempFile = $objUpFile->temp_file;
         $arrKeyName = $objUpFile->keyname;
@@ -774,8 +751,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return void
      */
-    function lfSaveUploadFiles(&$objUpFile, &$objDownFile, $product_id)
-    {
+    function lfSaveUploadFiles(&$objUpFile, &$objDownFile, $product_id) {
         // TODO: SC_UploadFile::moveTempFile$B$N2hA|:o=|>r7o8+D>$7MW(B
         $objImage = new SC_Image_Ex($objUpFile->temp_dir);
         $arrKeyName = $objUpFile->keyname;
@@ -809,8 +785,7 @@
      * @param string $image_file_name $B2hA|%U%!%$%kL>(B
      * @return boolean
      */
-    function lfHasSameProductImage($product_id, $arrImageKey, $image_file_name)
-    {
+    function lfHasSameProductImage($product_id, $arrImageKey, $image_file_name) {
         if (!SC_Utils_Ex::sfIsInt($product_id)) return false;
         if (!$arrImageKey) return false;
         if (!$image_file_name) return false;
@@ -843,8 +818,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return array $B>&IJ%G!<%?G[Ns(B
      */
-    function lfGetProductData_FromDB($product_id)
-    {
+    function lfGetProductData_FromDB($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrProduct = array();
 
@@ -907,8 +881,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return array $B4XO">&IJ%G!<%?G[Ns(B
      */
-    function lfGetRecommendProductsData_FromDB($product_id)
-    {
+    function lfGetRecommendProductsData_FromDB($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRecommendProducts = array();
 
@@ -935,8 +908,7 @@
      * @param string $arrForm $B%U%)!<%`F~NO%Q%i%a!<%?!<G[Ns(B
      * @return array $B4XO">&IJ%G!<%?G[Ns(B
      */
-    function lfGetRecommendProducts(&$arrForm)
-    {
+    function lfGetRecommendProducts(&$arrForm) {
         $arrRecommend = array();
 
         for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) {
@@ -963,8 +935,7 @@
      * @param void
      * @return array $B%+%F%4%j%^%9%?!<%G!<%?G[Ns(B
      */
-    function lfGetCategoryList_Edit()
-    {
+    function lfGetCategoryList_Edit() {
         $objDb = new SC_Helper_DB_Ex();
         $arrCategoryList = array();
 
@@ -983,8 +954,7 @@
      * @param string $anchor_hash $B%"%s%+!<MQ%O%C%7%eJ8;zNs(B($B>JN,2D(B)
      * @return string $B%Z!<%8(Bonload$BMQ(BJavaScript
      */
-    function lfSetOnloadJavaScript_InputPage($anchor_hash = '')
-    {
+    function lfSetOnloadJavaScript_InputPage($anchor_hash = '') {
         return "fnCheckStockLimit('" . DISABLED_RGB . "'); fnMoveSelect('category_id_unselect', 'category_id');" . $anchor_hash;
     }
 
@@ -996,8 +966,7 @@
      * @param array $arrList $B%U%)!<%`F~NO%Q%i%a!<%?!<G[Ns(B
      * @return integer $BEPO?>&IJ(BID
      */
-    function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList)
-    {
+    function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
 
@@ -1145,8 +1114,7 @@
      * @param array $arrList
      * @return void
      */
-    function lfInsertDummyProductClass($arrList)
-    {
+    function lfInsertDummyProductClass($arrList) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
 
@@ -1179,8 +1147,7 @@
      * @param array $arrList
      * @return void
      */
-    function lfUpdateProductClass($arrList)
-    {
+    function lfUpdateProductClass($arrList) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sqlval = array();
 
@@ -1199,8 +1166,7 @@
      * @param integer $product_id $BEPO?$9$k>&IJ(BID
      * @return void
      */
-    function lfInsertRecommendProducts(&$objQuery, $arrList, $product_id)
-    {
+    function lfInsertRecommendProducts(&$objQuery, $arrList, $product_id) {
         // $B0lC64XO">&IJ$r$9$Y$F:o=|$9$k(B
         $objQuery->delete('dtb_recommend_products', 'product_id = ?', array($product_id));
         $sqlval['product_id'] = $product_id;
@@ -1232,8 +1198,7 @@
      * @param object $objQuery SC_Query$B%$%s%9%?%s%9(B
      * @return boolean $B%(%i!<%U%i%0(B
      */
-    function lfCopyProductClass($arrList, &$objQuery)
-    {
+    function lfCopyProductClass($arrList, &$objQuery) {
         // $BJ#@=85$N(Bdtb_products_class$B$r<hF@!J5,3J$J$7$N$?$a!"(B1$B7o$N$_$N<hF@!K(B
         $col = '*';
         $table = 'dtb_products_class';
@@ -1283,8 +1248,7 @@
      * @param string $to_key
      * @return string
      */
-    function lfGetAddSuffix($to_key)
-    {
+    function lfGetAddSuffix($to_key) {
         if ( IMAGE_RENAME === true) return;
 
         // $B<+F0 ＠ 8@.$5$l$k2hA|L>(B
@@ -1311,8 +1275,7 @@
      * @param array $arrSubProductData $B%5%V>pJsG[Ns(B
      * @return boolean true: $B%5%V>pJs$"$j(B, false: $B%5%V>pJs$J$7(B
      */
-    function hasSubProductData($arrSubProductData)
-    {
+    function hasSubProductData($arrSubProductData) {
         $has_subproduct_data = false;
 
         for ($i = 1; $i <= PRODUCTSUB_MAX; $i++) {
@@ -1338,8 +1301,7 @@
      * @param string $anchor_key $B%U%)!<%`F~NO%Q%i%a!<%?!<$G<u$1<h$C$?%"%s%+!<%-!<(B
      * @return <type>
      */
-    function getAnchorHash($anchor_key)
-    {
+    function getAnchorHash($anchor_key) {
         if ($anchor_key != '') {
             return "location.hash='#" . htmlspecialchars($anchor_key) . "'";
         } else {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductClass extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ProductClass extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product_class.tpl';
         $this->tpl_mainno = 'products';
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -72,8 +69,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B>&IJ%^%9%?!<$N8!:w>r7o%Q%i%a!<%?!<$r=i4|2=(B
         $objFormParam = new SC_FormParam_Ex();
@@ -168,8 +164,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -179,8 +174,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function initParam(&$objFormParam)
-    {
+    function initParam(&$objFormParam) {
         // $B>&IJ%^%9%?!<8!:w%Q%i%a!<%?!<0z$-7Q$.(B
         $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%+%F%4%j(BID', 'category_id', STEXT_LEN, 'n', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -230,8 +224,7 @@
      * @param array $arrList $BF~NO%U%)!<%`$NFbMF(B
      * @param integer $product_id $BEPO?$r9T$&>&IJ(BID
      */
-    function registerProductClass($arrList, $product_id, $total)
-    {
+    function registerProductClass($arrList, $product_id, $total) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
 
@@ -314,8 +307,7 @@
      *
      * @return array $B%(%i!<$NG[Ns(B
      */
-    function lfCheckSelectClass()
-    {
+    function lfCheckSelectClass() {
         $objErr = new SC_CheckError_Ex();
         $objErr->doFunc(array('$B5,3J(B1', 'class_id1'), array('EXIST_CHECK'));
         $objErr->doFunc(array('$B5,3J(B', 'class_id1', 'select_class_id2'), array('TOP_EXIST_CHECK'));
@@ -329,8 +321,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<7k2L$NG[Ns(B
      */
-    function lfCheckProductsClass(&$objFormParam)
-    {
+    function lfCheckProductsClass(&$objFormParam) {
         $arrValues = $objFormParam->getHashArray();
         $arrErr = $objFormParam->checkError();
         $total = $objFormParam->getValue('total');
@@ -381,12 +372,12 @@
                 /*
                  * $BDL>o>&IJ%A%'%C%/(B
                  */
-                else if ($arrValues['product_type_id'][$i] != PRODUCT_TYPE_DOWNLOAD) {
+                else if ($arrValues['product_type_id'][$i] == PRODUCT_TYPE_NORMAL) {
                     if (!SC_Utils_Ex::isBlank($arrValues['down_filename'][$i])) {
-                        $arrErr['down_filename'][$i] = '$B"((B $B%@%&%s%m!<%I>&IJ$G$O$J$$>l9g!"%@%&%s%m!<%I%U%!%$%kL>$r ＠ _Dj$G$-$^$;$s!#(B<br />';
+                        $arrErr['down_filename'][$i] = '$B"((B $BDL>o>&IJ$N>l9g$O%@%&%s%m!<%I%U%!%$%kL>$r ＠ _Dj$G$-$^$;$s!#(B<br />';
                     }
                     if (!SC_Utils_Ex::isBlank($arrValues['down_realfilename'][$i])) {
-                        $arrErr['down_realfilename'][$i] = '$B"((B $B%@%&%s%m!<%I>&IJ$G$O$J$$>l9g!"%@%&%s%m!<%I>&IJMQ%U%!%$%k$r%"%C%W%m!<%I$G$-$^$;$s!#(B<br />$B%U%!%$%k$r<h$j>C$7$F$/$@$5$$!#(B<br />';
+                        $arrErr['down_realfilename'][$i] = '$B"((B $B<B>&IJ$N>l9g$O%@%&%s%m!<%I>&IJMQ%U%!%$%k$r%"%C%W%m!<%I$G$-$^$;$s!#(B<br />$B%U%!%$%k$r<h$j>C$7$F$/$@$5$$!#(B<br />';
                     }
                 }
             }
@@ -403,8 +394,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function doDisp(&$objFormParam)
-    {
+    function doDisp(&$objFormParam) {
         $product_id = $objFormParam->getValue('product_id');
         $class_id1 = $objFormParam->getValue('class_id1');
         $class_id2 = $objFormParam->getValue('class_id2');
@@ -440,8 +430,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function initDispParam(&$objFormParam)
-    {
+    function initDispParam(&$objFormParam) {
         // $BEPO?%A%'%C%/%\%C%/%9=i4|2=(B($B$9$Y$F%A%'%C%/$r30$9(B)
         $objFormParam->setValue('check', '');
 
@@ -459,8 +448,7 @@
      * @param bool $existsValue
      * @param bool $usepostValue
      */
-    function doPreEdit(&$objFormParam)
-    {
+    function doPreEdit(&$objFormParam) {
         $product_id = $objFormParam->getValue('product_id');
         $objProduct = new SC_Product_Ex();
         $existsProductsClass = $objProduct->getProductsClassFullByProductId($product_id);
@@ -537,8 +525,7 @@
      * @param $product_id
      * @return void
      */
-    function doDelete($product_id)
-    {
+    function doDelete($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $objQuery->begin();
@@ -575,8 +562,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function doFileUpload(&$objFormParam)
-    {
+    function doFileUpload(&$objFormParam) {
         $index   = $objFormParam->getValue('upload_index');
         $arrDownRealFiles = $objFormParam->getValue('down_realfilename');
 
@@ -638,8 +624,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function doFileDelete(&$objFormParam)
-    {
+    function doFileDelete(&$objFormParam) {
         $objImage = new SC_Image_Ex(DOWN_TEMP_REALDIR);
         $arrRealFileName = $objFormParam->getValue('down_realfilename');
         $index = $objFormParam->getValue('upload_index');
@@ -654,8 +639,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function doUploadComplete(&$objFormParam)
-    {
+    function doUploadComplete(&$objFormParam) {
         $objImage = new SC_Image_Ex(DOWN_TEMP_REALDIR);
         $arrRealFileName = $objFormParam->getValue('down_realfilename');
         if (is_array($arrRealFileName)) {
@@ -672,8 +656,7 @@
      * @param integer $class_id2 $B5,3J(BID2
      * @return array $B5,3J$H5,3JJ,N`$NG[Ns(B
      */
-    function getAllClassCategory($class_id1, $class_id2 = null)
-    {
+    function getAllClassCategory($class_id1, $class_id2 = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $col = <<< __EOF__
@@ -713,8 +696,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return string $B>&IJL>$NJ8;zNs(B
      */
-    function getProductName($product_id)
-    {
+    function getProductName($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         return $objQuery->get('name', 'dtb_products', 'product_id = ?', array($product_id));
     }
@@ -725,8 +707,7 @@
      * @access private
      * @return array $B5,3JJ,N`$NEPO?$5$l$?(B, $B$9$Y$F$N5,3J(B
      */
-    function getAllClass()
-    {
+    function getAllClass() {
         $arrClass = SC_Helper_DB_Ex::sfGetIDValueList('dtb_class', 'class_id', 'name');
 
         // $B5,3JJ,N`$,EPO?$5$l$F$$$J$$5,3J$OI=<($7$J$$$h$&$K$9$k!#(B
@@ -751,8 +732,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return array $B>&IJ5,3J$NG[Ns(B
      */
-    function getProductsClass($product_id)
-    {
+    function getProductsClass($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'product_code, price01, price02, stock, stock_unlimited, sale_limit, deliv_fee, point_rate';
         $where = 'product_id = ? AND classcategory_id1 = 0 AND classcategory_id2 = 0';
@@ -770,8 +750,7 @@
      * @param integer $size $B:n ＠ .$9$kG[Ns$N%5%$%:(B
      * @return void
      */
-    function fillCheckboxesValue($key, $size)
-    {
+    function fillCheckboxesValue($key, $size) {
         if (empty($_POST[$key])) {
             $_POST[$key] = array_pad(array(), $size, '');
         }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductRank extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ProductRank extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product_rank.tpl';
         $this->tpl_mainno = 'products';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,11 +65,10 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
-        $objCategory = new SC_Helper_Category_Ex();
 
         $this->tpl_pageno = isset($_POST['pageno']) ? $_POST['pageno'] : '';
 
@@ -103,11 +99,11 @@
                 break;
         }
 
-        $this->arrTree = $objCategory->getTree();
-        $this->arrParentID = $objCategory->getTreeTrail($this->arrForm['parent_category_id']);     
+        $this->arrTree = $objDb->sfGetCatTree($this->arrForm['parent_category_id']);
         $this->arrProductsList = $this->lfGetProduct($this->arrForm['parent_category_id']);
-        $arrBread = $objCategory->getTreeTrail($this->arrForm['parent_category_id'], FALSE);
-        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode(array_reverse($arrBread));
+        $arrBread = array();
+        $objDb->findTree($this->arrTree, $this->arrForm['parent_category_id'], $arrBread);
+        $this->tpl_bread_crumbs = SC_Utils_Ex::jsonEncode($arrBread);
 
     }
 
@@ -116,14 +112,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B>&IJFI$_9~$_(B */
-    function lfGetProduct($category_id)
-    {
+    function lfGetProduct($category_id) {
         // FIXME SC_Product $B%/%i%9$r;HMQ$7$?<BAu(B
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'alldtl.product_id, name, main_list_image, product_code_min, product_code_max, status';
@@ -156,8 +150,7 @@
     /*
      * $B>&IJ$N?tCM;XDj$G$NJB$SBX$(<B9T(B
      */
-    function lfRenumber($parent_category_id)
-    {
+    function lfRenumber($parent_category_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $sql = <<< __EOS__
@@ -182,20 +175,17 @@
         return $arrRet;
     }
 
-    function lfRankUp(&$objDb, $parent_category_id, $product_id)
-    {
+    function lfRankUp(&$objDb, $parent_category_id, $product_id) {
         $where = 'category_id = ' . SC_Utils_Ex::sfQuoteSmart($parent_category_id);
         $objDb->sfRankUp('dtb_product_categories', 'product_id', $product_id, $where);
     }
 
-    function lfRankDown(&$objDb, $parent_category_id, $product_id)
-    {
+    function lfRankDown(&$objDb, $parent_category_id, $product_id) {
         $where = 'category_id = ' . SC_Utils_Ex::sfQuoteSmart($parent_category_id);
         $objDb->sfRankDown('dtb_product_categories', 'product_id', $product_id, $where);
     }
 
-    function lfRankMove(&$objDb, $parent_category_id, $product_id)
-    {
+    function lfRankMove(&$objDb, $parent_category_id, $product_id) {
         $key = 'pos-'.$product_id;
         $input_pos = mb_convert_kana($_POST[$key], 'n');
         if (SC_Utils_Ex::sfIsInt($input_pos)) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductSelect extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_ProductSelect extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/product_select.tpl';
         $this->tpl_mainno = 'products';
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
 
@@ -101,8 +97,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -112,16 +107,14 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%+%F%4%j(B', 'search_category_id', STEXT_LEN, 'n');
         $objFormParam->addParam('$B>&IJL>(B', 'search_name', STEXT_LEN, 'KVa');
         $objFormParam->addParam('$B>&IJ%3!<%I(B', 'search_product_code', STEXT_LEN, 'KVa');
     }
 
     /* $B>&IJ8!:w7k2L<hF@(B */
-    function lfGetProducts(&$objDb)
-    {
+    function lfGetProducts(&$objDb) {
         $where = 'del_flg = 0';
         $arrWhereVal = array();
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Review extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_Review extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/review.tpl';
         $this->tpl_mainno = 'products';
@@ -77,8 +75,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -88,8 +85,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -138,8 +134,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -149,8 +144,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrRet =  $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrRet);
@@ -180,8 +174,7 @@
      * @param integer $review_id $B>&IJ%l%S%e!<$N(BID
      * @return void
      */
-    function lfDeleteReview($review_id)
-    {
+    function lfDeleteReview($review_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $sqlval['del_flg'] = 1;
         $objQuery->update('dtb_review', $sqlval, 'review_id = ?', array($review_id));
@@ -193,8 +186,7 @@
      * @param array $arrForm $B%U%)!<%`%G!<%?(B
      * @return array hidden$B>pJs(B
      */
-    function lfSetHidden($arrForm)
-    {
+    function lfSetHidden($arrForm) {
         $arrHidden = array();
         foreach ($arrForm AS $key=>$val) {
             if (preg_match('/^search_/', $key)) {
@@ -220,8 +212,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$BEj9F<TL>(B', 'search_reviewer_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
         $objFormParam->addParam('$BEj9F<T(BURL', 'search_reviewer_url', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
         $objFormParam->addParam('$B>&IJL>(B', 'search_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
@@ -246,8 +237,7 @@
      * @param array $arrWhereVal WHERE$BJ8$NH=DjCM(B
      * @return void
      */
-    function lfDoOutputCsv($where, $arrWhereVal)
-    {
+    function lfDoOutputCsv($where, $arrWhereVal) {
         $objCSV = new SC_Helper_CSV_Ex();
         if ($where != '') {
             $where = 'WHERE ' . $where;
@@ -261,8 +251,7 @@
      * @param array $arrForm $B%U%)!<%`%G!<%?(B
      * @return array WHERE$BJ8!"H=DjCM(B
      */
-    function lfGetWhere($arrForm)
-    {
+    function lfGetWhere($arrForm) {
         //$B:o=|$5$l$F$$$J$$>&IJ$r8!:w(B
         $where = 'A.del_flg = 0 AND B.del_flg = 0';
         $arrWhereVal = array();
@@ -354,8 +343,7 @@
      * @param array $arrWhereVal WHERE$BJ8$NH=DjCM(B
      * @return array $B%l%S%e!<0lMw(B
      */
-    function lfGetReview($arrForm, $where, $arrWhereVal)
-    {
+    function lfGetReview($arrForm, $where, $arrWhereVal) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B%Z!<%8Aw$j$N=hM}(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ReviewEdit extends LC_Page_Admin_Products_Review 
-{
+class LC_Page_Admin_Products_ReviewEdit extends LC_Page_Admin_Products_Review {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/review_edit.tpl';
         $this->tpl_mainno = 'products';
@@ -63,8 +61,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -74,8 +71,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
         $objFormParam = new SC_FormParam_Ex();
@@ -91,7 +87,7 @@
             case 'complete':
                 $this->arrErr = $objFormParam->checkError();
                 // $B%(%i!<L5$7(B
-                if (SC_Utils_Ex::isBlank($this->arrErr)) {
+                if (!SC_Utils_Ex::isBlank($this->arrErr)) {
                     // $B%l%S%e!<>pJs$N99?7(B
                     $this->lfRegistReviewData($this->arrForm['review_id'], $objFormParam);
                     // $B%l%S%e!<>pJs$N(BDB$B<hF@(B
@@ -112,8 +108,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -123,8 +118,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // $B8!:w>r7o$N%Q%i%a!<%?!<$r=i4|2=(B
         parent::lfInitParam($objFormParam);
         $objFormParam->addParam('$B%l%S%e!<(BID', 'review_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -147,8 +141,7 @@
      * @param integer $review_id $B%l%S%e!<(BID
      * @return array $B%l%S%e!<>pJs(B
      */
-    function lfGetReviewData($review_id)
-    {
+    function lfGetReviewData($review_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $select='review_id, A.product_id, reviewer_name, sex, recommend_level, ';
         $select.='reviewer_url, title, comment, A.status, A.create_date, A.update_date, name';
@@ -168,8 +161,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfRegistReviewData($review_id, &$objFormParam)
-    {
+    function lfRegistReviewData($review_id, &$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrValues = $objFormParam->getDbArray();
         $arrValues['update_date'] = 'CURRENT_TIMESTAMP';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  *
  * FIXME $BF10l>&IJ(BID$B$G>&IJ5,3J0c$$$rEPO?$G$-$J$$!#(B($B99?7$O2DG=(B)
  */
-class LC_Page_Admin_Products_UploadCSV extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_UploadCSV extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -60,8 +59,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/upload_csv.tpl';
         $this->tpl_mainno = 'products';
@@ -75,8 +73,8 @@
         $this->arrSTATUS = $masterData->getMasterData('mtb_status');
         $this->arrDELIVERYDATE = $masterData->getMasterData('mtb_delivery_date');
         $this->arrProductType = $masterData->getMasterData('mtb_product_type');
-        $this->arrMaker = SC_Helper_Maker_Ex::getIDValueList();
-        $this->arrPayments = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrMaker = SC_Helper_DB_Ex::sfGetIDValueList('dtb_maker', 'maker_id', 'name');
+        $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         $this->arrAllowedTag = $masterData->getMasterData('mtb_allowed_tag');
         $this->arrTagCheckItem = array();
@@ -87,8 +85,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -98,8 +95,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->objDb = new SC_Helper_DB_Ex();
 
@@ -125,8 +121,6 @@
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam, $arrCSVFrame);
 
-        $this->max_upload_csv_size = SC_Utils_Ex::getUnitDataSize(CSV_SIZE);
-
         $objFormParam->setHtmlDispNameArray();
         $this->arrTitle = $objFormParam->getHtmlDispNameArray();
 
@@ -147,8 +141,7 @@
      * @param stirng $message $B%a%C%;!<%8(B
      * @return void
      */
-    function addRowResult($line_count, $message)
-    {
+    function addRowResult($line_count, $message) {
         $this->arrRowResult[] = $line_count . '$B9TL\!'(B' . $message;
     }
 
@@ -159,32 +152,65 @@
      * @param stirng $message $B%a%C%;!<%8(B
      * @return void
      */
-    function addRowErr($line_count, $message)
-    {
+    function addRowErr($line_count, $message) {
         $this->arrRowErr[] = $line_count . '$B9TL\!'(B' . $message;
     }
 
     /**
-     * CSV$B%U%!%$%k$rFI$_9~$s$G!"J]B8=hM}$r9T$&(B
+     * CSV$B%"%C%W%m!<%I$r<B9T$7$^$9(B.
      *
-     * @param $objFormParam
-     * @param $fp CSV$B%U%!%$%k%]%$%s%?(B
-     * @param $objQuery $BJ]B8$r9T$&$?$a$N%/%(%j(B($B;XDj$,$J$$>l9g!"%F%9%H$N$_$r9T$&(B)
-     * @return boolean errFlag. $BFI$_9~$_$K<:GT$7$?>l9g(Btrue
+     * @return void
      */
-    function lfReadCSVFile(&$objFormParam, &$fp, $objQuery = null)
-    {
-        $dry_run = ($objQuery===null) ? true : false;
+    function doUploadCsv(&$objFormParam, &$objUpFile) {
+        // $B%U%!%$%k%"%C%W%m!<%I$N%A%'%C%/(B
+        $this->arrErr['csv_file'] = $objUpFile->makeTempFile('csv_file');
+        if (strlen($this->arrErr['csv_file']) >= 1) {
+            return;
+        }
+        $arrErr = $objUpFile->checkExists();
+        if (count($arrErr) > 0) {
+            $this->arrErr = $arrErr;
+            return;
+        }
+        // $B0l;~%U%!%$%kL>$N<hF@(B
+        $filepath = $objUpFile->getTempFilePath('csv_file');
+        // CSV$B%U%!%$%k$NJ8;z%3!<%IJQ49(B
+        $enc_filepath = SC_Utils_Ex::sfEncodeFile($filepath, CHAR_CODE, CSV_TEMP_REALDIR);
+        // CSV$B%U%!%$%k$N%*!<%W%s(B
+        $fp = fopen($enc_filepath, 'r');
+        // $B<:GT$7$?>l9g$O%(%i!<I=<((B
+        if (!$fp) {
+            SC_Utils_Ex::sfDispError('');
+        }
+
+        // $BEPO?@h%F!<%V%k(B $B%+%i%`>pJs$N=i4|2=(B
+        $this->lfInitTableInfo();
+
+        // $BEPO?%U%)!<%`(B $B%+%i%`>pJs(B
+        $this->arrFormKeyList = $objFormParam->getKeyList();
+
         // $BEPO?BP>]$NNs?t(B
         $col_max_count = $objFormParam->getCount();
         // $B9T?t(B
         $line_count = 0;
-        // $B=hM}$K<:GT$7$?>l9g$K(Btrue
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->begin();
+
         $errFlag = false;
+        $all_line_checked = false;
 
         while (!feof($fp)) {
             $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
 
+            // $BA49TF~NO%A%'%C%/8e$K!"%U%!%$%k%]%$%s%?!<$r ＠ hF,$KLa$9(B
+            if (feof($fp) && !$all_line_checked) {
+                rewind($fp);
+                $line_count = 0;
+                $all_line_checked = true;
+                continue;
+            }
+
             // $B9T%+%&%s%H(B
             $line_count++;
             // $B%X%C%@9T$O%9%-%C%W(B
@@ -195,28 +221,23 @@
             if (empty($arrCSV)) {
                 continue;
             }
-            // $BNs?t$,B?$9$.$k>l9g$O%(%i!<!"Ns?t$,>/$J$$>l9g$OL$@_Dj$H$7$FG[Ns$rJd$&(B
+            // $BNs?t$,0[$J$k>l9g$O%(%i!<(B
             $col_count = count($arrCSV);
-            if ($col_count > $col_max_count) {
+            if ($col_max_count != $col_count) {
                 $this->addRowErr($line_count, '$B"((B $B9`L\?t$,(B' . $col_count . '$B8D8!=P$5$l$^$7$?!#9`L\?t$O(B' . $col_max_count . '$B8D$K$J$j$^$9!#(B');
                 $errFlag = true;
                 break;
-            } elseif ($col_count < $col_max_count) {
-                $arrCSV = array_pad($arrCSV, $col_max_count, "");
-                if (!$dry_run) {
-                    $this->addRowResult($line_count, ($col_count + 1) . "$B9`L\0J9_$r6uMs$H$7$FFI$_9~$_$^$7$?(B");
-                }
             }
-
             // $B%7!<%1%s%9G[Ns$r3JG<$9$k!#(B
             $objFormParam->setParam($arrCSV, true);
             $arrRet = $objFormParam->getHashArray();
             $objFormParam->setParam($arrRet);
             // $BF~NOCM$NJQ49(B
             $objFormParam->convParam();
-
             // <br>$B$J$7$G%(%i!<<hF@$9$k!#(B
             $arrCSVErr = $this->lfCheckError($objFormParam);
+
+            // $BF~NO%(%i!<%A%'%C%/(B
             if (count($arrCSVErr) > 0) {
                 foreach ($arrCSVErr as $err) {
                     $this->addRowErr($line_count, $err);
@@ -225,7 +246,7 @@
                 break;
             }
 
-            if (!$dry_run) {
+            if ($all_line_checked) {
                 $this->lfRegistProduct($objQuery, $line_count, $objFormParam);
                 $arrParam = $objFormParam->getHashArray();
 
@@ -233,54 +254,7 @@
             }
             SC_Utils_Ex::extendTimeOut();
         }
-        return $errFlag;
-    }
 
-    /**
-     * CSV$B%"%C%W%m!<%I$r<B9T$7$^$9(B.
-     *
-     * @return void
-     */
-    function doUploadCsv(&$objFormParam, &$objUpFile)
-    {
-        // $B%U%!%$%k%"%C%W%m!<%I$N%A%'%C%/(B
-        $this->arrErr['csv_file'] = $objUpFile->makeTempFile('csv_file');
-        if (strlen($this->arrErr['csv_file']) >= 1) {
-            return;
-        }
-        $arrErr = $objUpFile->checkExists();
-        if (count($arrErr) > 0) {
-            $this->arrErr = $arrErr;
-            return;
-        }
-        // $B0l;~%U%!%$%kL>$N<hF@(B
-        $filepath = $objUpFile->getTempFilePath('csv_file');
-        // CSV$B%U%!%$%k$NJ8;z%3!<%IJQ49(B
-        $enc_filepath = SC_Utils_Ex::sfEncodeFile($filepath, CHAR_CODE, CSV_TEMP_REALDIR);
-        // CSV$B%U%!%$%k$N%*!<%W%s(B
-        $fp = fopen($enc_filepath, 'r');
-        // $B<:GT$7$?>l9g$O%(%i!<I=<((B
-        if (!$fp) {
-            SC_Utils_Ex::sfDispError('');
-        }
-
-        // $BEPO?@h%F!<%V%k(B $B%+%i%`>pJs$N=i4|2=(B
-        $this->lfInitTableInfo();
-
-        // $BEPO?%U%)!<%`(B $B%+%i%`>pJs(B
-        $this->arrFormKeyList = $objFormParam->getKeyList();
-
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->begin();
-
-        // CSV$B$+$i$NFI$_9~$_!"F~NO%(%i!<%A%'%C%/(B
-        $errFlag = $this->lfReadCSVFile($objFormParam, $fp);
-        if (!$errFlag) {
-            rewind($fp);
-            // CSV$B$+$i$NFI$_9~$_!"J]B8(B 
-            $errFlag = $this->lfReadCSVFile($objFormParam, $fp, $objQuery);
-        }
-
         // $B<B9T7k2L2hLL$rI=<((B
         $this->tpl_mainpage = 'products/upload_csv_complete.tpl';
 
@@ -303,8 +277,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -313,8 +286,7 @@
      *
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('CSV$B%U%!%$%k(B', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false);
     }
 
@@ -324,8 +296,7 @@
      * @param array CSV$B9=B$@_DjG[Ns(B
      * @return void
      */
-    function lfInitParam(&$objFormParam, &$arrCSVFrame)
-    {
+    function lfInitParam(&$objFormParam, &$arrCSVFrame) {
         // $B8GM-$N=i4|CMD4 ＠ 0(B
         $arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame);
         // CSV$B9`L\Kh$N=hM}(B
@@ -370,8 +341,7 @@
      *
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrRet =  $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrRet);
@@ -392,8 +362,7 @@
      *
      * @return void
      */
-    function lfInitTableInfo()
-    {
+    function lfInitTableInfo() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $this->arrProductColumn = $objQuery->listTableFields('dtb_products');
         $this->arrProductClassColumn = $objQuery->listTableFields('dtb_products_class');
@@ -408,12 +377,10 @@
      * @param string|integer $line $B=hM}Cf$N9T?t(B
      * @return void
      */
-    function lfRegistProduct($objQuery, $line = '', &$objFormParam)
-    {
+    function lfRegistProduct($objQuery, $line = '', &$objFormParam) {
         $objProduct = new SC_Product_Ex();
         // $BEPO?%G!<%?BP>]<hF@(B
         $arrList = $objFormParam->getHashArray();
-
         // $BEPO?;~4V$r ＠ 8@.(B(DB$B$N(BCURRENT_TIMESTAMP$B$@$H(Bcommit$B$7$?:]!"$9$Y$FF10l$N;~4V$K$J$C$F$7$^$&(B)
         $arrList['update_date'] = $this->lfGetDbFormatTimeWithLine($line);
 
@@ -479,28 +446,12 @@
      * @param integer $product_class_id $B>&IJ5,3J(BID
      * @return void
      */
-    function lfRegistProductClass($objQuery, $arrList, $product_id, $product_class_id)
-    {
+    function lfRegistProductClass($objQuery, $arrList, $product_id, $product_class_id) {
         $objProduct = new SC_Product_Ex();
-
-        // FIXME: dtb_csv$B%F!<%V%k$NCf$G8E$$%+%i%`L>(B($B1&JU(B)$B$, ＠ _Dj$5$l$F$$$k!#(BsfArrayIntersectKeys$B$G%U%#%k%?$5$l$F$7$^$&$N$G!"L>>N$rJQ99$9$kI,MW$,$"$k(B
-        if (array_key_exists('classcategory_id', $arrList) && $arrList['classcategory_id'] != '') {
-            $arrList['classcategory_id1'] = $arrList['classcategory_id'];
-        }
-        if (array_key_exists('parent_classcategory_id', $arrList) && $arrList['classcategory_id'] != '') {
-            $arrList['classcategory_id2'] = $arrList['parent_classcategory_id'];
-        }
-
         // $B>&IJ5,3JEPO?>pJs$r ＠ 8@.$9$k!#(B
         // $B>&IJ5,3J%F!<%V%k$N%+%i%`$KB8:_$7$F$$$k$b$N$N$&$A!"(BForm$BEjF~@_Dj$5$l$F$$$J$$%G!<%?$O>e=q$-$7$J$$!#(B
         $sqlval = SC_Utils_Ex::sfArrayIntersectKeys($arrList, $this->arrProductClassColumn);
 
-        // $B>&IJ(BID$B$, ＠ _Dj$5$l$F$*$j!"5,3J(BID$B$, ＠ _Dj$5$l$F$$$J$1$l$P!"4{B8$N5,3J(BID$B<hF@$r;n$_$k(B(product_class_id$B$OI,?\F~NO9`L\$G$O$J$$(B)
-        if ($product_class_id == '' && $product_id != '') {
-            $product_class_id = SC_Utils_Ex::sfGetProductClassId($product_id, $sqlval['classcategory_id1'], $sqlval['classcategory_id2']);
-            $sqlval['product_class_id'] = $product_class_id;
-        }
-
         if ($product_class_id == '') {
             // $B?75,EPO?(B
             // $BI,?\F~NO$G$OL5$$9`L\$@$,!"6uJ8;z$G$OLdBj$N$"$kFC<l$J%+%i%`CM$N=i4|CM ＠ _Dj(B
@@ -531,8 +482,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return void
      */
-    function lfRegistReccomendProducts($objQuery, $arrList, $product_id)
-    {
+    function lfRegistReccomendProducts($objQuery, $arrList, $product_id) {
         $objQuery->delete('dtb_recommend_products', 'product_id = ?', array($product_id));
         for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) {
             $keyname = 'recommend_product_id' . $i;
@@ -560,8 +510,7 @@
      * @param array $arrCSVFrame CSV$B9=B$G[Ns(B
      * @return array $arrCSVFrame CSV$B9=B$G[Ns(B
      */
-    function lfSetParamDefaultValue(&$arrCSVFrame)
-    {
+    function lfSetParamDefaultValue(&$arrCSVFrame) {
         foreach ($arrCSVFrame as $key => $val) {
             switch ($val['col']) {
                 case 'status':
@@ -591,8 +540,7 @@
      * @param array $sqlval $B>&IJEPO?>pJsG[Ns(B
      * @return $sqlval $BEPO?>pJsG[Ns(B
      */
-    function lfSetProductDefaultData(&$sqlval)
-    {
+    function lfSetProductDefaultData(&$sqlval) {
         //$B?75,EPO?;~$N$_ ＠ _Dj$9$k9`L\(B
         if ($sqlval['product_id'] == '') {
             if ($sqlval['status'] == '') {
@@ -616,8 +564,7 @@
      * @param boolean $upload_flg $B99?7%U%i%0(B($B99?7$N>l9g(Btrue)
      * @return $sqlval $BEPO?>pJsG[Ns(B
      */
-    function lfSetProductClassDefaultData(&$sqlval, $upload_flg)
-    {
+    function lfSetProductClassDefaultData(&$sqlval, $upload_flg) {
         //$B?75,EPO?;~$N$_ ＠ _Dj$9$k9`L\(B
         if ($sqlval['product_class_id'] == '') {
             if ($sqlval['point_rate'] == '') {
@@ -636,7 +583,7 @@
         }
 
         // $B:_8KL5@)8B%U%i%0Ns$rMxMQ$9$k>l9g!"(B
-        if (array_key_exists('stock_unlimited', $sqlval) and $sqlval['stock_unlimited'] != '') {
+        if (array_key_exists('stock_unlimited', $sqlval)) {
             // $B:_8KL5@)8B%U%i%0(B = $BL5@)8B$N>l9g!"(B
             if ($sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) {
                 $sqlval['stock'] = null;
@@ -668,8 +615,7 @@
      * @param array $B%(%i!<G[Ns(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckErrorDetail($item, $arrErr)
-    {
+    function lfCheckErrorDetail($item, $arrErr) {
         // $B5,3J(BID$B$NB8:_%A%'%C%/(B
         // FIXME $B5,3JJ,N`(BID$B<+BN$N$,M-8z$+$r<g4c$K$*$$$?%A%'%C%/$r$9$Y$-$H46$8$k!#(B
         if (!$this->lfIsDbRecord('dtb_products_class', 'product_class_id', $item)) {
@@ -687,15 +633,7 @@
                 ) {
                     $arrErr['product_class_id'] = '$B"((B $B;XDj$N>&IJ(BID$B$H>&IJ5,3J(BID$B$NAH9g$;$O ＠ 5$7$/$"$j$^$;$s!#(B';
                 }
-
-                // product_class_id$B$O(B(product_id, classcategory_id1, classcategory_id2)$B$KBP$7$F0l0U!#4{$K0[$J$k(Bproduct_class_id$B$,B8:_$7$?>l9g$O%(%i!<(B
-                $classcategory_id1 = $item['classcategory_id'] ? $item['classcategory_id'] : 0;
-                $classcategory_id2 = $item['parent_classcategory_id'] ? $item['parent_classcategory_id'] : 0;
-                $product_class_id = SC_Utils_Ex::sfGetProductClassId($item['product_id'], $classcategory_id1, $classcategory_id2);
-                if ($product_class_id && $product_class_id != $item['product_class_id']) {
-                    $arrErr['product_class_id'] = '$B"((B $B;XDj$N>&IJ(BID/$B5,3JJ,N`$H!">&IJ5,3J(BID$B$NAH9g$;$O ＠ 5$7$/$"$j$^$;$s!#(B';
-                }
-             }
+            }
         }
         // $BI=<(%9%F!<%?%9$NB8:_%A%'%C%/(B
         if (!$this->lfIsArrayRecord($this->arrDISP, 'status', $item)) {
@@ -763,14 +701,14 @@
 */
         // $B%@%&%s%m!<%I>&IJ%A%'%C%/(B
         if (array_search('product_type_id', $this->arrFormKeyList) !== FALSE
-            && $item['product_type_id'] != PRODUCT_TYPE_DOWNLOAD
+            && $item['product_type_id'] == PRODUCT_TYPE_NORMAL
         ) {
             //$B<B>&IJ$N>l9g(B
             if ($item['down_filename'] != '') {
-                $arrErr['down_filename'] = '$B"((B $B%@%&%s%m!<%I>&IJ$G$O$J$$>l9g!"%@%&%s%m!<%I%U%!%$%kL>$OF~NO$G$-$^$;$s!#(B';
+                $arrErr['down_filename'] = '$B"((B $B<B>&IJ$N>l9g$O%@%&%s%m!<%I%U%!%$%kL>$OF~NO$G$-$^$;$s!#(B';
             }
             if ($item['down_realfilename'] != '') {
-                $arrErr['down_realfilename'] = '$B"((B $B%@%&%s%m!<%I>&IJ$G$O$J$$>l9g!"%@%&%s%m!<%I>&IJMQ%U%!%$%k%"%C%W%m!<%I$OF~NO$G$-$^$;$s!#(B';
+                $arrErr['down_realfilename'] = '$B"((B $B<B>&IJ$N>l9g$O%@%&%s%m!<%I>&IJMQ%U%!%$%k%"%C%W%m!<%I$OF~NO$G$-$^$;$s!#(B';
             }
         } elseif (array_search('product_type_id', $this->arrFormKeyList) !== FALSE
                   && $item['product_type_id'] == PRODUCT_TYPE_DOWNLOAD
@@ -795,8 +733,7 @@
      * @param string $line_no $B9THV9f(B
      * @return string $time DB$BJ]B8MQ$N;~4VJ8;zNs(B
      */
-    function lfGetDbFormatTimeWithLine($line_no = '')
-    {
+    function lfGetDbFormatTimeWithLine($line_no = '') {
         $time = date('Y-m-d H:i:s');
         // $BIC0J2<$r ＠ 8@.(B
         if ($line_no != '') {
@@ -815,8 +752,7 @@
      * @param string $delimiter $BJ,3dJ8;z(B
      * @return boolean true:$BM-8z$J%G!<%?$,$"$k(B false:$BM-8z$G$O$J$$(B
      */
-    function lfIsArrayRecordMulti($arr, $keyname, $item, $delimiter = ',')
-    {
+    function lfIsArrayRecordMulti($arr, $keyname, $item, $delimiter = ',') {
         if (array_search($keyname, $this->arrFormKeyList) === FALSE) {
             return true;
         }
@@ -847,8 +783,7 @@
      * @param string $delimiter $BJ,3dJ8;z(B
      * @return boolean true:$BM-8z$J%G!<%?$,$"$k(B false:$BM-8z$G$O$J$$(B
      */
-    function lfIsDbRecordMulti($table, $tblkey, $keyname, $item, $delimiter = ',')
-    {
+    function lfIsDbRecordMulti($table, $tblkey, $keyname, $item, $delimiter = ',') {
         if (array_search($keyname, $this->arrFormKeyList) === FALSE) {
             return true;
         }
@@ -879,8 +814,7 @@
      * @param array  $item $BF~NO%G!<%?G[Ns(B
      * @return boolean true:$BM-8z$J%G!<%?$,$"$k(B false:$BM-8z$G$O$J$$(B
      */
-    function lfIsDbRecord($table, $keyname, $item)
-    {
+    function lfIsDbRecord($table, $keyname, $item) {
         if (array_search($keyname, $this->arrFormKeyList) !== FALSE  //$BF~NOBP>]$G$"$k(B
             && $item[$keyname] != ''   // $B6u$G$O$J$$(B
             && !$this->objDb->sfIsRecord($table, $keyname, (array)$item[$keyname]) //DB$B$KB8:_$9$k$+(B
@@ -898,8 +832,7 @@
      * @param array  $item $BF~NO%G!<%?G[Ns(B
      * @return boolean true:$BM-8z$J%G!<%?$,$"$k(B false:$BM-8z$G$O$J$$(B
      */
-    function lfIsArrayRecord($arr, $keyname, $item)
-    {
+    function lfIsArrayRecord($arr, $keyname, $item) {
         if (array_search($keyname, $this->arrFormKeyList) !== FALSE //$BF~NOBP>]$G$"$k(B
             && $item[$keyname] != '' // $B6u$G$O$J$$(B
             && !array_key_exists($item[$keyname], $arr) //$BG[Ns$KB8:_$9$k$+(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $$Id$$
  */
-class LC_Page_Admin_Products_UploadCSVCategory extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Products_UploadCSVCategory extends LC_Page_Admin_Ex {
 
     // {{{ properties
     /** $B%(%i!<>pJs(B **/
@@ -66,8 +65,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'products/upload_csv_category.tpl';
         $this->tpl_mainno   = 'products';
@@ -86,8 +84,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -97,8 +94,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // CSV$B4IM}%X%k%Q!<(B
         $objCSV = new SC_Helper_CSV_Ex();
@@ -122,8 +118,6 @@
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam, $arrCSVFrame);
 
-        $this->max_upload_csv_size = SC_Utils_Ex::getUnitDataSize(CSV_SIZE);
-
         $objFormParam->setHtmlDispNameArray();
         $this->arrTitle = $objFormParam->getHtmlDispNameArray();
 
@@ -144,8 +138,7 @@
      * @param stirng $message $B%a%C%;!<%8(B
      * @return void
      */
-    function addRowResult($line_count, $message)
-    {
+    function addRowResult($line_count, $message) {
         $this->arrRowResult[] = $line_count . '$B9TL\!'(B' . $message;
     }
 
@@ -156,8 +149,7 @@
      * @param stirng $message $B%a%C%;!<%8(B
      * @return void
      */
-    function addRowErr($line_count, $message)
-    {
+    function addRowErr($line_count, $message) {
         $this->arrRowErr[] = $line_count . '$B9TL\!'(B' . $message;
     }
 
@@ -169,8 +161,7 @@
      * @param SC_Helper_DB  $objDb
      * @return void
      */
-    function doUploadCsv(&$objFormParam, &$objUpFile)
-    {
+    function doUploadCsv(&$objFormParam, &$objUpFile) {
         // $B%U%!%$%k%"%C%W%m!<%I$N%A%'%C%/(B
         $objUpFile->makeTempFile('csv_file');
         $arrErr = $objUpFile->checkExists();
@@ -268,8 +259,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -278,8 +268,7 @@
      *
      * @return void
      */
-    function lfInitFile(&$objUpFile)
-    {
+    function lfInitFile(&$objUpFile) {
         $objUpFile->addFile('CSV$B%U%!%$%k(B', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false);
     }
 
@@ -289,8 +278,7 @@
      * @param array CSV$B9=B$@_DjG[Ns(B
      * @return void
      */
-    function lfInitParam(&$objFormParam, &$arrCSVFrame)
-    {
+    function lfInitParam(&$objFormParam, &$arrCSVFrame) {
         // $B8GM-$N=i4|CMD4 ＠ 0(B
         $arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame);
         // CSV$B9`L\Kh$N=hM}(B
@@ -335,8 +323,7 @@
      *
      * @return void
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrRet =  $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrRet);
@@ -357,8 +344,7 @@
      *
      * @return void
      */
-    function lfInitTableInfo()
-    {
+    function lfInitTableInfo() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $this->arrRegistColumn = $objQuery->listTableFields('dtb_category');
     }
@@ -372,8 +358,7 @@
      * @param string|integer $line $B=hM}Cf$N9T?t(B
      * @return integer $B%+%F%4%j(BID
      */
-    function lfRegistCategory($objQuery, $line, &$objFormParam)
-    {
+    function lfRegistCategory($objQuery, $line, &$objFormParam) {
         // $BEPO?%G!<%?BP>]<hF@(B
         $arrList = $objFormParam->getHashArray();
         // $BEPO?;~4V$r ＠ 8@.(B(DB$B$N(BCURRENT_TIMESTAMP$B$@$H(Bcommit$B$7$?:]!"$9$Y$FF10l$N;~4V$K$J$C$F$7$^$&(B)
@@ -419,8 +404,7 @@
      * @param array $arrCSVFrame CSV$B9=B$G[Ns(B
      * @return array $arrCSVFrame CSV$B9=B$G[Ns(B
      */
-    function lfSetParamDefaultValue(&$arrCSVFrame)
-    {
+    function lfSetParamDefaultValue(&$arrCSVFrame) {
         foreach ($arrCSVFrame as $key => $val) {
             switch ($val['col']) {
                 case 'parent_category_id':
@@ -442,8 +426,7 @@
      * @param array $sqlval $B>&IJEPO?>pJsG[Ns(B
      * @return $sqlval $BEPO?>pJsG[Ns(B
      */
-    function lfSetCategoryDefaultData(&$sqlval)
-    {
+    function lfSetCategoryDefaultData(&$sqlval) {
         if ($sqlval['del_flg'] == '') {
             $sqlval['del_flg'] = '0'; //$BM-8z(B
         }
@@ -463,8 +446,7 @@
      * @param array $B%(%i!<G[Ns(B
      * @return array $B%(%i!<G[Ns(B
      */
-    function lfCheckErrorDetail($item, $arrErr)
-    {
+    function lfCheckErrorDetail($item, $arrErr) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         /*
         // $B%+%F%4%j(BID$B$NB8:_%A%'%C%/(B
@@ -532,8 +514,7 @@
      * @param integer $B;XDj%+%F%4%j(BID
      * @return integer $B%+%F%4%j(BID
      */
-    function registerCategory($parent_category_id, $category_name, $creator_id, $category_id = null)
-    {
+    function registerCategory($parent_category_id, $category_name, $creator_id, $category_id = null) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $rank = null;
@@ -588,8 +569,7 @@
      * @param string $line_no $B9THV9f(B
      * @return string $time DB$BJ]B8MQ$N;~4VJ8;zNs(B
      */
-    function lfGetDbFormatTimeWithLine($line_no = '')
-    {
+    function lfGetDbFormatTimeWithLine($line_no = '') {
         $time = date('Y-m-d H:i:s');
         // $BIC0J2<$r ＠ 8@.(B
         if ($line_no != '') {
@@ -607,8 +587,7 @@
      * @param array  $item $BF~NO%G!<%?G[Ns(B
      * @return boolean true:$BM-8z$J%G!<%?$,$"$k(B false:$BM-8z$G$O$J$$(B
      */
-    function lfIsDbRecord($table, $keyname, $item)
-    {
+    function lfIsDbRecord($table, $keyname, $item) {
         if (array_search($keyname, $this->arrFormKeyList) !== FALSE  //$BF~NOBP>]$G$"$k(B
             && $item[$keyname] != ''   // $B6u$G$O$J$$(B
             && !SC_Helper_DB_EX::sfIsRecord($table, $keyname, (array)$item[$keyname]) //DB$B$KB8:_$9$k$+(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->list_data    = '';  // $B%F!<%V%k%G!<%?<hF ＠ MQ(B
@@ -58,7 +56,8 @@
 
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrAUTHORITY = $masterData->getMasterData('mtb_authority');
-        $this->arrWORK = $masterData->getMasterData('mtb_work');
+        $this->arrWORK[0]   = '$BHs2TF/(B';
+        $this->arrWORK[1]   = '$B2TF/(B';
     }
 
     /**
@@ -66,8 +65,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -77,8 +75,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // ADMIN_ID$B0J30$N4IM}<T7o?t$r<hF@(B
         $linemax = $this->getMemberCount('del_flg <> 1 AND member_id <> ' . ADMIN_ID);
@@ -105,8 +102,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -117,8 +113,7 @@
      * @param string $where WHERE$B6g(B
      * @return integer $B7o?t(B
      */
-    function getMemberCount($where)
-    {
+    function getMemberCount($where) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = 'dtb_member';
         return $objQuery->count($table, $where);
@@ -131,8 +126,7 @@
      * @param integer $startno $B3+;O9THV9f(B
      * @return array $B4IM}<T%G!<%?$NO"A[G[Ns(B
      */
-    function getMemberData($startno)
-    {
+    function getMemberData($startno) {
         $col = 'member_id,name,department,login_id,authority,rank,work';
         $from = 'dtb_member';
         $where = 'del_flg <> 1 AND member_id <> ?';
@@ -150,8 +144,7 @@
      * @param integer  $pageno $B%Z!<%8$NHV9f!J(B$_GET$B$+$iF~$C$F$-$?CM!K(B
      * @return integer $clean_pageno $B%A%'%C%/8e$N%Z!<%8$NHV9f(B
      */
-    function lfCheckPageNo($pageno)
-    {
+    function lfCheckPageNo($pageno) {
 
         $clean_pageno = '';
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_AdminArea extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_AdminArea extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/adminarea.tpl';
         $this->tpl_subno = 'adminarea';
@@ -58,8 +56,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -69,8 +66,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         if (strpos(HTTPS_URL,'https://') !== FALSE) {
             $this->tpl_enable_ssl = TRUE;
@@ -122,8 +118,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -134,8 +129,7 @@
      * @param array  $arrParams  $_POST$BCM(B
      * @return void
      */
-    function initParam(&$objFormParam, &$arrParams)
-    {
+    function initParam(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('$B%G%#%l%/%H%jL>(B', 'admin_dir', ID_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
         $objFormParam->addParam('SSL$B@)8B(B', 'admin_force_ssl', 1, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -152,8 +146,7 @@
      * @param array  $arrErr   $B%(%i!<$,$"$C$?9`L\MQG[Ns(B
      * @return void
      */
-    function lfCheckAdminArea(&$arrForm, &$arrErr)
-    {
+    function lfCheckAdminArea(&$arrForm, &$arrErr) {
         $admin_dir = trim($arrForm['admin_dir']) . '/';
 
         $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES);
@@ -172,8 +165,7 @@
     }
 
     //$B4IM}5!G=%G%#%l%/%H%j$N%j%M!<%`$H(B CONFIG_REALFILE $B$NJQ99(B
-    function lfUpdateAdminData(&$arrForm)
-    {
+    function lfUpdateAdminData(&$arrForm) {
         $admin_dir = trim($arrForm['admin_dir']) . '/';
         $admin_force_ssl = 'false';
         if ($arrForm['admin_force_ssl'] == 1) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Bkup extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Bkup extends LC_Page_Admin_Ex {
 
     /** $B%j%9%H%"Cf$K%(%i!<$,H/@8$7$?$+(B */
     var $tpl_restore_err = false;
@@ -51,8 +50,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/bkup.tpl';
         $this->tpl_mainno = 'system';
@@ -69,8 +67,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -80,8 +77,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex;
 
@@ -223,8 +219,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -235,8 +230,7 @@
      * @param array  $arrParams  $_POST$BCM(B
      * @return void
      */
-    function initParam(&$objFormParam, &$arrParams)
-    {
+    function initParam(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('$B%P%C%/%"%C%WL>(B', 'bkup_name', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB', 'FILE_NAME_CHECK_BY_NOUPLOAD'));
         $objFormParam->addParam('$B%P%C%/%"%C%W%a%b(B', 'bkup_memo', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -253,8 +247,7 @@
      * @param string $mode
      * @return $arrErr
      */
-    function lfCheckError(&$arrForm, $mode)
-    {
+    function lfCheckError(&$arrForm, $mode) {
 
         switch ($mode) {
             case 'bkup':
@@ -290,8 +283,7 @@
      * @param string $bkup_name
      * @return boolean|int $B7k2L!#(Btrue:$B ＠ .8y(B int:$B<:GT(B FIXME $BK\Mh$O(B int $B$G$O$J$/!"%(%i!<%a%C%;!<%8$rLa$9$Y$-(B
      */
-    function lfCreateBkupData($bkup_name, $work_dir)
-    {
+    function lfCreateBkupData($bkup_name, $work_dir) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $csv_autoinc = '';
         $arrData = array();
@@ -373,8 +365,7 @@
      * @param mixed $data $B=PNO%G!<%?(B
      * @return boolean true (true:$B8GDj(B false:$BCfCG(B)
      */
-    function cbOutputCSV($data)
-    {
+    function cbOutputCSV($data) {
         $line = '';
         if ($this->first_line) {
             // $B%+%i%`L>(B
@@ -395,8 +386,7 @@
      * @return string $B%7!<%1%s%90lMw$NJ8;zNs(B
      * @return string $ret
      */
-    function lfGetAutoIncrement()
-    {
+    function lfGetAutoIncrement() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrSequences = $objQuery->listSequences();
 
@@ -417,8 +407,7 @@
     }
 
     // $B%P%C%/%"%C%W%F!<%V%k$K%G!<%?$r99?7$9$k(B
-    function lfUpdBkupData($data)
-    {
+    function lfUpdBkupData($data) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $arrVal = array();
@@ -432,8 +421,7 @@
     /**
      * $B%P%C%/%"%C%W$N0lMw$r<hF@$9$k(B
      */
-    function lfGetBkupData($sql_option = '', $filter_bkup_name = '')
-    {
+    function lfGetBkupData($sql_option = '', $filter_bkup_name = '') {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B%F!<%V%k$+$i<hF@(B
@@ -485,8 +473,7 @@
      * @param string $bkup_ext
      * @return void
      */
-    function lfRestore($bkup_name, $bkup_dir, $bkup_ext, $mode)
-    {
+    function lfRestore($bkup_name, $bkup_dir, $bkup_ext, $mode) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $bkup_filepath = $bkup_dir . $bkup_name . $bkup_ext;
@@ -538,8 +525,7 @@
      * @param string $mode
      * @return void
      */
-    function lfExeInsertSQL(&$objQuery, $dir, $mode)
-    {
+    function lfExeInsertSQL(&$objQuery, $dir, $mode) {
 
         $tbl_flg = false;
         $col_flg = false;
@@ -608,8 +594,7 @@
     /**
      * $B%7!<%1%s%9 ＠ 8@.4o$rI|85$9$k(B
      */
-    function restoreSequence(&$objQuery, $csv)
-    {
+    function restoreSequence(&$objQuery, $csv) {
         // csv$B%U%!%$%k$+$i%G!<%?$N<hF@(B
         $arrCsvData = file($csv);
 
@@ -628,8 +613,7 @@
     }
 
     // $BA*Br$7$?%P%C%/%"%C%W$r(BDB$B$+$i:o=|(B
-    function lfDeleteBackUp(&$arrForm, $bkup_dir, $bkup_ext)
-    {
+    function lfDeleteBackUp(&$arrForm, $bkup_dir, $bkup_ext) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Delete extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Delete extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex;
 
@@ -96,8 +92,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -108,8 +103,7 @@
      * @param array  $arrParams  $_GET$BCM(B
      * @return void
      */
-    function initParam(&$objFormParam, &$arrParams)
-    {
+    function initParam(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('pageno', 'pageno', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK', 'EXIST_CHECK'));
         $objFormParam->addParam('id', 'id', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -123,8 +117,7 @@
      * @param integer $id $B:o=|BP>]$N(Bmember_id
      * @return void
      */
-    function deleteMember($id)
-    {
+    function deleteMember($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->begin();
 
@@ -141,8 +134,7 @@
      * @param integer $id $B:o=|BP>]$N(Bmember_id
      * @return void|UPDATE $B$N7k2L%U%i%0(B
      */
-    function renumberRank(&$objQuery, $id)
-    {
+    function renumberRank(&$objQuery, $id) {
 
         // $B%i%s%/$N<hF@(B
         $where1 = 'member_id = ?';
@@ -162,8 +154,7 @@
      * @param integer $id $B:o=|BP>]$N(Bmember_id
      * @return void|UPDATE $B$N7k2L%U%i%0(B
      */
-    function deleteRecode(&$objQuery, $id)
-    {
+    function deleteRecode(&$objQuery, $id) {
 
         // Update$B$9$kCM$r:n ＠ .$9$k(B.
         $sqlVal = array();

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Editdb extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Editdb extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/editdb.tpl';
         $this->tpl_subno    = 'editdb';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
 
@@ -97,8 +93,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -109,8 +104,7 @@
      * @param array $arrParams $_POST$BCM(B
      * @return void
      */
-    function initForm(&$objFormParam, &$arrParams)
-    {
+    function initForm(&$objFormParam, &$arrParams) {
 
         $objFormParam->addParam('$B%b!<%I(B', 'mode', INT_LEN, 'n', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%F!<%V%kL>(B', 'table_name');
@@ -121,8 +115,7 @@
 
     }
 
-    function lfDoChange(&$objFormParam)
-    {
+    function lfDoChange(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrTarget = $this->lfGetTargetData($objFormParam);
         $message = '';
@@ -147,8 +140,7 @@
         return $message;
     }
 
-    function lfGetTargetData(&$objFormParam)
-    {
+    function lfGetTargetData(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrIndexFlag    = $objFormParam->getValue('indexflag');
         $arrIndexFlagNew = $objFormParam->getValue('indexflag_new');
@@ -191,8 +183,7 @@
      *
      * @return void
      */
-    function lfGetIndexList()
-    {
+    function lfGetIndexList() {
         // $B%G!<%?%Y!<%9$+$i%$%s%G%C%/%9 ＠ _Dj0lMw$r<hF@$9$k(B
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setOrder('table_name, column_name');

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Input extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Input extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $this->tpl_mainpage = 'system/input.tpl';
@@ -51,7 +49,6 @@
         // $B%^%9%?!<%G!<%?$+$i8"8BG[Ns$r<hF@(B
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrAUTHORITY = $masterData->getMasterData('mtb_authority');
-        $this->arrWORK = $masterData->getMasterData('mtb_work');
 
         $this->tpl_subtitle = '$B%a%s%P!<EPO?(B/$BJT=8(B';
         $this->httpCacheControl('nocache');
@@ -62,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -73,13 +69,12 @@
      *
      * @return void
      */
-    function action()
-    {
-        $objFormParam = new SC_FormParam_Ex();
+    function action() {
 
         // $B%Z!<%8Aw$j$N=hM}(B $_REQUEST['pageno']$B$,?.Mj$7$&$kCM$+$I$&$+%A%'%C%/$9$k!#(B
         $this->tpl_pageno = $this->lfCheckPageNo($_REQUEST['pageno']);
 
+        $objFormParam = new SC_FormParam_Ex();
         $arrErr = array();
         $arrForm = array();
 
@@ -185,8 +180,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -198,8 +192,8 @@
      * @param string $mode edit$B$N;~$O;XDj(B
      * @return void
      */
-    function initForm(&$objFormParam, &$arrParams, $mode = '')
-    {
+    function initForm(&$objFormParam, &$arrParams, $mode = '') {
+
         $objFormParam->addParam('$B%a%s%P!<(BID', 'member_id', INT_LEN, 'n', array('NUM_CHECK'));
         $objFormParam->addParam('$BL>A0(B', 'name', STEXT_LEN, 'KV', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B=jB0(B', 'department', STEXT_LEN, 'KV', array('MAX_LENGTH_CHECK'));
@@ -227,8 +221,7 @@
      * @param void
      * @return array $B%(%i!<>pJs$NO"A[G[Ns(B
      */
-    function validateData(&$objFormParam, &$arrParams, $mode)
-    {
+    function validateData(&$objFormParam, &$arrParams, $mode) {
         $arrErr = $objFormParam->checkError();
         if (isset($arrErr) && count($arrErr) > 0) return $arrErr;
 
@@ -241,30 +234,30 @@
             $objErr->doFunc(array('$B%Q%9%o!<%I(B', 'password', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK'));
             $objErr->doFunc(array('$B%m%0%$%s(BID', 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK'));
         }
-        $objErr->doFunc(array('$B%Q%9%o!<%I(B', '$B%Q%9%o!<%I(B($B3NG'(B)', 'password', 'password02') ,array('EQUAL_CHECK'));
+    $objErr->doFunc(array('$B%Q%9%o!<%I(B', '$B%Q%9%o!<%I(B($B3NG'(B)', 'password', 'password02') ,array('EQUAL_CHECK'));
 
         $arrErr = $objErr->arrErr;
 
         switch ($mode) {
-            case 'new':
-                // $B4IM}<TL>$,EPO?:Q$_$G$J$$$+(B
-                if ($this->memberDataExists('name = ? AND del_flg = 0', $arrParams['name'])) {
-                    $arrErr['name'] = '$B4{$KEPO?$5$l$F$$$kL>A0$J$N$GMxMQ$G$-$^$;$s!#(B<br>';
-                }
+        case 'new':
+            // $B4IM}<TL>$,EPO?:Q$_$G$J$$$+(B
+            if ($this->memberDataExists('name = ? AND del_flg = 0', $arrParams['name'])) {
+                $arrErr['name'] = '$B4{$KEPO?$5$l$F$$$kL>A0$J$N$GMxMQ$G$-$^$;$s!#(B<br>';
+            }
+            // $B%m%0%$%s(BID$B$,EPO?:Q$_$G$J$$$+(B
+            if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) {
+                $arrErr['login_id'] = '$B4{$KEPO?$5$l$F$$$k(BID$B$J$N$GMxMQ$G$-$^$;$s!#(B<br>';
+            }
+            break;
+        case 'edit':
+            // $B%m%0%$%s(BID$B$,JQ99$5$l$F$$$k>l9g$O%A%'%C%/$9$k!#(B
+            if ($arrParams['login_id'] != $arrParams['old_login_id']) {
                 // $B%m%0%$%s(BID$B$,EPO?:Q$_$G$J$$$+(B
                 if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) {
                     $arrErr['login_id'] = '$B4{$KEPO?$5$l$F$$$k(BID$B$J$N$GMxMQ$G$-$^$;$s!#(B<br>';
                 }
-                break;
-            case 'edit':
-                // $B%m%0%$%s(BID$B$,JQ99$5$l$F$$$k>l9g$O%A%'%C%/$9$k!#(B
-                if ($arrParams['login_id'] != $arrParams['old_login_id']) {
-                    // $B%m%0%$%s(BID$B$,EPO?:Q$_$G$J$$$+(B
-                    if ($this->memberDataExists('login_id = ? AND del_flg = 0', $arrParams['login_id'])) {
-                        $arrErr['login_id'] = '$B4{$KEPO?$5$l$F$$$k(BID$B$J$N$GMxMQ$G$-$^$;$s!#(B<br>';
-                    }
-                }
-                break;
+            }
+            break;
         }
 
         return $arrErr;
@@ -276,8 +269,7 @@
      * @param integer $id $B%a%s%P!<(BID
      * @return array $B4IM}<T%G!<%?$NO"A[G[Ns(B, $BL5$$>l9g$O6u$NG[Ns$rJV$9(B
      */
-    function getMemberData($id)
-    {
+    function getMemberData($id) {
         $table   = 'dtb_member';
         $columns = 'name,department,login_id,authority, work';
         $where   = 'member_id = ?';
@@ -293,8 +285,7 @@
      * @param string $val $B8!:w$7$?$$CM(B
      * @return boolean $BEPO?:Q$_$J$i(Btrue, $BL$EPO?$J$i(Bfalse
      */
-    function memberDataExists($where, $val)
-    {
+    function memberDataExists($where, $val) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $table = 'dtb_member';
@@ -310,8 +301,7 @@
      * @param  integer $pageno $B%Z!<%8$NHV9f(B
      * @return integer $clean_pageno $B%A%'%C%/8e$N%Z!<%8$NHV9f(B
      */
-    function lfCheckPageNo($pageno)
-    {
+    function lfCheckPageNo($pageno) {
 
         $clean_pageno = '';
 
@@ -334,8 +324,7 @@
      * @param array $B4IM}<T%G!<%?$NO"A[G[Ns(B
      * @return void
      */
-    function insertMemberData($arrMemberData)
-    {
+    function insertMemberData($arrMemberData) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // INSERT$B$9$kCM$r:n ＠ .$9$k(B.
@@ -365,8 +354,7 @@
      * @param array $B4IM}<T%G!<%?$NO"A[G[Ns(B
      * @return void
      */
-    function updateMemberData($member_id, $arrMemberData)
-    {
+    function updateMemberData($member_id, $arrMemberData) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // Update$B$9$kCM$r:n ＠ .$9$k(B.

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author Seasoft $BDMED>-5W(B
  * @version $Id$
  */
-class LC_Page_Admin_System_Log extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Log extends LC_Page_Admin_Ex {
 
     var $arrLogList = array();
 
@@ -41,8 +40,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/log.tpl';
         $this->tpl_subno    = 'log';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex;
 
@@ -97,8 +93,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -107,8 +102,7 @@
      *
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%U%!%$%k(B', 'log', null, '', array());
         $objFormParam->addParam('$B9T?t(B', 'line_max', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), 50);
     }
@@ -118,8 +112,7 @@
      *
      * @return array $arrLogs $B<hF@$7$?%m%0(B
      */
-    function getEccubeLog($log_path_base)
-    {
+    function getEccubeLog($log_path_base) {
 
         $index = 0;
         $arrLogs = array();
@@ -166,8 +159,7 @@
      *
      * $B%;%-%e%j%F%#LL$r%+%P!<$9$kLr3d$b$"$k!#(B
      */
-    function getLogPath($log_name)
-    {
+    function getLogPath($log_name) {
         if (strlen($log_name) === 0) {
             return LOG_REALFILE;
         }
@@ -183,8 +175,7 @@
      * TODO mtb_constants $B$+$iF0E*@8 ＠ .$7$?$$!#(B
      * @return void
      */
-    function loadLogList()
-    {
+    function loadLogList() {
         $this->arrLogList[''] = '$BI8=`%m%0%U%!%$%k(B';
         $this->arrLogList['CUSTOMER'] = '$B2q0w%m%0%$%s(B $B%m%0%U%!%$%k(B';
         $this->arrLogList['ADMIN'] = '$B4IM}5!G=%m%0%U%!%$%k(B';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Masterdata extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Masterdata extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/masterdata.tpl';
         $this->tpl_subno = 'masterdata';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->arrMasterDataName = $this->getMasterDataNames(array('mtb_pref', 'mtb_zip', 'mtb_constants'));
         $masterData = new SC_DB_MasterData_Ex();
@@ -107,8 +103,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -120,8 +115,7 @@
      * @param array $arrMasterDataName  $B%^%9%?!<%G!<%?%F!<%V%kL>$N%j%9%H(B
      * @return string $master_data_name $BA*Br$7$F$$$k%^%9%?!<%G!<%?$N%F!<%V%kL>(B
      */
-    function checkMasterDataName(&$arrParams, &$arrMasterDataName)
-    {
+    function checkMasterDataName(&$arrParams, &$arrMasterDataName) {
 
         if (in_array($arrParams['master_data_name'], $arrMasterDataName)) {
             $master_data_name = $arrParams['master_data_name'];
@@ -139,8 +133,7 @@
      * @param array $ignores $B<hF@$7$J$$%^%9%?!<%G!<%?L>$NG[Ns(B
      * @return array $B%^%9%?!<%G!<%?L>$NG[Ns(B
      */
-    function getMasterDataNames($ignores = array())
-    {
+    function getMasterDataNames($ignores = array()) {
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $arrMasterDataName = $dbFactory->findTableNames('mtb_');
 
@@ -164,8 +157,7 @@
      * @access private
      * @return void|string $B%(%i!<$,H/@8$7$?>l9g$O%(%i!<%a%C%;!<%8$rJV$9(B.
      */
-    function checkUniqueID(&$arrParams)
-    {
+    function checkUniqueID(&$arrParams) {
 
         $arrId = $arrParams['id'];
         for ($i = 0; $i < count($arrId); $i++) {
@@ -191,8 +183,7 @@
      * @param string $master_data_name $BEPO?BP>]$N%^%9%?!<%G!<%?$N%F!<%V%kL>(B
      * @return void
      */
-    function registMasterData($arrParams, &$masterData, $master_data_name)
-    {
+    function registMasterData($arrParams, &$masterData, $master_data_name) {
 
         $arrTmp = array();
         foreach ($arrParams['id'] as $key => $val) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Parameter extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Parameter extends LC_Page_Admin_Ex {
 
     // {{{ properties
 
@@ -53,8 +52,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/parameter.tpl';
         $this->tpl_subno = 'parameter';
@@ -68,8 +66,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -79,8 +76,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $masterData = new SC_DB_MasterData_Ex();
 
@@ -122,8 +118,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -135,8 +130,7 @@
      * @access private
      * @return void
      */
-    function update(&$arrKeys, &$arrForm)
-    {
+    function update(&$arrKeys, &$arrForm) {
         $data = array();
         $masterData = new SC_DB_MasterData_Ex();
         foreach ($arrKeys as $key) {
@@ -157,8 +151,7 @@
      * @param array $arrForm $_POST $BCM(B
      * @return void
      */
-    function errorCheck(&$arrKeys, &$arrForm)
-    {
+    function errorCheck(&$arrKeys, &$arrForm) {
         $objErr = new SC_CheckError_Ex($arrForm);
         for ($i = 0; $i < count($arrKeys); $i++) {
             $objErr->doFunc(array($arrKeys[$i],
@@ -174,8 +167,7 @@
      * @access private
      * @return array $B%Q%i%a!<%?!<$N%-!<$NG[Ns(B
      */
-    function getParamKeys(&$masterData)
-    {
+    function getParamKeys(&$masterData) {
         $keys = array();
         $i = 0;
         foreach ($masterData->getDBMasterData('mtb_constants') as $key => $val) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Rank extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_Rank extends LC_Page_Admin_Ex {
     // }}}
     // {{{ functions
 
@@ -41,8 +40,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -51,8 +49,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -62,8 +59,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%A%'%C%/8e$N%G!<%?$r3JG<(B
         $arrClean = array();
@@ -111,14 +107,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // $B%i%s%-%s%0$r>e$2$k!#(B
-    function lfRunkUp($id)
-    {
+    function lfRunkUp($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B<+?H$N%i%s%/$r<hF@$9$k!#(B
@@ -148,8 +142,7 @@
     }
 
     // $B%i%s%-%s%0$r2<$2$k!#(B
-    function lfRunkDown($id)
-    {
+    function lfRunkDown($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // $B<+?H$N%i%s%/$r<hF@$9$k!#(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_System extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_System_System extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'system/system.tpl';
         $this->tpl_subno    = 'system';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
 
@@ -95,8 +91,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -107,8 +102,7 @@
      * @param array $arrParams $_GET$BCM(B
      * @return void
      */
-    function initForm(&$objFormParam, &$arrParams)
-    {
+    function initForm(&$objFormParam, &$arrParams) {
         $objFormParam->addParam('mode', 'mode', INT_LEN, '', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->setParam($arrParams);
     }
@@ -118,8 +112,7 @@
      *
      * @return array $B%7%9%F%`>pJs(B
      */
-    function getSystemInfo()
-    {
+    function getSystemInfo() {
         $objDB = SC_DB_DBFactory_Ex::getInstance();
 
         $arrSystemInfo = array(

$BJQ99(B: branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Total extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Total extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -41,8 +40,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         // GD$B%i%$%V%i%j$N%$%s%9%H!<%kH=Dj(B
         $this->install_GD = function_exists('gd_info') ? true : false;
@@ -92,8 +90,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -103,8 +100,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         if (isset($_GET['draw_image']) && $_GET['draw_image'] != '') {
             define('DRAW_IMAGE' , true);
@@ -173,14 +169,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B%G%U%)%k%HCM$N<hF@(B */
-    function lfGetDateDefault()
-    {
+    function lfGetDateDefault() {
         $year = date('Y');
         $month = date('m');
         $day = date('d');
@@ -207,8 +201,7 @@
     }
 
     /* $B%Q%i%a!<%?!<>pJs$N=i4|2=(B */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // $B%G%U%)%k%HCM$N<hF@(B
         $arrList = $this->lfGetDateDefault();
 
@@ -231,8 +224,7 @@
     }
 
     /* $BF~NOFbMF$N%A%'%C%/(B */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
 
         $objFormParam->convParam();
         $objErr         = new SC_CheckError_Ex($objFormParam->getHashArray());
@@ -258,8 +250,7 @@
     }
 
     /* $B%5%V%J%S$r0\F0$7$F$bF|IU$,;D$k$h$&$K%;%C%7%g%s$KF~NO4|4V$r5-O?$9$k(B */
-    function lfSaveDateSession($session, $arrForm)
-    {
+    function lfSaveDateSession($session, $arrForm) {
 
         // session $B$N=i4|2=$r$9$k(B
         if (!isset($session['total'])) {
@@ -274,8 +265,7 @@
     }
 
     /* $BF|IU$N=i4|CM(B */
-    function lfGetDateInit()
-    {
+    function lfGetDateInit() {
         $search_startyear_m     = $search_startyear  = $search_endyear  = date('Y');
         $search_startmonth_m    = $search_startmonth = $search_endmonth = date('m');
         $search_startday        = $search_endday     = date('d');
@@ -284,8 +274,7 @@
     }
 
     /* $B%U%)!<%`$GF~NO$5$l$?F|IU$rE, ＠ Z$J7A$K$9$k(B */
-    function lfSetStartEndDate(&$objFormParam)
-    {
+    function lfSetStartEndDate(&$objFormParam) {
         $arrRet = $objFormParam->getHashArray();
 
         // $B7nEY=87W(B
@@ -304,8 +293,7 @@
     }
 
     /* $B@^$l@~%0%i%U$N:n ＠ .(B */
-    function lfGetGraphLine($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate, $xincline)
-    {
+    function lfGetGraphLine($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate, $xincline) {
 
         $ret_path = '';
 
@@ -363,8 +351,7 @@
     }
 
     // $B1_%0%i%U$N:n ＠ .(B
-    function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = '')
-    {
+    function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = '') {
 
         $ret_path = '';
         // $B7k2L$,(B0$B9T0J>e$"$k>l9g$N$_%0%i%U$r ＠ 8@.$9$k!#(B
@@ -408,8 +395,7 @@
     }
 
     // $BK@%0%i%U$N:n ＠ .(B
-    function lfGetGraphBar($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate)
-    {
+    function lfGetGraphBar($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate) {
         $ret_path = '';
 
         // $B7k2L$,(B0$B9T0J>e$"$k>l9g$N$_%0%i%U$r ＠ 8@.$9$k!#(B
@@ -455,8 +441,7 @@
     }
 
     // $B%0%i%UMQ$N(BPNG$B%U%!%$%kL>(B
-    function lfGetGraphPng($keyname)
-    {
+    function lfGetGraphPng($keyname) {
 
         if ($_POST['search_startyear_m'] != '') {
             $pngname = sprintf('%s_%02d%02d.png', $keyname, substr($_POST['search_startyear_m'],2), $_POST['search_startmonth_m']);
@@ -467,8 +452,7 @@
     }
 
     // $B2q0w!"Hs2q0w=87W$N(BWHERE$BJ,$N:n ＠ .(B
-    function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id')
-    {
+    function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id') {
         $where = '';
         // $B<hF ＠ F|IU$N;XDj(B
         if ($sdate != '') {
@@ -511,8 +495,7 @@
     }
 
     /** $B2q0wJL=87W(B **/
-    function lfGetOrderMember($type, $sdate, $edate)
-    {
+    function lfGetOrderMember($type, $sdate, $edate) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
 
         list($where, $arrWhereVal) = $this->lfGetWhereMember('create_date', $sdate, $edate, $type);
@@ -553,8 +536,7 @@
     }
 
     /** $B>&IJJL=87W(B **/
-    function lfGetOrderProducts($type, $sdate, $edate)
-    {
+    function lfGetOrderProducts($type, $sdate, $edate) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
 
         list($where, $arrWhereVal) = $this->lfGetWhereMember('create_date', $sdate, $edate, $type);
@@ -591,8 +573,7 @@
     }
 
     /** $B?&6HJL=87W(B **/
-    function lfGetOrderJob($type, $sdate, $edate)
-    {
+    function lfGetOrderJob($type, $sdate, $edate) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         list($where, $arrWhereVal) = $this->lfGetWhereMember('dtb_order.create_date', $sdate, $edate, $type);
 
@@ -628,8 +609,7 @@
     }
 
     /** $BG/BeJL=87W(B **/
-    function lfGetOrderAge($type, $sdate, $edate)
-    {
+    function lfGetOrderAge($type, $sdate, $edate) {
 
         $objQuery = SC_Query_Ex::getSingletonInstance();
 
@@ -667,8 +647,7 @@
 
     /** $B4|4VJL=87W(B **/
     // todo $B$"$$$@$NF|IUKd$a$k(B
-    function lfGetOrderTerm($type, $sdate, $edate)
-    {
+    function lfGetOrderTerm($type, $sdate, $edate) {
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
         list($where, $arrWhereVal) = $this->lfGetWhereMember('create_date', $sdate, $edate);
@@ -724,8 +703,7 @@
     /*
      * $B4|4VCf$NF|IU$rKd$a$k(B
      */
-    function lfAddBlankLine($arrResults, $type, $st, $ed)
-    {
+    function lfAddBlankLine($arrResults, $type, $st, $ed) {
 
         $arrDateList = $this->lfDateTimeArray($type, $st, $ed);
 
@@ -751,8 +729,7 @@
      * $BF|IU$NG[Ns$r:n ＠ .$9$k(B
      *
      */
-    function lfDateTimeArray($type, $st, $ed)
-    {
+    function lfDateTimeArray($type, $st, $ed) {
         switch ($type) {
             case 'month':
                 $format        = 'm';
@@ -793,8 +770,7 @@
     /*
      * $B9g7W$rIUM?$9$k(B
      */
-    function lfAddTotalLine($arrResults)
-    {
+    function lfAddTotalLine($arrResults) {
         // $B8!:w7k2L$,(B0$B$G$J$$>l9g(B
         if (count($arrResults) > 0) {
 
@@ -813,13 +789,12 @@
     }
 
     // $BI,MW$J%+%i%`$N$_Cj=P$9$k(B(CSV$B%G!<%?$G<hF@$9$k(B)
-    function lfGetDataColCSV($arrData, $arrDataCol)
-    {
+    function lfGetDataColCSV($arrData, $arrDataCol) {
         $max = count($arrData);
         $csv_data = '';
         for ($i = 0; $i < $max; $i++) {
             foreach ($arrDataCol as $val) {
-                $arrRet[$i][$val] = ($arrData[$i][$val]) ? $arrData[$i][$val] : "0";
+                $arrRet[$i][$val] = $arrData[$i][$val];
             }
             // $B4|4VJL=87W$N9g7W9T$N!V4|4V!W9`L\$KITMW$JCM$,I=<($5$l$F$7$^$o$J$$MM!"(B'$B9g7W(B'$B$HI=<($9$k(B
             if (($i === $max -1) && isset($arrRet[$i]['str_date'])) {
@@ -830,8 +805,7 @@
         return $csv_data;
     }
 
-    function lfGetCSVColum($page)
-    {
+    function lfGetCSVColum($page) {
         switch ($page) {
             // $B>&IJJL=87W(B
             case 'products':

$BJQ99(B: branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api extends LC_Page_Ex 
-{
+class LC_Page_Api extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
     }
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
         list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -78,8 +74,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api_Json extends LC_Page_Ex 
-{
+class LC_Page_Api_Json extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
     }
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
         list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -78,8 +74,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api_Php extends LC_Page_Ex 
-{
+class LC_Page_Api_Php extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
     }
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
         list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -78,8 +74,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api_Xml extends LC_Page_Ex 
-{
+class LC_Page_Api_Xml extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
 //        $this->sendResponse();
     }
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         $arrParam = $_REQUEST;
 
         list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -78,8 +74,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Cart extends LC_Page_Ex 
-{
+class LC_Page_Cart extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -53,8 +52,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B8=:_$N%+%4$NCf(B';
         $masterData = new SC_DB_MasterData_Ex();
@@ -67,8 +65,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -79,8 +76,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCartSess = new SC_CartSession_Ex();
         $objSiteSess = new SC_SiteSession_Ex();
@@ -107,20 +103,6 @@
             SC_Response_Ex::actionExit();
         }
 
-        $objFormParam4OpenCategoryTree =
-            $this->lfInitParam4OpenCategoryTree($_REQUEST);
-        if ($objFormParam4OpenCategoryTree->getValue('product_id')) {
-            $arrQueryString = array(
-                'product_id' => $objFormParam4OpenCategoryTree->getValue(
-                    'product_id'),
-            );
-        } else {
-            $arrQueryString = array(
-                'category_id' => $objFormParam4OpenCategoryTree->getValue(
-                    'category_id'),
-            );
-        }
-
         switch ($this->mode) {
             case 'confirm':
                 // $B%+!<%HFb>pJs$N<hF@(B
@@ -139,25 +121,29 @@
             case 'up'://1$B8DDI2C(B
                 $objCartSess->upQuantity($cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
             case 'down'://1$B8D8:$i$9(B
                 $objCartSess->downQuantity($cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
             case 'setQuantity'://$B?tNLJQ99(B
                 $objCartSess->setQuantity($objFormParam->getValue('quantity'), $cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
             case 'delete'://$B%+!<%H$+$i:o=|(B
                 $objCartSess->delProduct($cart_no, $cartKey);
 
-                SC_Response_Ex::reload($arrQueryString, true);
+
+                SC_Response_Ex::reload(array('category_id' => $objFormParam->getValue('category_id')), true);
                 SC_Response_Ex::actionExit();
                 break;
             default:
@@ -186,10 +172,7 @@
         //$B>&IJ$N9g7W6b3[$r%;%C%H(B
         $this->tpl_all_total_inctax = $totalIncTax;
 
-        $this->tpl_category_id =
-            $objFormParam4OpenCategoryTree->getValue('category_id');
-        $this->tpl_product_id =
-            $objFormParam4OpenCategoryTree->getValue('product_id');
+        $this->tpl_category_id = $objFormParam->getValue('category_id');
 
         // $B%m%0%$%sH=Dj(B
         if ($objCustomer->isLoginSuccess(true)) {
@@ -214,8 +197,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -224,11 +206,12 @@
      *
      * @return object
      */
-    function lfInitParam($arrRequest)
-    {
+    function lfInitParam($arrRequest) {
         $objFormParam = new SC_FormParam_Ex();
         $objFormParam->addParam('$B%+!<%H%-!<(B', 'cartKey', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%+!<%H%J%s%P!<(B', 'cart_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        // PC$BHG$G$NCM0z$-7Q$.MQ(B
+        $objFormParam->addParam('$B%+%F%4%j(BID', 'category_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         // $B%9%^!<%H%U%)%sHG$G$N?tNLJQ99MQ(B
         $objFormParam->addParam('$B?tNL(B', 'quantity', INT_LEN, 'n', array('ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         // $BCM$N<hF@(B
@@ -239,33 +222,11 @@
     }
 
     /**
-     * PC$BHG$G$N3+$$$F$$$k%+%F%4%j!<%D%j!<$N0];}MQ$NF~NOCM(B
-     *
-     * @return object
-     */
-    function lfInitParam4OpenCategoryTree($arrRequest)
-    {
-        $objFormParam = new SC_FormParam_Ex();
-
-        $objFormParam->addParam('$B%+%F%4%j(BID', 'category_id', INT_LEN, 'n',
-            array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n',
-            array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-
-        // $BCM$N<hF@(B
-        $objFormParam->setParam($arrRequest);
-        // $BF~NOCM$NJQ49(B
-        $objFormParam->convParam();
-        return $objFormParam;
-    }
-
-    /**
      * order_temp_id $B$N99?7(B
      *
      * @return
      */
-    function lfUpdateOrderTempid($pre_uniqid,$uniqid)
-    {
+    function lfUpdateOrderTempid($pre_uniqid,$uniqid) {
         $sqlval['order_temp_id'] = $uniqid;
         $where = 'order_temp_id = ?';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -281,8 +242,7 @@
      *
      * @return void
      */
-    function lfGetCartPrevUrl(&$session,$referer)
-    {
+    function lfGetCartPrevUrl(&$session,$referer) {
         if (!preg_match('/cart/', $referer)) {
             if (!empty($session['cart_referer_url'])) {
                 $session['cart_prev_url'] = $session['cart_referer_url'];
@@ -306,8 +266,7 @@
      *
      * @return void
      */
-    function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey)
-    {
+    function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey) {
         // $B ＠ 5>o$KEPO?$5$l$?$3$H$r5-O?$7$F$*$/(B
         $objSiteSess->setRegistFlag();
         $pre_uniqid = $objSiteSess->getUniqId();

$BJQ99(B: branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Contact extends LC_Page_Ex 
-{
+class LC_Page_Contact extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
             $this->tpl_title = '$B$*Ld$$9g$o$;(B';
@@ -67,8 +65,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -79,8 +76,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
@@ -143,8 +139,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -157,8 +152,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
 
         $objFormParam->addParam('$B$*L>A0(B($B ＠ +(B)', 'name01', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*L>A0(B($BL>(B)', 'name02', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -183,8 +177,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $BF~NO%A%'%C%/7k2L$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrForm =  $objFormParam->getHashArray();
         $objErr = new SC_CheckError_Ex($arrForm);
@@ -198,8 +191,7 @@
      *
      * @return void
      */
-    function lfSendMail(&$objPage)
-    {
+    function lfSendMail(&$objPage) {
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
         $objPage->tpl_shopname = $CONF['shop_name'];
         $objPage->tpl_infoemail = $CONF['email02'];

$BJQ99(B: branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Contact_Complete extends LC_Page_Ex 
-{
+class LC_Page_Contact_Complete extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B$*Ld$$9g$o$;(B($B40N;%Z!<%8(B)';
         $this->tpl_mainno = 'contact';
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // do nothing...
 
@@ -79,8 +75,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Entry.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Entry extends LC_Page_Ex 
-{
+class LC_Page_Entry extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -43,8 +42,7 @@
      * Page $B$r=i4|2=$9$k(B.
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData         = new SC_DB_MasterData_Ex();
         $this->arrPref      = $masterData->getMasterData('mtb_pref');
@@ -65,8 +63,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -76,8 +73,7 @@
      * Page $B$N%W%m%;%9(B
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
 
@@ -170,8 +166,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -183,8 +178,7 @@
      * @access private
      * @return uniqid
      */
-    function lfRegistCustomerData($sqlval)
-    {
+    function lfRegistCustomerData($sqlval) {
         SC_Helper_Customer_Ex::sfEditCustomerData($sqlval);
         return $sqlval['secret_key'];
     }
@@ -200,8 +194,7 @@
      * @access private
      * @return $arrResults
      */
-    function lfMakeSqlVal(&$objFormParam)
-    {
+    function lfMakeSqlVal(&$objFormParam) {
         $arrForm                = $objFormParam->getHashArray();
         $arrResults             = $objFormParam->getDbArray();
 
@@ -236,8 +229,7 @@
      * @access private
      * @return void
      */
-    function lfSendMail($uniqid, $arrForm)
-    {
+    function lfSendMail($uniqid, $arrForm) {
         $CONF           = SC_Helper_DB_Ex::sfGetBasisData();
 
         $objMailText    = new SC_SiteView_Ex();
@@ -292,8 +284,7 @@
      * @param string $referer $_SERVER['HTTP_REFERER'] $B$N%G!<%?(B
      * @return boolean kiyaku.php $B$+$i$NBEEv$JA+0\$G$"$l$P(B true
      */
-    function lfCheckReferer(&$post, $referer)
-    {
+    function lfCheckReferer(&$post, $referer) {
 
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE
             && empty($post)
@@ -309,8 +300,7 @@
      * @param array $arrRequest $B%j%/%(%9%HCM(B($_GET)
      * @return array $arrErr $B%(%i!<%a%C%;!<%8G[Ns(B
      */
-    function lfCheckError($arrRequest)
-    {
+    function lfCheckError($arrRequest) {
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
         // $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
@@ -322,7 +312,29 @@
         $objFormParam->setParam($arrData);
         // $B%(%i!<%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
+        // $B?F%&%#%s%I%&$NLa$jCM$r3JG<$9$k(Binput$B%?%0$N(Bname$B$N%(%i!<%A%'%C%/(B
+        if (!$this->lfInputNameCheck($addData['zip01'])) {
+            $arrErr['zip01'] = '$B"((B $BF~NO7A<0$,IT ＠ 5$G$9!#(B<br />';
+        }
+        if (!$this->lfInputNameCheck($arrdata['zip02'])) {
+            $arrErr['zip02'] = '$B"((B $BF~NO7A<0$,IT ＠ 5$G$9!#(B<br />';
+        }
 
         return $arrErr;
     }
+
+    /**
+     * $B%(%i!<%A%'%C%/(B.
+     *
+     * @param string $value
+     * @return $B%(%i!<$J$7!'(Btrue $B%(%i!<!'(Bfalse
+     */
+    function lfInputNameCheck($value) {
+        // $BH>3Q1Q?t;z$H(B_$B!J%"%s%@!<%P!<!K(B, []$B0J30$NJ8;z$r;HMQ$7$F$$$?$i%(%i!<(B
+        if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
+            return false;
+        }
+
+        return true;
+    }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_Complete extends LC_Page_Ex 
-{
+class LC_Page_Entry_Complete extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->httpCacheControl('nocache');
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%+!<%H$,6u$+$I$&$+$r3NG'$9$k!#(B
         $objCartSess            = new SC_CartSession_Ex();
@@ -95,8 +91,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_EmailMobile extends LC_Page_Ex 
-{
+class LC_Page_Entry_EmailMobile extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer    = new SC_Customer_Ex();
         $objFormParam   = new SC_FormParam_Ex();
@@ -98,8 +94,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -109,8 +104,7 @@
      * @access public
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%a!<%k%"%I%l%9(B', 'email_mobile', null, 'a',
                                 array('NO_SPTAB', 'EXIST_CHECK', 'CHANGE_LOWER', 'EMAIL_CHAR_CHECK', 'EMAIL_CHECK', 'MOBILE_EMAIL_CHECK'));
     }
@@ -123,8 +117,7 @@
      * @access private
      * @return array $B%(%i!<>pJs$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objFormParam->convParam();
         $objErr         = new SC_CheckError_Ex();
         $objErr->arrErr = $objFormParam->checkError();
@@ -146,8 +139,7 @@
      * @access private
      * @return void
      */
-    function lfRegistEmailMobile($email_mobile, $customer_id)
-    {
+    function lfRegistEmailMobile($email_mobile, $customer_id) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         $objQuery->update('dtb_customer',
                           array('email_mobile' => $email_mobile),

$BJQ99(B: branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_Kiyaku extends LC_Page_Ex 
-{
+class LC_Page_Entry_Kiyaku extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B$4MxMQ5,Ls(B';
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $arrKiyaku = $this->lfGetKiyakuData();
         $this->max = count($arrKiyaku);
@@ -86,8 +82,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -100,8 +95,7 @@
      * @access public
      * @return string $B5,Ls$NFbMF$r%F%-%9%H%(%j%"$GI=<($9$k$h$&$K ＠ 07A$7$?%G!<%?(B
      */
-    function lfMakeKiyakuText($arrKiyaku, $max, $offset)
-    {
+    function lfMakeKiyakuText($arrKiyaku, $max, $offset) {
         $this->tpl_kiyaku_text = '';
         for ($i = 0; $i < $max; $i++) {
             if ($offset !== null && ($offset - 1) <> $i) continue;
@@ -117,11 +111,13 @@
      * @access private
      * @return array $arrKiyaku $B5,Ls$NG[Ns(B
      */
-    function lfGetKiyakuData()
-    {
-        $objKiyaku = new SC_Helper_Kiyaku_Ex();
-        $arrKiyaku = $objKiyaku->getList();
+    function lfGetKiyakuData() {
 
+        $objQuery   = SC_Query_Ex::getSingletonInstance();
+
+        $objQuery->setOrder('rank DESC');
+        $arrKiyaku  = $objQuery->select('kiyaku_title, kiyaku_text', 'dtb_kiyaku', 'del_flg <> 1');
+
         return $arrKiyaku;
     }
 
@@ -133,8 +129,7 @@
      * @access private
      * @return int
      */
-    function lfSetOffset($offset)
-    {
+    function lfSetOffset($offset) {
         return is_numeric($offset) === true ? intval($offset) : 1;
     }
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Error.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Error extends LC_Page_Ex 
-{
+class LC_Page_Error extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -61,8 +60,7 @@
      * $B$3$3$G$O(B, parent::init() $B$r9T$o$J$$(B.
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->tpl_mainpage = 'error.tpl';
         $this->tpl_title = '$B%(%i!<(B';
         // $B%G%#%9%W%l%$%/%i%9 ＠ 8@.(B
@@ -71,9 +69,6 @@
         // transform$B$G%U%C%/$7$F$$$k$P$"$$$K(B, $B:FEY%(%i!<$,H/@8$9$k$?$a(B, $B%3!<%k%P%C%/$rL58z2=(B.
         $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         $objHelperPlugin->arrRegistedPluginActions = array();
-
-        // $B%-%c%C%7%e$+$iE9J^>pJs<hF@!J(BDB$B$X$N@\B3$O9T$o$J$$!K(B
-        $this->arrSiteInfo = SC_Helper_DB_Ex::sfGetBasisDataCache(false);
     }
 
     /**
@@ -81,8 +76,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -93,8 +87,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->type) {
             case PRODUCT_NOT_FOUND:
@@ -180,16 +173,14 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /**
      * $B%(%i!<%Z!<%8$G$O%H%i%s%6%/%7%g%s%H!<%/%s$N<+F08!>Z$O9T$o$J$$(B
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // queit.
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Error_DispError extends LC_Page_Admin_Ex 
-{
+class LC_Page_Error_DispError extends LC_Page_Admin_Ex {
 
     // }}}
     // {{{ functions
@@ -45,8 +44,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         $this->template = LOGIN_FRAME;
         $this->tpl_mainpage = 'login_error.tpl';
         $this->tpl_title = '$B%m%0%$%s%(%i!<(B';
@@ -56,9 +54,6 @@
         // transform$B$G%U%C%/$7$F$$$k$P$"$$$K(B, $B:FEY%(%i!<$,H/@8$9$k$?$a(B, $B%3!<%k%P%C%/$rL58z2=(B.
         $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         $objHelperPlugin->arrRegistedPluginActions = array();
-
-        // $B%-%c%C%7%e$+$iE9J^>pJs<hF@!J(BDB$B$X$N@\B3$O9T$o$J$$!K(B
-        $this->arrSiteInfo = SC_Helper_DB_Ex::sfGetBasisDataCache(false);
     }
 
     /**
@@ -66,8 +61,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -77,8 +71,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->type) {
             case LOGIN_ERROR:
@@ -106,16 +99,14 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /**
      * $B%(%i!<%Z!<%8$G$O%H%i%s%6%/%7%g%s%H!<%/%s$N<+F08!>Z$O9T$o$J$$(B
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // queit.
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Error_SystemError extends LC_Page_Error 
-{
+class LC_Page_Error_SystemError extends LC_Page_Error {
 
     /** PEAR_Error */
     var $pearResult;
@@ -52,8 +51,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B%7%9%F%`%(%i!<(B';
     }
@@ -63,8 +61,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -74,8 +71,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->tpl_error = '$B%7%9%F%`%(%i!<$,H/@8$7$^$7$?!#(B<br />$BBgJQ$*<j?t$G$9$,!"%5%$%H4IM}<T$^$G$4O"Mm$/$@$5$$!#(B';
 
@@ -97,8 +93,7 @@
      *
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         $this->adminPage = GC_Utils_Ex::isAdminFunction();
 
         if ($this->adminPage) {
@@ -117,23 +112,20 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /**
      * $B%H%i%s%6%/%7%g%s%H!<%/%s$K4X$7$F=hM}$7$J$$$h$&$K%*!<%P!<%i%$%I(B
      */
-    function doValidToken()
-    {
+    function doValidToken() {
     }
 
     /**
      * $B%H%i%s%6%/%7%g%s%H!<%/%s$K4X$7$F=hM}$7$J$$$h$&$K%*!<%P!<%i%$%I(B
      */
-    function setTokenTo()
-    {
+    function setTokenTo() {
     }
 
     /**
@@ -141,8 +133,7 @@
      *
      * @return string
      */
-    function sfGetErrMsg()
-    {
+    function sfGetErrMsg() {
         $errmsg = '';
         $errmsg .= $this->lfGetErrMsgHead();
         $errmsg .= "\n";
@@ -174,8 +165,7 @@
      *
      * @return string
      */
-    function lfGetErrMsgHead()
-    {
+    function lfGetErrMsgHead() {
         $errmsg = '';
         $errmsg .= GC_Utils_Ex::getUrl() . "\n";
         $errmsg .= "\n";
@@ -191,8 +181,7 @@
      *
      * @return void
      */
-    function addDebugMsg($debugMsg)
-    {
+    function addDebugMsg($debugMsg) {
         $this->arrDebugMsg[] = rtrim($debugMsg, "\n");
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Forgot extends LC_Page_Ex 
-{
+class LC_Page_Forgot extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -56,8 +55,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B%Q%9%o!<%I$rK:$l$?J}(B';
         $this->tpl_mainpage = 'forgot/index.tpl';
@@ -76,8 +74,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -88,8 +85,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
@@ -150,8 +146,7 @@
      * @param array $arrReminder $B%j%^%$%s%@!<<ALd%j%9%H(B
      * @return string $B%(%i!<J8;zNs(B $BLdBj$,L5$1$l$P(BNULL
      */
-    function lfCheckForgotMail(&$arrForm, &$arrReminder)
-    {
+    function lfCheckForgotMail(&$arrForm, &$arrReminder) {
         $errmsg = NULL;
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = '(email = ? OR email_mobile = ?) AND name01 = ? AND name02 = ? AND del_flg = 0';
@@ -179,8 +174,7 @@
      * @param array $device_type $B%G%P%$%9%?%$%W(B
      * @return void
      */
-    function lfInitMailCheckParam(&$objFormParam, $device_type)
-    {
+    function lfInitMailCheckParam(&$objFormParam, $device_type) {
         $objFormParam->addParam('$B$*L>A0(B($B ＠ +(B)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*L>A0(B($BL>(B)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
         if ($device_type === DEVICE_TYPE_MOBILE) {
@@ -198,8 +192,7 @@
      * @param array $arrReminder $B%j%^%$%s%@!<<ALd%j%9%H(B
      * @return string $B%(%i!<J8;zNs(B $BLdBj$,L5$1$l$P(BNULL
      */
-    function lfCheckForgotSecret(&$arrForm, &$arrReminder)
-    {
+    function lfCheckForgotSecret(&$arrForm, &$arrReminder) {
         $errmsg = '';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $cols = 'customer_id, reminder, reminder_answer, salt';
@@ -259,8 +252,7 @@
      * @param array $device_type $B%G%P%$%9%?%$%W(B
      * @return void
      */
-    function lfInitSecretCheckParam(&$objFormParam, $device_type)
-    {
+    function lfInitSecretCheckParam(&$objFormParam, $device_type) {
         // $B%a!<%k%A%'%C%/$HF1Ey$N%A%'%C%/$r:FEY9T$&(B
         $this->lfInitMailCheckParam($objFormParam, $device_type);
         // $BHkL)$N<ALd%A%'%C%/$NDI2C(B
@@ -274,8 +266,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -290,8 +281,7 @@
      *
      * FIXME: $B%a!<%k%F%s%W%l!<%HJT=8$NJ}$KB-$9$N$,K>$^$7$$(B
      */
-    function lfSendMail(&$CONF, $email, $customer_name, $new_password)
-    {
+    function lfSendMail(&$CONF, $email, $customer_name, $new_password) {
         // $B%Q%9%o!<%IJQ99$*CN$i$;%a!<%kAw?.(B
         $objMailText = new SC_SiteView_Ex(false);
         $objMailText->setPage($this);

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_FrontParts_LoginCheck.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_LoginCheck extends LC_Page_Ex 
-{
+class LC_Page_FrontParts_LoginCheck extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
     }
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B2q0w4IM}%/%i%9(B
         $objCustomer = new SC_Customer_Ex();
@@ -212,8 +208,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -223,8 +218,7 @@
      * @param SC_FormParam $objFormParam $B%Q%i%a!<%?!<4IM}%/%i%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B5-21$9$k(B', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B%a!<%k%"%I%l%9(B', 'login_email', MTEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%Q%9%o!<%I(B', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -240,8 +234,7 @@
      * @return string JSON $B7A<0$N%(%i!<%a%C%;!<%8(B
      * @see LC_PageError
      */
-    function lfGetErrorMessage($error)
-    {
+    function lfGetErrorMessage($error) {
         switch ($error) {
             case TEMP_LOGIN_ERROR:
                 $msg = "$B%a!<%k%"%I%l%9$b$7$/$O%Q%9%o!<%I$, ＠ 5$7$/$"$j$^$;$s!#(B\n$BK\EPO?$,$*:Q$_$G$J$$>l9g$O!"2>EPO?%a!<%k$K5-:\$5$l$F$$$k(BURL$B$h$jK\EPO?$r9T$C$F$/$@$5$$!#(B";

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,16 +31,14 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc extends LC_Page_Ex 
-{
+class LC_Page_FrontParts_Bloc extends LC_Page_Ex {
 
     /**
      * Page $B$r=i4|2=$9$k(B.
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         // $B3+;O;~9o$r ＠ _Dj$9$k!#(B
         $this->timeStart = microtime(true);
 
@@ -65,8 +63,7 @@
      * @param string $bloc_file $B%V%m%C%/%U%!%$%kL>(B
      * @return void
      */
-    function setTplMainpage($bloc_file)
-    {
+    function setTplMainpage($bloc_file) {
         if (SC_Utils_Ex::isAbsoluteRealPath($bloc_file)) {
             $this->tpl_mainpage = $bloc_file;
         } else {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $ $
  */
-class LC_Page_FrontParts_Bloc_Calendar extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Calendar extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -64,9 +61,12 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
+        // $B5YF|<hF@<hF@(B
+        $this->arrHoliday = $this->lfGetHoliday();
+        // $BDj5YF|<hF@<hF@(B
+        $this->arrRegularHoliday = $this->lfGetRegularHoliday();
         // $B%+%l%s%@!<%G!<%?<hF@(B
         $this->arrCalendar = $this->lfGetCalendar(2);
 
@@ -78,8 +78,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -89,9 +88,7 @@
      * @param integer $disp_month $BI=<($9$k7n?t(B
      * @return array $B%+%l%s%@!<>pJs$NG[Ns$rJV$9(B
      */
-    function lfGetCalendar($disp_month = 1)
-    {
-        $objDate = new SC_Date_Ex();
+    function lfGetCalendar($disp_month = 1) {
         $arrCalendar = array();
         $today = date('Y/m/d');
 
@@ -111,7 +108,7 @@
                 $arrCalendar[$j][$i]['year']        = $year;
                 $arrCalendar[$j][$i]['month']       = $month;
                 $arrCalendar[$j][$i]['day']         = $objDay->day;
-                $arrCalendar[$j][$i]['holiday']     = $objDate->isHoliday($year, $month, $objDay->day);
+                $arrCalendar[$j][$i]['holiday']     = $this->lfCheckHoliday($year, $month, $objDay->day);
                 $arrCalendar[$j][$i]['today']       = $today === sprintf('%04d/%02d/%02d', $year, $month, $objDay->day);
 
                 $i++;
@@ -120,4 +117,56 @@
 
         return $arrCalendar;
     }
+
+    /**
+     * $B5YF|<hF@(B.
+     *
+     * @return array $arrHoliday $B5YF|>pJs$NG[Ns$rJV$9(B
+     */
+    function lfGetHoliday() {
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank DESC');
+
+        $where = 'del_flg <> 1';
+        $arrRet = $objQuery->select('month, day', 'dtb_holiday', $where);
+        foreach ($arrRet AS $key=>$val) {
+            $arrHoliday[$val['month']][] = $val['day'];
+        }
+        return $arrHoliday;
+    }
+
+    /**
+     * $BDj5YF|<hF@(B.
+     *
+     * @return array $arrRegularHoliday $BDj5YF|>pJs$NG[Ns$rJV$9(B
+     */
+    function lfGetRegularHoliday() {
+        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
+        $arrRegularHoliday = explode('|', $arrInfo['regular_holiday_ids']);
+        return $arrRegularHoliday;
+    }
+
+    /**
+     * $B5YF|%A%'%C%/<hF@(B.
+     *
+     * @param integer $year $BG/(B
+     * @param integer $month $B7n(B
+     * @param integer $day $BF|(B
+     * @return boolean $B5YF|$N>l9g(Btrue$B$rJV$9(B
+     */
+    function lfCheckHoliday($year, $month, $day) {
+        if (!empty($this->arrHoliday[$month])) {
+            if (in_array($day, $this->arrHoliday[$month])) {
+                return true;
+            }
+        }
+        if (!empty($this->arrRegularHoliday)) {
+            $day = date('w', mktime(0,0,0 ,$month, $day, $year));
+            if (in_array($day, $this->arrRegularHoliday)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_FrontParts_Bloc_Cart.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_Bloc_Cart extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Cart extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrProductType = $masterData->getMasterData('mtb_product_type'); //$B>&IJ<oN`$r<hF@(B
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCart = new SC_CartSession_Ex();
         $this->isMultiple = $objCart->isMultiple();
@@ -82,8 +78,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -93,8 +88,7 @@
      * @param SC_CartSession $objCart $B%+!<%H%;%C%7%g%s4IM}%/%i%9(B
      * @return array $B%+!<%H%G!<%?G[Ns(B
      */
-    function lfGetCartData(&$objCart)
-    {
+    function lfGetCartData(&$objCart) {
         $arrCartKeys = $objCart->getKeys();
         foreach ($arrCartKeys as $cart_key) {
             // $B9XF~6b3[9g7W(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,20 +31,17 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Category extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Category extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
-    public $arrParentID;
 
     /**
      * Page $B$r=i4|2=$9$k(B.
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -53,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -64,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%b%P%$%kH=Dj(B
         switch (SC_Display_Ex::detectDevice()) {
@@ -89,8 +84,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -100,8 +94,7 @@
      * @param array $arrRequest $B%j%/%(%9%HG[Ns(B
      * @return array $arrCategoryId $BA*BrCf$N%+%F%4%j(BID
      */
-    function lfGetSelectedCategoryId($arrRequest)
-    {
+    function lfGetSelectedCategoryId($arrRequest) {
             // $B>&IJ(BID$B<hF@(B
         $product_id = '';
         if (isset($arrRequest['product_id']) && $arrRequest['product_id'] != '' && is_numeric($arrRequest['product_id'])) {
@@ -128,19 +121,47 @@
      * @param boolean $count_check $BEPO?>&IJ?t$r%A%'%C%/$9$k>l9g$O(Btrue
      * @return array $arrRet $B%+%F%4%j%D%j!<$NG[Ns$rJV$9(B
      */
-    function lfGetCatTree($arrParentCategoryId, $count_check = false)
-    {
-        $objCategory = new SC_Helper_Category_Ex($count_check);
-        $arrTree = $objCategory->getTree();
-
-        $this->arrParentID = array();
+    function lfGetCatTree($arrParentCategoryId, $count_check = false) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objDb = new SC_Helper_DB_Ex();
+        $col = '*';
+        $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id';
+        // $BEPO?>&IJ?t$N%A%'%C%/(B
+        if ($count_check) {
+            $where = 'del_flg = 0 AND product_count > 0';
+        } else {
+            $where = 'del_flg = 0';
+        }
+        $objQuery->setOption('ORDER BY rank DESC');
+        $arrRet = $objQuery->select($col, $from, $where);
         foreach ($arrParentCategoryId as $category_id) {
-            $arrParentID = $objCategory->getTreeTrail($category_id);
-            $this->arrParentID = array_merge($this->arrParentID, $arrParentID); 
+            $arrParentID = $objDb->sfGetParents(
+                'dtb_category',
+                'parent_category_id',
+                'category_id',
+                $category_id
+            );
+            $arrBrothersID = SC_Utils_Ex::sfGetBrothersArray(
+                $arrRet,
+                'parent_category_id',
+                'category_id',
+                $arrParentID
+            );
+            $arrChildrenID = SC_Utils_Ex::sfGetUnderChildrenArray(
+                $arrRet,
+                'parent_category_id',
+                'category_id',
+                $category_id
+            );
             $this->root_parent_id[] = $arrParentID[0];
+            $arrDispID = array_merge($arrBrothersID, $arrChildrenID);
+            foreach ($arrRet as &$arrCategory) {
+                if (in_array($arrCategory['category_id'], $arrDispID)) {
+                    $arrCategory['display'] = 1;
+                }
+            }
         }
-
-        return $arrTree;
+        return $arrRet;
     }
 
     /**
@@ -149,8 +170,7 @@
      * @param boolean $count_check $BEPO?>&IJ?t$r%A%'%C%/$9$k>l9g$O(Btrue
      * @return array $arrMainCat $B%a%$%s%+%F%4%j$NG[Ns$rJV$9(B
      */
-    function lfGetMainCat($count_check = false)
-    {
+    function lfGetMainCat($count_check = false) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
         $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_FrontParts_Bloc_Login.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_Bloc_Login extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Login extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_login = false;
         $this->tpl_disable_logout = false;
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
         // $B%/%C%-!<4IM}%/%i%9(B
@@ -103,8 +99,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -113,8 +108,7 @@
      *
      * @return boolean
      */
-    function lfCheckDisableLogout()
-    {
+    function lfCheckDisableLogout() {
         $masterData = new SC_DB_MasterData_Ex();
         $arrDisableLogout = $masterData->getMasterData('mtb_disable_logout');
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginFooter extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_LoginFooter extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
     }
 
@@ -73,8 +69,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginHeader extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_LoginHeader extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
     }
 
@@ -73,8 +69,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviFooter extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_NaviFooter extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
     }
 
@@ -73,8 +69,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviHeader extends LC_Page_FrontParts_Bloc_Login_Ex 
-{
+class LC_Page_FrontParts_Bloc_NaviHeader extends LC_Page_FrontParts_Bloc_Login_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrProductType = $masterData->getMasterData('mtb_product_type'); //$B>&IJ<oN`$r<hF@(B
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         parent::action();
 
         //$B%X%C%@!<%J%S$N%+!<%H>pJs$r<hF@(B
@@ -82,8 +78,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -95,8 +90,7 @@
      * @param Array $cartKeys $B>&IJ<oN`G[Ns(B
      * @return array $arrCartList $B%+!<%H%G!<%?G[Ns(B
      */
-    function lfGetCartData($objCart, $arrInfo, $cartKeys)
-    {
+    function lfGetCartData($objCart, $arrInfo, $cartKeys) {
         $cartList = array();
         foreach ($cartKeys as $key) {
             // $B%+!<%H=87W=hM}(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_News extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_News extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,10 +60,8 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
-        $objNews = new SC_Helper_News_Ex();
         $objFormParam = new SC_FormParam_Ex();
         switch ($this->getMode()) {
             case 'getList':
@@ -75,8 +70,8 @@
                 $objFormParam->convParam();
                 $this->arrErr = $objFormParam->checkError(false);
                 if (empty($this->arrErr)) {
-                    $arrData = $objFormParam->getHashArray();
-                    $json = $this->lfGetNewsForJson($arrData, $objNews);
+
+                    $json = $this->lfGetNewsForJson($objFormParam);
                     echo $json;
                     SC_Response_Ex::actionExit();
                 } else {
@@ -90,8 +85,8 @@
                 $objFormParam->convParam();
                 $this->arrErr = $objFormParam->checkError(false);
                 if (empty($this->arrErr)) {
-                    $arrData = $objFormParam->getHashArray();
-                    $json = $this->lfGetNewsDetailForJson($arrData, $objNews);
+
+                    $json = $this->lfGetNewsDetailForJson($objFormParam);
                     echo $json;
                     SC_Response_Ex::actionExit();
                 } else {
@@ -100,8 +95,8 @@
                 }
                 break;
             default:
-                $this->arrNews = $objNews->getList();
-                $this->newsCount = $objNews->getCount();
+                $this->newsCount = $this->lfGetNewsCount();
+                $this->arrNews = $this->lfGetNews(SC_Query_Ex::getSingletonInstance());
                 break;
         }
 
@@ -112,8 +107,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -123,8 +117,7 @@
      * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return void
      */
-    function lfInitNewsParam(&$objFormParam)
-    {
+    function lfInitNewsParam(&$objFormParam) {
         $objFormParam->addParam('$B8=:_%Z!<%8(B', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
         $objFormParam->addParam('$BI=<(7o?t(B', 'disp_number', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
         $objFormParam->addParam('$B?7Ce(BID', 'news_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
@@ -135,9 +128,9 @@
      *
      * @return array $arrNewsList $B?7Ce>pJs$NG[Ns$rJV$9(B
      */
-    function lfGetNews($dispNumber, $pageNo, SC_Helper_News_Ex $objNews)
-    {
-        $arrNewsList = $objNews->getList($dispNumber, $pageNo);
+    function lfGetNews(&$objQuery) {
+        $objQuery->setOrder('rank DESC ');
+        $arrNewsList = $objQuery->select('* , cast(news_date as date) as news_date_disp', 'dtb_news' ,'del_flg = 0');
 
         // $B%b%P%$%k%5%$%H$N%;%C%7%g%sJ];}(B (#797)
         if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
@@ -158,19 +151,24 @@
      * $B?7Ce>pJs$r(BJSON$B7A<0$G<hF@$9$k(B
      * ($B%Z!<%8$HI=<(7o?t$r;XDj(B)
      *
-     * @param array $arrData $B%U%)!<%`F~NOCM(B
-     * @param object $objNews
+     * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return String $json $B?7Ce>pJs$N(BJSON$B$rJV$9(B
      */
-    function lfGetNewsForJson($arrData, SC_Helper_News_Ex $objNews)
-    {
+    function lfGetNewsForJson(&$objFormParam) {
 
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $arrData = $objFormParam->getHashArray();
+
         $dispNumber = $arrData['disp_number'];
         $pageNo = $arrData['pageno'];
-        $arrNewsList = $this->lfGetNews($dispNumber, $pageNo, $objNews);
+        if (!empty($dispNumber) && !empty($pageNo)) {
+            $objQuery->setLimitOffset($dispNumber, (($pageNo - 1) * $dispNumber));
+        }
 
+        $arrNewsList = $this->lfGetNews($objQuery);
+
         //$B?7Ce>pJs$N:GBg%Z!<%8?t$r%;%C%H(B
-        $newsCount = $objNews->getCount();
+        $newsCount = $this->lfGetNewsCount();
         $arrNewsList['news_page_count'] = ceil($newsCount / 3);
 
         $json =  SC_Utils_Ex::jsonEncode($arrNewsList);    //JSON$B7A<0(B
@@ -182,27 +180,43 @@
      * $B?7Ce>pJs(B1$B7oJ,$r(BJSON$B7A<0$G<hF@$9$k(B
      * (news_id$B$r;XDj(B)
      *
-     * @param array $arrData $B%U%)!<%`F~NOCM(B
-     * @param object $objNews
+     * @param array $objFormParam $B%U%)!<%`%Q%i%a!<%?!<%/%i%9(B
      * @return String $json $B?7Ce>pJs(B1$B7oJ,$N(BJSON$B$rJV$9(B
      */
-    function lfGetNewsDetailForJson($arrData, SC_Helper_News_Ex $objNews)
-    {
+    function lfGetNewsDetailForJson(&$objFormParam) {
 
-        $arrNewsList = $objNews->get($arrData['news_id']);
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+        $arrData = $objFormParam->getHashArray();
+        $newsId = $arrData['news_id'];
+        $arrNewsList = $objQuery->select(' * , cast(news_date as date) as news_date_disp ',' dtb_news '," del_flg = '0' AND news_id = ? ", array($newsId));
+
         $json =  SC_Utils_Ex::jsonEncode($arrNewsList);    //JSON$B7A<0(B
 
         return $json;
     }
 
     /**
+     * $B?7Ce>pJs$N7o?t$r<hF@$9$k(B
+     *
+     * @return Integer $count $B?7Ce>pJs$N7o?t$rJV$9(B
+     */
+    function lfGetNewsCount() {
+
+        $count = 0;
+
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+        $count = $objQuery->count('dtb_news', "del_flg = '0'");
+
+        return $count;
+    }
+
+    /**
      * $B%(%i!<%a%C%;!<%8$r ＠ 07A$7(B, JSON $B7A<0$GJV$9(B.
      *
      * @param array $arrErr $B%(%i!<%a%C%;!<%8$NG[Ns(B
      * @return string JSON $B7A<0$N%(%i!<%a%C%;!<%8(B
      */
-    function lfGetErrors($arrErr)
-    {
+    function lfGetErrors($arrErr) {
         $messages = '';
         foreach ($arrErr as $val) {
             $messages .= $val . "\n";

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id: LC_Page_FrontParts_Bloc_Best5 - Copy.php -1   $
  */
-class LC_Page_FrontParts_Bloc_Recommend extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_Recommend extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B4pK\>pJs$rEO$9(B
         $objSiteInfo = SC_Helper_DB_Ex::sfGetBasisData();
@@ -81,8 +77,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -91,41 +86,40 @@
      *
      * @return array $arrBestProducts $B8!:w7k2LG[Ns(B
      */
-    function lfGetRanking()
-    {
-        $objRecommend = new SC_Helper_Recommend_Ex();
+    function lfGetRanking() {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objProduct = new SC_Product_Ex();
 
         // $B$*$9$9$a>&IJ<hF@(B
-        $arrRecommends = $objRecommend->getList(RECOMMEND_NUM);
+        $col = 'T1.best_id, T1.category_id, T1.rank, T1.product_id, T1.title, T1.comment, T1.create_date, T1.update_date';
+        $table = 'dtb_best_products as T1 INNER JOIN dtb_products as T2 ON T1.product_id = T2.product_id';
+        $where = 'T1.del_flg = 0 and T2.status = 1';
+        $objQuery->setOrder('T1.rank');
+        $objQuery->setLimit(RECOMMEND_NUM);
+        $arrBestProducts = $objQuery->select($col, $table, $where);
 
-        $response = array();
-        if (count($arrRecommends) > 0) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        if (count($arrBestProducts) > 0) {
             // $B>&IJ0lMw$r<hF@(B
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $objProduct = new SC_Product_Ex();
             // where$B>r7o ＠ 8@.(B&$B%;%C%H(B
             $arrProductId = array();
-            foreach ($arrRecommends as $key => $val) {
+            $where = 'product_id IN (';
+            foreach ($arrBestProducts as $key => $val) {
                 $arrProductId[] = $val['product_id'];
             }
-            $arrProducts = $objProduct->getListByProductIds($objQuery, $arrProductId);
-
-            // $B ＠ G9~6b3[$r ＠ _Dj$9$k(B
-            SC_Product_Ex::setIncTaxToProducts($arrProducts);
-
+            // $B<hF@(B
+            $arrProductList = $objProduct->getListByProductIds($objQuery, $arrProductId);
             // $B$*$9$9$a>&IJ>pJs$K%^!<%8(B
-            foreach ($arrRecommends as $key => $value) {
-                if (isset($arrProducts[$value['product_id']])) {
-                    $product = $arrProducts[$value['product_id']];
-                    if (!NOSTOCK_HIDDEN || ($product['status'] == 1 && ($product['stock_max'] >= 1 || $product['stock_unlimited_max'] == 1))) {
-                        $response[] = array_merge($value, $arrProducts[$value['product_id']]);
-                    }
+            foreach ($arrBestProducts as $key => $value) {
+                $arrRow =& $arrBestProducts[$key];
+                if (isset($arrProductList[$arrRow['product_id']])) {
+                    $arrRow = array_merge($arrRow, $arrProductList[$arrRow['product_id']]);
                 } else {
                     // $B:o=|:Q$_>&IJ$O=|30(B
-                    unset($arrRecommends[$key]);
+                    unset($arrBestProducts[$key]);
                 }
             }
         }
-        return $response;
+        return $arrBestProducts;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_FrontParts_Bloc_SearchProducts.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_FrontParts_Bloc_SearchProducts extends LC_Page_FrontParts_Bloc_Ex 
-{
+class LC_Page_FrontParts_Bloc_SearchProducts extends LC_Page_FrontParts_Bloc_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
     }
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B>&IJ(BID$B<hF@(B
         $product_id = $this -> lfGetProductId();
@@ -89,8 +85,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -99,8 +94,7 @@
      *
      * @return string $product_id $B>&IJ(BID
      */
-    function lfGetProductId()
-    {
+    function lfGetProductId() {
         $product_id = '';
         if (isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id'])) {
             $product_id = $_GET['product_id'];
@@ -113,8 +107,7 @@
      *
      * @return string $category_id $B%+%F%4%j(BID
      */
-    function lfGetCategoryId()
-    {
+    function lfGetCategoryId() {
         $category_id = '';
         if (isset($_GET['category_id']) && $_GET['category_id'] != '' && is_numeric($_GET['category_id'])) {
             $category_id = $_GET['category_id'];
@@ -127,8 +120,7 @@
      *
      * @return string $maker_id $B%a!<%+!<(BID
      */
-    function lfGetMakerId()
-    {
+    function lfGetMakerId() {
         $maker_id = '';
         if (isset($_GET['maker_id']) && $_GET['maker_id'] != '' && is_numeric($_GET['maker_id'])) {
             $maker_id = $_GET['maker_id'];
@@ -141,8 +133,7 @@
      *
      * @return array $arrCategoryId $BA*BrCf$N%+%F%4%j(BID
      */
-    function lfGetSelectedCategoryId($product_id, $category_id)
-    {
+    function lfGetSelectedCategoryId($product_id, $category_id) {
         // $BA*BrCf$N%+%F%4%j(BID$B$rH=Dj$9$k(B
         $objDb = new SC_Helper_DB_Ex();
         $arrCategoryId = $objDb->sfGetCategoryId($product_id, $category_id);
@@ -154,8 +145,7 @@
      *
      * @return array $arrMakerId $BA*BrCf$N%a!<%+!<(BID
      */
-    function lfGetSelectedMakerId($product_id, $maker_id)
-    {
+    function lfGetSelectedMakerId($product_id, $maker_id) {
         // $BA*BrCf$N%a!<%+!<(BID$B$rH=Dj$9$k(B
         $objDb = new SC_Helper_DB_Ex();
         $arrMakerId = $objDb->sfGetMakerId($product_id, $maker_id);
@@ -167,8 +157,7 @@
      *
      * @return array $arrCategoryList $B%+%F%4%j8!:wMQA*Br%j%9%H(B
      */
-    function lfGetCategoryList()
-    {
+    function lfGetCategoryList() {
         $objDb = new SC_Helper_DB_Ex();
         // $B%+%F%4%j8!:wMQA*Br%j%9%H(B
         $arrCategoryList = $objDb->sfGetCategoryList('', true, '$B!!(B');
@@ -187,8 +176,7 @@
      *
      * @return array $arrMakerList $B%a!<%+!<8!:wMQA*Br%j%9%H(B
      */
-    function lfGetMakerList()
-    {
+    function lfGetMakerList() {
         $objDb = new SC_Helper_DB_Ex();
         // $B%a!<%+!<8!:wMQA*Br%j%9%H(B
         $arrMakerList = $objDb->sfGetMakerList('', true);

$BJQ99(B: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide extends LC_Page_Ex 
-{
+class LC_Page_Guide extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_About extends LC_Page_Ex 
-{
+class LC_Page_Guide_About extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     $masterData = new SC_DB_MasterData_Ex();
     $this->arrPref = $masterData->getMasterData('mtb_pref');
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -77,8 +73,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Charge extends LC_Page_Ex 
-{
+class LC_Page_Guide_Charge extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Kiyaku extends LC_Page_Ex 
-{
+class LC_Page_Guide_Kiyaku extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->lfGetKiyaku(intval($_GET['page']), $this);
 
@@ -77,8 +73,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -89,10 +84,10 @@
      * @param object &$objPage $B%Z!<%8%*%V%8%'%/%H(B
      * @return void
      */
-    function lfGetKiyaku($index, &$objPage)
-    {
-        $objKiyaku = new SC_Helper_Kiyaku_Ex();
-        $arrKiyaku = $objKiyaku->getList();
+    function lfGetKiyaku($index, &$objPage) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery->setOrder('rank DESC');
+        $arrKiyaku = $objQuery->select('kiyaku_title, kiyaku_text', 'dtb_kiyaku', 'del_flg <> 1');
 
         $number = count($arrKiyaku);
         if ($number > 0) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Privacy extends LC_Page_Ex 
-{
+class LC_Page_Guide_Privacy extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Usage extends LC_Page_Ex 
-{
+class LC_Page_Guide_Usage extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_AbstractMypage extends LC_Page_Ex 
-{
+class LC_Page_AbstractMypage extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         // mypage $B6&DL(B
         $this->tpl_title        = 'MY$B%Z!<%8(B';
@@ -56,8 +54,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
 
         parent::process();
         // $B%m%0%$%s%A%'%C%/(B
@@ -105,8 +102,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_MyPage extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_MyPage extends LC_Page_AbstractMypage_Ex {
 
     // {{{ properties
 
@@ -47,8 +46,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mypageno = 'index';
         if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) {
@@ -67,8 +65,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -77,8 +74,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
         $customer_id = $objCustomer->getvalue('customer_id');
@@ -103,12 +99,9 @@
                 break;
         }
         // $B;YJ'$$J}K!$N<hF@(B
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         // 1$B%Z!<%8$"$?$j$N7o?t(B
         $this->dispNumber = SEARCH_PMAX;
-        
-        $this->json_payment = SC_Utils::jsonEncode($this->arrPayment);
-        $this->json_customer_order_status = SC_Utils::jsonEncode($this->arrCustomerOrderStatus);
     }
 
     /**
@@ -116,8 +109,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -129,8 +121,7 @@
      * @access private
      * @return void
      */
-    function lfGetOrderHistory($customer_id, $startno = -1)
-    {
+    function lfGetOrderHistory($customer_id, $startno = -1) {
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
         $col        = 'order_id, create_date, payment_id, payment_total, status';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Change extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Change extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '$B2q0wEPO?FbMFJQ99(B($BF~NO%Z!<%8(B)';
         $this->tpl_mypageno = 'change';
@@ -68,8 +66,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -77,8 +74,7 @@
      * Page $B$N%W%m%;%9(B
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
         $customer_id = $objCustomer->getValue('customer_id');
@@ -169,8 +165,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -182,8 +177,7 @@
      * @access private
      * @return void
      */
-    function lfRegistCustomerData(&$objFormParam, $customer_id)
-    {
+    function lfRegistCustomerData(&$objFormParam, $customer_id) {
         $arrRet             = $objFormParam->getHashArray();
         $sqlval             = $objFormParam->getDbArray();
         $sqlval['birth']    = SC_Utils_Ex::sfGetTimestamp($arrRet['year'], $arrRet['month'], $arrRet['day']);
@@ -197,8 +191,7 @@
      * @param array $arrRequest $B%j%/%(%9%HCM(B($_GET)
      * @return array $arrErr $B%(%i!<%a%C%;!<%8G[Ns(B
      */
-    function lfCheckError($arrRequest)
-    {
+    function lfCheckError($arrRequest) {
         // $B%Q%i%a!<%?!<4IM}%/%i%9(B
         $objFormParam = new SC_FormParam_Ex();
         // $B%Q%i%a!<%?!<>pJs$N=i4|2=(B
@@ -210,7 +203,29 @@
         $objFormParam->setParam($arrData);
         // $B%(%i!<%A%'%C%/(B
         $arrErr = $objFormParam->checkError();
+        // $B?F%&%#%s%I%&$NLa$jCM$r3JG<$9$k(Binput$B%?%0$N(Bname$B$N%(%i!<%A%'%C%/(B
+        if (!$this->lfInputNameCheck($addData['zip01'])) {
+            $arrErr['zip01'] = '$B"((B $BF~NO7A<0$,IT ＠ 5$G$9!#(B<br />';
+        }
+        if (!$this->lfInputNameCheck($arrdata['zip02'])) {
+            $arrErr['zip02'] = '$B"((B $BF~NO7A<0$,IT ＠ 5$G$9!#(B<br />';
+        }
 
         return $arrErr;
     }
+
+    /**
+     * $B%(%i!<%A%'%C%/(B.
+     *
+     * @param string $value
+     * @return $B%(%i!<$J$7!'(Btrue $B%(%i!<!'(Bfalse
+     */
+    function lfInputNameCheck($value) {
+        // $BH>3Q1Q?t;z$H(B_$B!J%"%s%@!<%P!<!K(B, []$B0J30$NJ8;z$r;HMQ$7$F$$$?$i%(%i!<(B
+        if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
+            return false;
+        }
+
+        return true;
+    }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_ChangeComplete extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_ChangeComplete extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '$B2q0wEPO?FbMFJQ99(B($B40N;%Z!<%8(B)';
         $this->tpl_mypageno = 'change';
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Delivery extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Delivery extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '$B$*FO$1 ＠ hDI2C!&JQ99(B';
         $this->tpl_mypageno = 'delivery';
@@ -57,8 +55,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -67,8 +64,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer    = new SC_Customer_Ex();
         $customer_id    = $objCustomer->getValue('customer_id');
@@ -88,7 +84,7 @@
                     SC_Response_Ex::actionExit();
                 }
 
-                $objAddress->deleteAddress($objFormParam->getValue('other_deliv_id'));
+                $objAddress->delete($objFormParam->getValue('other_deliv_id'));
                 break;
 
             // $B%9%^!<%H%U%)%sHG$N$b$C$H8+$k%\%?%sMQ(B
@@ -128,8 +124,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -138,8 +133,7 @@
      *
      * @return SC_FormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B$*FO$1 ＠ h(BID', 'other_deliv_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B8=:_%Z!<%8(B', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
     }
@@ -151,8 +145,7 @@
      * @param array $arrPref
      * return array
      */
-    function setPref($arrOtherDeliv, $arrPref)
-    {
+    function setPref($arrOtherDeliv, $arrPref) {
         if (is_array($arrOtherDeliv)) {
             foreach ($arrOtherDeliv as $key => $arrDeliv) {
                 $arrOtherDeliv[$key]['prefname'] = $arrPref[$arrDeliv['pref']];

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_DeliveryAddr extends LC_Page_Ex 
-{
+class LC_Page_Mypage_DeliveryAddr extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title    = '$B$*FO$1 ＠ h$NDI2C!&JQ99(B';
         $masterData         = new SC_DB_MasterData_Ex();
@@ -59,8 +57,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -71,8 +68,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
         $objAddress  = new SC_Helper_Address_Ex();
@@ -139,7 +135,7 @@
             default :
 
                 if ($_GET['other_deliv_id'] != '') {
-                    $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id']);
+                    $arrOtherDeliv = $objAddress->get($_SESSION['other_deliv_id']);
 
                     //$BIT ＠ 5%"%/%;%9H=Dj(B
                     if (!$objCustomer->isLoginSuccess(true) || !$arrOtherDeliv) {
@@ -165,25 +161,22 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $BEPO?<B9T(B */
-    function lfRegistData($objAddress, $objFormParam, $customer_id)
-    {
+    function lfRegistData($objAddress, $objFormParam, $customer_id) {
         $arrRet     = $objFormParam->getHashArray();
         $sqlval     = $objFormParam->getDbArray();
 
         $sqlval['other_deliv_id'] = $arrRet['other_deliv_id'];
         $sqlval['customer_id'] = $customer_id;
 
-        $objAddress->registAddress($sqlval);
+        $objAddress->save($sqlval);
     }
 
-    function lfRegistDataNonMember($objFormParam)
-    {
+    function lfRegistDataNonMember($objFormParam) {
         $arrRegistColumn = $objFormParam->getDbArray();
         foreach ($arrRegistColumn as $key => $val) {
             $arrRegist['shipping_' . $key ] = $val;

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @author CUORE CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_DownLoad extends LC_Page_Ex 
-{
+class LC_Page_Mypage_DownLoad extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -56,8 +55,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->allowClientCache();
     }
@@ -67,8 +65,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         ob_end_clean();
         parent::process();
         $this->action();
@@ -80,8 +77,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%m%0%$%s%A%'%C%/(B
         $objCustomer = new SC_Customer_Ex();
@@ -108,8 +104,7 @@
      * todo $B$?$$$7$?=hM}$G$J$$$N$K0[>o$K=hM}$,=E$$(B
      * @return void
      */
-    function sendResponse()
-    {
+    function sendResponse() {
         // TODO sendResponse$B$r%*!<%P!<%i%$%I$7$F$$$k0Y!"(Bafter$B%U%C%/%]%$%s%H$,<B9T$5$l$J$$(B.$BD>@\<B9T$9$k(B.(#1790)
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         $objPlugin->doAction('LC_Page_Mypage_DownLoad_action_after', array($this));
@@ -169,8 +164,7 @@
      * @param integer $product_class_id $B>&IJ5,3J(BID
      * @return array $B>&IJ>pJs$NG[Ns(B
      */
-    function lfGetRealFileName($customer_id, $order_id, $product_id, $product_class_id)
-    {
+    function lfGetRealFileName($customer_id, $order_id, $product_id, $product_class_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = <<< __EOS__
             pc.product_id AS product_id,
@@ -199,8 +193,7 @@
     }
 
     /* $B%Q%i%a!<%?!<>pJs$N=i4|2=(B */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('customer_id', 'customer_id', INT_LEN, 'n', array('EXIST_CHECK','NUM_CHECK'));
         $objFormParam->addParam('order_id', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('product_id', 'product_id', INT_LEN, 'n', array('EXIST_CHECK','NUM_CHECK'));
@@ -208,8 +201,7 @@
     }
 
     /* $BF~NOFbMF$N%A%'%C%/(B */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
         $objErr->arrErr = $objFormParam->checkError();
         return $objErr->arrErr;
@@ -221,8 +213,7 @@
      * @param string $realpath $B%@%&%s%m!<%I%U%!%$%k%Q%9(B
      * @param string $sdown_filename $B%@%&%s%m!<%I;~$N;XDj%U%!%$%kL>(B
      */
-    function lfMobileHeader($realpath,$sdown_filename)
-    {
+    function lfMobileHeader($realpath,$sdown_filename) {
         $objHelperMobile = new SC_Helper_Mobile_Ex();
         //$B%U%!%$%k$N3HD%;R$+$i%3%s%F%s%D%?%$%W$r<hF@$9$k(B
         $mime_type = $objHelperMobile->getMIMEType($realpath);
@@ -239,8 +230,7 @@
      * @param string $realpath $B%@%&%s%m!<%I%U%!%$%k%Q%9(B
      * @param string $sdown_filename $B%@%&%s%m!<%I;~$N;XDj%U%!%$%kL>(B
      */
-    function lfMobileAuDownload($realpath,$sdown_filename)
-    {
+    function lfMobileAuDownload($realpath,$sdown_filename) {
         //$B%b%P%$%kMQ%X%C%@!<=PNO(B
         $this->lfMobileHeader($realpath,$sdown_filename);
         //$B%U%!%$%k%5%$%:$r<hF@$9$k(B
@@ -262,7 +252,8 @@
             header('Content-Length: ' . $content_length);
         }
         echo fread($fp, $content_length) ;
-        SC_Utils_Ex::sfFlush();
+        ob_flush();
+        flush();
     }
 
     /**
@@ -271,8 +262,7 @@
      * @param string $realpath $B%@%&%s%m!<%I%U%!%$%k%Q%9(B
      * @param string $sdown_filename $B%@%&%s%m!<%I;~$N;XDj%U%!%$%kL>(B
      */
-    function lfMobileDownload($realpath,$sdown_filename)
-    {
+    function lfMobileDownload($realpath,$sdown_filename) {
         //$B%b%P%$%kMQ%X%C%@!<=PNO(B
         $this->lfMobileHeader($realpath,$sdown_filename);
         //$B%U%!%$%k%5%$%:$r<hF@$9$k(B
@@ -315,8 +305,8 @@
             while (!feof($realpath) && (!connection_aborted()) && ($bytes_send<$new_length)) {
                 $buffer = fread($realpath, $chunksize);
                 print($buffer);
-                SC_Utils_Ex::sfFlush();
-                SC_Utils_Ex::extendTimeOut();
+                ob_flush();
+                flush();
                 $bytes_send += strlen($buffer);
             }
             fclose($realpath);
@@ -330,8 +320,7 @@
      * @param string $realpath $B%@%&%s%m!<%I%U%!%$%k%Q%9(B
      * @param string $sdown_filename $B%@%&%s%m!<%I;~$N;XDj%U%!%$%kL>(B
      */
-    function lfDownload($realpath,$sdown_filename)
-    {
+    function lfDownload($realpath,$sdown_filename) {
         // $B3HD%;R$r<hF@(B
         $extension = pathinfo($realpath, PATHINFO_EXTENSION);
         $contentType = $this->defaultContentType;
@@ -372,8 +361,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_MyPage_Favorite extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_MyPage_Favorite extends LC_Page_AbstractMypage_Ex {
 
     // {{{ properties
 
@@ -47,8 +46,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '$B$*5$$KF~$j0lMw(B';
         $this->tpl_mypageno = 'favorite';
@@ -59,8 +57,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -69,10 +66,10 @@
      *
      * @return void
      */
-    function action()
-    {
-        $objCustomer = new SC_Customer_Ex();
+    function action() {
 
+        $objProduct  = new SC_Product_Ex();
+        $objCustomer = new SC_Customer_Ex();
         $customer_id = $objCustomer->getValue('customer_id');
 
         switch ($this->getMode()) {
@@ -80,7 +77,6 @@
                 // $B$*5$$KF~$j:o=|(B
                 $this->lfDeleteFavoriteProduct($customer_id, intval($_POST['product_id']));
                 break;
-
             case 'getList':
                 // $B%9%^!<%H%U%)%sHG$N$b$C$H8+$k%\%?%sMQ(B
                 // $B%Z!<%8Aw$jMQ(B
@@ -88,14 +84,12 @@
                     $this->tpl_pageno = intval($_POST['pageno']);
                 }
                 $this->arrFavorite = $this->lfGetFavoriteProduct($customer_id, $this);
-                SC_Product_Ex::setPriceTaxTo($this->arrFavorite);
+                $this->arrFavorite = $objProduct->setPriceTaxTo($this->arrFavorite);
 
+
                 echo SC_Utils_Ex::jsonEncode($this->arrFavorite);
                 SC_Response_Ex::actionExit();
                 break;
-
-            default:
-                break;
         }
 
         // $B%Z!<%8Aw$jMQ(B
@@ -114,8 +108,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -127,17 +120,16 @@
      * @access private
      * @return array $B$*5$$KF~$j>&IJ0lMw(B
      */
-    function lfGetFavoriteProduct($customer_id, &$objPage)
-    {
+    function lfGetFavoriteProduct($customer_id, &$objPage) {
         $objQuery       = SC_Query_Ex::getSingletonInstance();
         $objProduct     = new SC_Product_Ex();
 
-        $objQuery->setOrder('f.create_date DESC');
-        $where = 'f.customer_id = ? and p.status = 1';
+        $objQuery->setOrder('create_date DESC');
+        $where = 'customer_id = ?';
         if (NOSTOCK_HIDDEN) {
             $where .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = dtb_customer_favorite_products.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
         }
-        $arrProductId  = $objQuery->getCol('f.product_id', 'dtb_customer_favorite_products f inner join dtb_products p using (product_id)', $where, array($customer_id));
+        $arrProductId  = $objQuery->getCol('product_id', 'dtb_customer_favorite_products', $where, array($customer_id));
 
         $objQuery       =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setWhere($this->lfMakeWhere('alldtl.', $arrProductId));
@@ -177,8 +169,7 @@
     }
 
     /* $B;EJ}$,$J$$=hM}!#!#(B */
-    function lfMakeWhere($tablename, $arrProductId)
-    {
+    function lfMakeWhere($tablename, $arrProductId) {
 
         // $B<hF@$7$?I=<($9$Y$-(BID$B$@$1$r;XDj$7$F>pJs$r<hF@!#(B
         $where = '';
@@ -192,8 +183,7 @@
     }
 
     // $B$*5$$KF~$j>&IJ:o=|(B
-    function lfDeleteFavoriteProduct($customer_id, $product_id)
-    {
+    function lfDeleteFavoriteProduct($customer_id, $product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $exists = $objQuery->exists('dtb_customer_favorite_products', 'customer_id = ? AND product_id = ?', array($customer_id, $product_id));

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_History extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_History extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mypageno     = 'index';
         $this->tpl_subtitle     = '$B9XF~MzNr>\:Y(B';
@@ -61,8 +59,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -71,20 +68,17 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer    = new SC_Customer_Ex();
         $objDb          = new SC_Helper_DB_Ex();
         $objPurchase = new SC_Helper_Purchase_Ex();
-        $objProduct  = new SC_Product();
 
         if (!SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
             SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
         }
 
-        $order_id               = $_GET['order_id'];
-        $this->is_price_change  = false;
+        $order_id        = $_GET['order_id'];
 
         //$B<uCm%G!<%?$N<hF@(B
         $this->tpl_arrOrderData = $objPurchase->getOrder($order_id, $objCustomer->getValue('customer_id'));
@@ -97,18 +91,9 @@
 
         $this->isMultiple       = count($this->arrShipping) > 1;
         // $B;YJ'$$J}K!$N<hF@(B
-        $this->arrPayment       = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment       = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
         // $B<uCm>&IJL@:Y$N<hF@(B
         $this->tpl_arrOrderDetail = $objPurchase->getOrderDetail($order_id);
-        foreach ($this->tpl_arrOrderDetail as $product_index => $arrOrderProductDetail) {
-            //$BI,MW$J$N$O>&IJ$NHNGd6b3[$N$_$J$N$G!"CY$$>l9g$O!"JLES(BSQL$B:n ＠ .$7$?J}$,NI$$(B
-            $arrTempProductDetail = $objProduct->getProductsClass($arrOrderProductDetail['product_class_id']); 
-            if($this->tpl_arrOrderDetail[$product_index]['price'] != $arrTempProductDetail['price02']) {
-                $this->is_price_change = true;
-            }
-            $this->tpl_arrOrderDetail[$product_index]['product_price'] = ($arrTempProductDetail['price02'])?$arrTempProductDetail['price02']:0;
-        }
-        
         $this->tpl_arrOrderDetail = $this->setMainListImage($this->tpl_arrOrderDetail);
         $objPurchase->setDownloadableFlgTo($this->tpl_arrOrderDetail);
         // $B%b%P%$%k%@%&%s%m!<%IBP1~=hM}(B
@@ -124,8 +109,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -135,8 +119,7 @@
      * @param integer $order_id $BCmJ8HV9f(B
      * @return array $B<uCm%a!<%kAw?.MzNr$NFbMF(B
      */
-    function lfGetMailHistory($order_id)
-    {
+    function lfGetMailHistory($order_id) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $col        = 'send_date, subject, template_id, send_id';
         $where      = 'order_id = ?';
@@ -152,8 +135,7 @@
      * @param $arrWDAY array $BMKF|%G!<%?$NG[Ns(B
      * @return array $B$*FO$1 ＠ h>pJs(B
      */
-    function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY)
-    {
+    function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY) {
         $arrShipping = $objPurchase->getShippings($order_id);
 
         foreach ($arrShipping as $shipping_index => $shippingData) {
@@ -175,8 +157,7 @@
      * @param $arrOrderDetail $B9XF~MzNr$NG[Ns(B
      * @return array $B2hA|$r%;%C%H$7$?9XF~MzNr$NG[Ns(B
      */
-    function setMainListImage($arrOrderDetails)
-    {
+    function setMainListImage($arrOrderDetails) {
         $i = 0;
         foreach ($arrOrderDetails as $arrOrderDetail) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -193,8 +174,7 @@
      * @param $arrOrderDetail $B9XF~MzNr$NG[Ns(B
      * @return array MIMETYPE$B!"%U%!%$%kL>$r%;%C%H$7$?9XF~MzNr$NG[Ns(B
      */
-    function lfSetMimetype($arrOrderDetails)
-    {
+    function lfSetMimetype($arrOrderDetails) {
         $objHelperMobile = new SC_Helper_Mobile_Ex();
         $i = 0;
         foreach ($arrOrderDetails as $arrOrderDetail) {
@@ -215,8 +195,7 @@
      * @param integer $order_id $BCmJ8HV9f(B
      * @param $arrOrderDetail $B9XF~MzNr$NG[Ns(B
      */
-    function lfSetAU($arrOrderDetails)
-    {
+    function lfSetAU($arrOrderDetails) {
         $this->isAU = false;
         // $B%b%P%$%kC<Kv$+$D!"%-%c%j%"$,(BAU$B$N>l9g$K=hM}$r9T$&(B
         if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE && SC_MobileUserAgent::getCarrier() == 'ezweb') {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Login extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Login extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->httpCacheControl('nocache');
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
         SC_Response_Ex::sendRedirect(DIR_INDEX_PATH);
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_MailView extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_MailView extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->httpCacheControl('nocache');
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCustomer = new SC_Customer_Ex();
         if (!SC_Utils_Ex::sfIsInt($_GET['send_id'])) {
@@ -104,8 +100,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -117,8 +112,7 @@
      * @access private
      * @return array
      */
-    function lfGetMailView($send_id, $customer_id)
-    {
+    function lfGetMailView($send_id, $customer_id) {
         $objQuery   = SC_Query_Ex::getSingletonInstance();
         $col        = 'subject, mail_body';
         $where      = 'send_id = ? AND customer_id = ?';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Order extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Order extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -62,8 +59,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         //$B<uCm>\:Y%G!<%?$N<hF@(B
         $arrOrderDetail = $this->lfGetOrderDetail($_POST['order_id']);
@@ -84,14 +80,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     // $B<uCm>\:Y%G!<%?$N<hF@(B
-    function lfGetOrderDetail($order_id)
-    {
+    function lfGetOrderDetail($order_id) {
         $objQuery       = SC_Query_Ex::getSingletonInstance();
 
         $objCustomer    = new SC_Customer_Ex();
@@ -109,8 +103,7 @@
     }
 
     // $B>&IJ$r%+!<%H$KDI2C(B
-    function lfAddCartProducts($arrOrderDetail)
-    {
+    function lfAddCartProducts($arrOrderDetail) {
 
         $objCartSess = new SC_CartSession_Ex();
         foreach ($arrOrderDetail as $order_row) {

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Refusal extends LC_Page_AbstractMypage_Ex 
-{
+class LC_Page_Mypage_Refusal extends LC_Page_AbstractMypage_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_subtitle = '$BB`2q<jB3$-(B($BF~NO%Z!<%8(B)';
         $this->tpl_mypageno = 'refusal';
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
             case 'confirm':
@@ -92,8 +88,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -103,9 +98,13 @@
      * @access private
      * @return void
      */
-    function lfDeleteCustomer($customer_id)
-    {
-        return SC_Helper_Customer_Ex::delete($customer_id);
+    function lfDeleteCustomer($customer_id) {
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+
+        $sqlval['del_flg']      = 1;
+        $sqlval['update_date']  = 'CURRENT_TIMESTAMP';
+        $where                  = 'customer_id = ?';
+        $objQuery->update('dtb_customer', $sqlval, $where, array($customer_id));
     }
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_RefusalComplete extends LC_Page_Ex 
-{
+class LC_Page_Mypage_RefusalComplete extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title    = 'MY$B%Z!<%8(B';
 
@@ -62,8 +60,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -74,8 +71,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -85,8 +81,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Order extends LC_Page_Ex 
-{
+class LC_Page_Order extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_page_category = 'order';
         $this->tpl_title = '$BFCDj>&<h0z$K4X$9$kK!N'$K4p$E$/I=5-(B';
@@ -56,8 +54,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
         $this->arrOrder = $objDb->sfGetBasisData();
@@ -82,8 +78,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Preview extends LC_Page_Ex 
-{
+class LC_Page_Preview extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
 
         $objView = new SC_SiteView_Ex();
@@ -80,8 +77,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_CategoryList extends LC_Page_Ex 
-{
+class LC_Page_Products_CategoryList extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -63,8 +60,7 @@
      * Page $B$N(BAction
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         // $B%+%F%4%j(BID$B$N ＠ 5Ev@-%A%'%C%/(B
         $this->lfCheckCategoryId();
@@ -84,14 +80,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B%+%F%4%j(BID$B$N ＠ 5Ev@-%A%'%C%/(B */
-    function lfCheckCategoryId($category_id)
-    {
+    function lfCheckCategoryId($category_id) {
         if ($category_id && !SC_Helper_DB_Ex::sfIsRecord('dtb_category', 'category_id', (array)$category_id, 'del_flg = 0')) {
             return 0;
         }
@@ -107,8 +101,7 @@
      * @param object &$objPage $B%Z!<%8%*%V%8%'%/%H(B
      * @return void
      */
-    function lfGetCategories($category_id, $count_check = false, &$objPage)
-    {
+    function lfGetCategories($category_id, $count_check = false, &$objPage) {
         // $B%+%F%4%j$N ＠ 5$7$$(BID$B$r<hF@$9$k!#(B
         $category_id = $this->lfCheckCategoryId($category_id);
         if ($category_id == 0) {
@@ -162,8 +155,7 @@
      *
      * @return object
      */
-    function lfInitParam($arrRequest)
-    {
+    function lfInitParam($arrRequest) {
         $objFormParam = new SC_FormParam_Ex();
         $objFormParam->addParam('$B%+%F%4%j(BID', 'category_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
         // $BCM$N<hF@(B

$BJQ99(B: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,8 +34,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Products_Detail.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Products_Detail extends LC_Page_Ex 
-{
+class LC_Page_Products_Detail extends LC_Page_Ex {
 
     /** $B>&IJ%9%F!<%?%9(B */
     var $arrSTATUS;
@@ -66,8 +65,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrSTATUS = $masterData->getMasterData('mtb_status');
@@ -81,8 +79,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -93,8 +90,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
         // $B2q0w%/%i%9(B
         $objCustomer = new SC_Customer_Ex();
 
@@ -139,8 +135,7 @@
         }
 
         $this->tpl_javascript .= 'classCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories[$product_id]) . ';';
-        $this->tpl_javascript .= 'function lnOnLoad()
-        {' . $this->js_lnOnload . '}';
+        $this->tpl_javascript .= 'function lnOnLoad(){' . $this->js_lnOnload . '}';
         $this->tpl_onload .= 'lnOnLoad();';
 
         // $B%b%P%$%kMQ(B $B5,3JA*Br%;%l%/%H%\%C%/%9$N:n ＠ .(B
@@ -241,14 +236,12 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /* $B%W%m%@%/%H(BID$B$N ＠ 5Ev@-%A%'%C%/(B */
-    function lfCheckProductId($admin_mode,$product_id)
-    {
+    function lfCheckProductId($admin_mode,$product_id) {
         // $B4IM}5!G=$+$i$N3NG'$N>l9g$O!"Hs8x3+$N>&IJ$bI=<($9$k!#(B
         if (isset($admin_mode) && $admin_mode == 'on') {
             SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
@@ -269,8 +262,7 @@
     }
 
     /* $B%U%!%$%k>pJs$N=i4|2=(B */
-    function lfInitFile($objUpFile)
-    {
+    function lfInitFile($objUpFile) {
         $objUpFile->addFile('$B>\:Y(B-$B%a%$%s2hA|(B', 'main_image', array('jpg'), IMAGE_SIZE);
         for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) {
             $objUpFile->addFile("$B>\:Y(B-$B%5%V2hA|(B$cnt", "sub_image$cnt", array('jpg'), IMAGE_SIZE);
@@ -279,8 +271,7 @@
     }
 
     /* $B5,3JA*Br%;%l%/%H%\%C%/%9$N:n ＠ .(B */
-    function lfMakeSelect()
-    {
+    function lfMakeSelect() {
         return 'fnSetClassCategories('
             . 'document.form1, '
             . SC_Utils_Ex::jsonEncode($this->objFormParam->getValue('classcategory_id2'))
@@ -288,8 +279,7 @@
     }
 
     /* $B5,3JA*Br%;%l%/%H%\%C%/%9$N:n ＠ .(B($B%b%P%$%k(B) */
-    function lfMakeSelectMobile(&$objPage, $product_id,$request_classcategory_id1)
-    {
+    function lfMakeSelectMobile(&$objPage, $product_id,$request_classcategory_id1) {
 
         $classcat_find1 = false;
         $classcat_find2 = false;
@@ -352,8 +342,7 @@
     }
 
     /* $B%Q%i%a!<%?!<>pJs$N=i4|2=(B */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B5,3J(B1', 'classcategory_id1', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B5,3J(B2', 'classcategory_id2', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B?tNL(B', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -370,15 +359,13 @@
     }
 
     /* $B>&IJ5,3J>pJs$N<hF@(B */
-    function lfGetProductsClass($product_id)
-    {
+    function lfGetProductsClass($product_id) {
         $objProduct = new SC_Product_Ex();
         return $objProduct->getProductsClassFullByProductId($product_id);
     }
 
     /* $BEPO?:Q$_4XO">&IJ$NFI$_9~$_(B */
-    function lfPreGetRecommendProducts($product_id)
-    {
+    function lfPreGetRecommendProducts($product_id) {
         $objProduct = new SC_Product_Ex();
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -402,8 +389,7 @@
     }
 
     /* $BF~NOFbMF$N%A%'%C%/(B */
-    function lfCheckError($mode,&$objFormParam,$tpl_classcat_find1 = null ,$tpl_classcat_find2 = null)
-    {
+    function lfCheckError($mode,&$objFormParam,$tpl_classcat_find1 = null ,$tpl_classcat_find2 = null) {
 
         switch ($mode) {
         case 'add_favorite_sphone':
@@ -435,8 +421,7 @@
     }
 
     //$B>&IJ$4$H$N%l%S%e!<>pJs$r<hF@$9$k(B
-    function lfGetReviewData($id)
-    {
+    function lfGetReviewData($id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //$B>&IJ$4$H$N%l%S%e!<>pJs$r<hF@$9$k(B
         $col = 'create_date, reviewer_url, reviewer_name, recommend_level, title, comment';
@@ -453,8 +438,7 @@
      * $B%U%!%$%k$N>pJs$r%;%C%H$9$k(B
      * @return $subImageFlag
      */
-    function lfSetFile($objUpFile,$arrProduct,&$arrFile)
-    {
+    function lfSetFile($objUpFile,$arrProduct,&$arrFile) {
         // DB$B$+$i$N%G!<%?$r0z$-7Q$0(B
         $objUpFile->setDBFileList($arrProduct);
         // $B%U%!%$%kI=<(MQG[Ns$rEO$9(B
@@ -474,8 +458,7 @@
      * $B$*5$$KF~$j>&IJEPO?(B
      * @return void
      */
-    function lfRegistFavoriteProduct($favorite_product_id,$customer_id)
-    {
+    function lfRegistFavoriteProduct($favorite_product_id,$customer_id) {
         // $B%m%0%$%sCf$N%f!<%6$,>&IJ$r$*5$$KF~$j$K$$$l$k=hM}(B
         if (!SC_Helper_DB_Ex::sfIsRecord('dtb_products', 'product_id', $favorite_product_id, 'del_flg = 0 AND status = 1')) {
             SC_Utils_Ex::sfDispSiteError(PRODUCT_NOT_FOUND);
@@ -505,8 +488,7 @@
      * 
      * @return void 
      */
-    function doCart()
-    {
+    function doCart() {
         $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,
                                             $this->tpl_classcat_find1,
                                             $this->tpl_classcat_find2);
@@ -516,12 +498,8 @@
 
             $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity'));
 
-            // $B3+$$$F$$$k%+%F%4%j!<%D%j!<$r0];}$9$k$?$a$N%Q%i%a!<%?!<(B
-            $arrQueryString = array(
-                'product_id' => $this->objFormParam->getValue('product_id'),
-            );
 
-            SC_Response_Ex::sendRedirect(CART_URLPATH, $arrQueryString);
+            SC_Response_Ex::sendRedirect(CART_URLPATH);
             SC_Response_Ex::actionExit();
         }
     }
@@ -532,8 +510,7 @@
      * @param type $objCustomer 
      * @return void
      */
-    function doAddFavorite(&$objCustomer)
-    {
+    function doAddFavorite(&$objCustomer) {
         // $B%m%0%$%sCf$N%f!<%6$,>&IJ$r$*5$$KF~$j$K$$$l$k=hM}(B
         if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0) {
             $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam);
@@ -555,8 +532,7 @@
      * @param type $objCustomer 
      * @return void
      */
-    function doAddFavoriteSphone($objCustomer)
-    {
+    function doAddFavoriteSphone($objCustomer) {
         // $B%m%0%$%sCf$N%f!<%6$,>&IJ$r$*5$$KF~$j$K$$$l$k=hM}(B($B%9%^!<%H%U%)%sMQ(B)
         if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0) {
             $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam);
@@ -580,8 +556,7 @@
      * 
      * @return void 
      */
-    function doDefault()
-    {
+    function doDefault() {
         // $B%+!<%H!VLa$k%\%?%s!WMQ$KJ];}(B
         $netURL = new Net_URL();
         $_SESSION['cart_referer_url'] = $netURL->getURL();
@@ -591,8 +566,7 @@
      * 
      * @return void
      */
-    function doMobileSelect()
-    {
+    function doMobileSelect() {
         // $B5,3J(B1$B$, ＠ _Dj$5$l$F$$$k>l9g(B
         if ($this->tpl_classcat_find1) {
             // template$B$NJQ99(B
@@ -608,8 +582,7 @@
      *
      * @return type 
      */
-    function doMobileSelect2()
-    {
+    function doMobileSelect2() {
         $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,$this->tpl_classcat_find1,$this->tpl_classcat_find2);
 
         // $B5,3J(B1$B$, ＠ _Dj$5$l$F$$$F!"%(%i!<$r8!=P$7$?>l9g(B
@@ -634,8 +607,7 @@
      * 
      * @return void
      */
-    function doMobileSelectItem()
-    {
+    function doMobileSelectItem() {
         $objProduct = new SC_Product_Ex();
 
         $this->arrErr = $this->lfCheckError($this->mode, $this->objFormParam, $this->tpl_classcat_find1, $this->tpl_classcat_find2);
@@ -677,8 +649,7 @@
      *
      * @return void 
      */
-    function doMobileCart()
-    {
+    function doMobileCart() {
         // $B$3$NCJ3,$G%(%i!<$,=P$k>l9g$O!"?tNL$NF~NO%(%i!<$N$O$:(B
         if (count($this->arrErr)) {
             // $B?tNL$NF~NO$r9T$&(B
@@ -690,8 +661,7 @@
      *
      * @return void 
      */
-    function doMobileDefault()
-    {
+    function doMobileDefault() {
         $this->tpl_mainpage = 'products/detail.tpl';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_List extends LC_Page_Ex 
-{
+class LC_Page_Products_List extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -68,8 +67,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $masterData                 = new SC_DB_MasterData_Ex();
@@ -84,8 +82,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -96,8 +93,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objProduct = new SC_Product_Ex();
 
@@ -146,7 +142,9 @@
                 break;
         }
 
-        $this->tpl_rnd = SC_Utils_Ex::sfGetRandomString(3);
+        $this->tpl_rnd          = SC_Utils_Ex::sfGetRandomString(3);
+
+
     }
 
     /**
@@ -154,8 +152,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -164,8 +161,7 @@
      *
      * @return integer $B%+%F%4%j(BID
      */
-    function lfGetCategoryId($category_id)
-    {
+    function lfGetCategoryId($category_id) {
 
         // $B;XDj$J$7$N>l9g!"(B0 $B$rJV$9(B
         if (empty($category_id)) return 0;
@@ -189,8 +185,7 @@
     }
 
     /* $B>&IJ0lMw$NI=<((B */
-    function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct)
-    {
+    function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct) {
 
         $arrOrderVal = array();
 
@@ -228,7 +223,7 @@
                     ) DESC
                     ,product_id DESC
 __EOS__;
-                $objQuery->setOrder($order);
+                    $objQuery->setOrder($order);
                 break;
         }
         // $B<hF ＠ HO0O$N;XDj(B($B3+;O9THV9f!"9T?t$N%;%C%H(B)
@@ -248,8 +243,7 @@
     }
 
     /* $BF~NOFbMF$N%A%'%C%/(B */
-    function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2)
-    {
+    function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2) {
 
         // $BF~NO%G!<%?$rEO$9!#(B
         $objErr = new SC_CheckError_Ex($arrForm);
@@ -273,8 +267,7 @@
      *
      * @return void
      */
-    function lfGetDisplayNum($display_number)
-    {
+    function lfGetDisplayNum($display_number) {
         // $BI=<(7o?t(B
         return (SC_Utils_Ex::sfIsInt($display_number))
             ? $display_number
@@ -286,16 +279,14 @@
      *
      * @return str
      */
-    function lfGetPageTitle($mode, $category_id = 0)
-    {
+    function lfGetPageTitle($mode, $category_id = 0) {
         if ($mode == 'search') {
             return '$B8!:w7k2L(B';
         } elseif ($category_id == 0) {
             return '$BA4>&IJ(B';
         } else {
-            $objCategory = new SC_Helper_Category_Ex();
-            $arrCat = $objCategory->get($category_id);
-            return $arrCat['category_name'];
+            $arrCat = SC_Helper_DB_Ex::sfGetCat($category_id);
+            return $arrCat['name'];
         }
     }
 
@@ -304,8 +295,7 @@
      *
      * @return array
      */
-    function lfGetSearchConditionDisp($arrSearchData)
-    {
+    function lfGetSearchConditionDisp($arrSearchData) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $arrSearch  = array('category' => '$B;XDj$J$7(B', 'maker' => '$B;XDj$J$7(B', 'name' => '$B;XDj$J$7(B');
         // $B%+%F%4%j8!:w>r7o(B
@@ -315,9 +305,7 @@
 
         // $B%a!<%+!<8!:w>r7o(B
         if (strlen($arrSearchData['maker_id']) > 0) {
-            $objMaker = new SC_Helper_Maker_Ex();
-            $maker = $objMaker->get($arrSearchData['maker_id']);
-            $arrSearch['maker']     = $maker['name'];
+            $arrSearch['maker']     = $objQuery->get('name', 'dtb_maker', 'maker_id = ?', array($arrSearchData['maker_id']));
         }
 
         // $B>&IJL>8!:w>r7o(B
@@ -332,8 +320,7 @@
      *
      * @return int
      */
-    function lfGetProductAllNum($searchCondition)
-    {
+    function lfGetProductAllNum($searchCondition) {
         // $B8!:w7k2LBP>]$H$J$k>&IJ$N?t$r<hF@(B
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $objQuery->setWhere($searchCondition['where_for_count']);
@@ -346,8 +333,7 @@
      *
      * @return array
      */
-    function lfGetSearchCondition($arrSearchData)
-    {
+    function lfGetSearchCondition($arrSearchData) {
         $searchCondition = array(
             'where'             => '',
             'arrval'            => array(),
@@ -390,14 +376,14 @@
             $searchCondition['arrval'][] = $arrSearchData['maker_id'];
         }
 
+        $searchCondition['where_for_count'] = $searchCondition['where'];
+
         // $B:_8KL5$7>&IJ$NHsI=<((B
         if (NOSTOCK_HIDDEN) {
             $searchCondition['where'] .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = alldtl.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
+            $searchCondition['where_for_count'] .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = alldtl.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
         }
 
-        // XXX $B0l;~4|FbMF$,0[$J$C$F$$$?$3$H$,$"$k$N$GJLMWAG$K$b3JG<$7$F$$$k!#(B
-        $searchCondition['where_for_count'] = $searchCondition['where'];
-
         return $searchCondition;
     }
 
@@ -406,8 +392,7 @@
      *
      * @return str
      */
-    function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id)
-    {
+    function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id) {
         $js_fnOnLoad = '';
         foreach ($arrProducts as $key => $value) {
             if ($arrProducts[$key]['product_id'] == $product_id) {
@@ -428,8 +413,7 @@
      *
      * @return void
      */
-    function lfAddCart($arrForm, $referer)
-    {
+    function lfAddCart($arrForm, $referer) {
         $product_class_id = $arrForm['product_class_id'];
         $objCartSess = new SC_CartSession_Ex();
         $objCartSess->addProduct($product_class_id, $arrForm['quantity']);
@@ -443,8 +427,7 @@
      * @param Array $arrStatusImage $B%9%?!<%?%92hA|G[Ns(B
      * @return Array $arrProducts $B>&IJ0lMw>pJs(B
      */
-    function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage)
-    {
+    function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage) {
 
         foreach ($arrProducts['productStatus'] as $product_id => $arrValues) {
             for ($i = 0; $i < count($arrValues); $i++) {
@@ -464,12 +447,12 @@
 
     /**
      *
+     * @param type $objProduct 
      * @return void
      */
-    function doJson()
-    {
+    function doJson(&$objProduct) {
         $this->arrProducts = $this->setStatusDataTo($this->arrProducts, $this->arrSTATUS, $this->arrSTATUS_IMAGE);
-        SC_Product_Ex::setPriceTaxTo($this->arrProducts);
+        $this->arrProducts = $objProduct->setPriceTaxTo($this->arrProducts);
 
         // $B0lMw%a%$%s2hA|$N;XDj$,L5$$>&IJ$N$?$a$N=hM}(B
         foreach ($this->arrProducts as $key=>$val) {
@@ -485,8 +468,7 @@
      * @param type $objProduct 
      * @return void
      */
-    function doDefault(&$objProduct)
-    {
+    function doDefault(&$objProduct) {
         //$B>&IJ0lMw$NI=<(=hM}(B
         $strnavi            = $this->objNavi->strnavi;
         // $BI=<(J8;zNs(B
@@ -535,12 +517,8 @@
             if (empty($arrErr)) {
                 $this->lfAddCart($this->arrForm, $_SERVER['HTTP_REFERER']);
 
-                // $B3+$$$F$$$k%+%F%4%j!<%D%j!<$r0];}$9$k$?$a$N%Q%i%a!<%?!<(B
-                $arrQueryString = array(
-                    'category_id' => $this->arrForm['category_id'],
-                );
 
-                SC_Response_Ex::sendRedirect(CART_URLPATH, $arrQueryString);
+                SC_Response_Ex::sendRedirect(CART_URLPATH);
                 SC_Response_Ex::actionExit();
             }
             $js_fnOnLoad .= $this->lfSetSelectedData($this->arrProducts, $this->arrForm, $arrErr, $target_product_id);
@@ -551,8 +529,7 @@
             $_SESSION['cart_referer_url'] = $netURL->getURL();
         }
 
-        $this->tpl_javascript   .= 'function fnOnLoad()
-        {' . $js_fnOnLoad . '}';
+        $this->tpl_javascript   .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
         $this->tpl_onload       .= 'fnOnLoad(); ';
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Products_Review.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Products_Review extends LC_Page_Ex 
-{
+class LC_Page_Products_Review extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -53,8 +52,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
         $masterData = new SC_DB_MasterData_Ex();
@@ -68,8 +66,7 @@
     /**
      * Page $B$N%W%m%;%9(B.
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -80,8 +77,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
@@ -140,8 +136,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -151,8 +146,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B%l%S%e!<(BID', 'review_id', INT_LEN, 'aKV');
         $objFormParam->addParam('$B>&IJ(BID', 'product_id', INT_LEN, 'n', array('NUM_CHECK','EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$BEj9F<TL>(B', 'reviewer_name', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -169,8 +163,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<%a%C%;!<%8$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $arrErr = $objFormParam->checkError();
 
         $arrForm = $objFormParam->getHashArray();
@@ -198,16 +191,14 @@
      * @param integer $product_id $B>&IJ(BID
      * @return string $product_name $B>&IJL>(B
      */
-    function lfGetProductName($product_id)
-    {
+    function lfGetProductName($product_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         return $objQuery->get('name', 'dtb_products', 'product_id = ? AND del_flg = 0 AND status = 1', array($product_id));
     }
 
     //$BEPO?<B9T(B
-    function lfRegistRecommendData(&$objFormParam)
-    {
+    function lfRegistRecommendData(&$objFormParam) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRegist = $objFormParam->getDbArray();
 

$BJQ99(B: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_ReviewComplete extends LC_Page_Ex 
-{
+class LC_Page_Products_ReviewComplete extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->setTemplate('products/review_complete.tpl');
 
@@ -77,8 +73,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_Search extends LC_Page_Ex 
-{
+class LC_Page_Products_Search extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -75,8 +71,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Regist extends LC_Page_Ex 
-{
+class LC_Page_Regist extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -66,8 +63,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         switch ($this->getMode()) {
             case 'regist':
@@ -95,8 +91,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -107,8 +102,7 @@
      * @access private
      * @return string $arrRegist['secret_key'] $BK\EPO?(BID
      */
-    function lfRegistData($array)
-    {
+    function lfRegistData($array) {
         $objQuery                   = SC_Query_Ex::getSingletonInstance();
         $arrRegist['secret_key']    = SC_Helper_Customer_Ex::sfGetUniqSecretKey(); //$BK\EPO?(BID$BH/9T(B
         $arrRegist['status']        = 2;
@@ -128,8 +122,7 @@
      * @access private
      * @return array $B%(%i!<$NG[Ns(B
      */
-    function lfCheckError($array)
-    {
+    function lfCheckError($array) {
         $objErr     = new SC_CheckError_Ex($array);
 
         if (preg_match("/^[[:alnum:]]+$/", $array['id'])) {
@@ -151,8 +144,7 @@
      * @access private
      * @return void
      */
-    function lfSendRegistMail($registSecretKey)
-    {
+    function lfSendRegistMail($registSecretKey) {
         $objQuery       = SC_Query_Ex::getSingletonInstance();
         $objCustomer    = new SC_Customer_Ex();
         $objHelperMail  = new SC_Helper_Mail_Ex();

$BJQ99(B: branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Regist_Complete.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Regist_Complete extends LC_Page_Ex 
-{
+class LC_Page_Regist_Complete extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B2q0wEPO?(B($B40N;%Z!<%8(B)';
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
 
     }
@@ -76,8 +72,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_RSS extends LC_Page_Ex 
-{
+class LC_Page_RSS extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'rss/index.tpl';
         $this->encode = 'UTF-8';
@@ -55,13 +53,13 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
 
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $objView = new SC_SiteView_Ex(false);
 
         //$B?7Ce>pJs$r<hF@(B
-        $arrNews = $this->lfGetNews();
+        $arrNews = $this->lfGetNews($objQuery);
 
         //$B%-%c%C%7%e$7$J$$(B($BG0$N$?$a(B)
         header('pragma: no-cache');
@@ -91,31 +89,37 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /**
      * $B?7Ce>pJs$r<hF@$9$k(B
      *
+     * @param SC_Query $objQuery DB$BA`:n%/%i%9(B
      * @return array $arrNews $B<hF ＠ 7k2L$rG[Ns$GJV$9(B
      */
-    function lfGetNews()
-    {
-        $objNews = new SC_Helper_News_Ex();
-        $arrNews = $objNews->getList();
+    function lfGetNews(&$objQuery) {
+        $col = '';
+        $col .= 'news_id ';        // $B?7Ce>pJs(BID
+        $col .= ',news_title ';    // $B?7Ce>pJs%?%$%H%k(B
+        $col .= ',news_comment ';  // $B?7Ce>pJsK\J8(B
+        $col .= ',news_date ';     // $BF|IU(B
+        $col .= ',news_url ';      // $B?7Ce>pJs(BURL
+        $col .= ',news_select ';   // $B?7Ce>pJs$N6hJ,(B(1:URL$B!"(B2:$BK\J8(B)
+        $col .= ',(SELECT shop_name FROM dtb_baseinfo limit 1) AS shop_name  ';    // $BE9L>(B
+        $col .= ',(SELECT email04 FROM dtb_baseinfo limit 1) AS email ';           // $BBeI=(BEmail$B%"%I%l%9(B
+        $from = 'dtb_news';
+        $where = "del_flg = '0'";
+        $order = 'rank DESC';
+        $objQuery->setOrder($order);
+        $arrNews = $objQuery->select($col,$from,$where);
 
-        $objDb = new SC_Helper_DB_Ex();
-        $arrInfo = $objDb->sfGetBasisData(FALSE, 'shop_name, email04');
-
         // RSS$BMQ$KJQ49(B
         foreach ($arrNews as $key => $value) {
             $netUrlHttpUrl = new Net_URL(HTTP_URL);
 
             $row =& $arrNews[$key];
-            $row['shop_name'] = $arrInfo['shop_name'];
-            $row['email'] = $arrInfo['email04'];
             // $BF|IU(B
             $row['news_date'] = date('r', strtotime($row['news_date']));
             // $B?7Ce>pJs(BURL

$BJQ99(B: branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Rss_Products extends LC_Page_Ex 
-{
+class LC_Page_Rss_Products extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'rss/products.tpl';
         $this->encode = 'UTF-8';
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
     }
 
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objView = new SC_SiteView_Ex();
 
@@ -127,8 +123,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -139,8 +134,7 @@
      * @param str $product_id $B>&IJ(BID
      * @return array $arrProduct $B>&IJ>pJs$NG[Ns$rJV$9(B
      */
-    function lfGetProductsDetailData($mode, $product_id)
-    {
+    function lfGetProductsDetailData($mode, $product_id) {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         //$B>&IJ>\:Y$r<hF@(B
         if ($mode == 'all') {
@@ -191,8 +185,7 @@
      *
      * @return array $arrProduct $B>&IJ>pJs$NG[Ns$rJV$9(B
      */
-    function lfGetProductsListData()
-    {
+    function lfGetProductsListData() {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         //$B>&IJ0lMw$r<hF@(B
         $arrProduct = $objQuery->getAll('SELECT product_id, name AS product_name FROM dtb_products');
@@ -204,8 +197,7 @@
      *
      * @return array $arrProduct $B>&IJ>pJs$NG[Ns$rJV$9(B
      */
-    function lfGetProductsAllData()
-    {
+    function lfGetProductsAllData() {
         $objQuery = SC_Query_Ex::getSingletonInstance();
         //$B>&IJ>pJs$r<hF@(B
         $arrProduct = $this->lfGetProductsAllclass($objQuery);
@@ -250,8 +242,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return array $arrProduct $B<hF ＠ 7k2L$rG[Ns$GJV$9(B
      */
-    function lfGetProductsDetail(&$objQuery, $product_id = 'all')
-    {
+    function lfGetProductsDetail(&$objQuery, $product_id = 'all') {
         $objProduct = new SC_Product_Ex();
 
         // --- $B>&IJ>\:Y$N<hF@(B
@@ -292,8 +283,7 @@
      * @param SC_Query $objQuery DB$BA`:n%/%i%9(B
      * @return array $arrProduct $B<hF ＠ 7k2L$rG[Ns$GJV$9(B
      */
-    function lfGetProductsAllclass(&$objQuery)
-    {
+    function lfGetProductsAllclass(&$objQuery) {
         // --- $B>&IJ0lMw$N<hF@(B
         $objQuery->setWhere('del_flg = 0 AND status = 1');
         $objQuery->setOrder('product_id');

$BJQ99(B: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping extends LC_Page_Ex 
-{
+class LC_Page_Shopping extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B%m%0%$%s(B';
         $masterData = new SC_DB_MasterData_Ex();
@@ -65,8 +63,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -77,8 +74,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objSiteSess = new SC_SiteSession_Ex();
         $objCartSess = new SC_CartSession_Ex();
@@ -275,8 +271,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -286,8 +281,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
 
         $objFormParam->addParam('$B$*L>A0(B($B ＠ +(B)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*L>A0(B($BL>(B)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -324,6 +318,7 @@
         $objFormParam->addParam('$BEEOCHV9f(B1', 'shipping_tel01', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
         $objFormParam->addParam('$BEEOCHV9f(B2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
         $objFormParam->addParam('$BEEOCHV9f(B3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('$B%a!<%k%^%,%8%s(B', 'mail_flag', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
     }
 
     /**
@@ -332,8 +327,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitLoginFormParam(&$objFormParam)
-    {
+    function lfInitLoginFormParam(&$objFormParam) {
         $objFormParam->addParam('$B5-21$9$k(B', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B%a!<%k%"%I%l%9(B', 'login_email', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B%Q%9%o!<%I(B', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -353,11 +347,9 @@
      * @param SC_SiteSession $objSiteSess SC_SiteSession $B%$%s%9%?%s%9(B
      * @return string $BA+0\@h$N%Q%9(B
      */
-    function getNextLocation($product_type_id, $uniqid, &$objCustomer, &$objPurchase, &$objSiteSess)
-    {
+    function getNextLocation($product_type_id, $uniqid, &$objCustomer, &$objPurchase, &$objSiteSess) {
         switch ($product_type_id) {
             case PRODUCT_TYPE_DOWNLOAD:
-                $objPurchase->unsetAllShippingTemp(true);
                 $objPurchase->saveOrderTemp($uniqid, array(), $objCustomer);
                 $objSiteSess->setRegistFlag();
                 return 'payment.php';
@@ -378,8 +370,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @param boolean $isMultiple $BJ#?tG[Aw$N>l9g(B true
      */
-    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false)
-    {
+    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false) {
         $arrParams = $objFormParam->getHashArray();
 
         // $BCmJ8<T$r$*FO$1 ＠ h$H$9$kG[Ns$r<hF@(B
@@ -422,8 +413,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<>pJs$NG[(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // $BF~NOCM$NJQ49(B
         $objFormParam->convParam();
         $objFormParam->toLower('order_mail');
@@ -472,8 +462,7 @@
      * @param integer $uniqid $B9XF~0l;~>pJs$N%f%K!<%/(BID
      * @return void
      */
-    function setFormParams(&$objFormParam, &$objPurchase, $uniqid)
-    {
+    function setFormParams(&$objFormParam, &$objPurchase, $uniqid) {
         $arrOrderTemp = $objPurchase->getOrderTemp($uniqid);
         if (SC_Utils_Ex::isBlank($arrOrderTemp)) {
             $arrOrderTemp = array(
@@ -491,11 +480,7 @@
         if (count($arrShippingTemp) > 1) {
             $objFormParam->setParam($arrShippingTemp[1]);
         } else {
-            if ($arrOrderTemp['deliv_check'] == 1) {
-                $objFormParam->setParam($arrShippingTemp[1]);
-            } else {
-                $objFormParam->setParam($arrShippingTemp[0]);
-            }
+            $objFormParam->setParam($arrShippingTemp[0]);
         }
         $objFormParam->setValue('order_email02', $arrOrderTemp['order_email']);
         $objFormParam->setDBDate($arrOrderTemp['order_birth']);
@@ -511,8 +496,7 @@
      * @return string JSON $B7A<0$N%(%i!<%a%C%;!<%8(B
      * @see LC_PageError
      */
-    function lfGetErrorMessage($error)
-    {
+    function lfGetErrorMessage($error) {
         switch ($error) {
             case TEMP_LOGIN_ERROR:
                 $msg = "$B%a!<%k%"%I%l%9$b$7$/$O%Q%9%o!<%I$, ＠ 5$7$/$"$j$^$;$s!#(B\n$BK\EPO?$,$*:Q$_$G$J$$>l9g$O!"2>EPO?%a!<%k$K5-:\$5$l$F$$$k(BURL$B$h$jK\EPO?$r9T$C$F$/$@$5$$!#(B";

$BJQ99(B: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Shopping_Complete.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Shopping_Complete extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Complete extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B$4CmJ840N;(B';
     }
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         unset($_SESSION['order_id']);
@@ -79,16 +75,14 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
     /**
      * $B7h:Q%b%8%e!<%k$+$iA+0\$9$k>l9g$,$"$k$?$a(B, $B%H!<%/%s%A%'%C%/$7$J$$(B.
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // nothing.
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Confirm extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Confirm extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B$4F~NOFbMF$N$43NG'(B';
         $masterData = new SC_DB_MasterData_Ex();
@@ -51,7 +49,7 @@
         $this->arrSex = $masterData->getMasterData('mtb_sex');
         $this->arrMAILMAGATYPE = $masterData->getMasterData('mtb_mail_magazine_type');
         $this->arrReminder = $masterData->getMasterData('mtb_reminder');
-        $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList('service_name');
+        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'service_name');
         $this->httpCacheControl('nocache');
     }
 
@@ -60,8 +58,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -72,8 +69,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objCartSess = new SC_CartSession_Ex();
         $objSiteSess = new SC_SiteSession_Ex();
@@ -167,7 +163,10 @@
                 // $B9XF~40N;%Z!<%8(B
                 else {
                     $objPurchase->completeOrder(ORDER_NEW);
-                    SC_Helper_Purchase_Ex::sendOrderMail($this->arrForm['order_id']);
+                    $template_id = SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1;
+                    $objHelperMail->sfSendOrderMail(
+                            $this->arrForm['order_id'],
+                            $template_id);
 
                     SC_Response_Ex::sendRedirect(SHOPPING_COMPLETE_URLPATH);
                 }
@@ -184,8 +183,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Deliv extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Deliv extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrPref = $masterData->getMasterData('mtb_pref');
@@ -56,8 +54,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -68,8 +65,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objSiteSess = new SC_SiteSession_Ex();
         $objCartSess = new SC_CartSession_Ex();
@@ -113,7 +109,7 @@
         switch ($this->getMode()) {
             // $B:o=|(B
             case 'delete':
-                $objAddress->deleteAddress($arrForm['other_deliv_id']);
+                $objAddress->delete($arrForm['other_deliv_id']);
                 break;
 
             // $B2q0wEPO?=;=j$KAw$k(B
@@ -194,8 +190,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -205,8 +200,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B$=$NB>$N$*FO$1 ＠ h(BID', 'other_deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('$B$*FO$1 ＠ h%A%'%C%/(B', 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));
     }
@@ -224,8 +218,7 @@
      * @param SC_Customer $objCustomer SC_Customer $B%$%s%9%?%s%9(B
      * @return boolean $B$*FO$1 ＠ h%A%'%C%/$NCM$,BEEv$J>l9g(B true
      */
-    function registerDeliv($other_deliv_id, $uniqid, &$objPurchase, &$objCustomer, $objAddress)
-    {
+    function registerDeliv($other_deliv_id, $uniqid, &$objPurchase, &$objCustomer, $objAddress) {
         GC_Utils_Ex::gfDebugLog('register deliv. deliv_check=' . $deliv_check);
         $arrValues = array();
         // $B2q0wEPO?=;=j$,%A%'%C%/$5$l$F$$$k>l9g(B
@@ -234,7 +227,7 @@
         }
         // $BJL$N$*FO$1 ＠ h$,%A%'%C%/$5$l$F$$$k>l9g(B
         else {
-            $arrOtherDeliv = $objAddress->getAddress($other_deliv_id);
+            $arrOtherDeliv = $objAddress->get($other_deliv_id);
             if (!$arrOtherDeliv) {
                 return false;
             }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,8 +34,7 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class LC_Page_Shopping_LoadPaymentModule extends LC_Page_Ex 
-{
+class LC_Page_Shopping_LoadPaymentModule extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -45,8 +44,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
 
         $order_id = $this->getOrderId();
         if ($order_id === false) {
@@ -78,8 +75,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -93,15 +89,16 @@
      * @return string|boolean $B ＠ .8y$7$?>l9g$O7h:Q%b%8%e!<%k$N%Q%9(B;
      *                        $B<:GT$7$?>l9g(B false
      */
-    function getModulePath($order_id)
-    {
-        $objPurchase = new SC_Helper_Purchase_Ex();
-        $objPayment = new SC_Helper_Payment_Ex();
-
-        $order = $objPurchase->getOrder($order_id);
-        $payment = $objPayment->get($order['payment_id']);
-        $module_path = $payment['module_path'];
-
+    function getModulePath($order_id) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $sql = <<< __EOS__
+            SELECT module_path
+            FROM dtb_payment T1
+                JOIN dtb_order T2
+                    ON T1.payment_id = T2.payment_id
+            WHERE order_id = ?
+__EOS__;
+        $module_path = $objQuery->getOne($sql, array($order_id));
         if (file_exists($module_path)) {
             return $module_path;
         }
@@ -123,8 +120,7 @@
      * @return integer|boolean $B<uCm(BID$B$N<hF@$K ＠ .8y$7$?>l9g$O<uCm(BID$B$rJV$9(B;
      *                         $B<:GT$7$?>l9g$O(B, false $B$rJV$9(B.
      */
-    function getOrderId()
-    {
+    function getOrderId() {
         if (isset($_SESSION['order_id'])
             && !SC_Utils_Ex::isBlank($_SESSION['order_id'])
             && SC_Utils_Ex::sfIsInt($_SESSION['order_id'])) {
@@ -148,8 +144,7 @@
     /**
      * $B7h:Q%b%8%e!<%k$+$iA+0\$9$k>l9g$,$"$k$?$a(B, $B%H!<%/%s%A%'%C%/$7$J$$(B.
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // nothing.
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Multiple extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Multiple extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$B$*FO$1 ＠ h$NJ#?t;XDj(B';
         $this->httpCacheControl('nocache');
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -66,8 +63,8 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
+
         $objSiteSess = new SC_SiteSession_Ex();
         $objCartSess = new SC_CartSession_Ex();
         $objPurchase = new SC_Helper_Purchase_Ex();
@@ -117,6 +114,8 @@
             $objFormParam->setParam($_SESSION['multiple_temp']);
         }
         $this->arrForm = $objFormParam->getFormParamList();
+
+
     }
 
     /**
@@ -124,8 +123,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -135,8 +133,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('$B>&IJ5,3J(BID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B>&IJL>(B', 'name');
         $objFormParam->addParam('$B5,3J(B1', 'class_name1');
@@ -145,7 +142,7 @@
         $objFormParam->addParam('$B5,3JJ,N`(B2', 'classcategory_name2');
         $objFormParam->addParam('$B%a%$%s2hA|(B', 'main_image');
         $objFormParam->addParam('$B%a%$%s0lMw2hA|(B', 'main_list_image');
-        $objFormParam->addParam(SALE_PRICE_TITLE, 'price');
+        $objFormParam->addParam('$BHNGd2A3J(B', 'price');
         $objFormParam->addParam('$B?tNL(B', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
         $objFormParam->addParam('$B$*FO$1 ＠ h(B', 'shipping', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B%+!<%HHV9f(B', 'cart_no', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -159,8 +156,7 @@
      * @param SC_CartSession $objCartSess SC_CartSession $B%$%s%9%?%s%9(B
      * @return void
      */
-    function setParamToSplitItems(&$objFormParam, &$objCartSess)
-    {
+    function setParamToSplitItems(&$objFormParam, &$objCartSess) {
         $cartLists =& $objCartSess->getCartList($objCartSess->getKey());
         $arrItems = array();
         $index = 0;
@@ -191,8 +187,7 @@
      * @param integer $uniqid $B<uCm0l;~%F!<%V%k$N%f%K!<%/(BID
      * @return array $BG[Aw=;=j$N%W%k%@%&%sMQO"A[G[Ns(B
      */
-    function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress, $uniqid)
-    {
+    function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress, $uniqid) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrPref = $masterData->getMasterData('mtb_pref');
 
@@ -233,7 +228,6 @@
                     . $val['shipping_addr01'] . $val['shipping_addr02'];
             }
         }
-
         return $arrResults;
     }
 
@@ -243,8 +237,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @return array $B%(%i!<>pJs$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         $objCartSess = new SC_CartSession_Ex();
 
         $objFormParam->convParam();
@@ -290,7 +283,6 @@
                 }
             }
         }
-
         return $arrErr;
     }
 
@@ -306,8 +298,7 @@
      * @param SC_CartSession $objCartSess SC_CartSession $B%$%s%9%?%s%9(B
      * @return void
      */
-    function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess, &$objAddress)
-    {
+    function saveMultipleShippings($uniqid, &$objFormParam, &$objCustomer, &$objPurchase, &$objCartSess, &$objAddress) {
         $arrParams = $objFormParam->getSwapArray();
 
         foreach ($arrParams as $arrParam) {
@@ -315,7 +306,7 @@
 
             if ($objCustomer->isLoginSuccess(true)) {
                 if ($other_deliv_id != 0) {
-                    $otherDeliv = $objAddress->getAddress($other_deliv_id);
+                    $otherDeliv = $objAddress->get($other_deliv_id);
                     foreach ($otherDeliv as $key => $val) {
                         $arrValues[$other_deliv_id]['shipping_' . $key] = $val;
                     }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Payment extends LC_Page_Ex 
-{
+class LC_Page_Shopping_Payment extends LC_Page_Ex {
 
     // {{{ properties
 
@@ -50,8 +49,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_onload = 'fnCheckInputPoint();';
         $this->tpl_title = '$B$*;YJ'J}K!!&$*FO$1;~4VEy$N;XDj(B';
@@ -64,8 +62,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -76,15 +73,13 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objSiteSess = new SC_SiteSession_Ex();
         $objCartSess = new SC_CartSession_Ex();
         $objPurchase = new SC_Helper_Purchase_Ex();
         $objCustomer = new SC_Customer_Ex();
         $objFormParam = new SC_FormParam_Ex();
-        $objDelivery = new SC_Helper_Delivery_Ex();
 
         $this->is_multiple = $objPurchase->isMultiple();
 
@@ -97,7 +92,7 @@
         $objPurchase->verifyChangeCart($this->tpl_uniqid, $objCartSess);
 
         // $BG[Aw6H<T$r<hF@(B
-        $this->arrDeliv = $objDelivery->getList($cart_key);
+        $this->arrDeliv = $objPurchase->getDeliv($cart_key);
         $this->is_single_deliv = $this->isSingleDeliv($this->arrDeliv);
 
         // $B2q0w>pJs$N<hF@(B
@@ -251,8 +246,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
@@ -264,8 +258,7 @@
      * @param boolean $deliv_only deliv_id $B%A%'%C%/$N$_$N>l9g(B true
      * @param array $arrShipping $BG[Aw ＠ h>pJs$NG[Ns(B
      */
-    function setFormParams(&$objFormParam, $arrParam, $deliv_only, &$arrShipping)
-    {
+    function setFormParams(&$objFormParam, $arrParam, $deliv_only, &$arrShipping) {
         $this->lfInitParam($objFormParam, $deliv_only, $arrShipping);
         $objFormParam->setParam($arrParam);
         $objFormParam->convParam();
@@ -279,8 +272,7 @@
      * @param array $arrShipping $BG[Aw ＠ h>pJs$NG[Ns(B
      * @return void
      */
-    function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping)
-    {
+    function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping) {
         $objFormParam->addParam('$BG[Aw6H<T(B', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('$B%]%$%s%H(B', 'use_point', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK', 'ZERO_START'));
         $objFormParam->addParam('$B$=$NB>$*Ld$$9g$o$;(B', 'message', LTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -309,8 +301,7 @@
      * @param integer $max_point $B2q0w$NJ];}%]%$%s%H(B
      * @return array $BF~NO%A%'%C%/7k2L$NG[Ns(B
      */
-    function lfCheckError(&$objFormParam, $subtotal, $max_point)
-    {
+    function lfCheckError(&$objFormParam, $subtotal, $max_point) {
         $objPurchase = new SC_Helper_Purchase_Ex();
         // $BF~NO%G!<%?$rEO$9!#(B
         $arrForm =  $objFormParam->getHashArray();
@@ -335,8 +326,7 @@
                 $objErr->arrErr['use_point'] = '$B"((B $B$4MxMQ%]%$%s%H$,$49XF~6b3[$rD6$($F$$$^$9!#(B<br>';
             }
             // $B%]%$%s%H:9$70z$-8e$N7h:QJ}K!%A%'%C%/(B
-            $objPayment = new SC_Helper_Payment_Ex();
-            $arrPayments = $objPayment->get($arrForm['payment_id']);
+            $arrPayments = $objPurchase->getPaymentsByPaymentsId($arrForm['payment_id']);
             if ($arrPayments['rule_max'] > $subtotal - $arrForm['use_point'] * POINT_VALUE) {
                 $objErr->arrErr['use_point'] = '$B"((B $BA*Br$7$?;YJ'J}K!$G$O!"%]%$%s%H$O(B'.($subtotal - $arrPayments['rule_max']).'$B%]%$%s%H$^$G$4MxMQ$$$?$@$1$^$9!#(B<br>';
             }
@@ -350,8 +340,7 @@
      * @param SC_FormParam $objFormParam SC_FormParam $B%$%s%9%?%s%9(B
      * @param array $arrDelivTime $BG[Aw;~4V$NG[Ns(B
      */
-    function saveShippings(&$objFormParam, $arrDelivTime)
-    {
+    function saveShippings(&$objFormParam, $arrDelivTime) {
         $deliv_id = $objFormParam->getValue('deliv_id');
 
         /* TODO
@@ -377,8 +366,7 @@
      * @param array $arrPayment $B$*;YJ'$$J}K!$NG[Ns(B
      * @return void
      */
-    function lfRegistData($uniqid, $arrForm, &$objPurchase, $arrPayment)
-    {
+    function lfRegistData($uniqid, $arrForm, &$objPurchase, $arrPayment) {
 
         $arrForm['order_temp_id'] = $uniqid;
         $arrForm['update_date'] = 'CURRENT_TIMESTAMP';
@@ -410,21 +398,11 @@
      * @param integer $deliv_id $BG[Aw6H<T(BID
      * @return array $B;YJ'$$J}K!(B, $B$*FO$1;~4V$r3JG<$7$?G[Ns(B
      */
-    function getSelectedDeliv(&$objPurchase, &$objCartSess, $deliv_id)
-    {
+    function getSelectedDeliv(&$objPurchase, &$objCartSess, $deliv_id) {
         $arrResults = array();
-        $arrResults['arrDelivTime'] = SC_Helper_Delivery_Ex::getDelivTime($deliv_id);
-        $total = $objCartSess->getAllProductsTotal($objCartSess->getKey());
-        $payments_deliv = SC_Helper_Delivery_Ex::getPayments($deliv_id);
-        $objPayment = new SC_Helper_Payment_Ex();
-        $payments_total = $objPayment->getByPrice($total);
-        $arrPayment = array();
-        foreach ($payments_total as $payment) {
-            if (in_array($payment['payment_id'], $payments_deliv)) {
-                $arrPayment[] = $payment;
-            }
-        }
-        $arrResults['arrPayment'] = $arrPayment;
+        $arrResults['arrDelivTime'] = $objPurchase->getDelivTime($deliv_id);
+        $total = $objCartSess->getAllProductsTotal($objCartSess->getKey(), $deliv_id);
+        $arrResults['arrPayment'] = $objPurchase->getPaymentsByPrice($total, $deliv_id);
         $arrResults['img_show'] = $this->hasPaymentImage($arrResults['arrPayment']);
         return $arrResults;
     }
@@ -435,8 +413,7 @@
      * @param array $arrPayment $B;YJ'$$J}K!$NG[Ns(B
      * @return boolean $B;YJ'$$J}K!$N2hA|$,$"$k>l9g(B true
      */
-    function hasPaymentImage($arrPayment)
-    {
+    function hasPaymentImage($arrPayment) {
         foreach ($arrPayment as $val) {
             if (!SC_Utils_Ex::isBlank($val['payment_image'])) {
                 return true;
@@ -451,8 +428,7 @@
      * @param array $arrDeliv $BG[Aw6H<T$NG[Ns(B
      * @return boolean $BG[Aw6H<T$,(B1$B<R$N$_$N>l9g(B true
      */
-    function isSingleDeliv($arrDeliv)
-    {
+    function isSingleDeliv($arrDeliv) {
         if (count($arrDeliv) == 1) {
             return true;
         } else {
@@ -467,8 +443,7 @@
      * @param string $mode $B%U%)!<%`%Q%i%a!<%?!<(B 'mode' $B$NJ8;zNs(B
      * @return string $B%b%P%$%kMQ%F%s%W%l!<%H$N%Q%9(B
      */
-    function getMobileMainpage($is_single_deliv = true, $mode)
-    {
+    function getMobileMainpage($is_single_deliv = true, $mode) {
         switch ($mode) {
             case 'select_deliv':
                 return 'shopping/payment.tpl';

$BJQ99(B: branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Unsupported extends LC_Page_Ex 
-{
+class LC_Page_Unsupported extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = '$BL$BP1~%G%P%$%9(B';
     }
@@ -53,15 +51,13 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
     }
 
-    function action()
-    {
+    function action() {
 
 
     }
@@ -71,8 +67,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -11,10 +11,8 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Upgrade_Base extends LC_Page_Ex 
-{
-    function isValidIP()
-    {
+class LC_Page_Upgrade_Base extends LC_Page_Ex {
+    function isValidIP() {
         $objLog  = new LC_Upgrade_Helper_Log;
         $masterData = new SC_DB_MasterData_Ex();
         $arrOstoreIPs = $masterData->getMasterData('mtb_ownersstore_ips');
@@ -35,8 +33,7 @@
      * @param integer $product_id
      * @return boolean
      */
-    function autoUpdateEnable($product_id)
-    {
+    function autoUpdateEnable($product_id) {
         $where = 'module_id = ?';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('auto_update_flg', 'dtb_module', $where, array($product_id));
@@ -57,8 +54,7 @@
      * @param array $arrParams $BDI2C%Q%i%a!<%?!<(B.$BO"A[G[Ns$GEO$9(B.
      * @return string|object $B%l%9%]%s%9%\%G%#(B|$B%(%i!<;~$K$O(BPEAR::Error$B%*%V%8%'%/%H$rJV$9(B.
      */
-    function request($mode, $arrParams = array(), $arrCookies = array())
-    {
+    function request($mode, $arrParams = array(), $arrCookies = array()) {
         $objReq = new HTTP_Request();
         $objReq->setUrl(OSTORE_URL . 'upgrade/index.php');
         $objReq->setMethod('POST');
@@ -79,8 +75,7 @@
         }
     }
 
-    function isLoggedInAdminPage()
-    {
+    function isLoggedInAdminPage() {
         $objSess = new SC_Session_Ex();
 
         if ($objSess->isSuccess() === SUCCESS) {
@@ -94,13 +89,11 @@
      *
      * @return string
      */
-    function createSeed()
-    {
+    function createSeed() {
         return sha1(uniqid(rand(), true) . time());
     }
 
-    function getPublicKey()
-    {
+    function getPublicKey() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrRet = $objQuery->select('*', 'dtb_ownersstore_settings');
         return isset($arrRet[0]['public_key'])
@@ -111,8 +104,7 @@
     /**
      * $B%*!<%J!<%:%9%H%"$+$i$N(B POST $B$N$?$a(B, $B%H!<%/%s%A%'%C%/$7$J$$(B.
      */
-    function doValidToken()
-    {
+    function doValidToken() {
         // nothing.
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Upgrade_Download extends LC_Page_Upgrade_Base 
-{
+class LC_Page_Upgrade_Download extends LC_Page_Upgrade_Base {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process($mode)
-    {
+    function process($mode) {
         $objLog  = new LC_Upgrade_Helper_Log;
         $objLog->start($mode);
 
@@ -247,13 +244,11 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 
-    function initParam()
-    {
+    function initParam() {
         $this->objForm = new SC_FormParam_Ex();
         $this->objForm->addParam(
             'product_id', 'product_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')
@@ -266,8 +261,7 @@
      *
      * @param object $objRet
      */
-    function updateMdlTable($objRet)
-    {
+    function updateMdlTable($objRet) {
         $table = 'dtb_module';
         $where = 'module_id = ?';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -300,8 +294,7 @@
      * @param array #arrCookies Cookie$BG[Ns(B
      * @return
      */
-    function notifyDownload($mode, $arrCookies)
-    {
+    function notifyDownload($mode, $arrCookies) {
         $arrPOSTParams = array(
             'eccube_url' => HTTP_URL
         );
@@ -314,8 +307,7 @@
      *
      * @return boolean
      */
-    function isValidAccess($mode)
-    {
+    function isValidAccess($mode) {
         $objLog = new LC_Upgrade_Helper_Log;
         switch ($mode) {
         // $B%b%8%e!<%k%@%&%s%m!<%I(B
@@ -365,8 +357,7 @@
         return false;
     }
 
-    function registerUpdateLog($arrLog, $objRet)
-    {
+    function registerUpdateLog($arrLog, $objRet) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $arrInsert = array(
             'log_id'      => $objQuery->nextVal('dtb_module_update_logs_log_id'),
@@ -388,8 +379,7 @@
      * $BB>$NJQ?t!&4X?t$H$+$V$i$J$$$h$&!"(B
      * LC_Update_Updater::execute()$B$G=hM}$r<B9T$9$k(B.
      */
-    function fileExecute($productCode)
-    {
+    function fileExecute($productCode) {
         $file = DATA_REALDIR . 'downloads/update/' . $productCode . '_update.php';
         if (file_exists($file)) {
             @include_once $file;

$BJQ99(B: branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Upgrade_ProductsList extends LC_Page_Upgrade_Base 
-{
+class LC_Page_Upgrade_ProductsList extends LC_Page_Upgrade_Base {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process($mode)
-    {
+    function process($mode) {
         $objLog  = new LC_Upgrade_Helper_Log;
         $objJson = new LC_Upgrade_Helper_Json;
 
@@ -159,8 +156,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Upgrade_SiteCheck extends LC_Page_Upgrade_Base 
-{
+class LC_Page_Upgrade_SiteCheck extends LC_Page_Upgrade_Base {
 
     // }}}
     // {{{ functions
@@ -42,16 +41,14 @@
      *
      * @return void
      */
-    function init()
-    {}
+    function init() {}
 
     /**
      * Page $B$N%W%m%;%9(B.
      *
      * @return void
      */
-    function process($mode)
-    {
+    function process($mode) {
         $objLog  = new LC_Upgrade_Helper_LOG;
         $objJson = new LC_Upgrade_Helper_Json;
 
@@ -80,6 +77,5 @@
      *
      * @return void
      */
-    function destroy()
-    {}
+    function destroy() {}
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -3,8 +3,7 @@
  * Enter description here...
  *
  */
-class LC_Upgrade_Helper_Json extends Services_JSON 
-{
+class LC_Upgrade_Helper_Json extends Services_JSON {
     /** */
     var $arrData = array(
         'status'  => null,
@@ -18,8 +17,7 @@
      *
      * @return SC_Upgrade_Helper_Json
      */
-    function __construct()
-    {
+    function __construct() {
         parent::Services_JSON();
     }
 
@@ -27,13 +25,11 @@
      * Enter description here...
      *
      */
-    function isError()
-    {
+    function isError() {
         return $this->isSuccess() ? false : true;
     }
 
-    function isSuccess()
-    {
+    function isSuccess() {
         if ($this->arrData['status'] === OSTORE_STATUS_SUCCESS) {
             return true;
         }
@@ -46,8 +42,7 @@
      * @param unknown_type $errCode
      * @param unknown_type $errMessage
      */
-    function setError($errCode)
-    {
+    function setError($errCode) {
         $masterData = new SC_DB_MasterData_Ex();
         $arrOStoreErrMsg = $masterData->getMasterData('mtb_ownersstore_err');
 
@@ -63,8 +58,7 @@
      *
      * @param mixed $data
      */
-    function setSuccess($data = array(), $msg = '')
-    {
+    function setSuccess($data = array(), $msg = '') {
         $this->arrData['status'] = OSTORE_STATUS_SUCCESS;
         $this->arrData['data']   = $data;
         $this->arrData['msg']    = $msg;
@@ -74,8 +68,7 @@
      * Enter description here...
      *
      */
-    function display()
-    {
+    function display() {
         header('Content-Type: text/javascript; charset=UTF-8');
         echo $this->encode($this->arrData);
     }
@@ -91,8 +84,7 @@
      * @return StdClass
      * @see SC_Utils_Ex::jsonDecode
      */
-    function decode($str)
-    {
+    function decode($str) {
         return SC_Utils_Ex::jsonDecode($str);
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -25,15 +25,13 @@
  * $B%*!<%J!<%:%9%H%"4IM}MQ%m%0%/%i%9(B
  *
  */
-class LC_Upgrade_Helper_Log 
-{
+class LC_Upgrade_Helper_Log {
     /**
      * $B3+;O%a%C%;!<%8$r=PNO(B
      *
      * @param string $mode
      */
-    function start($mode)
-    {
+    function start($mode) {
         $message = "##### $mode start #####";
         $this->log($message);
     }
@@ -42,8 +40,7 @@
      *
      * @param string $mode
      */
-    function end()
-    {
+    function end() {
         $message = '##### end #####';
         $this->log($message);
     }
@@ -52,8 +49,7 @@
      *
      * @param string $message
      */
-    function log($message)
-    {
+    function log($message) {
         GC_Utils_Ex::gfPrintLog($message, OSTORE_LOG_REALFILE);
     }
     /**
@@ -62,8 +58,7 @@
      * @param string $code
      * @param mixed $val
      */
-    function error($code, $val = null)
-    {
+    function error($code, $val = null) {
         $format = '* error! code:%s / debug:%s';
         $message = sprintf($format, $code, serialize($val));
         $this->log($message);

$BJQ99(B: branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php
===================================================================
--- branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id: $
  */
-abstract class SC_Plugin_Base 
-{
+abstract class SC_Plugin_Base {
 
     protected $arrSelfInfo;
 
@@ -41,8 +40,7 @@
      * @param array $arrSelfInfo $B<+?H$N%W%i%0%$%s>pJs(B
      * @return void
      */
-    function __construct(array $arrSelfInfo)
-    {
+    function __construct(array $arrSelfInfo) {
         $this->arrSelfInfo = $arrSelfInfo;
     }
     /**
@@ -91,8 +89,7 @@
      * @param object $objPluginHelper
      * @param integer $priority
      */
-    function register(SC_Helper_Plugin $objHelperPlugin, $priority)
-    {
+    function register(SC_Helper_Plugin $objHelperPlugin, $priority) {
         if (isset($this->arrSelfInfo['plugin_hook_point'])) {
             $arrHookPoints = $this->arrSelfInfo['plugin_hook_point'];
             foreach ($arrHookPoints as $hook_point) {
@@ -110,8 +107,7 @@
      *
      * @return array $arrSelfInfo $B<+?H$N%W%i%0%$%s>pJs(B
      */
-    function getPluginInfo()
-    {
+    function getPluginInfo() {
         return $this->arrSelfInfo;
     }
 

$BJQ99(B: branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php
===================================================================
--- branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -22,14 +22,12 @@
  */
 
 // $B%W%i%0%$%s$N%f!<%F%#%j%F%#%/%i%9(B.
-class SC_Plugin_Util 
-{
+class SC_Plugin_Util {
 
     /**
      * $B2TF/Cf$N%W%i%0%$%s$r<hF@$9$k!#(B
      */
-    function getEnablePlugin()
-    {
+    function getEnablePlugin() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
         $table = 'dtb_plugin';
@@ -56,8 +54,7 @@
      * 
      * @return array $arrRet $B%$%s%9%H!<%k$5$l$F$$$k%W%i%0%$%s(B.
      */
-    function getAllPlugin()
-    {
+    function getAllPlugin() {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
         $table = 'dtb_plugin';
@@ -76,8 +73,7 @@
      * @param int $plugin_id $B%W%i%0%$%s(BID.
      * @return array $B%W%i%0%$%s$N4pK\>pJs(B.
      */
-    function getPluginByPluginId($plugin_id)
-    {
+    function getPluginByPluginId($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
         $table = 'dtb_plugin';
@@ -93,8 +89,7 @@
      * @param string $plugin_code $B%W%i%0%$%s%3!<%I(B.
      * @return array $B%W%i%0%$%s$N4pK\>pJs(B.
      */
-    function getPluginByPluginCode($plugin_code)
-    {
+    function getPluginByPluginCode($plugin_code) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = '*';
         $table = 'dtb_plugin';
@@ -109,8 +104,7 @@
      * @param string $plugin_id $B%W%i%0%$%s(BID.
      * @return array $B%W%i%0%$%s$N4pK\>pJs(B.
      */
-    function deletePluginByPluginId($plugin_id)
-    {
+    function deletePluginByPluginId($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'plugin_id = ?';
         $objQuery->delete('dtb_plugin', $where, array($plugin_id));
@@ -122,8 +116,7 @@
      *
      * @return array $arrPluginDirectory
      */
-    function getPluginDirectory()
-    {
+    function getPluginDirectory() {
         $arrPluginDirectory = array();
         if (is_dir(PLUGIN_UPLOAD_REALDIR)) {
             if ($dh = opendir(PLUGIN_UPLOAD_REALDIR)) {
@@ -142,8 +135,7 @@
      * @param integer $plugin_id
      * @return array $B%U%C%/%]%$%s%H$N0lMw(B
      */
-    function getPluginHookPoint($plugin_id)
-    {
+    function getPluginHookPoint($plugin_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $cols = '*';
         $from = 'dtb_plugin_hookpoint';
@@ -157,8 +149,7 @@
      * @param string $key  $B%(%i!<>pJs$r3JG<$9$k%-!<(B
      * @return array $arrErr $B%(%i!<>pJs$r3JG<$7$?O"A[G[Ns(B.
      */
-    function checkExtension($key)
-    {
+    function checkExtension($key) {
         // $B%W%i%0%$%sMxMQ$KI,?\$N%b%8%e!<%k(B
         // 'EC-CUBE$B%P!<%8%g%s(B' => array('$B%b%8%e!<%kL>(B')
         $arrRequireExtension = array(

$BJQ99(B: branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php
===================================================================
--- branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_SessionFactory_UseCookie extends SC_SessionFactory_Ex 
-{
+class SC_SessionFactory_UseCookie extends SC_SessionFactory_Ex {
 
     // }}}
     // {{{ functions
@@ -45,8 +44,7 @@
      * $B!&F1$8%I%a%$%s4V$G6&M-(B
      * FIXME $B%;%C%7%g%s%-!<$N%-!<$,(B PHP $B%G%U%)%k%H$N$?$a!">e0L%G%#%l%/%H%j!<$GDj5A$,$"$k$H!"$=$NCM$GF0:n$9$k$H9M$($i$l$k!#(B
      **/
-    function initSession()
-    {
+    function initSession() {
         ini_set('session.cache_limiter', 'none');
         // (session.auto_start $B$J$I$G(B)$B%;%C%7%g%s$,3+;O$5$l$F$$$?>l9g$KHw$($FJD$8$k!#(B(FIXME: $BJ]B8$9$kI,MW$O$J$$!#GK4~$GNI$$!#(B)
         session_write_close();
@@ -62,8 +60,7 @@
      *
      * @return boolean $B>o$K(B true $B$rJV$9(B
      */
-    function useCookie()
-    {
+    function useCookie() {
         return true;
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php
===================================================================
--- branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_SessionFactory_UseRequest extends SC_SessionFactory_Ex 
-{
+class SC_SessionFactory_UseRequest extends SC_SessionFactory_Ex {
 
     var $state = null;
 
@@ -45,8 +44,7 @@
      *
      * @param string $state
      */
-    function setState($state = 'pc')
-    {
+    function setState($state = 'pc') {
         switch ($state) {
             case 'mobile':
                 $this->state = new LC_UseRequest_State_Mobile;
@@ -64,8 +62,7 @@
      *
      * @return boolean $B>o$K(Bfalse$B$rJV$9(B
      */
-    function useCookie()
-    {
+    function useCookie() {
         return false;
     }
 
@@ -76,8 +73,7 @@
      * @return string|null $B<hF@$7$?%;%C%7%g%s(BID$B$rJV$9!#(B
      *                     $B<hF@$G$-$J$+$C$?>l9g$O(B null $B$rJV$9!#(B
      */
-    function getExtSessionId()
-    {
+    function getExtSessionId() {
         if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
             return null;
         }
@@ -107,8 +103,7 @@
      * @param string $url URL
      * @return void
      */
-    function setExtSessionId($param_key, $param_value, $url)
-    {
+    function setExtSessionId($param_key, $param_value, $url) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         // GC
@@ -131,8 +126,7 @@
      *
      * @return boolean $B%;%C%7%g%s%G!<%?$,M-8z$J>l9g$O(B true$B!"L58z$J>l9g$O(B false $B$rJV$9!#(B
      */
-    function validateSession()
-    {
+    function validateSession() {
         /**
          * PC$B%5%$%H$G$O(B
          *  $B!&%;%C%7%g%s%G!<%?$,E, ＠ Z$K ＠ _Dj$5$l$F$$$k$+(B
@@ -156,8 +150,7 @@
      * @return string|false $B<hF@$7$?M-8z$J%;%C%7%g%s(BID$B$rJV$9!#(B
      *                      $B<hF@$G$-$J$+$C$?>l9g$O(B false $B$rJV$9!#(B
      */
-    function getSessionId()
-    {
+    function getSessionId() {
         // $B%Q%i%a!<%?!<$+$i%;%C%7%g%s(BID$B$r<hF@$9$k!#(B
         $sessionId = @$_POST[session_name()];
         if (!isset($sessionId)) {
@@ -191,8 +184,7 @@
      *
      * @return void
      */
-    function initSession()
-    {
+    function initSession() {
         // $B%;%C%7%g%s(BID$B$N<u$1EO$7$K%/%C%-!<$r;HMQ$7$J$$!#(B
         ini_set('session.use_cookies', '0');
         ini_set('session.use_trans_sid', '1');
@@ -240,8 +232,7 @@
  * $B%;%C%7%g%s%G!<%?4IM}%/%i%9$N4pDl%/%i%9(B
  *
  */
-class LC_UseRequest_State 
-{
+class LC_UseRequest_State {
     /** $BL>A06u4V(B(pc/mobile) */
     var $namespace = '';
     /** $BM-8z4|4V(B */
@@ -254,16 +245,14 @@
      *
      * @return string
      */
-    function getNameSpace()
-    { return $this->namespace; }
+    function getNameSpace() { return $this->namespace; }
 
     /**
      * $BM-8z4|4V$r<hF@$9$k(B
      *
      * @return integer
      */
-    function getLifeTime()
-    { return $this->lifetime; }
+    function getLifeTime() { return $this->lifetime; }
 
     /**
      * $B%;%C%7%g%s%G!<%?$, ＠ _Dj$5$l$F$$$k$+$rH=Dj$9$k(B.
@@ -272,8 +261,7 @@
      *
      * @return boolean
      */
-    function validateNameSpace()
-    {
+    function validateNameSpace() {
         $namespace = $this->getNameSpace();
         if (isset($_SESSION[$namespace]) && is_array($_SESSION[$namespace])) {
             return true;
@@ -289,8 +277,7 @@
      * @param string $key
      * @return mixed|null
      */
-    function getValue($key)
-    {
+    function getValue($key) {
         $namespace = $this->getNameSpace();
         return isset($_SESSION[$namespace][$key])
             ? $_SESSION[$namespace][$key]
@@ -304,8 +291,7 @@
      * @param string $key
      * @param mixed $value
      */
-    function setValue($key, $value)
-    {
+    function setValue($key, $value) {
         $namespace = $this->getNameSpace();
         $_SESSION[$namespace][$key] = $value;
     }
@@ -315,8 +301,7 @@
      *
      * @return integer
      */
-    function getExpire()
-    {
+    function getExpire() {
         return $this->getValue('expires');
     }
 
@@ -324,8 +309,7 @@
      * $BM-8z4|8B$r ＠ _Dj$9$k(B.
      *
      */
-    function updateExpire()
-    {
+    function updateExpire() {
         $lifetime = $this->getLifeTime();
         $this->setValue('expires', time() + $lifetime);
     }
@@ -335,8 +319,7 @@
      *
      * @return boolean
      */
-    function validateExpire()
-    {
+    function validateExpire() {
         $expire = $this->getExpire();
         if (intval($expire) > time()) {
             return true;
@@ -351,8 +334,7 @@
      *
      * @return string
      */
-    function getIp()
-    {
+    function getIp() {
         return $this->getValue('ip');
     }
 
@@ -360,8 +342,7 @@
      * IP$B%"%I%l%9$r ＠ _Dj$9$k(B.
      *
      */
-    function updateIp()
-    {
+    function updateIp() {
         $this->setValue('ip', $_SERVER['REMOTE_ADDR']);
     }
 
@@ -371,8 +352,7 @@
      *
      * @return boolean
      */
-    function validateIp()
-    {
+    function validateIp() {
         $ip = $this->getIp();
         if (!empty($_SERVER['REMOTE_ADDR']) && $ip === $_SERVER['REMOTE_ADDR']) {
 
@@ -389,8 +369,7 @@
      *
      * @return string
      */
-    function getModel()
-    {
+    function getModel() {
         return $this->getValue('model');
     }
 
@@ -399,8 +378,7 @@
      *
      * @return boolean
      */
-    function validateSessionData()
-    {
+    function validateSessionData() {
         foreach ($this->validate as $method) {
             $method = 'validate' . $method;
             if (!$this->$method()) {
@@ -414,16 +392,14 @@
      * $B%;%C%7%g%s%G!<%?$r=i4|2=$9$k(B.
      *
      */
-    function inisializeSessionData()
-    {}
+    function inisializeSessionData() {}
 }
 
 /**
  * PC$B%5%$%HMQ$N%;%C%7%g%s%G!<%?4IM}%/%i%9(B
  *
  */
-class LC_UseRequest_State_PC extends LC_UseRequest_State 
-{
+class LC_UseRequest_State_PC extends LC_UseRequest_State {
 
     /**
      * $B%3%s%9%H%i%/%?(B
@@ -436,8 +412,7 @@
      *
      * @return LC_UseRequest_State_PC
      */
-    function LC_UseRequest_State_PC()
-    {
+    function LC_UseRequest_State_PC() {
         $this->namespace = 'pc';
         $this->lifetime  = SESSION_LIFETIME;
         $this->validate  = array('NameSpace', 'Model', 'Ip', 'Expire');
@@ -447,8 +422,7 @@
      * $B%;%C%7%g%s$K(BUserAgent$B$r ＠ _Dj$9$k(B.
      *
      */
-    function updateModel()
-    {
+    function updateModel() {
         $this->setValue('model', $_SERVER['HTTP_USER_AGENT']);
     }
 
@@ -457,8 +431,7 @@
      *
      * @return boolean
      */
-    function validateModel()
-    {
+    function validateModel() {
         $ua = $this->getModel();
         if (!empty($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] === $ua) {
             return true;
@@ -473,8 +446,7 @@
      * $B%;%C%7%g%s%G!<%?$r=i4|2=$9$k(B.
      *
      */
-    function inisializeSessionData()
-    {
+    function inisializeSessionData() {
         $_SESSION = array();
         $this->updateModel();
         $this->updateIp();
@@ -486,8 +458,7 @@
  * $B%b%P%$%k%5%$%HMQ$N%;%C%7%g%s%G!<%?4IM}%/%i%9(B
  *
  */
-class LC_UseRequest_State_Mobile extends LC_UseRequest_State 
-{
+class LC_UseRequest_State_Mobile extends LC_UseRequest_State {
 
     /**
      * $B%3%s%9%H%i%/%?(B
@@ -501,8 +472,7 @@
      *
      * @return LC_UseRequest_State_Mobile
      */
-    function LC_UseRequest_State_Mobile()
-    {
+    function LC_UseRequest_State_Mobile() {
         $this->namespace = 'mobile';
         $this->lifetime  = MOBILE_SESSION_LIFETIME;
         $this->validate  = array('NameSpace', 'Model', 'Expire');
@@ -512,8 +482,7 @@
      * $B7HBS$N5!<oL>$r ＠ _Dj$9$k(B
      *
      */
-    function updateModel()
-    {
+    function updateModel() {
         $this->setValue('model', SC_MobileUserAgent_Ex::getModel());
     }
 
@@ -522,8 +491,7 @@
      *
      * @return boolean
      */
-    function validateModel()
-    {
+    function validateModel() {
         $modelInSession = $this->getModel();
         $model = SC_MobileUserAgent_Ex::getModel();
         if (!empty($model) && $model === $modelInSession) {
@@ -537,8 +505,7 @@
      *
      * @return string
      */
-    function getPhoneId()
-    {
+    function getPhoneId() {
         return $this->getValue('phone_id');
     }
 
@@ -546,8 +513,7 @@
      * $B7HBS$N(BID$B$rEPO?$9$k(B.
      *
      */
-    function updatePhoneId()
-    {
+    function updatePhoneId() {
         $this->setValue('phone_id', SC_MobileUserAgent_Ex::getId());
     }
 
@@ -555,8 +521,7 @@
      * $B%;%C%7%g%s%G!<%?$r=i4|2=$9$k(B.
      *
      */
-    function inisializeSessionData()
-    {
+    function inisializeSessionData() {
         $_SESSION = array();
         $this->updateModel();
         $this->updateIp();

$BJQ99(B: branches/version-2_12-dev/data/class/util/GC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/GC_Utils.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/util/GC_Utils.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class GC_Utils 
-{
+class GC_Utils {
 
     /**
      * $B%m%0%U%!%$%k$KJQ?t$N>\:Y$r=PNO(B
@@ -39,8 +38,7 @@
      * @param mixed $obj
      * @return void
      */
-    function gfDebugLog($obj)
-    {
+    function gfDebugLog($obj) {
         if (USE_VERBOSE_LOG === true) {
             $msg = "DEBUG\n"
                  . print_r($obj, true);
@@ -54,8 +52,7 @@
      * @param int $forLogInfo $B%m%0=PNOMQ$KMxMQ$9$k$+$I$&$+(B(1:$B%m%0=PNOMQ$KMxMQ$9$k(B)
      * @return string $B8F$S=P$785%/%i%9!"4X?tL>!"9T?t$NJ8;zNsI=8=(B
      */
-    function gfGetCallerInfo($forLogInfo = true)
-    {
+    function gfGetCallerInfo($forLogInfo = true) {
         // $B%P%C%/%H%l!<%9$r<hF@$9$k(B
         $traces = debug_backtrace(false);
         $bklv = 1;
@@ -76,8 +73,7 @@
      *
      * $B%(%i!<%O%s%I%j%s%0$K4X$o$k>pJs$r ＠ Z$j<N$F$k!#(B
      */
-    function getDebugBacktrace($arrBacktrace = null)
-    {
+    function getDebugBacktrace($arrBacktrace = null) {
         if (is_null($arrBacktrace)) {
             $arrBacktrace = debug_backtrace(false);
         }
@@ -122,8 +118,7 @@
      *
      * @deprecated 2.12.0
      */
-    function gfGetLogStr($mess, $log_level = 'Info')
-    {
+    function gfGetLogStr($mess, $log_level = 'Info') {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         // $B%a%C%;!<%8$NA0$K!"%m%0=PNO854X?tL>$H%m%0=PNO4X?t8F$S=P$7ItJ,$N9T?t$rIUM?(B
         $mess = GC_Utils::gfGetCallerInfo(true) . $mess;
@@ -141,8 +136,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog $B$r;HMQ$9$k$3$H(B
      */
-    function gfAdminLog($mess, $log_level = 'Info')
-    {
+    function gfAdminLog($mess, $log_level = 'Info') {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         // $B%m%0%l%Y%k(B=Debug$B$N>l9g$O!"(BDEBUG_MODE$B$,(Btrue$B$N>l9g$N$_%m%0=PNO$9$k(B
         if ($log_level === 'Debug' && DEBUG_MODE === false) {
@@ -158,8 +152,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog $B$r;HMQ$9$k$3$H(B
      */
-    function gfFrontLog($mess, $log_level = 'Info')
-    {
+    function gfFrontLog($mess, $log_level = 'Info') {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         // $B%m%0%l%Y%k(B=Debug$B$N>l9g$O!"(BDEBUG_MODE$B$,(Btrue$B$N>l9g$N$_%m%0=PNO$9$k(B
         if ($log_level === 'Debug' && DEBUG_MODE === false) {
@@ -178,8 +171,7 @@
      * @param string $path
      * @param bool $verbose $B>iD9$J=PNO$r9T$&$+(B
      */
-    function gfPrintLog($msg, $path = '', $verbose = USE_VERBOSE_LOG)
-    {
+    function gfPrintLog($msg, $path = '', $verbose = USE_VERBOSE_LOG) {
         // $BF|IU$N<hF@(B
         $today = date('Y/m/d H:i:s');
         // $B=PNO%Q%9$N:n ＠ .(B
@@ -215,8 +207,7 @@
      * @param string  $path $B%U%!%$%k%Q%9(B
      * @return void
      */
-    function gfLogRotation($max_log, $max_size, $path)
-    {
+    function gfLogRotation($max_log, $max_size, $path) {
 
         // $B%U%!%$%k$,B8:_$7$J$$>l9g!"=*N;(B
         if (!file_exists($path)) return;
@@ -253,8 +244,7 @@
      * [$B0MB8(B] $B$J$7(B
      * [$BCm<a(B] -
      *----------------------------------------------------------------------*/
-    function gfMakePassword($pwLength)
-    {
+    function gfMakePassword($pwLength) {
 
         // $BMp?tI=$N%7!<%I$r7hDj(B
         srand((double)microtime() * 54234853);
@@ -280,8 +270,7 @@
      * [$BCm<a(B] -
      *----------------------------------------------------------------------------------------------------------------------*/
 
-    function gfMailHeaderAddr($str)
-    {
+    function gfMailHeaderAddr($str) {
         $addrs = explode(',', $str); //$B%"%I%l%9$rG[Ns$KF~$l$k(B
         $mailaddrs = array();
         foreach ($addrs as $addr) {
@@ -303,8 +292,7 @@
      * @param array $arrBacktrace $B%P%C%/%H%l!<%9(B
      * @return string $B%F%-%9%H$GI=8=$7$?%P%C%/%H%l!<%9(B
      */
-    function toStringBacktrace($arrBacktrace)
-    {
+    function toStringBacktrace($arrBacktrace) {
         $string = '';
 
         foreach (array_reverse($arrBacktrace) as $backtrace) {
@@ -327,8 +315,7 @@
      * @param integer $error_type $B%(%i!<7?(B
      * @return string|integer $B%(%i!<Dj?tL>(B
      */
-    function getErrorTypeName($error_type)
-    {
+    function getErrorTypeName($error_type) {
         $arrDefinedConstants = get_defined_constants(true);
 
         // PHP $B$NNr;KBP1~(B
@@ -359,8 +346,7 @@
      *
      * @return string $B8=:_$N(BURL
      */
-    function getUrl()
-    {
+    function getUrl() {
         $url = '';
 
         if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
@@ -382,8 +368,7 @@
      *
      * @return bool $B4IM}5!G=$+(B
      */
-    function isAdminFunction()
-    {
+    function isAdminFunction() {
         return defined('ADMIN_FUNCTION') && ADMIN_FUNCTION === true;
     }
 
@@ -392,8 +377,7 @@
      *
      * @return bool $B%U%m%s%H5!G=$+(B
      */
-    function isFrontFunction()
-    {
+    function isFrontFunction() {
         return defined('FRONT_FUNCTION') && FRONT_FUNCTION === true;
     }
 
@@ -402,8 +386,7 @@
      *
      * @return bool $B%$%s%9%H!<%k5!G=$+(B
      */
-    function isInstallFunction()
-    {
+    function isInstallFunction() {
         return defined('INSTALL_FUNCTION') && INSTALL_FUNCTION === true;
     }
 
@@ -414,8 +397,7 @@
      *
      * @return string XML$B ＠ k8@$NJ8;zNs(B
      */
-    function printXMLDeclaration()
-    {
+    function printXMLDeclaration() {
         $ua = $_SERVER['HTTP_USER_AGENT'];
         if (!preg_match('/MSIE/', $ua) || preg_match('/MSIE 7/', $ua)) {
             echo '<?xml version="1.0" encoding="' . CHAR_CODE . '"?>' . "\n";

$BJQ99(B: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,12 +32,10 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Utils.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Utils 
-{
+class SC_Utils {
 
     // $B%$%s%9%H!<%k=i4|=hM}(B
-    function sfInitInstall()
-    {
+    function sfInitInstall() {
         // $B%$%s%9%H!<%k:Q$_$,Dj5A$5$l$F$$$J$$!#(B
         if (!defined('ECCUBE_INSTALL')) {
             $phpself = $_SERVER['SCRIPT_NAME'];
@@ -65,8 +63,7 @@
      * @param string $path $B8!:wBP>]$N%Q%9(B
      * @return string $B%$%s%9%H!<%i$N(B URL
      */
-    function searchInstallerPath($path)
-    {
+    function searchInstallerPath($path) {
         $installer = 'install/' . DIR_INDEX_PATH;
 
         if (SC_Utils_Ex::sfIsHTTPS()) {
@@ -103,8 +100,7 @@
      * @param string $url http(s):// $B$+$i;O$^$k(B URL
      * @return string $url $B$r ＠ dBP%Q%9$KJQ49$7$?(B URL
      */
-    function getRealURL($url)
-    {
+    function getRealURL($url) {
         $parse = parse_url($url);
         $tmp = explode('/', $parse['path']);
         $results = array();
@@ -123,8 +119,7 @@
     }
 
     // $BAu>~IU$-%(%i!<%a%C%;!<%8$NI=<((B
-    function sfErrorHeader($mess, $print = false)
-    {
+    function sfErrorHeader($mess, $print = false) {
         global $GLOBAL_ERR;
         $GLOBAL_ERR.= '<div id="errorHeader">';
         $GLOBAL_ERR.= $mess;
@@ -135,8 +130,7 @@
     }
 
     /* $B%(%i!<%Z!<%8$NI=<((B */
-    function sfDispError($type)
-    {
+    function sfDispError($type) {
 
         require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_DispError_Ex.php';
 
@@ -149,8 +143,7 @@
     }
 
     /* $B%5%$%H%(%i!<%Z!<%8$NI=<((B */
-    function sfDispSiteError($type, $objSiteSess = '', $return_top = false, $err_msg = '')
-    {
+    function sfDispSiteError($type, $objSiteSess = '', $return_top = false, $err_msg = '') {
 
         require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_Ex.php';
 
@@ -171,15 +164,13 @@
      *
      * @deprecated 2.12.0 trigger_error($debugMsg, E_USER_ERROR) $B$r;HMQ$9$k$3$H(B
      */
-    function sfDispException($debugMsg = null)
-    {
+    function sfDispException($debugMsg = null) {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         trigger_error($debugMsg, E_USER_ERROR);
     }
 
     /* $BG'>Z$N2DH]H=Dj(B */
-    function sfIsSuccess($objSess, $disp_error = true)
-    {
+    function sfIsSuccess($objSess, $disp_error = true) {
         $ret = $objSess->IsSuccess();
         if ($ret != SUCCESS) {
             if ($disp_error) {
@@ -214,8 +205,7 @@
      * @param string $passlen $BJQ49$9$kJ8;zNs(B
      * @return string $B%"%9%?%j%9%/$XJQ49$7$?J8;zNs(B
      */
-    function sfPassLen($passlen)
-    {
+    function sfPassLen($passlen) {
         $ret = '';
         for ($i=0;$i<$passlen;true) {
             $ret.='*';
@@ -229,8 +219,7 @@
      *
      * @return bool
      */
-    function sfIsHTTPS()
-    {
+    function sfIsHTTPS() {
         // HTTPS$B;~$K$O(B$_SERVER['HTTPS']$B$K$O6u$G$J$$CM$,F~$k(B
         // $_SERVER['HTTPS'] != 'off' $B$O(BIIS$BMQ(B
         if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
@@ -246,8 +235,7 @@
      *  @param  obj  SC_Session, SC_SiteSession
      *  @return bool
      */
-    function sfIsValidTransition($objSess)
-    {
+    function sfIsValidTransition($objSess) {
         // $BA02hLL$+$i(BPOST$B$5$l$k(Buniqid$B$, ＠ 5$7$$$b$N$+$I$&$+$r%A%'%C%/(B
         $uniqid = $objSess->getUniqId();
         if (!empty($_POST['uniqid']) && ($_POST['uniqid'] === $uniqid)) {
@@ -258,8 +246,7 @@
     }
 
     /* DB$BMQF|IUJ8;zNs<hF@(B */
-    function sfGetTimestamp($year, $month, $day, $last = false)
-    {
+    function sfGetTimestamp($year, $month, $day, $last = false) {
         if ($year != '' && $month != '' && $day != '') {
             if ($last) {
                 $time = '23:59:59';
@@ -282,8 +269,7 @@
      *  @return bool
      */
     //
-    function sfIsInt($value)
-    {
+    function sfIsInt($value) {
         if (strlen($value) >= 1 && strlen($value) <= INT_LEN && is_numeric($value)) {
             return true;
         }
@@ -296,15 +282,13 @@
      * @param string $value $B8!::BP>](B
      * @return boolean 0$B$GKd$a$i$l$F$$$k(B
      */
-    function sfIsZeroFilling($value)
-    {
+    function sfIsZeroFilling($value) {
         if (strlen($value) > 1 && $value{0} === '0')
             return true;
         return false;
     }
 
-    function sfGetCSVData($data, $prefix = '')
-    {
+    function sfGetCSVData($data, $prefix = '') {
         if ($prefix == '') {
             $dir_name = SC_Utils_Ex::sfUpDirName();
             $file_name = $dir_name . date('ymdHis') .'.csv';
@@ -321,8 +305,7 @@
     }
 
     /* 1$B3,AX>e$N%G%#%l%/%H%jL>$r<hF@$9$k(B */
-    function sfUpDirName()
-    {
+    function sfUpDirName() {
         $path = $_SERVER['SCRIPT_NAME'];
         $arrVal = explode('/', $path);
         $cnt = count($arrVal);
@@ -333,8 +316,7 @@
     /**
      * @deprecated
      */
-    function sfMergeCBValue($keyname, $max)
-    {
+    function sfMergeCBValue($keyname, $max) {
         $conv = '';
         $cnt = 1;
         for ($cnt = 1; $cnt <= $max; $cnt++) {
@@ -351,8 +333,7 @@
     /**
      * @deprecated
      */
-    function sfMergeCheckBoxes($array, $max)
-    {
+    function sfMergeCheckBoxes($array, $max) {
         $ret = '';
         $arrTmp = array();
         if (is_array($array)) {
@@ -374,8 +355,7 @@
     /**
      * @deprecated
      */
-    function sfMergeParamCheckBoxes($array)
-    {
+    function sfMergeParamCheckBoxes($array) {
         $ret = '';
         if (is_array($array)) {
             foreach ($array as $val) {
@@ -395,8 +375,7 @@
     /**
      * @deprecated
      */
-    function sfSearchCheckBoxes($array)
-    {
+    function sfSearchCheckBoxes($array) {
         $max = max($array);
         $ret = '';
         for ($i = 1; $i <= $max; $i++) {
@@ -412,8 +391,7 @@
     /**
      * @deprecated
      */
-    function sfSplitCheckBoxes($val)
-    {
+    function sfSplitCheckBoxes($val) {
         $arrRet = array();
         $len = strlen($val);
         for ($i = 0; $i < $len; $i++) {
@@ -428,8 +406,7 @@
     /**
      * @deprecated
      */
-    function sfMergeCBSearchValue($keyname, $max)
-    {
+    function sfMergeCBSearchValue($keyname, $max) {
         $conv = '';
         $cnt = 1;
         for ($cnt = 1; $cnt <= $max; $cnt++) {
@@ -446,8 +423,7 @@
     /**
      * @deprecated
      */
-    function sfSplitCBValue($val, $keyname = '')
-    {
+    function sfSplitCBValue($val, $keyname = '') {
         $arr = array();
         $len = strlen($val);
         $no = 1;
@@ -463,8 +439,7 @@
     }
 
     // $B%-!<$HCM$r%;%C%H$7$?G[Ns$r<hF@(B
-    function sfArrKeyValue($arrList, $keyname, $valname, $len_max = '', $keysize = '')
-    {
+    function sfArrKeyValue($arrList, $keyname, $valname, $len_max = '', $keysize = '') {
         $arrRet = array();
         $max = count($arrList);
 
@@ -489,8 +464,7 @@
     }
 
     // $B%-!<$HCM$r%;%C%H$7$?G[Ns$r<hF@(B($BCM$,J#?t$N>l9g(B)
-    function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = '')
-    {
+    function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = '') {
 
         $max = count($arrList);
 
@@ -517,8 +491,7 @@
     }
 
     // $BG[Ns$NCM$r%+%s%^6h ＠ Z$j$GJV$9!#(B
-    function sfGetCommaList($array, $space=true, $arrPop = array())
-    {
+    function sfGetCommaList($array, $space=true, $arrPop = array()) {
         if (count($array) > 0) {
             $line = '';
             foreach ($array as $val) {
@@ -543,8 +516,7 @@
     }
 
     /* $BG[Ns$NMWAG$r(BCSV$B%U%)!<%^%C%H$G=PNO$9$k!#(B*/
-    function sfGetCSVList($array)
-    {
+    function sfGetCSVList($array) {
         $line = '';
         if (count($array) > 0) {
             foreach ($array as $val) {
@@ -567,8 +539,7 @@
     /*            $B#2!%=*N;G/7nF|(B (YYYY/MM/DD 235959)
     /*            $B#3!%%(%i!<(B (0 = OK, 1 = NG)
     /*-----------------------------------------------------------------*/
-    function sfCheckSetTerm($start_year, $start_month, $start_day, $end_year, $end_month, $end_day)
-    {
+    function sfCheckSetTerm($start_year, $start_month, $start_day, $end_year, $end_month, $end_day) {
 
         // $B4|4V;XDj(B
         $error = 0;
@@ -591,14 +562,12 @@
     }
 
     // $B%(%i!<2U=j$NGX7J?'$rJQ99$9$k$?$a$N(Bfunction SC_View$B$GFI$_9~$`(B
-    function sfSetErrorStyle()
-    {
+    function sfSetErrorStyle() {
         return 'style="background-color:'.ERR_COLOR.'"';
     }
 
     // $B0lCW$7$?CM$N%-!<L>$r<hF@(B
-    function sfSearchKey($array, $word, $default)
-    {
+    function sfSearchKey($array, $word, $default) {
         foreach ($array as $key => $val) {
             if ($val == $word) {
                 return $key;
@@ -607,32 +576,28 @@
         return $default;
     }
 
-    function sfGetErrorColor($val)
-    {
+    function sfGetErrorColor($val) {
         if ($val != '') {
             return 'background-color:' . ERR_COLOR;
         }
         return '';
     }
 
-    function sfGetEnabled($val)
-    {
+    function sfGetEnabled($val) {
         if (! $val) {
             return ' disabled="disabled"';
         }
         return '';
     }
 
-    function sfGetChecked($param, $value)
-    {
+    function sfGetChecked($param, $value) {
         if ((string)$param === (string)$value) {
             return 'checked="checked"';
         }
         return '';
     }
 
-    function sfTrim($str)
-    {
+    function sfTrim($str) {
         $ret = mb_ereg_replace("^[$B!!(B \n\r]*", '', $str);
         $ret = mb_ereg_replace("[$B!!(B \n\r]*$", '', $ret);
         return $ret;
@@ -649,8 +614,7 @@
      * @param integer $tax_rule $BC<?t=hM}(B
      * @return integer $B ＠ G6b3[(B
      */
-    function sfTax($price, $tax, $tax_rule)
-    {
+    function sfTax($price, $tax, $tax_rule) {
         $real_tax = $tax / 100;
         $ret = $price * $real_tax;
         switch ($tax_rule) {
@@ -685,14 +649,12 @@
      * @param integer $tax_rule $BC<?t=hM}(B
      * @return integer $B ＠ G6bIUM?$7$?6b3[(B
      */
-    function sfCalcIncTax($price, $tax, $tax_rule)
-    {
+    function sfCalcIncTax($price, $tax, $tax_rule) {
         return $price + SC_Utils_Ex::sfTax($price, $tax, $tax_rule);
     }
 
     // $B7e?t$r;XDj$7$F;M<N8^F~(B
-    function sfRound($value, $pow = 0)
-    {
+    function sfRound($value, $pow = 0) {
         $adjust = pow(10 ,$pow-1);
 
         // $B ＠ 0?t3n$D(B0$B=P$J$1$l$P7e?t;XDj$r9T$&(B
@@ -714,8 +676,7 @@
      * @param int $product_id
      * @return int 
      */
-    function sfPrePoint($price, $point_rate, $rule = POINT_RULE, $product_id = '')
-    {
+    function sfPrePoint($price, $point_rate, $rule = POINT_RULE, $product_id = '') {
         $real_point = $point_rate / 100;
         $ret = $price * $real_point;
         switch ($rule) {
@@ -740,8 +701,7 @@
     }
 
     /* $B5,3JJ,N`$N7o?t<hF@(B */
-    function sfGetClassCatCount()
-    {
+    function sfGetClassCatCount() {
         $sql = 'select count(dtb_class.class_id) as count, dtb_class.class_id ';
         $sql.= 'from dtb_class inner join dtb_classcategory on dtb_class.class_id = dtb_classcategory.class_id ';
         $sql.= 'where dtb_class.del_flg = 0 AND dtb_classcategory.del_flg = 0 ';
@@ -755,36 +715,27 @@
     }
 
     /**
-     * $B>&IJ(BID$B$H%+%F%4%j(BID$B$+$i>&IJ5,3J(BID$B$r<hF@$9$k(B
+     * $classcategory_id1 $B$H(B $classcategory_id2 $B$,;HMQ$5$l$F$$$J$$!#(B
      * @param int $product_id
-     * @param int $classcategory_id1 $B%G%U%)%k%HCM(B0
-     * @param int $classcategory_id2 $B%G%U%)%k%HCM(B0
+     * @param int $classcategory_id1
+     * @param int $classcategory_id2
      * @return int 
      */
-    function sfGetProductClassId($product_id, $classcategory_id1=0, $classcategory_id2=0)
-    {
-        $where = 'product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?';
-        if (!$classcategory_id1) { //NULL$B$,F~$C$F$-$?>l9g$X$NBP:v(B
-          $classcategory_id1 = 0;
-        }
-        if (!$classcategory_id2) {
-          $classcategory_id2 = 0;
-        }
+    function sfGetProductClassId($product_id, $classcategory_id1, $classcategory_id2) {
+        $where = 'product_id = ?';
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $ret = $objQuery->get('product_class_id', 'dtb_products_class', $where, Array($product_id, $classcategory_id1, $classcategory_id2));
+        $ret = $objQuery->get('product_class_id', 'dtb_products_class', $where, Array($product_id));
         return $ret;
     }
 
     /* $BJ8Kv$N!V(B/$B!W$r$J$/$9(B */
-    function sfTrimURL($url)
-    {
+    function sfTrimURL($url) {
         $ret = rtrim($url, '/');
         return $ret;
     }
 
     /* DB$B$+$i<h$j=P$7$?F|IU$NJ8;zNs$rD4 ＠ 0$9$k!#(B*/
-    function sfDispDBDate($dbdate, $time = true)
-    {
+    function sfDispDBDate($dbdate, $time = true) {
         list($y, $m, $d, $H, $M) = preg_split('/[- :]/', $dbdate);
 
         if (strlen($y) > 0 && strlen($m) > 0 && strlen($d) > 0) {
@@ -800,8 +751,7 @@
     }
 
     /* $BG[Ns$r%-!<L>$4$H$NG[Ns$KJQ99$9$k(B */
-    function sfSwapArray($array, $isColumnName = true)
-    {
+    function sfSwapArray($array, $isColumnName = true) {
         $arrRet = array();
         foreach ($array as $key1 => $arr1) {
             if (!is_array($arr1)) continue 1;
@@ -826,8 +776,7 @@
      * @param array $BI,?\%-!<$NG[Ns(B
      * @return array $BO"A[G[Ns$NCM$N$_$NG[Ns(B
      */
-    function getHash2Array($hash, $requires = array())
-    {
+    function getHash2Array($hash, $requires = array()) {
         $array = array();
         $i = 0;
         foreach ($hash as $key => $val) {
@@ -845,8 +794,7 @@
     }
 
     /* $B$+$1;;$r$9$k!J(BSmarty$BMQ(B) */
-    function sfMultiply($num1, $num2)
-    {
+    function sfMultiply($num1, $num2) {
         return $num1 * $num2;
     }
 
@@ -860,8 +808,7 @@
      * @param integer $point_rate
      * @return integer $B2C;;%]%$%s%H(B
      */
-    function sfGetAddPoint($totalpoint, $use_point, $point_rate)
-    {
+    function sfGetAddPoint($totalpoint, $use_point, $point_rate) {
         // $B9XF~>&IJ$N9g7W%]%$%s%H$+$iMxMQ$7$?%]%$%s%H$N%]%$%s%H49;;2ACM$r0z$/J}<0(B
         $add_point = $totalpoint - intval($use_point * ($point_rate / 100));
 
@@ -872,8 +819,7 @@
     }
 
     /* $B0l0U$+$DM=B,$5$l$K$/$$(BID */
-    function sfGetUniqRandomId($head = '')
-    {
+    function sfGetUniqRandomId($head = '') {
         // $BM=B,$5$l$J$$$h$&$K%i%s%@%`J8;zNs$rIUM?$9$k!#(B
         $random = GC_Utils_Ex::gfMakePassword(8);
         // $BF10l%[%9%HFb$G0l0U$J(BID$B$r ＠ 8@.(B
@@ -882,8 +828,7 @@
     }
 
     // $BFs2s0J>e7+$jJV$5$l$F$$$k%9%i%C%7%e(B[/]$B$r0l$D$KJQ49$9$k!#(B
-    function sfRmDupSlash($istr)
-    {
+    function sfRmDupSlash($istr) {
         if (preg_match('|^http://|', $istr)) {
             $str = substr($istr, 7);
             $head = 'http://';
@@ -915,8 +860,7 @@
      * @param string $out_dir $BJQ498e$N%U%!%$%k$r=PNO$9$k%G%#%l%/%H%j$rI=$9J8;zNs(B
      * @return string $BJQ498e$N%F%-%9%H%U%!%$%k$N%Q%9(B
      */
-    function sfEncodeFile($filepath, $enc_type, $out_dir)
-    {
+    function sfEncodeFile($filepath, $enc_type, $out_dir) {
         $ifp = fopen($filepath, 'r');
 
         // $B ＠ 5>o$K%U%!%$%k%*!<%W%s$7$?>l9g(B
@@ -944,8 +888,7 @@
         return $outpath;
     }
 
-    function sfCutString($str, $len, $byte = true, $commadisp = true)
-    {
+    function sfCutString($str, $len, $byte = true, $commadisp = true) {
         if ($byte) {
             if (strlen($str) > ($len + 2)) {
                 $ret =substr($str, 0, $len);
@@ -993,8 +936,7 @@
     }
 
     // $BG/!"7n!"Dy$aF|$+$i!"@h7n$NDy$aF|(B+1$B!":#7n$NDy$aF|$r5a$a$k!#(B
-    function sfTermMonth($year, $month, $close_day)
-    {
+    function sfTermMonth($year, $month, $close_day) {
         $end_year = $year;
         $end_month = $month;
 
@@ -1036,8 +978,7 @@
     }
 
     // $B:F5"E*$KB?CJG[Ns$r8!:w$7$F0l<!85G[Ns(B(Hidden$B0zEO$7MQG[Ns(B)$B$KJQ49$9$k!#(B
-    function sfMakeHiddenArray($arrSrc, $arrDst = array(), $parent_key = '')
-    {
+    function sfMakeHiddenArray($arrSrc, $arrDst = array(), $parent_key = '') {
         if (is_array($arrSrc)) {
             foreach ($arrSrc as $key => $val) {
                 if ($parent_key != '') {
@@ -1056,8 +997,7 @@
     }
 
     // DB$B<hF ＠ F|;~$r%?%$%`$KJQ49(B
-    function sfDBDatetoTime($db_date)
-    {
+    function sfDBDatetoTime($db_date) {
         $date = preg_replace("|\..*$|",'',$db_date);
         $time = strtotime($date);
         return $time;
@@ -1068,14 +1008,12 @@
      *
      * XXX $B$3$N4X?t$r;H$C$F$$$k2U=j$O!"$[$\@_7W8m$j$H;W$o$l$k!#JQ?t$K%U%'%C%A$9$k$+!"=PNO;~$N%(%s%3!<%G%#%s%0$GBP1~$9$Y$-$H8+<u$1$k!#(B
      */
-    function sfMbConvertEncoding($str, $encode = CHAR_CODE)
-    {
+    function sfMbConvertEncoding($str, $encode = CHAR_CODE) {
         return mb_convert_encoding($str, $encode);
     }
 
     // 2$B$D$NG[Ns$rMQ$$$FO"A[G[Ns$r:n ＠ .$9$k(B
-    function sfArrCombine($arrKeys, $arrValues)
-    {
+    function sfArrCombine($arrKeys, $arrValues) {
 
         if (count($arrKeys) <= 0 and count($arrValues) <= 0) return array();
 
@@ -1092,9 +1030,31 @@
         return false;
     }
 
+    /* $B3,AX9=B$$N%F!<%V%k$+$iM?$($i$l$?(BID$B$N7;Do$r<hF@$9$k(B */
+    function sfGetBrothersArray($arrData, $pid_name, $id_name, $arrPID) {
+        $max = count($arrData);
+
+        $arrBrothers = array();
+        foreach ($arrPID as $id) {
+            // $B?F(BID$B$r8!:w$9$k(B
+            for ($i = 0; $i < $max; $i++) {
+                if ($arrData[$i][$id_name] == $id) {
+                    $parent = $arrData[$i][$pid_name];
+                    break;
+                }
+            }
+            // $B7;Do(BID$B$r8!:w$9$k(B
+            for ($i = 0; $i < $max; $i++) {
+                if ($arrData[$i][$pid_name] == $parent) {
+                    $arrBrothers[] = $arrData[$i][$id_name];
+                }
+            }
+        }
+        return $arrBrothers;
+    }
+
     /* $B3,AX9=B$$N%F!<%V%k$+$iM?$($i$l$?(BID$B$ND>B0$N;R$r<hF@$9$k(B */
-    function sfGetUnderChildrenArray($arrData, $pid_name, $id_name, $parent)
-    {
+    function sfGetUnderChildrenArray($arrData, $pid_name, $id_name, $parent) {
         $max = count($arrData);
 
         $arrChildren = array();
@@ -1111,8 +1071,7 @@
      * SQL$B%7%s%0%k%/%)!<%HBP1~(B
      * @deprecated SC_Query::quote() $B$r;HMQ$9$k$3$H(B
      */
-    function sfQuoteSmart($in)
-    {
+    function sfQuoteSmart($in) {
 
         if (is_int($in) || is_double($in)) {
             return $in;
@@ -1126,8 +1085,7 @@
     }
 
     // $B%G%#%l%/%H%j$r:F5"E*$K ＠ 8@.$9$k(B
-    function sfMakeDir($path)
-    {
+    function sfMakeDir($path) {
         static $count = 0;
         $count++;  // $BL58B%k!<%W2sHr(B
         $dir = dirname($path);
@@ -1154,8 +1112,7 @@
     }
 
     // $B%G%#%l%/%H%j0J2<$N%U%!%$%k$r:F5"E*$K%3%T!<(B
-    function sfCopyDir($src, $des, $mess = '', $override = false)
-    {
+    function sfCopyDir($src, $des, $mess = '', $override = false) {
         if (!is_dir($src)) {
             return false;
         }
@@ -1212,8 +1169,7 @@
      * @param boolean|string $output $BH>3Q%9%Z!<%9(B256$BJ8;z(B+$B2~9T$r=PNO$9$k$+!#$^$?$O!"Aw?.$9$kJ8;zNs$r;XDj!#(B
      * @return void
      */
-    function sfFlush($output = false, $sleep = 0)
-    {
+    function sfFlush($output = false, $sleep = 0) {
         // $B=PNO$r%P%C%U%!%j%s%0$7$J$$(B(==$BF|K\8l<+F0JQ49$b$7$J$$(B)
         while (@ob_end_flush());
 
@@ -1235,8 +1191,7 @@
     }
 
     // @version$B$N5-:\$,$"$k%U%!%$%k$+$i%P!<%8%g%s$r<hF@$9$k!#(B
-    function sfGetFileVersion($path)
-    {
+    function sfGetFileVersion($path) {
         if (file_exists($path)) {
             $src_fp = fopen($path, 'rb');
             if ($src_fp) {
@@ -1261,8 +1216,7 @@
      * @return array $BJQ498e$NG[Ns(B
      * @see mb_convert_kana
      */
-    function mbConvertKanaWithArray($array, $arrConvList)
-    {
+    function mbConvertKanaWithArray($array, $arrConvList) {
         foreach ($arrConvList as $key => $val) {
             if (isset($array[$key])) {
                 $array[$key] = mb_convert_kana($array[$key] ,$val);
@@ -1278,8 +1232,7 @@
      * @param array $defineIndexes $B%A%'%C%/$9$kE:;z(B
      * @return array $BE:;z$rDj5A$7$?G[Ns(B
      */
-    function arrayDefineIndexes($array, $defineIndexes)
-    {
+    function arrayDefineIndexes($array, $defineIndexes) {
         foreach ($defineIndexes as $key) {
             if (!isset($array[$key])) $array[$key] = '';
         }
@@ -1295,8 +1248,7 @@
      * @param array $arrKey
      * @return array
      */
-    function sfArrayIntersectKeys($arrSrc, $arrKey)
-    {
+    function sfArrayIntersectKeys($arrSrc, $arrKey) {
         $arrRet = array();
         foreach ($arrKey as $key) {
             if (isset($arrSrc[$key])) $arrRet[$key] = $arrSrc[$key];
@@ -1309,8 +1261,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::printXMLDeclaration $B$r;HMQ$9$k$3$H(B
      */
-    function printXMLDeclaration()
-    {
+    function printXMLDeclaration() {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         GC_Utils_Ex::printXMLDeclaration();
     }
@@ -1320,8 +1271,7 @@
      *
      * @return string
      */
-    function getTableTag($array)
-    {
+    function getTableTag($array) {
         $html = '<table>';
         $html.= '<tr>';
         foreach ($array[0] as $key => $val) {
@@ -1347,8 +1297,7 @@
      * @param string &$filename $B%U%!%$%kL>(B
      * @return string
      */
-    function sfNoImageMainList($filename = '')
-    {
+    function sfNoImageMainList($filename = '') {
         if (strlen($filename) == 0 || substr($filename, -1, 1) == '/') {
             $filename .= 'noimage_main_list.jpg';
         }
@@ -1361,8 +1310,7 @@
      * @param string &$filename $B%U%!%$%kL>(B
      * @return string
      */
-    function sfNoImageMain($filename = '')
-    {
+    function sfNoImageMain($filename = '') {
         if (strlen($filename) == 0 || substr($filename, -1, 1) == '/') {
             $filename .= 'noimage_main.png';
         }
@@ -1370,8 +1318,7 @@
     }
 
     /* $B%G%P%C%0MQ(B ------------------------------------------------------------------------------------------------*/
-    function sfPrintR($obj)
-    {
+    function sfPrintR($obj) {
         echo '<div style="font-size: 12px;color: #00FF00;">' . "\n";
         echo '<strong>**$B%G%P%C%0Cf(B**</strong><br />' . "\n";
         echo '<pre>' . "\n";
@@ -1386,8 +1333,7 @@
      * @param integer $length $BJ8;z?t(B
      * @return string $B%i%s%@%`$JJ8;zNs(B
      */
-    function sfGetRandomString($length = 1)
-    {
+    function sfGetRandomString($length = 1) {
         return Text_Password::create($length);
     }
 
@@ -1396,8 +1342,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::getUrl $B$r;HMQ$9$k$3$H(B
      */
-    function sfGetUrl()
-    {
+    function sfGetUrl() {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         return GC_Utils_Ex::getUrl();
     }
@@ -1407,8 +1352,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::toStringBacktrace $B$r;HMQ$9$k$3$H(B
      */
-    function sfBacktraceToString($arrBacktrace)
-    {
+    function sfBacktraceToString($arrBacktrace) {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         return GC_Utils_Ex::toStringBacktrace($arrBacktrace);
     }
@@ -1418,8 +1362,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::isAdminFunction $B$r;HMQ$9$k$3$H(B
      */
-    function sfIsAdminFunction()
-    {
+    function sfIsAdminFunction() {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         return GC_Utils_Ex::isAdminFunction();
     }
@@ -1429,8 +1372,7 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::isFrontFunction $B$r;HMQ$9$k$3$H(B
      */
-    function sfIsFrontFunction()
-    {
+    function sfIsFrontFunction() {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         return GC_Utils_Ex::isFrontFunction();
     }
@@ -1440,15 +1382,13 @@
      *
      * @deprecated 2.12.0 GC_Utils_Ex::isInstallFunction $B$r;HMQ$9$k$3$H(B
      */
-    function sfIsInstallFunction()
-    {
+    function sfIsInstallFunction() {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         return GC_Utils_Ex::isInstallFunction();
     }
 
     // $BM9JXHV9f$+$i=;=j$N<hF@(B
-    function sfGetAddress($zipcode)
-    {
+    function sfGetAddress($zipcode) {
 
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -1494,8 +1434,7 @@
      *
      * @deprecated 2.12.0 microtime(true) $B$r;HMQ$9$k!#(B
      */
-    function sfMicrotimeFloat()
-    {
+    function sfMicrotimeFloat() {
         trigger_error('$BA0J}8_49MQ%a%=%C%I$,;HMQ$5$l$^$7$?!#(B', E_USER_WARNING);
         return microtime(true);
     }
@@ -1521,8 +1460,7 @@
      * @param boolean $greedy '$BIOM_(B'$B$K%A%'%C%/$r9T$&>l9g(B true
      * @return boolean $val $B$,6uGr$HH=CG$5$l$?>l9g(B true
      */
-    function isBlank($val, $greedy = true)
-    {
+    function isBlank($val, $greedy = true) {
         if (is_array($val)) {
             if ($greedy) {
                 if (empty($val)) {
@@ -1564,8 +1502,7 @@
      * @param string $url
      * @return boolean
      */
-    function sfIsInternalDomain($url)
-    {
+    function sfIsInternalDomain($url) {
         $netURL = new Net_URL(HTTP_URL);
         $host = $netURL->host;
         if (!$host) return false;
@@ -1581,8 +1518,7 @@
      * @param string $salt salt
      * @return string $B%O%C%7%e0E9f2=$5$l$?J8;zNs(B
      */
-    function sfGetHashString($str, $salt)
-    {
+    function sfGetHashString($str, $salt) {
         $res = '';
         if ($salt == '') {
             $salt = AUTH_MAGIC;
@@ -1603,8 +1539,7 @@
      * @param string $salt salt
      * @return boolean $B0lCWH=Dj(B
      */
-    function sfIsMatchHashPassword($pass, $hashpass, $salt)
-    {
+    function sfIsMatchHashPassword($pass, $hashpass, $salt) {
         $res = false;
         if ($hashpass != '') {
             if (AUTH_TYPE == 'PLAIN') {
@@ -1635,8 +1570,7 @@
      * @param string $search_page_max $BI=<(7o?t$NA*BrCM(B
      * @return integer 1$B%Z!<%8$"$?$j$N:GBgI=<(7o?t(B
      */
-    function sfGetSearchPageMax($search_page_max)
-    {
+    function sfGetSearchPageMax($search_page_max) {
         if (SC_Utils_Ex::sfIsInt($search_page_max) && $search_page_max > 0) {
             $page_max = intval($search_page_max);
         } else {
@@ -1657,8 +1591,7 @@
      * @see json_encode()
      * @see Services_JSON::encode()
      */
-    function jsonEncode($value)
-    {
+    function jsonEncode($value) {
         if (function_exists('json_encode')) {
             return json_encode($value);
         } else {
@@ -1680,8 +1613,7 @@
      * @see json_decode()
      * @see Services_JSON::decode()
      */
-    function jsonDecode($json)
-    {
+    function jsonDecode($json) {
         if (function_exists('json_decode')) {
             return json_decode($json);
         } else {
@@ -1700,8 +1632,7 @@
      * @param string $B%A%'%C%/BP>]$N%Q%9(B
      * @return boolean $B ＠ dBP%Q%9$N>l9g(B true
      */
-    function isAbsoluteRealPath($realpath)
-    {
+    function isAbsoluteRealPath($realpath) {
         if (strpos(PHP_OS, 'WIN') === false) {
             return substr($realpath, 0, 1) == '/';
         } else {
@@ -1719,8 +1650,7 @@
      * @return boolean $B:n ＠ .$K ＠ .8y$7$?>l9g(B true; $B<:GT$7$?>l9g(B false
      * @see http://jp.php.net/mkdir
      */
-    function recursiveMkdir($pathname, $mode = 0777)
-    {
+    function recursiveMkdir($pathname, $mode = 0777) {
         /*
          * SC_Utils_Ex $B$X$N:F5"$OL58B%k!<%W$d%a%b%j%j!<%/$N7|G0(B
          * $B<+%/%i%9$X:F5"$9$k(B.
@@ -1729,8 +1659,7 @@
         return is_dir($pathname) || @mkdir($pathname, $mode);
     }
 
-    function isAppInnerUrl($url)
-    {
+    function isAppInnerUrl($url) {
         $pattern = '/^(' . preg_quote(HTTP_URL, '/') . '|' . preg_quote(HTTPS_URL, '/') . ')/';
         return preg_match($pattern, $url) >= 1;
     }
@@ -1743,8 +1672,7 @@
      * @param integer $seconds $B:GBg<B9T;~4V$r1dD9$9$kIC?t!#(B
      * @return boolean $B ＠ .8y(B=true, $B<:GT(B=false
      */
-    function extendTimeOut($seconds = null)
-    {
+    function extendTimeOut($seconds = null) {
         $safe_mode = (boolean)ini_get('safe_mode');
         if ($safe_mode) return false;
 
@@ -1766,8 +1694,7 @@
      * $B%3%s%Q%$%k%U%!%$%k$r:o=|$7$^$9(B.
      * @return void
      */
-    function clearCompliedTemplate()
-    {
+    function clearCompliedTemplate() {
         // $B%3%s%Q%$%k%U%!%$%k$N:o=|=hM}(B
         SC_Helper_FileManager_Ex::deleteFile(COMPILE_REALDIR, false);
         SC_Helper_FileManager_Ex::deleteFile(COMPILE_ADMIN_REALDIR, false);
@@ -1781,8 +1708,7 @@
      * @param string $destDir $B%3%T!<@h%G%#%l%/%H%j$N%Q%9(B
      * @return void
      */
-    function copyDirectory($source_path, $dest_path)
-    {
+    function copyDirectory($source_path, $dest_path) {
 
         $handle=opendir($source_path);  
         while ($filename = readdir($handle)) {
@@ -1808,8 +1734,7 @@
      * @param string $separator $B6h ＠ Z$jJ8;z(B
      * @return string
      */
-    function repeatStrWithSeparator($input, $multiplier, $separator = ',')
-    {
+    function repeatStrWithSeparator($input, $multiplier, $separator = ',') {
         return implode($separator, array_fill(0, $multiplier, $input));
     }
 
@@ -1820,8 +1745,7 @@
      * @param string $str $BJ8;zNs(B
      * @return string RFC3986$B%(%s%3!<%IJ8;zNs(B
      */
-    function encodeRFC3986($str)
-    {
+    function encodeRFC3986($str) {
         return str_replace('%7E', '~', rawurlencode($str));
     }
 
@@ -1832,8 +1756,7 @@
      * @param string $charlist $B:o=|$9$kJ8;z$r;XDj(B
      * @return string $BJQ998e$NJ8;zNs(B
      */
-    static function trim($str, $charlist = null)
-    {
+    static function trim($str, $charlist = null) {
         $re = SC_Utils_Ex::getTrimPregPattern($charlist);
         return preg_replace('/(^' . $re . ')|(' . $re . '$)/us', '', $str);
     }
@@ -1845,8 +1768,7 @@
      * @param string $charlist $B:o=|$9$kJ8;z$r;XDj(B
      * @return string $BJQ998e$NJ8;zNs(B
      */
-    static function ltrim($str, $charlist = null)
-    {
+    static function ltrim($str, $charlist = null) {
         $re = SC_Utils_Ex::getTrimPregPattern($charlist);
         return preg_replace('/^' . $re . '/us', '', $str);
     }
@@ -1858,8 +1780,7 @@
      * @param string $charlist $B:o=|$9$kJ8;z$r;XDj(B
      * @return string $BJQ998e$NJ8;zNs(B
      */
-    static function rtrim($str, $charlist = null)
-    {
+    static function rtrim($str, $charlist = null) {
         $re = SC_Utils_Ex::getTrimPregPattern($charlist);
         return preg_replace('/' . $re . '$/us', '', $str);
     }
@@ -1870,130 +1791,11 @@
      * @param string $charlist $B:o=|$9$kJ8;z$r;XDj(B
      * @return string $B%Q%?!<%s(B
      */
-    static function getTrimPregPattern($charlist = null)
-    {
+    static function getTrimPregPattern($charlist = null) {
         if (is_null($charlist)) {
             return '\s+';
         } else {
             return '[' . preg_quote($charlist, '/') . ']+';
         }
     }
-
-    /**
-     * $B%G!<%?NL$NC10L$rIUM?$9$k(B
-     * 
-     * @param int $data
-     * @return string
-     */
-    function getUnitDataSize($data)
-    {
-
-        if($data < 1000){
-            $return = $data . "KB";
-        }elseif($data < 1000000){ 
-            $return = $data/1000 . "MB";
-        }else{
-            $return = $data/1000000 . "GB";
-        }
-        return $return;
-    }
-
-    /**
-     * $B%+%F%4%j!<%D%j!<>u$NG[Ns$r:n ＠ .(B.
-     * 
-     * @param string $primary_key
-     * @param string $glue_key
-     * @param integer $max_depth
-     * @param array $correction
-     * @param integer $root_id
-     * @return array $B%D%j!<$NG[Ns(B
-     */
-    public static function buildTree($primary_key, $glue_key, $max_depth, $correction = array(), $root_id = 0)
-    {
-        $children = array();
-        foreach ($correction as $child) {
-            $children[$child[$glue_key]][] = $child;
-        }
-        $arrTree = $children[$root_id];
-        foreach ($arrTree as &$child) {
-            SC_Utils_Ex::addChild($child, $primary_key, 1, $max_depth, $children);
-        }
-        return $arrTree;
-    }
-
-    /**
-     * $B%D%j!<$N?F;R$r$D$J$2$k%k!<%A%s(B.
-     * 
-     * @param array $target $B?F(B
-     * @param string $primary_key $B<g%-!<$N<1JL;R(B
-     * @param integer $level $B?F$N3,AX(B
-     * @param integer $max_depth $B3,AX$N?<$5$N:GBgCM(B
-     * @param array $children $B;R$NG[Ns!J%-!<$,?F(BID$B!K(B
-     * @return void
-     */
-    public static function addChild(&$target, $primary_key, $level, $max_depth, &$children = array())
-    {
-        if (isset($children[$target[$primary_key]])) {
-            $target['children'] = $children[$target[$primary_key]];
-            if ($level + 1 < $max_depth) {
-                foreach ($target['children'] as &$child) {
-                    SC_Utils_Ex::addChild($child, $primary_key, $level++, $max_depth, $children);
-                }
-            }
-        }
-    }
-
-    /**
-     * $BG[Ns$N%-!<$r(BID$B$K$7$?G[Ns$r:n ＠ .(B.
-     * 
-     * @param string $ID_name ID$B$,3JG<$5$l$F$$$k%-!<L>(B
-     * @param array $correction $B85$NG[Ns(B
-     * @return array
-     */
-    public static function makeArrayIDToKey($ID_name, $correction = array())
-    {
-        $arrTmp = array();
-        foreach ($correction as $item) {
-            $arrTmp[$item[$ID_name]] = $item;
-        }
-        $return =& $arrTmp;
-        unset($arrTmp);
-        return $return;
-    }
-
-    /**
-     * $B3,AX>pJs$,4^$^$l$F$$$kG[Ns$+$i?F(BID$BG[Ns$r<hF@$9$k(B.
-     * 
-     * @param integer $start_id $B<hF ＠ 5/E@(B
-     * @param string $primary_key $B<g%-!<L>(B
-     * @param string $glue_key $B?F(BID$B%-!<L>(B
-     * @param array $correction $B3,AX9=B$$,4^$^$l$F$$$kG[Ns(B
-     * @param boolean $cid_is_key $B%-!<$,(BID$B$NG[Ns$N>l9g$O(Btrue
-     * @param integer $root_id $B%k!<%H(BID
-     * @param boolean $id_only ID$B$@$1$NG[Ns$rJV$9>l9g$O(Btrue
-     * @return array $B?F(BID$BG[Ns(B
-     */
-    public static function getTreeTrail($start_id, $primary_key, $glue_key, $correction = array(), $cid_is_key = FALSE, $root_id = 0, $id_only = TRUE)
-    {
-        if ($cid_is_key) {
-            $arrIDToKay = $correction;
-        } else {
-            $arrIDToKay = SC_Utils_Ex::makeArrayIDToKey($primary_key, $correction);
-        }
-        $id = $start_id;
-        $arrTrail = array();
-        while ($id != $root_id && !SC_Utils_Ex::isBlank($id)) {
-            if ($id_only) {
-                $arrTrail[] = $id;
-            } else {
-                $arrTrail[] = $arrIDToKay[$id];
-            }
-            if (isset($arrIDToKay[$id][$glue_key])) {
-                $id = $arrIDToKay[$id][$glue_key];
-            } else {
-                $id = $root_id;
-            }
-        }
-        return array_reverse($arrTrail);
-    }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_AdminView.php';
 
-class SC_AdminView_Ex extends SC_AdminView 
-{
+class SC_AdminView_Ex extends SC_AdminView {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Batch.php';
 
-class SC_Batch_Ex extends SC_Batch 
-{
+class SC_Batch_Ex extends SC_Batch {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/SC_Cache_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Cache_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Cache_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,28 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-require_once CLASS_REALDIR . 'SC_Cache.php';
-
-class SC_Cache_Ex extends SC_Cache
-{
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_CartSession.php';
 
-class SC_CartSession_Ex extends SC_CartSession 
-{
+class SC_CartSession_Ex extends SC_CartSession {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_CheckError.php';
 
-class SC_CheckError_Ex extends SC_CheckError 
-{
+class SC_CheckError_Ex extends SC_CheckError {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_ClassAutoloader.php';
 
-class SC_ClassAutoloader_Ex extends SC_ClassAutoloader 
-{
+class SC_ClassAutoloader_Ex extends SC_ClassAutoloader {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Cookie.php';
 
-class SC_Cookie_Ex extends SC_Cookie 
-{
+class SC_Cookie_Ex extends SC_Cookie {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_CustomerList.php';
 
-class SC_CustomerList_Ex extends SC_CustomerList 
-{
+class SC_CustomerList_Ex extends SC_CustomerList {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Customer.php';
 
-class SC_Customer_Ex extends SC_Customer 
-{
+class SC_Customer_Ex extends SC_Customer {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Date.php';
 
-class SC_Date_Ex extends SC_Date 
-{
+class SC_Date_Ex extends SC_Date {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -2,6 +2,5 @@
 
 require_once CLASS_REALDIR . 'SC_Display.php';
 
-class SC_Display_Ex extends SC_Display
-{
+class SC_Display_Ex extends SC_Display{
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_FormParam.php';
 
-class SC_FormParam_Ex extends SC_FormParam 
-{
+class SC_FormParam_Ex extends SC_FormParam {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Fpdf.php';
 
-class SC_Fpdf_Ex extends SC_Fpdf 
-{
+class SC_Fpdf_Ex extends SC_Fpdf {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Image.php';
 
-class SC_Image_Ex extends SC_Image 
-{
+class SC_Image_Ex extends SC_Image {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,6 +32,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Initial_Ex extends SC_Initial 
-{
+class SC_Initial_Ex extends SC_Initial {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_InstallView.php';
 
-class SC_InstallView_Ex extends SC_InstallView 
-{
+class SC_InstallView_Ex extends SC_InstallView {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_MobileEmoji.php';
 
-class SC_MobileEmoji_Ex extends SC_MobileEmoji 
-{
+class SC_MobileEmoji_Ex extends SC_MobileEmoji {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_MobileImage.php';
 
-class SC_MobileImage_Ex extends SC_MobileImage 
-{
+class SC_MobileImage_Ex extends SC_MobileImage {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_MobileUserAgent.php';
 
-class SC_MobileUserAgent_Ex extends SC_MobileUserAgent 
-{
+class SC_MobileUserAgent_Ex extends SC_MobileUserAgent {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_MobileView.php';
 
-class SC_MobileView_Ex extends SC_MobileView 
-{
+class SC_MobileView_Ex extends SC_MobileView {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_PageNavi.php';
 
-class SC_PageNavi_Ex extends SC_PageNavi 
-{
+class SC_PageNavi_Ex extends SC_PageNavi {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Product.php';
 
-class SC_Product_Ex extends SC_Product 
-{
+class SC_Product_Ex extends SC_Product {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Query.php';
 
-class SC_Query_Ex extends SC_Query 
-{
+class SC_Query_Ex extends SC_Query {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -2,6 +2,5 @@
 
 require_once CLASS_REALDIR . 'SC_Response.php';
 
-class SC_Response_Ex extends SC_Response
-{
+class SC_Response_Ex extends SC_Response{
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_SelectSql.php';
 
-class SC_SelectSql_Ex extends SC_SelectSql 
-{
+class SC_SelectSql_Ex extends SC_SelectSql {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_SendMail_Ex extends SC_SendMail 
-{
+class SC_SendMail_Ex extends SC_SendMail {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_SessionFactory.php';
 
-class SC_SessionFactory_Ex extends SC_SessionFactory 
-{
+class SC_SessionFactory_Ex extends SC_SessionFactory {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_Session.php';
 
-class SC_Session_Ex extends SC_Session 
-{
+class SC_Session_Ex extends SC_Session {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_SiteSession.php';
 
-class SC_SiteSession_Ex extends SC_SiteSession 
-{
+class SC_SiteSession_Ex extends SC_SiteSession {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_SiteView.php';
 
-class SC_SiteView_Ex extends SC_SiteView 
-{
+class SC_SiteView_Ex extends SC_SiteView {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_SmartphoneUserAgent.php';
 
-class SC_SmartphoneUserAgent_Ex extends SC_SmartphoneUserAgent 
-{
+class SC_SmartphoneUserAgent_Ex extends SC_SmartphoneUserAgent {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_SmartphoneView.php';
 
-class SC_SmartphoneView_Ex extends SC_SmartphoneView 
-{
+class SC_SmartphoneView_Ex extends SC_SmartphoneView {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_UploadFile.php';
 
-class SC_UploadFile_Ex extends SC_UploadFile 
-{
+class SC_UploadFile_Ex extends SC_UploadFile {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/SC_View_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/SC_View_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/SC_View_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'SC_View.php';
 
-class SC_View_Ex extends SC_View 
-{
+class SC_View_Ex extends SC_View {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/SC_Api_Abstract.php';
 
-abstract class SC_Api_Abstract_Ex extends SC_Api_Abstract 
-{
+abstract class SC_Api_Abstract_Ex extends SC_Api_Abstract {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/SC_Api_Operation.php';
 
-class SC_Api_Operation_Ex extends SC_Api_Operation 
-{
+class SC_Api_Operation_Ex extends SC_Api_Operation {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/SC_Api_Utils.php';
 
-class SC_Api_Utils_Ex extends SC_Api_Utils 
-{
+class SC_Api_Utils_Ex extends SC_Api_Utils {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/AddrFromZip.php';
 
-class API_AddrFromZip_Ex extends API_AddrFromZip 
-{
+class API_AddrFromZip_Ex extends API_AddrFromZip {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/BrowseNodeLookup.php';
 
-class API_BrowseNodeLookup_Ex extends API_BrowseNodeLookup 
-{
+class API_BrowseNodeLookup_Ex extends API_BrowseNodeLookup {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/CartAdd.php';
 
-class API_CartAdd_Ex extends API_CartAdd 
-{
+class API_CartAdd_Ex extends API_CartAdd {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/CartClear.php';
 
-class API_CartClear_Ex extends API_CartClear 
-{
+class API_CartClear_Ex extends API_CartClear {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/CartCreate.php';
 
-class API_CartCreate_Ex extends API_CartCreate 
-{
+class API_CartCreate_Ex extends API_CartCreate {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/CartGet.php';
 
-class API_CartGet_Ex extends API_CartGet 
-{
+class API_CartGet_Ex extends API_CartGet {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/CartModify.php';
 
-class API_CartModify_Ex extends API_CartModify 
-{
+class API_CartModify_Ex extends API_CartModify {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/Default.php';
 
-class API_Default_Ex extends API_Default 
-{
+class API_Default_Ex extends API_Default {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/GetVersion.php';
 
-class API_GetVersion_Ex extends API_GetVersion 
-{
+class API_GetVersion_Ex extends API_GetVersion {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/ItemLookup.php';
 
-class API_ItemLookup_Ex extends API_ItemLookup 
-{
+class API_ItemLookup_Ex extends API_ItemLookup {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,7 +30,6 @@
  */
 require_once CLASS_REALDIR . 'api/operations/ItemSearch.php';
 
-class API_ItemSearch_Ex extends API_ItemSearch 
-{
+class API_ItemSearch_Ex extends API_ItemSearch {
 
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'util/SC_Batch_Update.php';
 
-class SC_Batch_Update_Ex extends SC_Batch_Update 
-{
+class SC_Batch_Update_Ex extends SC_Batch_Update {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_DB_DBFactory_Ex extends SC_DB_DBFactory 
-{
+class SC_DB_DBFactory_Ex extends SC_DB_DBFactory {
 
     // }}}
     // {{{ functions
@@ -45,8 +44,7 @@
      * @param string $db_type $BG$0U$N%$%s%9%?%s%9$rJV$7$?$$>l9g$O(B DB_TYPE $BJ8;zNs$r;XDj(B
      * @return mixed DBFactory $B%$%s%9%?%s%9(B
      */
-    function getInstance($db_type = DB_TYPE)
-    {
+    function getInstance($db_type = DB_TYPE) {
         switch ($db_type) {
             case 'mysql':
                 return new SC_DB_DBFactory_MYSQL_Ex();

$BJQ99(B: branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_DB_MasterData_Ex extends SC_DB_MasterData 
-{
+class SC_DB_MasterData_Ex extends SC_DB_MasterData {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_DB_DBFactory_MYSQL_Ex extends SC_DB_DBFactory_MYSQL 
-{
+class SC_DB_DBFactory_MYSQL_Ex extends SC_DB_DBFactory_MYSQL {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_DB_DBFactory_PGSQL_Ex extends SC_DB_DBFactory_PGSQL 
-{
+class SC_DB_DBFactory_PGSQL_Ex extends SC_DB_DBFactory_PGSQL {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'graph/SC_Graph_Bar.php';
 
-class SC_Graph_Bar_Ex extends SC_Graph_Bar 
-{
+class SC_Graph_Bar_Ex extends SC_Graph_Bar {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'graph/SC_Graph_Base.php';
 
-class SC_Graph_Base_Ex extends SC_Graph_Base 
-{
+class SC_Graph_Base_Ex extends SC_Graph_Base {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'graph/SC_Graph_Line.php';
 
-class SC_Graph_Line_Ex extends SC_Graph_Line 
-{
+class SC_Graph_Line_Ex extends SC_Graph_Line {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'graph/SC_Graph_Pie.php';
 
-class SC_Graph_Pie_Ex extends SC_Graph_Pie 
-{
+class SC_Graph_Pie_Ex extends SC_Graph_Pie {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Bloc_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Bloc_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Bloc_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Bloc.php';
-
-/**
- * $B%V%m%C%/$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Bloc $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Bloc_Ex extends SC_Helper_Bloc
-{
-    //put your code here
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_CSV_Ex extends SC_Helper_CSV 
-{
+class SC_Helper_CSV_Ex extends SC_Helper_CSV {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Category_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Category_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Category_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Category.php';
-
-/**
- * $B%+%F%4%j!<$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Category $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Category_Ex extends SC_Helper_Category
-{
-    //put your code here
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_Customer_Ex extends SC_Helper_Customer 
-{
+class SC_Helper_Customer_Ex extends SC_Helper_Customer {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_DB_Ex extends SC_Helper_DB 
-{
+class SC_Helper_DB_Ex extends SC_Helper_DB {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Delivery_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Delivery_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Delivery_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Delivery.php';
-
-/**
- * $BG[AwJ}K!$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Delivery $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Delivery_Ex extends SC_Helper_Delivery
-{
-    //put your code here
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,6 +30,5 @@
  * @package Helper
  * @version $Id:$
  */
-class SC_Helper_FPDI_Ex extends SC_Helper_FPDI 
-{
+class SC_Helper_FPDI_Ex extends SC_Helper_FPDI {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_FileManager_Ex extends SC_Helper_FileManager 
-{
+class SC_Helper_FileManager_Ex extends SC_Helper_FileManager {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -29,6 +29,5 @@
  * @package Page
  * @version $Id$
  */
-class SC_Helper_HandleError_Ex extends SC_Helper_HandleError 
-{
+class SC_Helper_HandleError_Ex extends SC_Helper_HandleError {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Holiday_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Holiday_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Holiday_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Holiday.php';
-
-/**
- * $B5YF|$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Holiday $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Holiday_Ex extends SC_Helper_Holiday
-{
-    //put your code here
-}

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Kiyaku_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Kiyaku_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Kiyaku_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Kiyaku.php';
-
-/**
- * $B2q0w5,Ls$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Kiyaku $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Kiyaku_Ex extends SC_Helper_Kiyaku
-{
-    //put your code here
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_Mail_Ex extends SC_Helper_Mail 
-{
+class SC_Helper_Mail_Ex extends SC_Helper_Mail {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mailtemplate_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mailtemplate_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mailtemplate_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Mailtemplate.php';
-
-/**
- * $B%a!<%k%F%s%W%l!<%H$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Mailtemplate $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Mailtemplate_Ex extends SC_Helper_Mailtemplate
-{
-    //put your code here
-}

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Maker_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Maker_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Maker_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Maker.php';
-
-/**
- * $B%a!<%+!<$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Maker $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Maker_Ex extends SC_Helper_Maker
-{
-    //put your code here
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_Mobile_Ex extends SC_Helper_Mobile 
-{
+class SC_Helper_Mobile_Ex extends SC_Helper_Mobile {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_News_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_News_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_News_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_News.php';
-
-/**
- * $B?7Ce>pJs$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_News $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_News_Ex extends SC_Helper_News
-{
-    //put your code here
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_PageLayout_Ex extends SC_Helper_PageLayout 
-{
+class SC_Helper_PageLayout_Ex extends SC_Helper_PageLayout {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_Plugin_Ex extends SC_Helper_Plugin 
-{
+class SC_Helper_Plugin_Ex extends SC_Helper_Plugin {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class SC_Helper_Purchase_Ex extends SC_Helper_Purchase 
-{
+class SC_Helper_Purchase_Ex extends SC_Helper_Purchase {
 }

$B:o=|(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Recommend_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Recommend_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Recommend_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once CLASS_REALDIR . 'helper/SC_Helper_Recommend.php';
-
-/**
- * $B$*$9$9$a>&IJ$r4IM}$9$k%X%k%Q!<%/%i%9(B($B3HD%(B).
- *
- * LC_Helper_Recommend $B$r%+%9%?%^%$%:$9$k>l9g$O$3$N%/%i%9$rJT=8$9$k(B.
- *
- * @package Helper
- * @author pineray
- * @version $Id:$
- */
-class SC_Helper_Recommend_Ex extends SC_Helper_Recommend
-{
-    //put your code here
-}

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_Helper_Session_Ex.php 16741 2007-11-08 00:43:24Z adachi $
  */
-class SC_Helper_Session_Ex extends SC_Helper_Session 
-{
+class SC_Helper_Session_Ex extends SC_Helper_Session {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_Transform_Ex extends SC_Helper_Transform 
-{
+class SC_Helper_Transform_Ex extends SC_Helper_Transform {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'pages/LC_Page.php';
 
-class LC_Page_Ex extends LC_Page 
-{
+class LC_Page_Ex extends LC_Page {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Index_Ex extends LC_Page_Index 
-{
+class LC_Page_Index_Ex extends LC_Page_Index {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_InputZip_Ex extends LC_Page_InputZip 
-{
+class LC_Page_InputZip_Ex extends LC_Page_InputZip {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Redirect_Ex extends LC_Page_Redirect 
-{
+class LC_Page_Redirect_Ex extends LC_Page_Redirect {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_ResizeImage_Ex extends LC_Page_ResizeImage 
-{
+class LC_Page_ResizeImage_Ex extends LC_Page_ResizeImage {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Sitemap_Ex extends LC_Page_Sitemap 
-{
+class LC_Page_Sitemap_Ex extends LC_Page_Sitemap {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Abouts_Ex extends LC_Page_Abouts 
-{
+class LC_Page_Abouts_Ex extends LC_Page_Abouts {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'pages/admin/LC_Page_Admin.php';
 
-class LC_Page_Admin_Ex extends LC_Page_Admin 
-{
+class LC_Page_Admin_Ex extends LC_Page_Admin {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Home_Ex extends LC_Page_Admin_Home 
-{
+class LC_Page_Admin_Home_Ex extends LC_Page_Admin_Home {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Index_Ex extends LC_Page_Admin_Index 
-{
+class LC_Page_Admin_Index_Ex extends LC_Page_Admin_Index {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Login_Ex extends LC_Page_Admin_Login 
-{
+class LC_Page_Admin_Login_Ex extends LC_Page_Admin_Login {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Logout_Ex extends LC_Page_Admin_Logout 
-{
+class LC_Page_Admin_Logout_Ex extends LC_Page_Admin_Logout {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_DeliveryInput_Ex extends LC_Page_Admin_Basis_DeliveryInput 
-{
+class LC_Page_Admin_Basis_DeliveryInput_Ex extends LC_Page_Admin_Basis_DeliveryInput {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Delivery_Ex extends LC_Page_Admin_Basis_Delivery 
-{
+class LC_Page_Admin_Basis_Delivery_Ex extends LC_Page_Admin_Basis_Delivery {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Ex extends LC_Page_Admin_Basis 
-{
+class LC_Page_Admin_Basis_Ex extends LC_Page_Admin_Basis {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Admin_Basis_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_Basis_Holiday_Ex extends LC_Page_Admin_Basis_Holiday 
-{
+class LC_Page_Admin_Basis_Holiday_Ex extends LC_Page_Admin_Basis_Holiday {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Kiyaku_Ex extends LC_Page_Admin_Basis_Kiyaku 
-{
+class LC_Page_Admin_Basis_Kiyaku_Ex extends LC_Page_Admin_Basis_Kiyaku {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Mail_Ex extends LC_Page_Admin_Basis_Mail 
-{
+class LC_Page_Admin_Basis_Mail_Ex extends LC_Page_Admin_Basis_Mail {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_PaymentInput_Ex extends LC_Page_Admin_Basis_PaymentInput 
-{
+class LC_Page_Admin_Basis_PaymentInput_Ex extends LC_Page_Admin_Basis_PaymentInput {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Payment_Ex extends LC_Page_Admin_Basis_Payment 
-{
+class LC_Page_Admin_Basis_Payment_Ex extends LC_Page_Admin_Basis_Payment {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Point_Ex extends LC_Page_Admin_Basis_Point 
-{
+class LC_Page_Admin_Basis_Point_Ex extends LC_Page_Admin_Basis_Point {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Seo_Ex extends LC_Page_Admin_Basis_Seo 
-{
+class LC_Page_Admin_Basis_Seo_Ex extends LC_Page_Admin_Basis_Seo {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_Tradelaw_Ex extends LC_Page_Admin_Basis_Tradelaw 
-{
+class LC_Page_Admin_Basis_Tradelaw_Ex extends LC_Page_Admin_Basis_Tradelaw {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -53,8 +51,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -63,8 +60,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Basis_ZipInstall_Ex extends LC_Page_Admin_Basis_ZipInstall 
-{
+class LC_Page_Admin_Basis_ZipInstall_Ex extends LC_Page_Admin_Basis_ZipInstall {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CSV_Ex extends LC_Page_Admin_Contents_CSV 
-{
+class LC_Page_Admin_Contents_CSV_Ex extends LC_Page_Admin_Contents_CSV {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_CsvSql_Ex extends LC_Page_Admin_Contents_CsvSql 
-{
+class LC_Page_Admin_Contents_CsvSql_Ex extends LC_Page_Admin_Contents_CsvSql {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_Ex extends LC_Page_Admin_Contents 
-{
+class LC_Page_Admin_Contents_Ex extends LC_Page_Admin_Contents {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileManager_Ex extends LC_Page_Admin_Contents_FileManager 
-{
+class LC_Page_Admin_Contents_FileManager_Ex extends LC_Page_Admin_Contents_FileManager {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_FileView_Ex extends LC_Page_Admin_Contents_FileView 
-{
+class LC_Page_Admin_Contents_FileView_Ex extends LC_Page_Admin_Contents_FileView {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_RecommendSearch_Ex extends LC_Page_Admin_Contents_RecommendSearch 
-{
+class LC_Page_Admin_Contents_RecommendSearch_Ex extends LC_Page_Admin_Contents_RecommendSearch {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Contents_Recommend_Ex extends LC_Page_Admin_Contents_Recommend 
-{
+class LC_Page_Admin_Contents_Recommend_Ex extends LC_Page_Admin_Contents_Recommend {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Customer_Ex extends LC_Page_Admin_Customer_Customer 
-{
+class LC_Page_Admin_Customer_Customer_Ex extends LC_Page_Admin_Customer_Customer {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Edit_Ex extends LC_Page_Admin_Customer_Edit 
-{
+class LC_Page_Admin_Customer_Edit_Ex extends LC_Page_Admin_Customer_Edit {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Customer_Ex extends LC_Page_Admin_Customer 
-{
+class LC_Page_Admin_Customer_Ex extends LC_Page_Admin_Customer {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -44,8 +44,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +62,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_Bloc_Ex extends LC_Page_Admin_Design_Bloc 
-{
+class LC_Page_Admin_Design_Bloc_Ex extends LC_Page_Admin_Design_Bloc {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_CSS_Ex extends LC_Page_Admin_Design_CSS 
-{
+class LC_Page_Admin_Design_CSS_Ex extends LC_Page_Admin_Design_CSS {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_Ex extends LC_Page_Admin_Design 
-{
+class LC_Page_Admin_Design_Ex extends LC_Page_Admin_Design {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_Header_Ex extends LC_Page_Admin_Design_Header 
-{
+class LC_Page_Admin_Design_Header_Ex extends LC_Page_Admin_Design_Header {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_MainEdit_Ex extends LC_Page_Admin_Design_MainEdit 
-{
+class LC_Page_Admin_Design_MainEdit_Ex extends LC_Page_Admin_Design_MainEdit {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_Template_Ex extends LC_Page_Admin_Design_Template 
-{
+class LC_Page_Admin_Design_Template_Ex extends LC_Page_Admin_Design_Template {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Design_UpDown_Ex extends LC_Page_Admin_Design_UpDown 
-{
+class LC_Page_Admin_Design_UpDown_Ex extends LC_Page_Admin_Design_UpDown {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Ex extends LC_Page_Admin_Mail 
-{
+class LC_Page_Admin_Mail_Ex extends LC_Page_Admin_Mail {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_History_Ex extends LC_Page_Admin_Mail_History 
-{
+class LC_Page_Admin_Mail_History_Ex extends LC_Page_Admin_Mail_History {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Preview_Ex extends LC_Page_Admin_Mail_Preview 
-{
+class LC_Page_Admin_Mail_Preview_Ex extends LC_Page_Admin_Mail_Preview {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Sendmail_Ex extends LC_Page_Admin_Mail_Sendmail 
-{
+class LC_Page_Admin_Mail_Sendmail_Ex extends LC_Page_Admin_Mail_Sendmail {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_TemplateInput_Ex extends LC_Page_Admin_Mail_TemplateInput 
-{
+class LC_Page_Admin_Mail_TemplateInput_Ex extends LC_Page_Admin_Mail_TemplateInput {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Mail_Template_Ex extends LC_Page_Admin_Mail_Template 
-{
+class LC_Page_Admin_Mail_Template_Ex extends LC_Page_Admin_Mail_Template {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id: LC_Page_Admin_Order_Disp_Ex.php 20764 2011-03-22 06:26:40Z nanasess $
  */
-class LC_Page_Admin_Order_Disp_Ex extends LC_Page_Admin_Order_Disp 
-{
+class LC_Page_Admin_Order_Disp_Ex extends LC_Page_Admin_Order_Disp {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Edit_Ex extends LC_Page_Admin_Order_Edit 
-{
+class LC_Page_Admin_Order_Edit_Ex extends LC_Page_Admin_Order_Edit {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Ex extends LC_Page_Admin_Order 
-{
+class LC_Page_Admin_Order_Ex extends LC_Page_Admin_Order {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_MailView_Ex extends LC_Page_Admin_Order_MailView 
-{
+class LC_Page_Admin_Order_MailView_Ex extends LC_Page_Admin_Order_MailView {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Mail_Ex extends LC_Page_Admin_Order_Mail 
-{
+class LC_Page_Admin_Order_Mail_Ex extends LC_Page_Admin_Order_Mail {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Multiple_Ex extends LC_Page_Admin_Order_Multiple 
-{
+class LC_Page_Admin_Order_Multiple_Ex extends LC_Page_Admin_Order_Multiple {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Pdf_Ex extends LC_Page_Admin_Order_Pdf 
-{
+class LC_Page_Admin_Order_Pdf_Ex extends LC_Page_Admin_Order_Pdf {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_ProductSelect_Ex extends LC_Page_Admin_Order_ProductSelect 
-{
+class LC_Page_Admin_Order_ProductSelect_Ex extends LC_Page_Admin_Order_ProductSelect {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Order_Status_Ex extends LC_Page_Admin_Order_Status 
-{
+class LC_Page_Admin_Order_Status_Ex extends LC_Page_Admin_Order_Status {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Ex extends LC_Page_Admin_OwnersStore 
-{
+class LC_Page_Admin_OwnersStore_Ex extends LC_Page_Admin_OwnersStore {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Log_Ex extends LC_Page_Admin_OwnersStore_Log 
-{
+class LC_Page_Admin_OwnersStore_Log_Ex extends LC_Page_Admin_OwnersStore_Log {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Module_Ex extends LC_Page_Admin_OwnersStore_Module 
-{
+class LC_Page_Admin_OwnersStore_Module_Ex extends LC_Page_Admin_OwnersStore_Module {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_OwnersStore_Settings_Ex extends LC_Page_Admin_OwnersStore_Settings 
-{
+class LC_Page_Admin_OwnersStore_Settings_Ex extends LC_Page_Admin_OwnersStore_Settings {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Category_Ex extends LC_Page_Admin_Products_Category 
-{
+class LC_Page_Admin_Products_Category_Ex extends LC_Page_Admin_Products_Category {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ClassCategory_Ex extends LC_Page_Admin_Products_ClassCategory 
-{
+class LC_Page_Admin_Products_ClassCategory_Ex extends LC_Page_Admin_Products_ClassCategory {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Class_Ex extends LC_Page_Admin_Products_Class 
-{
+class LC_Page_Admin_Products_Class_Ex extends LC_Page_Admin_Products_Class {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Ex extends LC_Page_Admin_Products 
-{
+class LC_Page_Admin_Products_Ex extends LC_Page_Admin_Products {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Maker_Ex extends LC_Page_Admin_Products_Maker 
-{
+class LC_Page_Admin_Products_Maker_Ex extends LC_Page_Admin_Products_Maker {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Admin_Products_Product_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_Products_ProductClass_Ex extends LC_Page_Admin_Products_ProductClass 
-{
+class LC_Page_Admin_Products_ProductClass_Ex extends LC_Page_Admin_Products_ProductClass {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductRank_Ex extends LC_Page_Admin_Products_ProductRank 
-{
+class LC_Page_Admin_Products_ProductRank_Ex extends LC_Page_Admin_Products_ProductRank {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductSelect_Ex extends LC_Page_Admin_Products_ProductSelect 
-{
+class LC_Page_Admin_Products_ProductSelect_Ex extends LC_Page_Admin_Products_ProductSelect {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Product_Ex extends LC_Page_Admin_Products_Product 
-{
+class LC_Page_Admin_Products_Product_Ex extends LC_Page_Admin_Products_Product {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_ReviewEdit_Ex extends LC_Page_Admin_Products_ReviewEdit 
-{
+class LC_Page_Admin_Products_ReviewEdit_Ex extends LC_Page_Admin_Products_ReviewEdit {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Products_Review_Ex extends LC_Page_Admin_Products_Review 
-{
+class LC_Page_Admin_Products_Review_Ex extends LC_Page_Admin_Products_Review {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $$Id$$
  */
-class LC_Page_Admin_Products_UploadCSVCategory_Ex extends LC_Page_Admin_Products_UploadCSVCategory 
-{
+class LC_Page_Admin_Products_UploadCSVCategory_Ex extends LC_Page_Admin_Products_UploadCSVCategory {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $$Id$$
  */
-class LC_Page_Admin_Products_UploadCSV_Ex extends LC_Page_Admin_Products_UploadCSV 
-{
+class LC_Page_Admin_Products_UploadCSV_Ex extends LC_Page_Admin_Products_UploadCSV {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_AdminArea_Ex extends LC_Page_Admin_System_AdminArea 
-{
+class LC_Page_Admin_System_AdminArea_Ex extends LC_Page_Admin_System_AdminArea {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Bkup_Ex extends LC_Page_Admin_System_Bkup 
-{
+class LC_Page_Admin_System_Bkup_Ex extends LC_Page_Admin_System_Bkup {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Delete_Ex extends LC_Page_Admin_System_Delete 
-{
+class LC_Page_Admin_System_Delete_Ex extends LC_Page_Admin_System_Delete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Editdb_Ex extends LC_Page_Admin_System_Editdb 
-{
+class LC_Page_Admin_System_Editdb_Ex extends LC_Page_Admin_System_Editdb {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Ex extends LC_Page_Admin_System 
-{
+class LC_Page_Admin_System_Ex extends LC_Page_Admin_System {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Input_Ex extends LC_Page_Admin_System_Input 
-{
+class LC_Page_Admin_System_Input_Ex extends LC_Page_Admin_System_Input {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author Seasoft $BDMED>-5W(B
  * @version $Id$
  */
-class LC_Page_Admin_System_Log_Ex extends LC_Page_Admin_System_Log 
-{
+class LC_Page_Admin_System_Log_Ex extends LC_Page_Admin_System_Log {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Admin_Basis_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_System_Masterdata_Ex extends LC_Page_Admin_System_Masterdata 
-{
+class LC_Page_Admin_System_Masterdata_Ex extends LC_Page_Admin_System_Masterdata {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Admin_Basis_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class LC_Page_Admin_System_Parameter_Ex extends LC_Page_Admin_System_Parameter 
-{
+class LC_Page_Admin_System_Parameter_Ex extends LC_Page_Admin_System_Parameter {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_Rank_Ex extends LC_Page_Admin_System_Rank 
-{
+class LC_Page_Admin_System_Rank_Ex extends LC_Page_Admin_System_Rank {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_System_System_Ex extends LC_Page_Admin_System_System 
-{
+class LC_Page_Admin_System_System_Ex extends LC_Page_Admin_System_System {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Admin_Total_Ex extends LC_Page_Admin_Total 
-{
+class LC_Page_Admin_Total_Ex extends LC_Page_Admin_Total {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api_Ex extends LC_Page_Api 
-{
+class LC_Page_Api_Ex extends LC_Page_Api {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api_Json_Ex extends LC_Page_Api_Json 
-{
+class LC_Page_Api_Json_Ex extends LC_Page_Api_Json {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api_Php_Ex extends LC_Page_Api_Php 
-{
+class LC_Page_Api_Php_Ex extends LC_Page_Api_Php {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Api_Xml_Ex extends LC_Page_Api_Xml 
-{
+class LC_Page_Api_Xml_Ex extends LC_Page_Api_Xml {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Cart_Ex extends LC_Page_Cart 
-{
+class LC_Page_Cart_Ex extends LC_Page_Cart {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Contact_Complete_Ex extends LC_Page_Contact_Complete 
-{
+class LC_Page_Contact_Complete_Ex extends LC_Page_Contact_Complete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Contact_Ex extends LC_Page_Contact 
-{
+class LC_Page_Contact_Ex extends LC_Page_Contact {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_Complete_Ex extends LC_Page_Entry_Complete 
-{
+class LC_Page_Entry_Complete_Ex extends LC_Page_Entry_Complete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_EmailMobile_Ex extends LC_Page_Entry_EmailMobile 
-{
+class LC_Page_Entry_EmailMobile_Ex extends LC_Page_Entry_EmailMobile {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_Ex extends LC_Page_Entry 
-{
+class LC_Page_Entry_Ex extends LC_Page_Entry {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_Kiyaku_Ex extends LC_Page_Entry_Kiyaku 
-{
+class LC_Page_Entry_Kiyaku_Ex extends LC_Page_Entry_Kiyaku {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Entry_New_Ex extends LC_Page_Entry_New 
-{
+class LC_Page_Entry_New_Ex extends LC_Page_Entry_New {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Error_DispError_Ex extends LC_Page_Error_DispError 
-{
+class LC_Page_Error_DispError_Ex extends LC_Page_Error_DispError {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Error_Ex extends LC_Page_Error 
-{
+class LC_Page_Error_Ex extends LC_Page_Error {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,8 +34,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Error_SystemError_Ex extends LC_Page_Error_SystemError 
-{
+class LC_Page_Error_SystemError_Ex extends LC_Page_Error_SystemError {
 
     // }}}
     // {{{ functions
@@ -45,8 +44,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -55,8 +53,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -65,8 +62,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Forgot_Ex extends LC_Page_Forgot 
-{
+class LC_Page_Forgot_Ex extends LC_Page_Forgot {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_LoginCheck_Ex extends LC_Page_FrontParts_LoginCheck 
-{
+class LC_Page_FrontParts_LoginCheck_Ex extends LC_Page_FrontParts_LoginCheck {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $ $
  */
-class LC_Page_FrontParts_Bloc_Calendar_Ex extends LC_Page_FrontParts_Bloc_Calendar 
-{
+class LC_Page_FrontParts_Bloc_Calendar_Ex extends LC_Page_FrontParts_Bloc_Calendar {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Cart_Ex extends LC_Page_FrontParts_Bloc_Cart 
-{
+class LC_Page_FrontParts_Bloc_Cart_Ex extends LC_Page_FrontParts_Bloc_Cart {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Category_Ex extends LC_Page_FrontParts_Bloc_Category 
-{
+class LC_Page_FrontParts_Bloc_Category_Ex extends LC_Page_FrontParts_Bloc_Category {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id: LC_Page_FrontParts_Bloc_Ex.php $
  */
-class LC_Page_FrontParts_Bloc_Ex extends LC_Page_FrontParts_Bloc 
-{
+class LC_Page_FrontParts_Bloc_Ex extends LC_Page_FrontParts_Bloc {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginFooter_Ex extends LC_Page_FrontParts_Bloc_LoginFooter 
-{
+class LC_Page_FrontParts_Bloc_LoginFooter_Ex extends LC_Page_FrontParts_Bloc_LoginFooter {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_LoginHeader_Ex extends LC_Page_FrontParts_Bloc_LoginHeader 
-{
+class LC_Page_FrontParts_Bloc_LoginHeader_Ex extends LC_Page_FrontParts_Bloc_LoginHeader {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_Login_Ex extends LC_Page_FrontParts_Bloc_Login 
-{
+class LC_Page_FrontParts_Bloc_Login_Ex extends LC_Page_FrontParts_Bloc_Login {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviFooter_Ex extends LC_Page_FrontParts_Bloc_NaviFooter 
-{
+class LC_Page_FrontParts_Bloc_NaviFooter_Ex extends LC_Page_FrontParts_Bloc_NaviFooter {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_NaviHeader_Ex extends LC_Page_FrontParts_Bloc_NaviHeader 
-{
+class LC_Page_FrontParts_Bloc_NaviHeader_Ex extends LC_Page_FrontParts_Bloc_NaviHeader {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_News_Ex extends LC_Page_FrontParts_Bloc_News 
-{
+class LC_Page_FrontParts_Bloc_News_Ex extends LC_Page_FrontParts_Bloc_News {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id: LC_Page_FrontParts_Bloc__Ex.php -1   $
  */
-class LC_Page_FrontParts_Bloc_Recommend_Ex extends LC_Page_FrontParts_Bloc_Recommend 
-{
+class LC_Page_FrontParts_Bloc_Recommend_Ex extends LC_Page_FrontParts_Bloc_Recommend {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_FrontParts_Bloc_SearchProducts_Ex extends LC_Page_FrontParts_Bloc_SearchProducts 
-{
+class LC_Page_FrontParts_Bloc_SearchProducts_Ex extends LC_Page_FrontParts_Bloc_SearchProducts {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_About_Ex extends LC_Page_Guide_About 
-{
+class LC_Page_Guide_About_Ex extends LC_Page_Guide_About {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Charge_Ex extends LC_Page_Guide_Charge 
-{
+class LC_Page_Guide_Charge_Ex extends LC_Page_Guide_Charge {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Ex extends LC_Page_Guide 
-{
+class LC_Page_Guide_Ex extends LC_Page_Guide {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Kiyaku_Ex extends LC_Page_Guide_Kiyaku 
-{
+class LC_Page_Guide_Kiyaku_Ex extends LC_Page_Guide_Kiyaku {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Order_Ex extends LC_Page_Guide_Order 
-{
+class LC_Page_Guide_Order_Ex extends LC_Page_Guide_Order {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Privacy_Ex extends LC_Page_Guide_Privacy 
-{
+class LC_Page_Guide_Privacy_Ex extends LC_Page_Guide_Privacy {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Guide_Usage_Ex extends LC_Page_Guide_Usage 
-{
+class LC_Page_Guide_Usage_Ex extends LC_Page_Guide_Usage {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_AbstractMypage_Ex extends LC_Page_AbstractMypage 
-{
+class LC_Page_AbstractMypage_Ex extends LC_Page_AbstractMypage {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_ChangeComplete_Ex extends LC_Page_Mypage_ChangeComplete 
-{
+class LC_Page_Mypage_ChangeComplete_Ex extends LC_Page_Mypage_ChangeComplete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Change_Ex extends LC_Page_Mypage_Change 
-{
+class LC_Page_Mypage_Change_Ex extends LC_Page_Mypage_Change {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_DeliveryAddr_Ex extends LC_Page_Mypage_DeliveryAddr 
-{
+class LC_Page_Mypage_DeliveryAddr_Ex extends LC_Page_Mypage_DeliveryAddr {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Delivery_Ex extends LC_Page_Mypage_Delivery 
-{
+class LC_Page_Mypage_Delivery_Ex extends LC_Page_Mypage_Delivery {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id: LC_Page_Mypage_Download_Ex.php $
  */
-class LC_Page_Mypage_Download_Ex extends LC_Page_Mypage_Download 
-{
+class LC_Page_Mypage_Download_Ex extends LC_Page_Mypage_Download {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Ex extends LC_Page_Mypage 
-{
+class LC_Page_Mypage_Ex extends LC_Page_Mypage {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Favorite_Ex extends LC_Page_Mypage_Favorite 
-{
+class LC_Page_Mypage_Favorite_Ex extends LC_Page_Mypage_Favorite {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_HistoryDetail_Ex extends LC_Page_Mypage_HistoryDetail 
-{
+class LC_Page_Mypage_HistoryDetail_Ex extends LC_Page_Mypage_HistoryDetail {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_History_Ex extends LC_Page_Mypage_History 
-{
+class LC_Page_Mypage_History_Ex extends LC_Page_Mypage_History {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Login_Ex extends LC_Page_Mypage_Login 
-{
+class LC_Page_Mypage_Login_Ex extends LC_Page_Mypage_Login {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_MailView_Ex extends LC_Page_Mypage_MailView 
-{
+class LC_Page_Mypage_MailView_Ex extends LC_Page_Mypage_MailView {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Order_Ex extends LC_Page_Mypage_Order 
-{
+class LC_Page_Mypage_Order_Ex extends LC_Page_Mypage_Order {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_RefusalComplete_Ex extends LC_Page_Mypage_RefusalComplete 
-{
+class LC_Page_Mypage_RefusalComplete_Ex extends LC_Page_Mypage_RefusalComplete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Mypage_Refusal_Ex extends LC_Page_Mypage_Refusal 
-{
+class LC_Page_Mypage_Refusal_Ex extends LC_Page_Mypage_Refusal {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Order_Ex extends LC_Page_Order 
-{
+class LC_Page_Order_Ex extends LC_Page_Order {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Preview_Ex extends LC_Page_Preview 
-{
+class LC_Page_Preview_Ex extends LC_Page_Preview {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_CategoryList_Ex extends LC_Page_Products_CategoryList 
-{
+class LC_Page_Products_CategoryList_Ex extends LC_Page_Products_CategoryList {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_Detail_Ex extends LC_Page_Products_Detail 
-{
+class LC_Page_Products_Detail_Ex extends LC_Page_Products_Detail {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_List_Ex extends LC_Page_Products_List 
-{
+class LC_Page_Products_List_Ex extends LC_Page_Products_List {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_ReviewComplete_Ex extends LC_Page_Products_ReviewComplete 
-{
+class LC_Page_Products_ReviewComplete_Ex extends LC_Page_Products_ReviewComplete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_Review_Ex extends LC_Page_Products_Review 
-{
+class LC_Page_Products_Review_Ex extends LC_Page_Products_Review {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Products_Search_Ex extends LC_Page_Products_Search 
-{
+class LC_Page_Products_Search_Ex extends LC_Page_Products_Search {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Regist_Complete_Ex extends LC_Page_Regist_Complete 
-{
+class LC_Page_Regist_Complete_Ex extends LC_Page_Regist_Complete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Regist_Ex extends LC_Page_Regist 
-{
+class LC_Page_Regist_Ex extends LC_Page_Regist {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Rss_Ex extends LC_Page_Rss 
-{
+class LC_Page_Rss_Ex extends LC_Page_Rss {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Rss_Products_Ex extends LC_Page_Rss_Products 
-{
+class LC_Page_Rss_Products_Ex extends LC_Page_Rss_Products {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Complete_Ex extends LC_Page_Shopping_Complete 
-{
+class LC_Page_Shopping_Complete_Ex extends LC_Page_Shopping_Complete {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Confirm_Ex extends LC_Page_Shopping_Confirm 
-{
+class LC_Page_Shopping_Confirm_Ex extends LC_Page_Shopping_Confirm {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_DelivAddr_Ex extends LC_Page_Shopping_DelivAddr 
-{
+class LC_Page_Shopping_DelivAddr_Ex extends LC_Page_Shopping_DelivAddr {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Deliv_Ex extends LC_Page_Shopping_Deliv 
-{
+class LC_Page_Shopping_Deliv_Ex extends LC_Page_Shopping_Deliv {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Ex extends LC_Page_Shopping 
-{
+class LC_Page_Shopping_Ex extends LC_Page_Shopping {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class LC_Page_Shopping_LoadPaymentModule_Ex extends LC_Page_Shopping_LoadPaymentModule 
-{
+class LC_Page_Shopping_LoadPaymentModule_Ex extends LC_Page_Shopping_LoadPaymentModule {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Multiple_Ex extends LC_Page_Shopping_Multiple 
-{
+class LC_Page_Shopping_Multiple_Ex extends LC_Page_Shopping_Multiple {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Shopping_Payment_Ex extends LC_Page_Shopping_Payment 
-{
+class LC_Page_Shopping_Payment_Ex extends LC_Page_Shopping_Payment {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Unsupported_Ex extends LC_Page_Unsupported 
-{
+class LC_Page_Unsupported_Ex extends LC_Page_Unsupported {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'plugin/SC_Plugin_Util.php';
 
-class SC_Plugin_Util_Ex extends SC_Plugin_Util 
-{
+class SC_Plugin_Util_Ex extends SC_Plugin_Util {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'sessionfactory/SC_SessionFactory_UseCookie.php';
 
-class SC_SessionFactory_UseCookie_Ex extends SC_SessionFactory_UseCookie 
-{
+class SC_SessionFactory_UseCookie_Ex extends SC_SessionFactory_UseCookie {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -23,6 +23,5 @@
 
 require_once CLASS_REALDIR . 'sessionfactory/SC_SessionFactory_UseRequest.php';
 
-class SC_SessionFactory_UseRequest_Ex extends SC_SessionFactory_UseRequest 
-{
+class SC_SessionFactory_UseRequest_Ex extends SC_SessionFactory_UseRequest {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class GC_Utils_Ex extends GC_Utils 
-{
+class GC_Utils_Ex extends GC_Utils {
 }

$BJQ99(B: branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php
===================================================================
--- branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,6 +33,5 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Utils_Ex extends SC_Utils 
-{
+class SC_Utils_Ex extends SC_Utils {
 }

$BJQ99(B: branches/version-2_12-dev/data/include/image_converter.inc
===================================================================
--- branches/version-2_12-dev/data/include/image_converter.inc	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/include/image_converter.inc	2013-05-02 09:11:36 UTC (rev 22796)
@@ -2,8 +2,7 @@
 /**
  * $B2hA|%U%!%$%k$NJQ49$r9T$&(B
  */
-class ImageConverter 
-{
+class ImageConverter {
     var $outputImageDir;         // $BJQ498e$N2hA|$NJ]B8 ＠ h(B
     var $outputImageType;        // $BJQ498e$N2hA|$N7A<0(B
     var $outputImageWidth;       // $BJQ498e$N2hA|$N2#I}(B
@@ -11,8 +10,7 @@
     var $outputImageFileSize;    // $BJQ498e$N2hA|$N%U%!%$%k%5%$%:(B
 
     // $B%3%s%9%H%i%/%?(B
-    function ImageConverter()
-    {
+    function ImageConverter() {
         $this->outputImageDir    = realpath(realpath(dirname(__FILE__)));
         $this->outputImageType   = 'jpg';
         $this->outputImageWidth  = 320;
@@ -21,8 +19,7 @@
     }
 
     // $BJQ49<B9T(B
-    function execute($inputImagePath)
-    {
+    function execute($inputImagePath) {
         // $BA0=hM}(B
         $filestat         = @stat($inputImagePath);
         $imagesize        = getimagesize($inputImagePath);
@@ -163,50 +160,22 @@
     }
 
     // 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;
-    }
-    function setFileSize($fileSize)
-    {
-        $this->outputFileSize   = $fileSize;
-    }
+    function setOutputDir($outputDir)   { $this->outputImageDir   = $outputDir;  }
+    function setImageType($imageType)   { $this->outputImageType  = $imageType;  }
+    function setImageWidth($imageWidth) { $this->outputImageWidth = $imageWidth; }
+    function setImageHeight($imageHeight) { $this->outputImageHeight = $imageHeight; }
+    function setFileSize($fileSize)     { $this->outputFileSize   = $fileSize;   }
 
     // Getter
-    function getOutputDir()
-    {
-        return $this->outputDir;
-    }
-    function getImageType()
-    {
-        return $this->outputImageType;
-    }
-    function getImageWidth()
-    {
-        return $this->outputImageWidth;
-    }
-    function getImageHeight()
-    {
-        return $this->outputImageHeight;
-    }
+    function getOutputDir()   { return $this->outputDir;         }
+    function getImageType()   { return $this->outputImageType;   }
+    function getImageWidth()  { return $this->outputImageWidth;  }
+    function getImageHeight() { return $this->outputImageHeight; }
 
     /*
      * PrivateMethod
      */
-    function beforeExecute()
-    {
+    function beforeExecute() {
     }
 
     /**
@@ -216,8 +185,7 @@
      * @param resource $image imagecreatetruecolor() $B$N$h$&$J2hA|:n ＠ .4X?t$,JV$92hA|%j%=!<%9!#(B
      * @return array $B?'>pJs(B
      */
-    function getTransparentColor($image)
-    {
+    function getTransparentColor($image) {
         $max_x = imagesx($image) - 1;
         $max_y = imagesy($image) - 1;
         for ($x = 0; $x <= $max_x; $x++) {

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/block.marquee.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/block.marquee.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/block.marquee.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -7,8 +7,7 @@
  * @param string $value $BF~NO(B
  * @return string $B=PNO(B
  */
-function smarty_block_marquee($params, $content, &$smarty, &$repeat)
-{
+function smarty_block_marquee($params, $content, &$smarty, &$repeat) {
     // {/marquee}$B$N>l9g$N$_=PNO$9$k!#(B
     if ($repeat || !isset($content)) {
     return null;

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/function.from_to.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/function.from_to.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/function.from_to.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,8 +30,7 @@
  * @return string
  * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_from_to($params, &$smarty)
-{
+function smarty_function_from_to($params, &$smarty) {
     require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
 
     $from = null;

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -38,8 +38,7 @@
  * @return string
  * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_checkboxes_ex($params, &$smarty)
-{
+function smarty_function_html_checkboxes_ex($params, &$smarty) {
     require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
 
     $name = 'checkbox';
@@ -127,8 +126,7 @@
     }
 }
 
-function smarty_function_html_checkboxes_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags)
-{
+function smarty_function_html_checkboxes_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags) {
     $_output = '';
 
     $_output .= '<input type="checkbox" name="'

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -38,8 +38,7 @@
  * @return string
  * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_radios_ex($params, &$smarty)
-{
+function smarty_function_html_radios_ex($params, &$smarty) {
     require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
 
     $name = 'radio';
@@ -129,8 +128,7 @@
 
 }
 
-function smarty_function_html_radios_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags)
-{
+function smarty_function_html_radios_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags) {
     $_output = '';
 
     $_output .= '<input type="radio" name="'

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/modifier.h.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/modifier.h.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.h.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -18,7 +18,6 @@
  * @param string $string
  * @return string
  */
-function smarty_modifier_h($string)
-{
+function smarty_modifier_h($string) {
     return htmlspecialchars($string, ENT_QUOTES);
 }

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -18,8 +18,7 @@
  * @param string
  * @return string
  */
-function smarty_modifier_nl2br_html($string)
-{
+function smarty_modifier_nl2br_html($string) {
     $lines = preg_split('/(\\r\\n|\\r|\\n)/', $string);
     $keys = array_keys($lines);
     $last_key = end($keys); // $B:G=*9T$N%-!<(B

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -8,8 +8,7 @@
  * @param string $value $BF~NO(B
  * @return string $B=PNO(B
  */
-function smarty_modifier_numeric_emoji($value)
-{
+function smarty_modifier_numeric_emoji($value) {
     // $B?t;z3(J8;z(B (0$B!A(B9) $B$N3(J8;zHV9f(B
     static $numeric_emoji_index = array('134', '125', '126', '127', '128', '129', '130', '131', '132', '133');
 

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,8 +5,7 @@
  * @param  string $value $BF~NO(B
  * @return string $value $B%^%C%A$7$?>l9g$OJQ498e$NJ8;zNs!"$7$J$$>l9g$OF~NO$5$l$?J8;zNs$r$=$N$^$^JV$9!#(B
  */
-function smarty_modifier_script_escape($value)
-{
+function smarty_modifier_script_escape($value) {
 
     if (is_array($value)) return $value;
 

$BJQ99(B: branches/version-2_12-dev/data/smarty_extends/modifier.u.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/modifier.u.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.u.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -18,7 +18,6 @@
  * @param string $string
  * @return string
  */
-function smarty_modifier_u($string)
-{
+function smarty_modifier_u($string) {
     return htmlspecialchars(rawurlencode($string), ENT_QUOTES);
 }

$BJQ99(B: branches/version-2_12-dev/html/install/index.php
===================================================================
--- branches/version-2_12-dev/html/install/index.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/install/index.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -197,14 +197,12 @@
         }
 
         //$B%^%9%?!<%G!<%?$N%-%c%C%7%e$r:o=|(B
-        $cache_dir = DATA_REALDIR . 'cache/';
+        $cache_dir = '../../data/cache/';
         $res_dir = opendir($cache_dir);
         while ($file_name = readdir($res_dir)){
             //dummy$B0J30$O:o=|(B
             if ($file_name != 'dummy'){
-                if (is_file($cache_dir . $file_name)) {
-                    unlink($cache_dir . $file_name);
-                }
+                unlink($cache_dir . $file_name);
             }
         }
         closedir($res_dir);
@@ -274,8 +272,7 @@
 $objView->display('install_frame.tpl');
 //-----------------------------------------------------------------------------------------------------------------------------------
 // $B$h$&$3$=2hLL$NI=<((B
-function lfDispWelcome($objPage)
-{
+function lfDispWelcome($objPage) {
     global $objWebParam;
     global $objDBParam;
     // hidden$B$KF~NOCM$rJ];}(B
@@ -290,8 +287,7 @@
 }
 
 // $B;HMQ5vBz7 ＠ Ls=q$NI=<((B
-function lfDispAgreement($objPage)
-{
+function lfDispAgreement($objPage) {
     global $objWebParam;
     global $objDBParam;
     // hidden$B$KF~NOCM$rJ];}(B
@@ -306,8 +302,7 @@
 }
 
 // STEP0$B2hLL$NI=<((B($B%A%'%C%/(B)
-function lfDispStep0($objPage)
-{
+function lfDispStep0($objPage) {
     global $objWebParam;
     global $objDBParam;
     // hidden$B$KF~NOCM$rJ];}(B
@@ -451,8 +446,7 @@
 }
 
 // STEP0_1$B2hLL$NI=<((B($B%U%!%$%k$N%3%T!<(B)
-function lfDispStep0_1($objPage)
-{
+function lfDispStep0_1($objPage) {
     global $objWebParam;
     global $objDBParam;
 
@@ -469,15 +463,13 @@
     return $objPage;
 }
 
-function lfGetFileMode($path)
-{
+function lfGetFileMode($path) {
     $mode = substr(sprintf('%o', fileperms($path)), -3);
     return $mode;
 }
 
 // STEP1$B2hLL$NI=<((B
-function lfDispStep1($objPage)
-{
+function lfDispStep1($objPage) {
     global $objDBParam;
     // hidden$B$KF~NOCM$rJ];}(B
     $objPage->arrHidden = $objDBParam->getHashArray();
@@ -489,8 +481,7 @@
 }
 
 // STEP2$B2hLL$NI=<((B
-function lfDispStep2($objPage)
-{
+function lfDispStep2($objPage) {
     global $objWebParam;
     global $objDBParam;
     // hidden$B$KF~NOCM$rJ];}(B
@@ -503,8 +494,7 @@
 }
 
 // STEP3$B2hLL$NI=<((B
-function lfDispStep3($objPage)
-{
+function lfDispStep3($objPage) {
     global $objWebParam;
     global $objDBParam;
     // hidden$B$KF~NOCM$rJ];}(B
@@ -519,8 +509,7 @@
 }
 
 // STEP4$B2hLL$NI=<((B
-function lfDispStep4($objPage)
-{
+function lfDispStep4($objPage) {
     global $objWebParam;
     global $objDBParam;
     global $objDb;
@@ -553,8 +542,7 @@
 }
 
 // $B40N;2hLL$NI=<((B
-function lfDispComplete($objPage)
-{
+function lfDispComplete($objPage) {
     global $objWebParam;
     global $objDBParam;
     // hidden$B$KF~NOCM$rJ];}(B
@@ -626,8 +614,7 @@
 }
 
 // WEB$B%Q%i%a!<%?!<>pJs$N=i4|2=(B
-function lfInitWebParam($objWebParam)
-{
+function lfInitWebParam($objWebParam) {
     global $objDb;
 
     if (defined('HTTP_URL')) {
@@ -714,8 +701,7 @@
 }
 
 // DB$B%Q%i%a!<%?!<>pJs$N=i4|2=(B
-function lfInitDBParam($objDBParam)
-{
+function lfInitDBParam($objDBParam) {
 
     if (defined('DB_SERVER')) {
         $db_server = DB_SERVER;
@@ -758,8 +744,7 @@
 }
 
 // $BF~NOFbMF$N%A%'%C%/(B
-function lfCheckWebError($objWebParam)
-{
+function lfCheckWebError($objWebParam) {
     // $BF~NO%G!<%?$rEO$9!#(B
     $arrRet = $objWebParam->getHashArray();
     $objErr = new SC_CheckError($arrRet);
@@ -793,8 +778,7 @@
 }
 
 // $BF~NOFbMF$N%A%'%C%/(B
-function lfCheckDBError($objDBParam)
-{
+function lfCheckDBError($objDBParam) {
     global $objPage;
 
     // $BF~NO%G!<%?$rEO$9!#(B
@@ -825,8 +809,7 @@
 }
 
 // SQL$BJ8$N<B9T(B
-function lfExecuteSQL($filepath, $arrDsn, $disp_err = true)
-{
+function lfExecuteSQL($filepath, $arrDsn, $disp_err = true) {
     $arrErr = array();
 
     if (!file_exists($filepath)) {
@@ -883,8 +866,7 @@
  * @param array $arrDsn $B%G!<%?%=!<%9L>$NG[Ns(B
  * @return array $B%(%i!<$,H/@8$7$?>l9g$O%(%i!<%a%C%;!<%8$NG[Ns(B
  */
-function lfDropSequence($arrSequences, $arrDsn)
-{
+function lfDropSequence($arrSequences, $arrDsn) {
     $arrErr = array();
 
     // Debug$B%b!<%I;XDj(B
@@ -923,8 +905,7 @@
  * @param array $arrDsn $B%G!<%?%=!<%9L>$NG[Ns(B
  * @return array $B%(%i!<$,H/@8$7$?>l9g$O%(%i!<%a%C%;!<%8$NG[Ns(B
  */
-function lfCreateSequence($arrSequences, $arrDsn)
-{
+function lfCreateSequence($arrSequences, $arrDsn) {
     $arrErr = array();
 
     // Debug$B%b!<%I;XDj(B
@@ -963,8 +944,7 @@
 }
 
 // $B ＠ _Dj%U%!%$%k$N:n ＠ .(B
-function lfMakeConfigFile()
-{
+function lfMakeConfigFile() {
     global $objWebParam;
     global $objDBParam;
 
@@ -1058,8 +1038,7 @@
  * @see http://www.php.net/glob
  */
 $alldirs = array();
-function listdirs($dir)
-{
+function listdirs($dir) {
     global $alldirs;
     $alldirs[] = $dir;
     $dirs = glob($dir . '/*');
@@ -1074,8 +1053,7 @@
 /**
  * $BJ];}$7$?%9%?%F%#%C%/JQ?t$r%/%j%"$9$k!#(B
  */
-function initdirs()
-{
+function initdirs() {
     global $alldirs;
     $alldirs = array();
 }
@@ -1085,8 +1063,7 @@
  *
  * @return array $B%7!<%1%s%9$r;HMQ$9$k%F!<%V%kL>$H%+%i%`L>$NG[Ns(B
  */
-function getSequences()
-{
+function getSequences() {
     return array(
         array('dtb_best_products', 'best_id'),
         array('dtb_bloc', 'bloc_id'),
@@ -1127,8 +1104,7 @@
  *
  * @param string $B ＠ _Dj$9$k4IM}5!G=$N%G%#%l%/%H%jL>(B
  */
-function renameAdminDir($adminDir)
-{
+function renameAdminDir($adminDir) {
     $oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR);
     if ($adminDir === $oldAdminDir) {
         return true;
@@ -1142,8 +1118,7 @@
     return true;
 }
 
-function getArrayDsn(SC_FormParam $objDBParam)
-{
+function getArrayDsn(SC_FormParam $objDBParam) {
     $arrRet = $objDBParam->getHashArray();
 
     if (!defined('DB_TYPE')) {

$BJQ99(B: branches/version-2_12-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_12-dev/html/install/sql/create_table_mysql.sql	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/install/sql/create_table_mysql.sql	2013-05-02 09:11:36 UTC (rev 22796)
@@ -552,8 +552,6 @@
     add_point numeric NOT NULL DEFAULT 0,
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
     payment_id int,
@@ -611,8 +609,6 @@
     add_point numeric NOT NULL DEFAULT 0,
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
     payment_id int,
@@ -717,8 +713,6 @@
     price numeric,
     quantity numeric,
     point_rate numeric NOT NULL DEFAULT 0,
-    tax_rate numeric,
-    tax_rule smallint,
     PRIMARY KEY (order_detail_id)
 );
 

$BJQ99(B: branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql	2013-05-02 09:11:36 UTC (rev 22796)
@@ -552,8 +552,6 @@
     add_point numeric NOT NULL DEFAULT 0,
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
     payment_id int,
@@ -611,8 +609,6 @@
     add_point numeric NOT NULL DEFAULT 0,
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
-    order_tax_rate numeric,
-    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
     payment_id int,
@@ -717,8 +713,6 @@
     price numeric,
     quantity numeric,
     point_rate numeric NOT NULL DEFAULT 0,
-    tax_rate numeric,
-    tax_rule smallint,
     PRIMARY KEY (order_detail_id)
 );
 

$BJQ99(B: branches/version-2_12-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_12-dev/html/install/sql/insert_data.sql	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/install/sql/insert_data.sql	2013-05-02 09:11:36 UTC (rev 22796)
@@ -827,7 +827,6 @@
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (5, 'pdx.ne.jp', 4);
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (6, 'disney.ne.jp', 5);
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (7, 'willcom.com', 6);
-INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (8, 'emnet.ne.jp', 7);
 
 INSERT INTO mtb_order_status (id, name, rank) VALUES (7, '$B7h:Q=hM}Cf(B', 0);
 INSERT INTO mtb_order_status (id, name, rank) VALUES (1, '$B?75,<uIU(B', 1);
@@ -1222,7 +1221,7 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR', 'DATA_REALDIR . "downloads/tmp/plugin_install/"', 613, '$B%W%i%0%$%s0l;~E83+MQ%G%#%l%/%H%j!J%$%s%9%H!<%kMQ!K(B');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PLUGIN_HTML_URLPATH', 'ROOT_URLPATH . "plugin/"', 614, '$B%W%i%0%$%s(BURL'); 
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_DAYS_LEN', '3', 700, '$BF|?t7e?t(B');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_EXTENSION', '"zip,lzh,jpg,jpeg,gif,png,mp3,pdf,csv"', 701, '$B%@%&%s%m!<%I%U%!%$%kEPO?2DG=3HD%;R(B($B%+%s%^6h ＠ Z$j(B)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_EXTENSION', '"zip,lzh,jpg,jpeg,gif,png,mp3,pdf,csv"', 701, '$B%@%&%s%m!<%I%U%!%$%kEPO?2DG=3HD%;R(B($B%+%s%^6h ＠ Z$j(B)"');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_SIZE', '50000', 702, '$B%@%&%s%m!<%IHNGd%U%!%$%kMQ%5%$%:@)8B(B(KB)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEFAULT_PRODUCT_DOWN', '1', 703, '1:$B<B>&IJ(B 2:$B%@%&%s%m!<%I(B');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_TEMP_REALDIR', 'DATA_REALDIR . "download/temp/"', 704, '$B%@%&%s%m!<%I%U%!%$%k0l;~J]B8(B');

$BJQ99(B: branches/version-2_12-dev/html/js/site.js
===================================================================
--- branches/version-2_12-dev/html/js/site.js	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/js/site.js	2013-05-02 09:11:36 UTC (rev 22796)
@@ -129,6 +129,12 @@
             return;
         }
         break;
+    case 'delete_order':
+        if(!window.confirm('$B0lEY:o=|$7$?%G!<%?$O!"85$KLa$;$^$;$s!#(B\n$B:o=|$7$F$b59$7$$$G$9$+!)(B\n\n$B"((B $B:_8K?t$O<jF0$GLa$7$F$/$@$5$$!#(B')){
+            return;
+        }
+        mode = 'delete';
+        break;
     case 'confirm':
         if(!window.confirm('$BEPO?$7$F$b59$7$$$G$9$+(B')){
             return;

$BJQ99(B: branches/version-2_12-dev/html/test/upgrade/index.php
===================================================================
--- branches/version-2_12-dev/html/test/upgrade/index.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/test/upgrade/index.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -72,8 +72,7 @@
  *
  * @return string
  */
-function getMode()
-{
+function getMode() {
     if (isset($_GET['mode'])) {
         return $_GET['mode'];
     } elseif (isset($_POST['mode'])) {
@@ -86,8 +85,7 @@
  * $B%b%8%e!<%k%j%9%H0lMw$r(Bjson$B=PNO$9$k(B
  *
  */
-function displayProductsList()
-{
+function displayProductsList() {
     $arrRet = array(
         'status' => 'SUCCESS',
         'data'   => $GLOBALS['productsList']
@@ -104,8 +102,7 @@
  *
  * @param array $arrProductsList
  */
-function updateModuleTable($arrProductsList)
-{
+function updateModuleTable($arrProductsList) {
     $table = 'dtb_module';
     $where = 'module_id = ?';
     $objQuery =& SC_Query_Ex::getSingletonInstance();

$BJQ99(B: branches/version-2_12-dev/html/upgrade/index.php
===================================================================
--- branches/version-2_12-dev/html/upgrade/index.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/upgrade/index.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -42,8 +42,7 @@
 $objPage->process($mode);
 
 
-function lfPageFactory($mode)
-{
+function lfPageFactory($mode) {
     $prefix = 'LC_Page_Upgrade_';
     $file   = CLASS_REALDIR . "pages/upgrade/${prefix}";
     $class  = $prefix;

$BJQ99(B: branches/version-2_12-dev/html/user_data/__default.php
===================================================================
--- branches/version-2_12-dev/html/user_data/__default.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/__default.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -9,16 +9,14 @@
  *
  * @package Page
  */
-class LC_Page_User extends LC_Page_Ex 
-{
+class LC_Page_User extends LC_Page_Ex {
 
     /**
      * Page $B$r=i4|2=$9$k(B.
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -27,8 +25,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
         $this->sendResponse();
@@ -39,8 +36,7 @@
      *
      * @return void
      */
-    function action()
-    {
+    function action() {
     }
 
     /**
@@ -48,8 +44,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/admin/css/admin_contents.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/admin/css/admin_contents.css	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/admin/css/admin_contents.css	2013-05-02 09:11:36 UTC (rev 22796)
@@ -176,48 +176,47 @@
 
 /*$B$*$9$9$a>&IJ4IM}(B*/
 
-table.recommend-table {
+table#recommend-table {
     border-collapse: collapse;
     font-size: 100%;
     margin: 0 0 50px;
     width: 100%;
 }
 
-.recommend-product.hidden td{
-    background: #C9C9C9;
-}
-
-div.table-wrap {
+div#table-wrap {
     margin-top: 6px;
 }
 
-div.table-wrap div.table-img {
+div#table-wrap div.table-img {
     float: left;
     padding-left: 6px;
 }
 
-div.table-wrap div.table-detail {
+div#table-wrap div.table-detail {
     float: left;
     text-align: left;
     padding-left: 11px;
 }
 
-div.table-wrap div.table-detail div.detail-name {
+div#table-wrap div.table-detail div.detail-name {
     margin-bottom: 5px;
 }
 
+td.no-border {
+    border: 0;
+    background: #f5f5f5;
+    padding: 20px;
+}
+
+td.no-border-w {
+    border: 0;
+}
+
 td.AlignLeft {
     text-align: left;
     padding-left: 11px;
 }
 
-/*$B$*$9$9$a>&IJ8!:w2hLL(B*/
-
-#recommend-search-results .hidden td,
-#recommend-search-results .hidden th{
-    background: #C9C9C9;
-}
-
 /*$BDL>o%\%?%s(B*/
 .btn-normal,
 a.btn-normal:link,
@@ -631,7 +630,8 @@
 #navi li.on li a,
 #navi li.on li a span,
 #navi li li.on a,
-#navi li li.on a span {
+#navi li li.on a span,
+ {
     background: transparent;
 }
 
@@ -766,7 +766,7 @@
 
 #agreement {
     margin: 0;
-    border-width: 1px;
+    border-width: 1px
     border-color: #c0c0c0;
     border-style: solid;
     width: 480px;
@@ -1131,11 +1131,6 @@
     background-color: #f3f3f3;
 }
 
-#products-category-left li ul,
-#products-rank-left li ul {
-    margin-left: 20px;
-}
-
 #products-category-right .now_dir {
     margin-bottom: 20px;
     padding: 10px;

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/admin/css/reset.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/admin/css/reset.css	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/admin/css/reset.css	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,4 +1,4 @@
- ＠ charset "utf-8";
+ ＠ charset "utf-8";
 
 /************************************************
  $B%V%i%&%6%j%;%C%H(B

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/admin/js/admin.js
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/admin/js/admin.js	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/admin/js/admin.js	2013-05-02 09:11:36 UTC (rev 22796)
@@ -19,7 +19,40 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+// $B4IM}<T%a%s%P!<$rDI2C$9$k!#(B
+function fnRegistMember() {
+    // $BI,?\9`L\$NL>A0!"%m%0%$%s(BID$B!"%Q%9%o!<%I!"8"8B(B
+    var lstitem = new Array();
+    lstitem[0] = 'name';
+    lstitem[1] = 'login_id';
+    lstitem[2] = 'password';
+    lstitem[3] = 'authority';
 
+    var max = lstitem.length;
+    var errflg = false;
+    var cnt = 0;
+
+    //$B!!I,?\9`L\$N%A%'%C%/(B
+    for(cnt = 0; cnt < max; cnt++) {
+        if(document.form1[lstitem[cnt]].value == "") {
+            errflg = true;
+            break;
+        }
+    }
+
+    // $BI,?\9`L\$,F~NO$5$l$F$$$J$$>l9g(B
+    if(errflg == true) {
+        alert('$BI,?\9`L\$rF~NO$7$F2<$5$$!#(B');
+        return false;
+    } else {
+        if(window.confirm('$BFbMF$rEPO?$7$F$b59$7$$$G$7$g$&$+(B')){
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
+
 //$B?F%&%#%s%I%&$N%Z!<%8$rJQ99$9$k!#(B
 function fnUpdateParent(url) {
     // $B?F%&%#%s%I%&$NB8:_3NG'(B

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/default/css/reset.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/reset.css	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/reset.css	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,4 +1,4 @@
- ＠ charset "utf-8";
+ ＠ charset "utf-8";
 
 /************************************************
  $B%V%i%&%6%j%;%C%H(B

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/default/css/table.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/table.css	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/table.css	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,4 +1,4 @@
- ＠ charset "utf-8";
+ ＠ charset "utf-8";
 
 /************************************************
  tables

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/default/img/common/bg_header.gif
===================================================================
($B%P%$%J%j%U%!%$%k$,0[$J$C$F$$$^$9(B)

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_news.jpg ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_news.jpg)
===================================================================
($B%P%$%J%j%U%!%$%k$,0[$J$C$F$$$^$9(B)

$B:o=|(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_news.png
===================================================================
($B%P%$%J%j%U%!%$%k$,0[$J$C$F$$$^$9(B)

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_recommend.jpg ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_recommend.jpg)
===================================================================
($B%P%$%J%j%U%!%$%k$,0[$J$C$F$$$^$9(B)

$B:o=|(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_bloc_recommend.png
===================================================================
($B%P%$%J%j%U%!%$%k$,0[$J$C$F$$$^$9(B)

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_recommend.jpg ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_recommend.jpg)
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_recommend.jpg	                        (rev 0)
+++ branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_recommend.jpg	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,50 @@
+ JFIF  H H   C  C   $B%)(B               	
+ 1       !"	#$12qABb%Q            	 < 	     !1AQ"2aq#3B$B"Cu3!#%"(B$4CTbr$B#r(B   ? $B{0I^(B]&l$B%Mpc3{(B$Bsh\;(B"$B!W%(%e(B2$BV_(BZP$B\,(B!#$BkA(Bb$B%l(Bk..P$BD%%_(B	? 0
+RZ$B!&#T(BS$B%e(BJ$B%1(B$B%o%r(B5)F$B~a(BL$Bywf't9%3(B7$B%s(B[$B^e%%(B$B%=(Bj$B%=%i%s(B$B%mz_(B$B9p(Bw$Bqe;>(B}$Bq9%l%=(B>$B%i(B$B_pxW%L6?%m(Bu$BZo(B$Bt6%A%h(B-$B}*%A(Bl$B/4(B#$B%U<q(BW$B%(7 ＠ vh(B*$B!VzN3_%a%(yP(BiiZz$B!"Oq(Br$BbY(B)=$B&t(B#? $B%-%e(BM$BzI(BWuO7$B!,%((B$B%!(B5$B%_(BU$Bhw(BW<+=$B~A$(D{í(B<N$B%$%3(Ba$B%h(B?$BeLg(%U(B>$B%1(B/#]$Bz"%U%#(Bf$B%*%^(B$B%9%e(BU$BtM(BG$BIG(B$B%r$(Dwp$BCxRd(B7$B%"ni^o%!(B<
+z$B%g(Bu$B%J(B[$B{f%?(Bk$B%F(B&D$B[Z(Br$$B%1%c(BW=$Bg\%K(B1$B%#%'i6wi$(Dx@$BM6(B*$B%F%7%H(Bs$B[x(B )$B%b(B$B%R(B
+$B%;(Bg$B%C;o(B6[$B`4(Bq$B!+!V(B]$B%$%_(BWB$B%V(B$B%A(E$(D{1(B'+$B%a(B$(D}K$B=P(B`$B%L(B1 $B!&%)pU%((BY$Bb)-#(Bb|$B%r(B@$Bs4(B
+/$B%b(BZ$BRy%A(B?$B"B%C(Bi:tY;$B=U(B08$B%F(B+$B#r(Bv$B$p!+%H0*%j(BuU$BJR(B$B%r(B;$B%5(B$B%"%D%K(B<$B+K(Bz$B5w(B-$Byo$(D{(Bl$(Dw1(BH$B%%(B$$BzR(B$B%R(Bj8ME a$$B{((Bw$B%[(BX$B["%f(Bl$B%$(B9y$B%am0%F%`(Bf$B}v(BRD$B%h(BE$BOq4w(BE7$B%=(B$B%ohs(Bo$B-W(B'$B%l%C%h(B*V$BD'(B'$B%h(BP`$B%^yoVc(B-V$B%!(Bx$Bn8(B $(D}c$B%'(B.$B%b%5R;(Bo$B%L(Bg$B%_g+(B4s$B%b%o%C(BA#^$B%f(B|$Bqh%i%1(BOkQ$B%%%s(B=c/]U\$(DyW$B%hgP(BA$B|/.l(Bq$BNz(B-~"$B !lZr:%=WY%-Tu(Bi$B!<c/(BB$B%N(Br.k$Bh<(B	$B%e(Ba$B ＠ Q}m(B%$Bw>(B,$B!w(B20$B%eE4%h%'swqu(BeB$B%k%/(BD$B{.%#vG&P%b#1(BA$BPy(Br.$BkY%U(BX$Bdk(B$B:d(BJn/$(Dyu$B%h%-%$(B$BNw(B7$B%m(B$B/0$(D{$B!,(Be$B%&(BAT$By+Gf%*(B)AW$Bo}(B\a$B!<(B
+$B%1(BS$Bg&(Bd$BxG(B)u$B8^(B^F$B;F(B3$B!#(Ba$B|0(Bf!8+$B6f(Bb$B%*%=(BM_$B%*g-(BT$Bun(B:$B_F%"(Br$B%N%_(Bu$B7\(Bq$B!"(B%7$B%)(BA$B*e(B/$B%i}*(B=^g$BVi(B<$BIn%&(Bep<$BI<(B4$B]}(1%h(BDA1e$BwPMVpM%k(Bvb$B%Oy)F3"Y(BC$B/J%%%r(B$ $B%"(B'$(D~U(B>\$Bs$.z(B=$$B%g(B\$B%s%h(BbA$B!"(B9$Be3(B$B%M(Br$B2t(B$Bf7(BT$BvPLoe[{>%9(B$B%R%o%%%'(B$S$B%!(Bx$B!+(B:bC$B%=(B$B%[O`%g(Bz|$Bm^(B$B%[(BS$B0{(BW9$B%-%an+%k!#%3!V%c(B	$BB[(B)$Bcr(B $B%=%j(BS$B%1(B$Bg}%b%N(BQ?$B%s(B=o$B%C(Bj$B%+(BG$BU3(BLO)q+$B%#(BP'$Byir_vt(B$Bi?(B\K$Bn#(B\R$B|n!&\=(BR$B&,rm(BTLg*#$B%O=6(B$B%?(B$B%`(Bl$Bi`(Bv`$B5^(Bx%$B%*%&(B$B%9(B+$B4K(B$B?t)}(BICK(0$Bxp(Bs*$BUi%s(B=F$B!W(BR$B%r(BIP$B%^(BNx$B%k~R(B>t$B%d(B$B%+{n(B*$B%M(BW#$B%&(B}$BK~%g(B|2$B%d%a(B-dh$By|%R%N]o(B$$B%A%N(BjEj$B%"#;!W(BX$B!,(B/D$BTL(B3%$B!#(BJ$B`.(B[
+T$B%^G'%"(B$BuJb1%M(B{$B`M(BO$B%f(B/$BsY%m(Bu$B%R(BX~E$B%^(Bo$Bp<(Bs$BYu%!%d%o(Bb$B%R(BH$B.4i#Br%Dmm%#%=%Cv4(B$B}[(Bm$B%d(B2$B%s!"CN(B8$BCu(B2$B!"J&(B$$BG&(BWu$B%CAt(B^6}$B%!(Bs$BMv(B5$B%1(B^$B%)(BW$BQU(BJ$B%F%U%_%98*(Bk$Bh~%D(B(H$B4Y(B+>$BFo(B}^MV.JRI^(N$B"h/b%*(B+Sk$B,o(BlUQW$B%$!V$(Dw@(BJG:$B%A(BN$Bs|(B#;\$B%e(B&$BvNAyJ-(B
+%$B}2(B,$B%kLs!W(BI$B!<%cn}(BL$B%M%K%CGS%*%#(B&$B~8%^(B^$Brf(B$B{@(Be>$B5R%U$(Dwq(B-$B%7%R;,!#%R(BV:$B%&(B+m$B%L(B%je$B%J%#(B$B%f!W%#LN(B7$B%`Yx%X(B$B%C(Bi4$B%i(Bu$B%((BxB$B!"(B4$B{N%!(Bb$B'Y(BR	$B%7pb!+(B$BnM(B9.$B%i(BRG$Bd3%=%'cDQ(z!(B$B,0%e(BB$B:,%!Xv(B$B%J(B`cFw$B%1]H(BkU^$B2l%#%M(B;c$BSG%C(B"$B3{%?(B6%FKmBu$B%-sh(B $B%*Yt%!!#(BO|$B%)r$(B_hP<A$B2>%%(Bj$B%o(B<$B%3%#/](BL]v$B%a(BuXK\$Bqy(Bi$(D{Y$B!<(B+$BIl%M(Bd$B%o(BO$B1@(BS$Brv%d(Bs$B%;(BW$(DuX(Bh$Bt/(B=$BVr(Bnf%$B%3(Bgi$BM[(B@$Bb>z?(BX!$B%J(B8$B5G(B+$Bf{%%(B$B%f%l(B:$B-J(Bh$BW>(BKoo+$B%b(Bn-$B%"(BD$B%Fu0(B2$BN`(Bj$B+g(BM?HL$Bk`(Bx$B%k(Btp$Bud!"LN%c%9(B8O"$B%((BVJ$XG$B3Y%$D>(B$B'8%`Io(BTrv$B%e(B6v$B!,(B<bl$B%/(B]i$B):(B>+I$BZC%J(B$$B%e(B6$B%H%KF6z!(BLT-'uIs$B%h(BUu$B/s(B9W+$BF0(Bv$BX;%Uxr(By$B%=(Bo!$BXS(BK$B%"-.2e%'(B
+$B%(ej(B[$B%%(B3I>$B%J'l%#(B $B!<(Bbs$B$r^UdLvP98(B8$Bc#(BJ$B3vCb(B|nv$B'`(Bf$B%5%#%OtY(BUb$B3+(B$$BO`(Bg$B!#}g(BU|w$B%F(B|3$B0g(B~X$Bgn(BF$B`]%[!"qC$(Du$B%M%o%(t!(B}$B%j%i(BE$B%+!<$(D{(Bg$B%[(BR$B%_%i%J%U%R%`%A%%%[8X%3(B$B%&#:?R(BOd$B3Z(B:$B|U(Bj6$B%(%b%e(BM&I$B%1_1(B%7)FqCY53$BTS(B:$B%J(B($B%'_=(BG$B!V(B`xn M0*k8Mu$B%9%^(B $BH"%UwH(BT$B%3!V=kq:(Bh'$B>M%F%L`I(BIO A$BJb(B\)64Q$B!W/SFi%H(B<v0$B%KtWRi%foW#fGu(BT$B%o(B$Bz@(B$$B%rj^jf(BH$B%"(BV-D$B%m(Bc$Bi(O3(B_y$B%X(B$B/-o-(BM$B%;%r(B$
+\$By{8<p{(BM$B%M%+%$(Bo$B?K(B/3Wtii$(D{J(B4N1.$B%s(B
+c$B%/%3(B=U$B%*%e(B=~$B!V(B?$BMpuq(B$B%FEG(BYr]$B%)(Be$BGZ(Bj$B%k(B* $B%HMv_I(Bi$B%$(BR$Bjl!&(Bm8$B!8(BN$(D}$(BKQ$B%s!&%L%$(Bn$B~R(BiE$Br#%1(BM$B5<3>$(D(B:[$B^QsW(B.$B4t(BV0$B-v(B$BG@(B~,$B%`%+(BN$B%_(BHvy$B%+(B#	$B}-(Bz$BWo%h(B
+u$B!,(BN$B!,(B~:T$B:X!V(BPm$B'i(BQ$B%8(B5$Bih(BbU$B!,?e(Br$Bv0%l(B$B%e(Bk$BoZ%m(By$B%R(B|	.$B@<(B$B!&(B9$B!W%g(B&$B%A(Bv$B23(B$B W(BB$B%=!W(Bie$BG?%s(BnREp$B%H=A(Bm$B%g(B.%$BviKrGA(Br$B%'%gxG(B=CE)$B!&(BE)YTB$B%b(Bj$BFl%(%e(BJ*?$B!&(B:xF&$B%d%-%H(BZ$B%_%%(B.I$B?^(B:$B%i(B
+$B'>(B'\u$B%f%^%l7d3G(B`$Bq[(BH$B%)(B]&\$B%;%s(Bg$BnU(BA$B%k(BA\$B%N%C(BsX$B%3(BH9$B%r(Bh$B[((B+$B%;(Bx`$BEz(B7$B%a(Bc$B%1Y6(BVN$Bfw(B $B%o(Bj$B%L(Bu$B%/(BB$BK1(B$(D}*(B
+$B!<(Ba4$B%X%-(BV$BiB{X%j(B{$B%L(B0&y^;$B%gVzew$(Du}(B8_$B9X%o(BK$B%b(B$B\)(B0$B%j(BL]$B%-(BC$B%$(Be$Bdj(B"$BJ)(B+$B^dSsQp(BCb$B!&(B/$B.E%&Tu%3(Byd$B02(B<$BiUVp(BMQek)@L6<$B%*(BY |)*$B%d(Bm\7$B%^3/zR(B:s$BkD(Bc]$B(|(BU$Be\sW%M&GSu(B+Y}q$B%)%5%${T(B$B%F(B$B%+(B$B%bm*(BkU$B!#(Bb4H_/$B!#>Ovg%^(BY$BMK%'(Bs:$B%H!#LC(Bz$Bu3(B%jcD$B>qsC(BV$$B%e(B^$BER%_(Bb$B%7(Bmz$B8>BV(Bo$BTw(Bj$Bq}(BV$BSX(Ba$B%s(B^9D$B%l(B@$B%s%`lS(BU$BuL(BN$BzP(B	$B%a(B
+$B!V%C4d(B>$B%K(B<2$B%m7b%1%#(BY$B%%(Bc.v$BB9Dx(Bb$B%(%o%r{s(B`$B,SO:(BF$B!&(Bq$Bk8Gt%m(B[$BqV(BH)$B%!(B$B!W^w(B+$B%Y(B'
+$B%U%s(BKb8$B,8!+$(DwM$Bum(B6$B%+(Bshx$B%i<t(B
+I$B%3(B
+U$B%"%b%7(BZ$B%'(Bw$BX5%M(Br$B%-%1(B[_zIq$BLneZ)>(BQj$BLf(B)?$B05(B)C)$BY5bgzh(BQ$B%`(B $Bax(Bj$(Dy$B&g(B$B%d(Bz$ $Bmd!,!"{'%`(Bqs/$B%)(Bl$B%l(BqX$B%9(BL\$B ＠ k(B-$B%;(B{,$B%&(Bw$B%k(BZ$BB7(Blx$B&{O1%O(BJ$BR3(BQe\1$Br"(BKc$B%J$(Dxc$B3!%R%i%L(Ba$B%L%L~T(B/r$$B 5%c(B!$B!<%&(B=$Bow%J5?%#(B:$$(D{î$B%i(Bc$B-{(B;$B}w(Bb$By7!+(Br\$B6m(Bx$Btk(BYI[Ek[$B{)!"(B<$Bc1%_Jt`.qru~(B
+$Bb%4*(BK$B%sqv%i(BB5Z$B%h(B $B*H1F(BbXU$B%#(BL$B%%(BQ"Hv$B%$%d(B$B%((BuX$B%l(B:i$$B%j(Bt$Bwsk?U[(BD$Bin(B*$B%oYM(B7$BAT(BZ$BET(BF2$Bb8(BC$BEP(B$$BzP(B($B%mT]!W(BXHVM$Bv=%e(B8$Bze(B1a4M$B%[%l(Bg$B}u(Bu$BGL!W(B}+d$B%3GQ%/(BZQ
+m$B%`(B1$B%R(B2zZi$B%_(B+Wi7ov$B(Q%7}j6<(B$ByH(B
+$(Du (B$B%M(B$B"V(B3[$B%(cn(B($Bi/(Bg$B%r%U(BZ$B%l%ono%&ssC~&W(Bssmrp$BU<(B,$B!V(BxT$B%JO8%/(Ba$B%3(B[$B%%(Bi
+e$B%+%D(B:$B%(%!(Bd$BH,(BtJ>+VgR.$BFU(B	+PZPO9OI6$B%J*c(B9$BKT%greB,(BY$B%X%3%g(BFS$BA6(B=$B%*(BG$B%g!:(BJ$B%7(Bv[$B%=(BA"$B T%h(B($B%$(B-{$B!"(B;]$BdH%-%L%a(B/h$B%#E6(BZ$B%RAa1^(B$B&`(BKo!:$B"t(Bb|Q	$B%A%c%9%a%b(BKB$B%b(B}$B%Ram(Bc$B%U#X&U%r(B$B%/%m$(D}[(B[$B%R%baZ%R!#b}(BM$B%=(B"$B%&(B$B%M(B\$B%?hO%d]b(Bv$(Dux$B%*(Bp$3R$B%m%(K4(BH$B7Q(Bb$B%!%L(Bk$B%9%J~j%n(a(BV$B!&(B0$BH/%+(B7$B%'E5%k(BX$B%b2c%m%%%o(BcHL$B%F(B@,$BH+(B^$B%+(B-$B%'(B?$B%!(B\[$B%!(B
+$(D}s$B.zUx(B#U$B%3(B-q$B+`Fe(BQ$B%N(B!;F&$BRs(B$Bg#(B$B=7y#(B[$B_7(B>$B%R(Bj)k$B%!(B*J$B%/(Bn;N$B%5%HO~OV!V%%(Bm$B%K ＠ 2(B"R0$BS>(B&?C$BKf%k(Bs$B%rtB(Bc$B{j(BF$B%?%L(B$B^b(B*/$B5)%h(B;$B%&(B$B%[z`(BjO\7$Bw^T^%i(B-o/$B!V(B$B%!(BjQt$B?t(B+Y&O"$B'b(Bt$B%m(B$Bpf%gCj%*%O%3%F_$(B
+$BD'(B$B!"(Bd$B9A(B`A$B8;(BC%$B!V%%(B>z$B%O(B5$B%(v<(BY"$B%_Bh(Bl*$B%/%[(B"$B%c(B^$Br~(Bi$By?%^d9%s(BA;$Bro(BF$B!<(BI$Bng(BHT$B%Uqt%F(BT/\$Bei(BYye\&H^^$B%c(B3)$Bp"(B$B>?%mX0%1%-(BUV$B%f/N(BI$B!+(B\$B!,(B|H$Brx(Bn$B&,%($Q(B$B%-(BF$BQ{(BZ$B%C.)(BK$Bw8(B$$BNJ(B$B%g%_(BC$B]a(BR$B%k40(B2$B%)%mng%l!+$(D{(BCU$BL5(BV$B4xd)%7(B[}$B%A%D%r(BxM$B%%(B	
+
+$ )`x|$ByM%k(B$B%-<T%/(Bi$Bin(B$B%`(BiG$B!+(B$B!&(B$B%'(BQ:$Bom(BF;$B%1(B8$B%C|$(B$B2B%7(B#$B%R(BZ]w!`#$B%o(Bks$B%`!W(B_OaoEp($B!V ＠ k(Bc$B(8%d(BM$B%$(B^$Bd~(BR$BRs(BG{]$B%M~n(B]$BTz!W(B]$B%+(B$B%*(Bl$B%/(BeM$B%e(B!h$B%3(B"$Bo5(B$B;c8I%&%c%d%#(B-R$BYt(B41$B%b(BNX7$Byp%$(BC$B!+(B;$B%kyX(BO$Bqi(Bd$(Dwu$B%?$(Dyú$B%C%5(B3"$B%s(B-$(DxC(B$B%"(B^/~x$Bb/p|(Bo$B"d(Bix+$B%!hn(Bt'W$Bfy%l(B:$B%#(BSm$B%'(BD$Bd#uS(Bd$B-fkw%5Ps(B9$B%C(Bb$B%7(B+$B]U[-(By$B%J(B<$B%h(B!$B7W(B$By$%M(B$$BOx%3(B$B%#x_(B3HO$B-M(BxM$B[z(B$B%L(B]$BSk!W%_(BVb{U$BAE%/(BIO$B%'yF(Ba$B!#!Y(B%44z$BW%(B{%h\4)$B?z(B2$B%=(B|6$B?w(B
+Q>k-$B%c(B+pSz$B%+(B $B%h(B`G$B%3WaM+(B.I$B!"(B*.lf$B%_(B:R$Br8(BhC$B|"%5%"!z(B}5$Bv?(BkeP"U'$B!&!<%_%N%'(B(a8$B$G(B;$B%&(BQ=6}$B%3(Bf3yC<B $B%C+`%&(B"	$B%/(B$A$B%i(B\$By\%H(BE$B%R;r(Bc$B%#%a(Bcm$B%Hbj(B*$B%e%#(BnJ+$Bof%C%1!"\H(r(BX$Ba);Q(B=2$B D(Br$B%"wS(B+\$B%f(BTTT_H$B%>%)(BA%.$B%e(B2$B%5(BS $B0\(B
+}$B%^(B4$B!"k&(B9g$B%J|2(B$BcS(B<q$B4-(Bz_
+]$B%M%hC$%A(Bbad$BNC(B=$B%F(B?$B%M!"(BT$By\XA(B~$B%rnA(Bs$B%K(B;$B%b%'(BTs$B%dE&(BO$(D{*(B:5$Bem(B /$B%N%m(B$B%`%(%m(BA$B!V%U%N%M%(%$%+(BX$B!&(BA$$B$EX\(BV$B%[(Bm)$B%c(B"K$B%o(Be$B0{(B#_o$B%?%%%D(BvQ$Bw7%;(B!$+$B%1(B@@$BEv(B[$Br+%KT@%X(B2$B,`x6z*cP(B[$BNF~C(B[{$B:Mzb(BShb$Bv7!<(B#$B%j(BG{$B0g(B2$B+2%$(BTb*$B%#%M2f!+v[(B{*$BHx%l%g,%%7%b(B-HY$Bku(By$BCV%d(B$BO}(BU$BH8r8(Bn F$B1wDN!"(BU[z$BV<(B
+$B)>(B~$BSg(BK\j}$B%j(BY&$$B%M(Bi@Q9Z$Bf9(B$B+[WC6u"((BV$B-7(B
+$B%/(B+$B''%r(B>9K\.
+$B!V%D(B"1	_$BBes}(BE$B%l%!>2$(Duz$Bwv(B7$(DyX$BBT(BW$B%f(BB$B%l'10/@B!#(B $B%i(B"
+$B%#(B+$B!<(Bh$B2[(B$B0,3 ＠ y0(B4$B|N(BuC$B%7(B*$BjH%J(Bq$B%K%iB<%-%H(BO$B%)(B$B%s(B=$B%9(B1$B%-(ByG$BFV%U%X(BXj$B%$%k%s(BL$B%7(Bf$B7<(B$BB6(Bp$B%A(B5km$B!W!<!W=H(Bd1pg$B{+(B$Bd*%i(B"$(D{ø$BHxz81/(B*$BZG(B*JV7J$B%-(B
+$B%)(B'i$B_p(B#$B%_;x%`%Ofr(BX{$Bzx%&(B$B4Nlw%7%!(Bh~E$B%f(BUD$Bl.(B
+8$BbGy2%`(B=x$B%3(B
+$B%g(BR$B{t%C(B|$B%i(B~%$B!V(BN^]W	$B!V(BI$B%3!,(Bi?$B%?(B4'$B%&6r(B/?$BgJ(B>$(D{w$B%91>!"!"%1%[%m*t(B*o$Bt&(BR$B%l(B$B=\(B$Bqe(B$Bw5(B{$B%F(Bz$B%!(B*T^$B%%(B{D$B!#%d(By$B@"!#%^(BT$B%o(B`$B&6(Bai(;=0$B%($;T0X:ET(B0X:n4$B5Z%M(BT$BwP%c(Bc$B%b%_(BW-]dxs$B%e(BD3$B#C(B=R=$BgD(B$B%m(B/$Bze(B9I<',w$B%?%_(B\uV$B+'(B>$B!&(BR$B%/(BL|$B%"%/(Bn$BO[(B$B]u%%%L(B_bn5$BI6(B\$B%C(B'$BXa(B3W$B!W%a%X%"N/M:(B&$BPY(BS$B%c!,(Bl$BFgRW(Br$B%N(B$B%l(B)]$Bdq(Bg$B%o(Bc$BxmQX(V(B!-$B!"+k(Bd$B55(B+"#OR$Bz'(B#Ob$Brz(Be$B%$(BT|A[7$Bg!9R(B$B._(B*$B|m(B8$B%1%j!,(B7K$BXU$(Dwì(B6$B%;%`(B}$B%M]p%*(B~$B%"fo%K$(Dw#$B%'(B5$B%k$(Dx}$BUK(B!$B%/(B)H$Bxd(B $BmH(B$Bug(B8$Bsu(B"$BV,%-(B<$B%^lV(B$B%U(BlZ=$B%L(Bd8N:,n'[$B.J%a(B4$B%a(Bd$B!"(B:$B%3/!%g%C6t(B&D$B%&(B#
+$B\c3#%=%-w*%1(BU3_$B1u(BUu$B%%(Bt&'$Br=(B<$B%m(BM$B,T(BL'
\ No newline at end of file

$B:o=|(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_recommend.png
===================================================================
($B%P%$%J%j%U%!%$%k$,0[$J$C$F$$$^$9(B)

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_voice.jpg ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_voice.jpg)
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_voice.jpg	                        (rev 0)
+++ branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_voice.jpg	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,55 @@
+ JFIF  H H   C  C   $B%d(B              	
+ 3      !	"#1$2A3Qacq$BAs%`(B           	
+ @ 
+    !1A"Qa2q$B!#B#%"(B#R$B%A(B$3Cbr$B$S%a(Bt$BDc(B   ? $Bt_(Bu$Bi/%L%j%h(Bew$B>T(B:$Bck%C%%(B$B*/(B[$B%1(B$B%+6X(B-RaR$B ＠ g9W(B?$B%Wg+%f(Bh$B%O(B|$B}\`JnH(BY$BDrfs(Bum{$B%M%1(Bs$B%b(BS$B%b%D%l(B$$B%c%%(Bm0$B!"(B+$B%"BI$(D{%$B(x8/PuN6(B/$B%a(BB$B%3%r%+%!(B/COKG!$B,%(B5$B%e(Bo$Bt`v&-j%C(B=$B!W(B"$B%l(B4$B\G(BN$BAIS+$(D}F$B!+%m(Bfg$';oq$B%j%J%9(BJ&1$B<f$(Dy÷$B%&(B$B|H(Bq$B%s&i%g(B>$Bw|%f(Bk2$BcyE~2^(BvZP"'$Blvq=%9(Bo$B%=(Bls$B|s(Bq5$B%U(BX$BI/(B>$B%Oj2(B,$(Dyû$B[b(B)4$Bv8(B;x$Bq3(Bw[tV$B%%%s(B+$B%`(B6$B%5(BszM$Bl-(B&a$B%$%g(B9$B%R(B'%rX$BQ&(B q$B%s!+(Bp$B%"1B(B60$Ba`(BjOQ($B!&%e(B$B%$(B7$B%?r4(BHF$B-5DH(B7$B!<%/(Bm$B%?%"!<(B=$Bt-(B^ $B%Cab%+(Bm$B%%mk(BR$B%b(BU:$B#-(B/$B%&%*(B=AQ$B%'(B?$B%l(B<S$BY)%7%1(B9q$B%R(Blwj^$B%f(Bm$B!<(BB$B%f%)(B$Bxr(BKOX$BwO G!#(BNVg.$B!+(B9X$BV8(Bn$c*Y$B%(!#(B8$B|4(Bq$B=?(BjH$B%A(Bf&$B%?(BrO\$BWWu4!V5{(B 1_$B!#yMC{(B$BD9(BO$B%c(Br$BE!(B[-V$(D}`$B%i%l:<(B
+U$BfI%g(B$B!<(B[$B%L%;(Br\$BHF(B"R$B7U%L(Bvs$Bu}(Bg$BEW%r%U(B$BMK(By$B%d(B($B%1(B&6P $B~<(B+%$B&=&#(B'$B%N"~!<rAy[(B$B%%%)%M%s%+(Bm$B%l%C(B@$B%#(BD#em$B%M(BYVz!
+p$Bob(B$B?j(BG^$B!V(BQ$B8-(B8$B%L!&%(%*rL|8(BU$BYo(Be$B>^(B$BPj(Bb $Bu[(B-A$BK>(B9$BoWNb(Bt$Bng!_(BfDW$BHy(B3&1$BB>%H(By$B%7(BOT$B%X(B}$B%joU%^(B\~$B%=(BGW$B%L(BYJ5TD$Bh<Hp_Jbb#$(Bde'$BqBce~!(B|Q$BU`%+!,%)%[(BY+$B%CyM(BVv$B%f%dk+(BF9$B ＠ X(B,$B`JDC%FR2$$(B#J$BT,%NG:(B}|$BiU(BD$B%?(B7F"$B%R%ae\(Bw$Bzi/G%%%!(BK$B%s*I(Ba$B%i(B$ByV%R(B.;$Bz](Bj:$B%=(Btk$B%R$(Duu$B%;(B$Bmd%)(BI$B%m'\(BT$B!&(Bn0$B%"1:%O(B$B%e(B9^3$B%b(B)$B%K(Bq$B%i(B~$B(/48YV%X(B$B!V$(D}q$B%+(B$$B+)(B$6FRp$B%5(B}$B%X%'(Bxs$B%"W%t?(Bl$B"W(Bv$B1z*H%m(BU$B%c%%%d(BX^W$B%h%((BK$nr$BuZ(B($B%l(Bvg9V$(Dyo$B%7(BzeWT$Boo%'(B!$B%U(BPV$ByC(BCt$B"lRw0r%F(Bjk$BA;%[%*%!VI(B4\$B%m(Bc$B%)(B20$B%$(B*$B=_zS(B?/u$B%K(B ?$B%kvw(B8z$(Dw>$B%#(B{%$BxT(BN$BcF(B#B$B%hI`%h(B}$BpS*>!W(BV$B%i(B$BP^%j(B[J$BFm%m(B$BsgNO(B'$B%F%-eA(B;z$B`@%f%+(Bu$BMy5zvh%N(B$(D}%$B%)(B$B1+(B<$B33%9%`%J%m'o$(DyH(B9$(Dz(Bz:$B%1%oq%(Bv>$B3/(BA$B1:(B"$BD%kN(B+$B%)%N%r%r(Bi$B|3%;(B">j$(DyY(BaD$B;l$(Dz3(BC$B%M(B$B%m ?Mm%M%a(B1#d$B%;B1)F(B$B%D(BU$B%spN%/(BT$B%f(Bj$Bh+(B:T$B%-(BCckm$B%m(B~$BOj!#!V4\%M%o%m~utA(B$Bvr%!(BAYt$B%J(B_$B%X(B9$B!,(B6G$B%fI\%?qi(B\$BP6Xi(Bu$B&'(B)j$B%#%#(BG9$Bjq(B/OEwb:i'$BM{%!%c(B+$B%%"Z%m(BPN$BLm(Bs$Br8(B3'-t$B!,y{(B$B%/^c(B'$BB\55(BW$Bz8(B$B%'%R(B4$B%Of}(B<$$B#q(B&@$BT4(B3$B%[(BW$Byv(B1$B>x$(Dyø(B$BYR\?(B5$B!WL$(BvU$BsA(B$B%"%b(B\$B%m%r(Bv30,F$B%F%^(B}$B%"%(%iVY(BZm($Bx7(Bt$B;-(Bba$Bte(BY$B=@(Bu$BK3(BQ$B{EV5(B8$B%m(B/*v$B%`!W%!(B*[$B%%%j'M$(Du3(BU$B!&(B$ByJ(B5$BrT(BS1Y$BAe:1(Bc$B!"]#(BG{cR$B%%(B$B%L(B$(Dx(B $ByNw8(BX$B%H(B;$B!&le(B$BT'Vr%N#_(B$B\w(Bq$B%M(Bg$B%h(B\$B%-(BZ$B%[(B T$BJf(Bf/jF$B%*(Bw'$B%)(BJL$B%)(B1E!$BLe%L(B$B%/%*~=<a(B\-e2$B%3(Bz7s+e)($BC5(B`$B%%(BR$B%`(BX$Bun(B	Z3xV1Y$B-@(BU$B%k(BsVF($B%d(Bya$B$U%%(BG$B%_%1(BG$B%r(BvA$B%e%h(B.$B{"/h(Bw0H$B%a$(D}k(Bhr$BR)(Bu$B%X8m%M(BHK2($B!&(B}$Bi>%/(Br$B!&(Ba>$BRX(B-T/$B!#Ai(B"$B%D%l(Bu$B%?(B+$B*c(BqpG^$B{<%-mh(B[OI$B%c(BP$BWD(BT$Bs"&R%9(B.[C$BPq(B[
+I$B%O%m(B58$B%m(B4Y$Be>(B#*$BEnzJ%h(Bh$B%$%%(Bu$B%A(B8$B%f%!%-%H(B,m$B%9%-%&(B$B%=(BN$Bu'(Blk$By?(Ba@$Bnq(Bv
++$BLY(B)J$B%7<GOB(B]$B%c%i(Bn$B%"(B2q!*$(D}ò$B%`(Bl$B1|%+(B#48$BAU(BQ$$Bsg(B$Byo%^(BLW$BHh(B$BL>(Bz$B#kD&(B`.O$B\a(B,Ae3[{_$B%^~0(BM$B29$(D'u(B#M|$BG\(B$B%L(B
+$B%o(B%$BDz(B,[$B*H(B, ~x$B%+(B1t$(D{ù(B}&$Bne%h(B!$B%+%^7f(Bp$B!<"AOd%D(B}
+GMU8$B2$(BQ$B%i(Bb$B%9(BKYv$B%^!<(BI4$BP!(B`$B]E(B_$B~k(Bo\b$B%d%7%oeGwY6}(BQ$B'v(Ba$B%k(B*$B%*(B$Bus%&%f(B&b$B%-(Br$B%l(BAn$B!#%Lb=(Bzh$B%U(By$BBJ%m(Br$Bz";5%/(B/$B.#-&.!(B<l$B6*%g`^(BZ$B%mZ/(Bc$Bvw^G6xt!(B $BOq%L(B$BX~(BL$B%f(B7
+$B.J(B][V$B%1!<(B$BSC%7~T(Bq$B8*(Bi$B{u%?%$(BD$B%J(B'$B%%(BQ$(Dxu(B!$B%L(BE%_$BrP(B3$Bj:(B:j$BycfC(B$B8?:8(B?$BjA%JeJ(Be$B%!(BC$B!&Y"ytyy(B}p$BL6(Bo$B9R(BM$B%)(BW$B|T(Br3U[R$B%KTn%f(B*b$B%a(B'i(V$B_'(B%$BMv!"(B3$BH!(B8$B%?(Bs$(Dul(B$B%1(BI$B%K(BF$B%rD$(BY*$B%;(B5$B0Jx0(Bq$$BX'(B]d$Bw\69(B$B?`%#(BO'z$B!W(BL>$B=L(B,rk$B%m%O%_%*(BH$B%$(BK$B`z%I%;(Bw$B o(B
+$B%"%s-A(Bm$BJi$(Dyè(B$By[(Br$(D}(B`#Y4$B%e(B m6$B%"%+(B}$B%HzA(B$B4l(BbH$B%1%m%_5~%*:$(B
+"$B%L(B 9)H$BxK%((Bv$B%A%K(BBd$BaD%NQ (Bg$B%e(BI$B%m^3O$(B"s$Bt$(Bc?^$B%)6D(B6a$By 0:(B?L0q$B%%(Bzc$B%O(Be$Bd7(B}?$B!<(B=$B{*(B:$B%O(Bg$B%O%9%c7K30(Bo/$B%c~C(BG	)$B}h(B?$B%D(B%$B!#(B<	$BVX%d%a(B7$B%5%U(B[Lw$B%b{~(BI$B%;!&(B7_;$BwX(B$B%[>7%^(B877$B%[K&(B4$B%J%1(B-$B%=(B&zwv$B%`(BS$BoD\G%C(B
+$B!#(Be$B:S(BD$B%=%H(BO$B|P_$_,(B>$B8r?V%C(B\>8$B%J(Bn$B%o%m%m(BZ$B!<%e(B3rX+d$B%s(BlJJ$B%9%c(Bs8$BNK/M(Bc$B%r(B$B%R(B$B;;t7a'(B^q$B%)(BM$B!WL,%g(B6_$BXv(Bk|$BZV(B?+$Bc((BD~	$BMx%)8t(Bcov$B%R(Bki$Btl%r%-x#;z(BQ:$B%K<)(B1raO$B1i(Bf$B%-(B.9Y;$B%AiV!&(B8$B}4v{(Bxy$Bwu(BZ$B[-%K(B:$B%N!,wY(B;$BEe?=%Rx1(B$BbM$(Du$B!VDN(BFV$BXe%5(BE$B%DD}vc(B.$B2:_(x,(Bb$B{0(B Y?$B%H(BF?$B{%hU%7%+(BH$B{`(BN$BnU(B$B%#(B\$B%h(B{.$B%k%'E0!W(Ba$Bwg(B yc$B%m(B#$B%L(B$ByG_K(B6$B!<%^!"(Bd$BO#(Bp$B!+(B9$B1f%X(B=qs$B\;%-(Bm$BV*(Bl$B%7(B	$B7q(B}Q$B%[%O(B:wn$B%!%g(B$B%`h6%r%f(B$B%)(B$B5P%^pE(BM$Bhp%l%c(Bk$B%[(BT6$B%((Bl$(D{ø$B%i(BG4>4.$B%F%F%e(Bu$BPe(BI&$B%A%(h)(B$$BPK(B
+Q=$B539N(B&}q$BD3(Bg!"2$Bh+(By$Bxx(BG$BJ+0h%*(BPIZ$B%k(BA$B!&(Bv$B%=(BD$B%1H](\*B(BY$ByL(BI$Buh|%$(Dy~$BmBv4(B8$BNX(BUI$B}0xb%A(BPR$B%7%g%h(B{>$B>e(B%p$B%j(B#$ByF%M(Bn)$B%T%K(B^C$B%3Q$%a(B>$B%f%F(B+|$B=G(BX$B%L(BM]$BQ7(B.$Bke(B`p$Bgo%k{ %3(BP~`kl7$B%a(B$BvB!,(BpXi$Bc !,(B$B}k(B}$B%3(Bm$Bt9(BB[}$B%=ME%&(BK$B!,(B7$B%R(BX$BzE(B $B%+<#%i%^(B4$B%oUg%h(B$B%L4#(B
+$$B%3(B|,$/F$B%O(BjNA$B%R%K(B6d$B%s%g(B$BJ;(B$B%;(B$Br5(B($Bsa(B\$B&2(B>6$B%R(B\;$B^x(B0Wj$BE\xf(B~`?$B%/&Dz)%"(B8$Bi<%k%hyk(B$BUW(B]$BVx(Bs;M<$B%(K>(BN^i$B%i(BrE$B%s(Bf$E/$B%f(Bp$B%$%b(Bs$BqR(Bx$B/2}d(Bd$B!&(B$(DvA(BD$BIt(B+[$B4p(BF]+>$B ＠ A(Bx$B%d(B$B%*yl(BeLa$B@;<I%d%!(B^$B%9(B$B%j(B:$B%*%O%;%c(BLm$B%s(Bp$B%b%cU7(Bv$B5\(BV$B%9%i%5(B?$B;+%6$(Dy:(B*r2$B`m!&9Q$(D{ý(B$B%l(BX><$(Dy[(B_CNZ(S\3{$B%1(Bx$(Dux$B%coJ!#(BYzsH'I$B%K}p(BD9$B%&%C(B2$B%X(Bm[c$Bv)(Bm$B~](B;$B!W(Bx$B%L(BA$BqV(Rs ＠ N5'p%b%&(BO$B%o(Bk$B%`(B3$BH&x6LV%)(Bs$B#"(BQQEt$B!W:}(B$(D{ $B%-(BA$BgZ(B2$B%C(B>$BIt(B4$B<[%O(BT$B!"*%P'+k(B?-$B%%%7P`[1(B)eJ$Brd(BP{$Bm3(B$BCS$(D}(Bv;$B%kW'!<y@(B{$B%*g7%gcW%9%;(BT$B!V(B)$B%O#x!,(BQu@^'-9GO$ByF(B
+S$BOh*/%c(BP$B})%o(B$$B%j(B=	$B%;(B=W$B%r!W(Biiu$B%^(B(d$B9;(BT$B8.8%%%(Bk7$BbY(Bn$B%/(Bb$B5*(B,$BiF(B$B%+(BE$B%"(Bb$B%*%h}z(Bn$B`b;~%#(Bn)1$$B%h(BVs$B!W(BR$B%M(B@$B|w(B5$B%h(B7$B%'!<D3%D(BT$B%*(B=y$B%K%A%'(BV$B f(Bn$By_%k:5Li(BjF$B%[%K(Ba$Bl#(B;$B\,(BZ$BP/(B$B%i(B{$B?z%m%F%N(Btc`]$B%7(BK`$B%D%i%/(BQ$J$B@`(B[
+$(Dub(B<$B,I%+%!(Bz$BTEH~(Bd$B03(Bh$B%O(Bm>	n$B,5lu(B$Bws(BxkOv$BqI(Bh$BUU%#$(Dy(B/$B%5(B<$B%?(BP$B-Q%R(B$j:+$B%L(B$B%'(B1Zc$B%e(BdR$B%c%R(B$B%j(B][$Bc<%o%j6q*T(Be$B%l(B^5*E$BhZ;l!&(BKz$B;g(B$B%=(BQ$B%O%s(B6x$B%`(B$B%g%(%IN<(BM$B!,%+(Bf$BD'%b(BO$B%N!+!+(B-$B%j(BZ$$B%r(B!$B!,%3(Bo)$B.q(B$B%g(B+$g$B?O%7%c(B{/$Bc7%c%7(B&@$Br$2$(B6vP!$B!,(BQK$B%O(BXm$B%;(B)$B^L(B.$Bxm(Be*n$Bdn(B$Bni%owG(BcZj$B%e$(Du$B%+(Bx-UY$B%#(B_[iX&v$B%MtN(BL{9L$B%5(BLC?$B7:%a(B6$B%R(B!2$(D{$B%1(BIJ$BH*%#(BNI$BWH(B$B%j%!(Bq$(Dyö$B%[(Bs$B%%(B9$B!WN1%=(BA$Bs[ttC|(BOwYt$Bx-$(Du(Bv$B%A(Bw$B%j(B|$B8+x@(BD$B|x(B:V$B%f(BR$BCg<S(Bz0T){$B%H(B6$B!<L8(B
+fB$BwG(BK$B ＠ T(BXlK	\`$B%=(BL$B!#(B$B!,%c(Bd$B%^(B[jP$(Du'$B%H%&%)%'(B||$BOD(BN$B%l(BE$B%m(Br$B%Dv'(Bj$B%f4U(BT~$B%h%`:.(B'M$By0(B?$B!Wv2(B$B8j(B;$B%m3t(BInD$Bqz(BG$-$B%-(B
+$B%r(Bh$B?i(Bv$B%-(BW'$B%c!<(BLfl$B%L(Bo!$By6(Bn$BW|/o(Bd$BM}(B
+N
+Ij
+$B%3(B\$Ba;#H(BE3410$B84%O(B$B%J!V(Bi ]$B4`%m ＠ g(Bg$B3+(BKN} /Ga$B%'%J(Bo$B%_(B	$B%=Js(BQx$Bz-(Be*$B%7(B$B%$%k%m%_(B?O$B!<%fS8(B
+$BB((B-TS$B%1E{9j%$%l(B0&$Bsw0N!<(Bl$Bcn%l(B1$B{jf6(BMG$BH'(B9
+$B!<(B;$B!,(Bq	_MM$$B%f(BK#$B%((Bv$B%b%e%(=`%K%J%;(B YD$B!W(Bcl$$B%R(Br$(Dy(BI H$B%O6l(B
+$B%h%D}n(B-$BED%!(B~x
+$(D9+(B+~$BF.$(D}N(B$B%L(Bqh$B%O(B>$B%e!"(BS55w2q3j+mB$B%5(Bq$BVJ(B&-$BFs%L(B,yx$B%+{|^{(B9$B%[(B$BV|(BQU$Bo5(B1$B3JU%%UnG(Bf$B|3(B|+$B%C%A(Bfb$BU((B&6^`$B%3"Tf;(B
+[$B%%%+(B|p$B|a(Bc$B `{;%C(Byq$B%)C{(B&$(D}I(B$$B%F%i(B$BuD%jwV%J(Bn"\$(Dw3$BwVzb(Bj$B!&(Ba$BxQ(Bc$B%^(B!'$B]s%R(Be(l$B,N(B|\W$B%[(BjCQA%8)}E$B0W(Bb$B%rv,(Bq$B%/%j(B)$B%bs>(B$BJt(B	tNt$Bvj(B7$Bri%;(B"!vH$B%-%!%7(Bit$B%O(BN$B%r%i(B.$B16QwG[%h%X(Br$B+`(B$B%N(BV$B%f%)!+%CWL5I(Ba$B!+%j!,8L%+%F(Bl$B%N(BB2$B!+R1(Bj$B!V(B\$B%+QV(BJ$B%X(Bam.$B%e(B!$Br|(BQ$BL'N*(BD$B&:%d(B$B%jc*eD(BQ3F$B%+(BP=A$B%-5G(BC$Bd8%g%=ym%C(B$B%g(B\$BrEKx%7(BNl)$By"%C(Bw:$BH^2[(BYb$B%h|c(BfyL$B%H(B;KV$Bl4%i(B$$B9B(B{w$B\{)2(Bn$B%`%j(BfOd$BZJ%9(By7MNa$B%!w/Y$2A(B{PI$B%#0C(BSo$B9((Bp$B%+(B$B%lzdex4-$(D}}$B%JyP(B$BPt(B>W$B%J%&dF(Bn$BF9(Bl$B%X(BAw$B%d(B
/$B0X`2(B$Bs{(B7cV7$B%_(B?$BN2%L(BCC<U$B"K(BTB5s+$B+O(B$Ba.(B{$B%3(BZ$B+*(B$Tv$B%)%_(B35$B!W(BQ$(DwD$B%/(B$B%+(B$B;J(Bc$B%/(BPK$BFTn/%Nw[%+(B9$B%+%F%i%/(BO$B%9!"(Bu'$B:3(Bcs$Ba%(BS$B42(B
+$B!W!&(B$$Be~%imN(BT$B%#%k(Bs$B%f!#!#(B$B%K%3?m(B]$B'vNs(B-XM$B%o(Bc$B%R(B~$B`/(B)Pq$B1F%U(B2$B}Z%3%dS8(B3$B}8(B!$BAwR*(B$Bwq$(Duì$B#)%j:((Bm+G/x$(D}c(BGpn$B%O(B$B%#5W%J(B}$B%+%`(B.T$B%#;+%mf6}3(B$B%f(Bd$B%hC(%_z|[O(B.$BPY(B$BST$(D~H(BW&$B%$(B"$(Dwù(B3c|{$B(e%&(B$B%;%C(B^$B%c(B"Mc$B%J(B&$Bh<(B $B=.(B<;$Bmb0^{&(B3BF$B%r%-(BE$B%/{A$(Dxt$B%L!#og%)(Bo^
+$B%L,,(By$B%f(B=$Bx@?J(BK&<$Bi}JJ>>{|zK%X(B9y$B(SL ＠ t<%$M5(B
+m$B%m(B	]$B20(Bu$B%K%l,G(BeR$B%)%i(B8$B!"(BeKl	$B%h[-(BxV$B.k&5(B6q$B;~(B@$B%c(Bk$Brw%su}%'(BkRa$B%r(BU={|$B=2~HxI(B"$Bc;(B_r$B%^%#(Bi$B%)!V(B$B%a(B%@$B%X(Bm$BR#EJ(B r$B6Dpx%l$(D|/$BPb(B$B!<(BL&zg$B%5(BU$B,W(B $BrLfES~Z?(B=($B%L(BPu$Bh1(B ,s$Bj~!_%O(BCk_n$B?rwk(Bc.$BZc%s(B3 ＠ mwT\-$B ＠ r(B3P$B%[(B $ByV(Bx$BCG(Bp-X3?f$Bwj(B$B%K%)(BbRu<^G$BCk(B
+G$BQ+u6(B_T$BCy(B)$B|#%3%C(Bc$Bri(Bky$B{^(Bq/$B%$>R(B'$B_O(B$|$B{etl(Bi$B%%%'(B"mS$B4X(Bhy$B04(B$B*0(By}$Bs'(BNdz$BMx%X5p(Bs$B%-(Bt$B%*(Bv$B%o(B.$BT<(B
+j $B%O(B5$B%!(B)X$B%M(B5X$B%hXi(B
+Nq$BWH(B$B%[(B3$Buj%L(B$n$BC)$B%/(B#$B%#(B#$B!#(B$Bty!"(B
+p$BAB%K(B~)E$B%R(B$B%A(B$B%J(B.10$B!<(B6y$Bn[v|!#%L(BvUI:O$B%s\@(BL+$B%5%C!,(B^$B%;%9(B$By4%^%((Br$B%X(BK$BAL(Bos$B%-%g$(D{$$Byc(BE}Z$BstC|(Bs$BNB(BB(Vos$B%9(B$Bqj(B$B%f(BFR2$Bk'(Bk$BaKiq!<(B
+$B%?(B<S$B!W(Bkj$B4k(Bs$B!&(BkR$Bm1(B$B%N%(%7%A(B$BGF(B_!$ $B!&%m(Bc$BBr*1(B($B%N(B{$B5|(By$B%*(B)$Bg~%d(B3F$B!"(BM3$BPV(BX_r$BwA(B'a$Bry(Bt$B%FHD(BS0Q$B%#~~(Bx\$B3R%);7(BUWIs$B%"j8%N(BcvK\N$B%L%o(BsH$B%!}_(B2O$B%o(BG$B%)%9!&(BXT$B /(B>P$B!&(B$BXg!+%l(B3JH$B!W%b%R5w(Bp,Ju$B%1(B$Bzi(B}$B|F(B:$B%rIyW@(BSj$Bz]%K%$(B'$B4^(Bq$B%o%j(BP$B%_(B%$Bt|%X(BB"BQ$B%9"K(B^$B%[%D(BW$Ba9%7(Bo[i,$Bxd(BtR{$B*.%M(BZ$B%cT{(Bu$Bts(B#i$B5%(BC!k$B&.4d%s(BF!$B=c(B)$BIi(B$B%a(BT$BZL(B,m$Bi`(BLB$B%^(B8$B%)LU8s%!(B[%$B%*(O%+(B$Bm.(B:T$B{u%d$(Dy]$B%i(BpQ$B%N(B$B%d(ByNO$B%seT(B<$BlY(B$B%JP9%D(B>$B%a(Bh~$B!,(Biv$Btm(BlG$ByS(BK$B%azR(B$B%!%"%/{R(B
++$B%3(BCT$B%'EU(Bz$B~.(BJ$B%R%((Bn{$B!W(B ＠ 9$B%$!<%H(B&I$Bng(B<X$BL]xJx"(BB$B%O(B$B%o!,%5(B"$B%O3MA.(B$B%+8P(Bi`E$B%7(B2j$B%!%U(Bx$B>0(Bt$B%s&\$(Dza(Bu$B%*>b(B0$B%_!<(BG$B%h%e!&(BAm$B%*(Bj$B%9%C(B""$BYcRJ(B`j_$Byv(B<;	$B%7(B}$B!,~]%b%C%'$(Du $B%(XLZ_ay%iP\VJF`%j(B:l$B#~(B@$B%d(B"$B%Fim(B*V$B%;(Baw$B!<wv%d%3y4K[(Bc]s-f |$B,N(BB$B!W(B7j6rq$B%F\B(Ba$B%L(B+$BVb(BFG$By4(B3Zv$B%!(BY
+&$B%5!G(Bmr$B!,(B{}7$B%*%g(Bop$B%f(B9p$BgU(B[z[$By~(Bvw$B(u<&sc%o(Bm$B+H(Bg$B%f(B"$B%^(BRt$By7(Bk11$B3U%Jt[NO%)q]O0(Bd$BEv%)(Bt$B%r%O(B7$B(,(BO$(Du|(B$BK\(BZ$B%c%r!W[s(BJ?>$(DyS$B!WRd%*%A(Bp5$BAQ(BRl$BvD(BU<1$BD&%-(B#GA$B%s%bvY(B$B%e%3%=(BV]$Bq`!W(BC$B%s(B'$(DuM$B!#(B'$B0eAZ(BGH$B/EPnVe(Bm$B@'(BM$B;Q(B$B%e(B$B%o%+%O(B$BL>i@(B$Bzl%e%O%1%;sN%X(B[$B%-%lv_b6{((B 6$B%l"2%A(B9$B;"(BV$B[P%k(B;$B%i(BO$B%C(Bn$B%j(BeT$B%g(BLC$BQK(BYJ$B%gu/(B?$Bsu(B]$B*b(B9f$BB'Ak(B3$BFm(BQP"6?8$B%/(B$$B%N(Blo<$B%R(Bfl$B%c(BB3$B%N(BFM$BjE(B_; $B%[(B4$B;]%`!"_y(B~7'^$B%gy\(B2$B%O!Wi!%?(B$B%_%L%g#O(BV$B}tA](B'$B%U(BxZ$B\'%*%=(B[X$B%m(Bk$B%m!&(Bem$B%h%l%Du2%gv{%3(B,($Btr(B3-2$B%A!#(BC$B%#(BLUHbF$B!#(BZ$B%&(B Tb$B%K(B|kRs $Bv/yL(Bu$B~P$&(BZ$BpJ%m%$(Bc$B%/(B;$BeT%F(B4w$B%-.1%#(B#$B!#(Ba3$B%J(BMT$(Duý$B%D(Buz$B%s(BI1 /$B%-=I(B|$B%3(Bn$B%M%O(BV;$B^6(B$B!&(B($(D{ì$B%7W_(Be$B@[(BNHE$B%%(BN$B!Vvi(B &$BOv(B{$BRcH[(B$B%/(B6$B@*(Bt$B~~(Bv$B%K%$(B$B%d(BC$B%&(B"$BjgTS%g(Bh$B%=%h%`(B/-V$ByC7sDt(B$Bw\%d!&(B,%$B%o>3(B%Js$B!,$(Dyl$B~I!"%k(B$B%*(BJ$B%k(B+$BGg(BiP$B!W%%(BR$B%O%h%"%/(B($B%+(B?N$(D{$B%5,c(n(B$B%o(B[cp$Bvw(B8$B%_%`(B4N$B\X%-%D(Bl$B%l(Bu~$B%a%lx,(B+$B1\(B
+$B%'%b(B=$B'%%N(BHD$B%N%7(B 1& $B(/(B!+B$B%3(B$B%-%C(BEg$B%b(B\$B%^%m(B=mU$B%((BMJ$B%$?*(BUn/$B{d(B_$B%%ua(Bi$B%/(BJ($B!&(BY+$Bk*%3(BJ$B%s(Bf;+:$B%i(B3m$BEdUr(Bs8C{\c)$(Dv"(BL$B*-%M_-%3%M(BJ4$Ba)(B2$B,e(B$B%[(B $Bd~%i(Bs*d$B%r*8(BB$B%hsR(BS$Bf$"v%m!&%K(B&$B%)aY(B&$B ＠ J!,(Bj$B!,(Bx$Bo_(Bx$BB1%((B~$BNW!&%)(B>$B!&(BP$B%l%$!<(BT $B%r%)%`(BW	GO$B!"(B&$B0`%J(B:$BtO(B5$B.T==Zf;?%^(B>r$Bw|JK&}(Bo
+
+D$B%#%;(B $BvOPh(B14$Brg!<(B_
+$B%+(B$B$L%R{h(B
+$B%+zH(B*$B7T(B	$B_==1(B|$Bpe0j(B=$B%[%C%+(Bi5M$BY8(Ba,$B%l(Bu$B%*(Bj$Bz'%(%)(B;h$B%c%%%1rQ`J(B,}s$B>6n,(B$B%"%)%'(B$B!"l=L}(BH$B%UqF(BY$B!V[!%M(B
+$B:Q%D(Bz$B%C(B^$BOB(BQ$B?4%O!&(B$B%H!,%!(B<}N$B%dq7(By$B%e(Bi9=Z`$B}FYx(BY$B!<(BFJS$Bf((B$B%K%-(B $B%j(B)l$B%j%5(B($B%l%s!+!,%K%=%spl(B_j$B%kGT%R(BQ$B%g(Bz
+$B ＠ Y(Bn$B3[%C%"(B$B!<%9(BN$B%M%"%l%A(BZ$Bfi(Bko$Bn8(Bs0$B%O%7nmXy(Bu$B{8%;%'%!2i(B'W13$B~x(Bh($BV2}XF9(B%YY$B%/(B?$B%lJY%C%#(Bd$B%^ZP%r(B$$BEm%h(Bal
\ No newline at end of file

$B:o=|(B: branches/version-2_12-dev/html/user_data/packages/default/img/title/tit_product_voice.png
===================================================================
($B%P%$%J%j%U%!%$%k$,0[$J$C$F$$$^$9(B)

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css	2013-05-02 09:11:36 UTC (rev 22796)
@@ -249,11 +249,6 @@
     line-height: 1.3em;
     vertical-align: middle;
 }
-#categorytree li ul {
-    border: none;
-    margin: 0;
-    padding: 0;
-}
 
 #categorytree li:first-child {
     border-top: none;

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/css/mypage.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/css/mypage.css	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/css/mypage.css	2013-05-02 09:11:36 UTC (rev 22796)
@@ -113,7 +113,7 @@
     padding: 10px 0;
 }
 
-.historyBox {
+#historyBox {
     padding: 10px 10px 5px;
     background: #F7F5F0;
     border: #A9ABAD solid 1px;
@@ -122,13 +122,13 @@
     -webkit-border-radius: 7px;
     margin-bottom: 10px;
 }
-.historyBox p {
+#historyBox p {
     font-size: 12px;
     width: 70%;
     display: inline;
     float: left;
 }
-.historyBox .btn_reorder {
+#historyBox .btn_reorder {
     width: 5em;
     float: right;
     padding: 15px;

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/js/btn.js
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/js/btn.js	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/js/btn.js	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,27 +1,27 @@
-
-		
-		function smartRollover() {
-	if(document.getElementsByTagName) {
-		var images = document.getElementsByTagName("img");
-
-		for(var i=0; i < images.length; i++) {
-			if(images[i].getAttribute("src").match("_off."))
-			{
-				images[i].onmouseover = function() {
-					this.setAttribute("src", this.getAttribute("src").replace("_off.", "_on."));
-				}
-				images[i].onmouseout = function() {
-					this.setAttribute("src", this.getAttribute("src").replace("_on.", "_off."));
-				}
-			}
-		}
-	}
-}
-
-if(window.addEventListener) {
-	window.addEventListener("load", smartRollover, false);
-}
-else if(window.attachEvent) {
-	window.attachEvent("onload", smartRollover);
-}
-
+
+		
+		function smartRollover() {
+	if(document.getElementsByTagName) {
+		var images = document.getElementsByTagName("img");
+
+		for(var i=0; i < images.length; i++) {
+			if(images[i].getAttribute("src").match("_off."))
+			{
+				images[i].onmouseover = function() {
+					this.setAttribute("src", this.getAttribute("src").replace("_off.", "_on."));
+				}
+				images[i].onmouseout = function() {
+					this.setAttribute("src", this.getAttribute("src").replace("_on.", "_off."));
+				}
+			}
+		}
+	}
+}
+
+if(window.addEventListener) {
+	window.addEventListener("load", smartRollover, false);
+}
+else if(window.attachEvent) {
+	window.attachEvent("onload", smartRollover);
+}
+

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,26 +1,118 @@
 /*------------------------------------------
+$B;XDj$5$l$?%N!<%I$r!"%*!<%W%s$^$?$O%/%m!<%:$9$k(B
+------------------------------------------*/
+function openOrClose(tgt){
+    //$B;XDj%N!<%I$,!V(Bhidden$B!W$N$H$-!"%j%9%H$r2D;k2=(B
+    if(tgt.style.visibility == "hidden"){
+        tgt.style.display = "block";
+        tgt.style.visibility = "visible";
+        tgt.style.height = "auto";
+        tgt.style.paddingTop = "0.25em";
+        tgt.style.lineHeight = "1em";
+        tgt.style.opacity = 1.0;
+    }
+    //$B;XDj%N!<%I$,!V(Bhidden$B!W$G$J$$$H$-!"%j%9%H$r1#$9(B
+    else{
+        tgt.style.display = "none";
+        tgt.style.visibility = "hidden";
+        tgt.style.height = "0px";
+        tgt.style.paddingTop = "0";
+        tgt.style.lineHeight = 0;
+        tgt.style.opacity = 0;
+    }
+}
+
+/*------------------------------------------
+$B%j%9%H!<%W%s=hM}(B
+------------------------------------------*/
+function listopen(lv, num){
+    var tgt = document.getElementsByClassName("level" + lv)[num];
+    //$B<!$N%l%Y%k$r%5!<%A(B $B"*(B $B<!$N%l%Y%k$N%j%9%H$r%*!<%W%s$9$k(B
+    for(var i=0; i < document.getElementsByClassName("level" + (lv+1)).length; i++){
+        var next_tgt = document.getElementsByClassName("level" + (lv+1))[i];
+        //li
+        if (next_tgt.parentNode == tgt || next_tgt.parentNode.parentNode == tgt){
+            openOrClose(next_tgt);
+        }
+    }
+    //$B<!$N%l%Y%k$r%5!<%A(B $B"*(B $BI=<(%\%?%s$N>uBV$rJQ99(B
+    for(var i=0; i < tgt.childNodes.length; i++){
+        var next_tgt = tgt.childNodes[i];
+        //ul
+        if(next_tgt.tagName == "UL"){
+            if(next_tgt.style.height == "0px"){
+                if(event.srcElement.parentNode.className == "category_header plus"){
+                    event.srcElement.innerText = '$B!](B';
+                    event.srcElement.parentNode.className = "category_header minus";
+                }
+                next_tgt.style.height = "auto";
+            }
+            else{
+                for(var i=0; i<next_tgt.parentNode.childNodes.length; i++){
+                    if(event.srcElement.parentNode.className == "category_header minus"){
+                        event.srcElement.innerText = '$B!\(B';
+                        event.srcElement.parentNode.className = "category_header plus";
+                    }
+                }
+                next_tgt.style.height = "0px";
+            }
+        }
+    }
+}
+
+/*------------------------------------------
+$B%/%j%C%/%$%Y%s%H$r ＠ _Dj$9$k(B
+------------------------------------------*/
+function setclickevent(tgt, lv, num){
+    //$B%l%Y%k#10J30$N;~$OHsI=<($K(B
+    if(lv!=1){
+        tgt.style.visibility = "hidden";
+        tgt.style.display = "none";
+        tgt.style.height = "0px";
+        tgt.style.lineHeight = 0;
+        tgt.style.paddingTop = 0;
+        tgt.style.paddingBottom = 0;
+        if(tgt.parentNode.tagName == "UL"){
+            tgt.parentNode.style.height = "0px";
+            tgt.parentNode.style.margin = "0";
+            tgt.parentNode.style.padding = "0";
+            tgt.parentNode.style.border = "none";
+        }
+    }
+    var hasLink_flg;
+    if(tgt.childNodes.length){
+        for (var j = 0; j < tgt.childNodes.length; j++) {
+            //$B%/%j%C%/HO0O$N3HBg(B
+            if(tgt.childNodes[j].tagName == 'A'){
+                tgt.setAttribute('onclick', 'location.href="' + tgt.childNodes[j].getAttribute('href') + '"');
+            }
+            //$B%"%3!<%G%#%*%s%j%9%H$NA`:n%$%Y%s%H4X?t$rDI2C(B
+            else if(tgt.childNodes[j].tagName == 'UL'){
+                //$B$rI=<($7!"%j%9%H%*!<%W%s4X?t$rDI2C(B
+                var linkObj = document.createElement("a");
+                linkObj.innerText = '$B!\(B';
+                tgt.childNodes[0].className="category_header plus";
+                tgt.childNodes[0].appendChild(linkObj);
+                j++;
+                linkObj.parentNode.setAttribute('onclick', 'listopen(' + lv + ',' + num + ')');
+
+                //tgt.setAttribute('onclick', 'listopen(' + lv + ',' + num + ')');
+                break;
+            }
+        }
+    }
+}
+
+/*------------------------------------------
 $B=i4|2=(B
 ------------------------------------------*/
 //level?$B%/%i%9$r;}$D%N!<%IA4$F$rAv::$7=i4|2=(B
-$(function(){
-    $("#categorytree li").each(function(){
-        if ($(this).children("ul").length) {
-            //$B$rI=<($7!"%j%9%H%*!<%W%s%$%Y%s%H$rDI2C(B
-            var tgt = $(this).children('span.category_header');
-            var linkObj = $("<a>");
-            linkObj.text('$B!\(B');
-            tgt
-                .click(function(){
-                    $(this).siblings("ul").toggle('fast', function(){
-                        if ($(this).css('display') === 'none') {
-                            tgt.children('a').text('$B!\(B');
-                        } else {
-                            tgt.children('a').text('$B!](B');
-                        }
-                    });
-                })
-                .addClass('plus')
-                .append(linkObj);
+function initCategoryList(){
+    var lv = 0;
+    //level?$B%/%i%9$r;}$D%N!<%IA4$F$K!"%/%j%C%/%$%Y%s%H$rDI2C(B
+    while(document.getElementsByClassName("level" + (++lv)).length){
+        for (var i = 0; i < document.getElementsByClassName("level" + lv).length; i++) {
+            setclickevent(document.getElementsByClassName("level" + lv)[i], lv, i);
         }
-    });
-});
\ No newline at end of file
+    }
+}

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,5 +1,5 @@
-$(document).bind("mobileinit", function(){
-    $.mobile.ajaxEnabled = false;
-    $.mobile.pushStateEnabled = false;
-    $.mobile.page.prototype.options.keepNative = "select, input, textarea.bar";
-});
+$(document).bind("mobileinit", function(){
+    $.mobile.ajaxEnabled = false;
+    $.mobile.pushStateEnabled = false;
+    $.mobile.page.prototype.options.keepNative = "select, input, textarea.bar";
+});

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/js/favorite.js
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/js/favorite.js	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/js/favorite.js	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,8 +5,8 @@
     $.mobile.showPageLoadingMsg();
     //$BAw?.%G!<%?$r=`Hw(B
     var postData = {};
-    $("#form1").find(':input').each(function(){
-        postData[$(this).attr('name')] = $(this).val();
+    $("#form1").find(':input').each(function(){  
+        postData[$(this).attr('name')] = $(this).val();  
     });
     postData["mode"] = "add_favorite_sphone";
     postData["favorite_product_id"] = favoriteProductId;

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1 +1,118 @@
-/* * jQuery autoResizeTextAreaQ plugin * @requires jQuery v1.4.2 or later * * Copyright (c) 2010 M. Brown (mbrowniebytes A gmail.com) * Licensed under the Revised BSD license: * http://www.opensource.org/licenses/bsd-license.php * http://en.wikipedia.org/wiki/BSD_licenses  * * Versions: * 0.1 - 2010-07-21 *       initial *  * usage: *  $(document).ready( function() { *      $('textarea').autoResizeTextAreaQ({"max_rows":8}); *  }); * */(function($) {	$.fn.autoResizeTextAreaQ = function(options) {	var opts = $.extend({		// ya prob want to use		max_rows: 10,	// # - max rows to resize too				// ya may want to use, but defaults should be ok		extra_rows: 1,  // # - nbr extra rows after last line ie padding; 0|1 optimal				// ya should really specify in html		rows: null,		// null|# - null infer from html; # override html		cols: null,		// null|# - null infer from html; # override html				debug: false	// true|false - turn on|off console.log()	}, options);		// extra padding based on browser	if ($.browser.msie) {		opts.extra_rows += 1;	} else if ($.browser.webkit) {		opts.extra_rows += 1;	} // else $.browser.mozilla				// iterate over passed in selector, only process actual textareas	return $(this).filter('textarea').each(function(index) {		var ta = $(this);		var orig = {};				// textarea rows cols current state		if (opts.cols != null && opts.cols > 0) {							ta.attr('cols', opts.cols);		}		orig.cols = ta.attr('cols');							if (opts.rows != null && opts.rows > 0) {							ta.attr('rows', opts.rows);		}		orig.rows = ta.attr('rows');				// validate max extra_rows		if (opts.max_rows == null || opts.max_rows < orig.rows) {			opts.max_rows = orig.rows;		}		if (opts.extra_rows == null || opts.extra_rows < 0) {			opts.extra_rows = 0;		}				if (opts.debug) {			console.log('opts: ', opts, ' orig: ', orig);		}		// resize textares on load		resize(ta, orig);				// check resize on key input		ta.bind('keyup', function(e) {			resize(ta, orig);		});				}); // end each()	function resize(ta, orig) {				// nbr explicit rows		var nl_rows = ta.val().split('\n');				// nbr inferred rows		var nbr_ta_rows = 0;					for (index in nl_rows) {			// overly simple check to account for text being auto wrapped and thus a new line			nbr_ta_rows += Math.floor((nl_rows[index].length / orig.cols)) + 1;		}				// get final nbr ta rows		var final_nbr_ta_rows = nbr_ta_rows - 1; // deduct for current line		final_nbr_ta_rows += opts.extra_rows; // add on extra rows		 		// resize textarea		// note: $.animate() doesnt work well here since only inc/dec row by one		if (final_nbr_ta_rows >= opts.max_rows) {			ta.attr('rows', opts.max_rows);									} else if (final_nbr_ta_rows >= orig.rows) {			ta.attr('rows', final_nbr_ta_rows);					} else {			ta.attr('rows', orig.rows);		}				if (opts.debug) {			console.log('rows: ', ta.attr('rows'), ' nbr nl_rows: ', nl_rows.length, ' nbr_ta_rows: ', nbr_ta_rows, ' final_nbr_ta_rows: ', final_nbr_ta_rows);		}	} // end resize()}; // end autoResizeTextAreaQ()})(jQuery);
+/*
+ * jQuery autoResizeTextAreaQ plugin
+ * @requires jQuery v1.4.2 or later
+ *
+ * Copyright (c) 2010 M. Brown (mbrowniebytes A gmail.com)
+ * Licensed under the Revised BSD license:
+ * http://www.opensource.org/licenses/bsd-license.php
+ * http://en.wikipedia.org/wiki/BSD_licenses 
+ *
+ * Versions:
+ * 0.1 - 2010-07-21
+ *       initial
+ * 
+ * usage:
+ *  $(document).ready( function() {
+ *      $('textarea').autoResizeTextAreaQ({"max_rows":8});
+ *  });
+ *
+ */
+
+(function($) {
+	
+$.fn.autoResizeTextAreaQ = function(options) {
+	var opts = $.extend({
+		// ya prob want to use
+		max_rows: 10,	// # - max rows to resize too
+		
+		// ya may want to use, but defaults should be ok
+		extra_rows: 1,  // # - nbr extra rows after last line ie padding; 0|1 optimal
+		
+		// ya should really specify in html
+		rows: null,		// null|# - null infer from html; # override html
+		cols: null,		// null|# - null infer from html; # override html
+		
+		debug: false	// true|false - turn on|off console.log()
+	}, options);
+	
+	// extra padding based on browser
+	if ($.browser.msie) {
+		opts.extra_rows += 1;
+	} else if ($.browser.webkit) {
+		opts.extra_rows += 1;
+	} // else $.browser.mozilla
+			
+	// iterate over passed in selector, only process actual textareas
+	return $(this).filter('textarea').each(function(index) {
+
+		var ta = $(this);
+		var orig = {};
+		
+		// textarea rows cols current state
+		if (opts.cols != null && opts.cols > 0) {				
+			ta.attr('cols', opts.cols);
+		}
+		orig.cols = ta.attr('cols');
+					
+		if (opts.rows != null && opts.rows > 0) {				
+			ta.attr('rows', opts.rows);
+		}
+		orig.rows = ta.attr('rows');
+		
+		// validate max extra_rows
+		if (opts.max_rows == null || opts.max_rows < orig.rows) {
+			opts.max_rows = orig.rows;
+		}
+		if (opts.extra_rows == null || opts.extra_rows < 0) {
+			opts.extra_rows = 0;
+		}
+		
+		if (opts.debug) {
+			console.log('opts: ', opts, ' orig: ', orig);
+		}
+
+		// resize textares on load
+		resize(ta, orig);
+		
+		// check resize on key input
+		ta.bind('keyup', function(e) {
+			resize(ta, orig);
+		});			
+	}); // end each()
+
+	function resize(ta, orig) {
+		
+		// nbr explicit rows
+		var nl_rows = ta.val().split('\n');
+		
+		// nbr inferred rows
+		var nbr_ta_rows = 0;			
+		for (index in nl_rows) {
+			// overly simple check to account for text being auto wrapped and thus a new line
+			nbr_ta_rows += Math.floor((nl_rows[index].length / orig.cols)) + 1;
+		}
+		
+		// get final nbr ta rows
+		var final_nbr_ta_rows = nbr_ta_rows - 1; // deduct for current line
+		final_nbr_ta_rows += opts.extra_rows; // add on extra rows
+		 
+		// resize textarea
+		// note: $.animate() doesnt work well here since only inc/dec row by one
+		if (final_nbr_ta_rows >= opts.max_rows) {
+			ta.attr('rows', opts.max_rows);
+							
+		} else if (final_nbr_ta_rows >= orig.rows) {
+			ta.attr('rows', final_nbr_ta_rows);
+			
+		} else {
+			ta.attr('rows', orig.rows);
+		}
+		
+		if (opts.debug) {
+			console.log('rows: ', ta.attr('rows'), ' nbr nl_rows: ', nl_rows.length, ' nbr_ta_rows: ', nbr_ta_rows, ' final_nbr_ta_rows: ', final_nbr_ta_rows);
+		}
+	} // end resize()
+
+}; // end autoResizeTextAreaQ()
+
+})(jQuery);

$BJQ99(B: branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.facebox/facebox.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.facebox/facebox.css	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.facebox/facebox.css	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,86 +1,86 @@
-#facebox {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 100;
-  text-align: left;
-}
-
-
-#facebox .popup{
-  position:relative;
-  border:3px solid rgba(0,0,0,0);
-  -webkit-border-radius:5px;
-  -moz-border-radius:5px;
-  border-radius:5px;
-  -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4);
-  -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);
-  box-shadow:0 0 18px rgba(0,0,0,0.4);
-}
-
-#facebox .content {
-  display:table;
-  width: 370px;
-  padding: 10px;
-  background: #fff;
-  -webkit-border-radius:4px;
-  -moz-border-radius:4px;
-  border-radius:4px;
-}
-
-#facebox .content > p:first-child{
-  margin-top:0;
-}
-#facebox .content > p:last-child{
-  margin-bottom:0;
-}
-
-#facebox .close{
-  position:absolute;
-  top:5%;
-  right:5%;
-  padding:3px;
-  background:#fff;
-		border:#FFF solid 1px;
-		border-radius: 16px;
--moz-border-radius: 16px;
--webkit-border-radius: 16px;
-}
-#facebox .close img{
-		width:21px;
-		height:20px;
-  opacity:1.0;
-}
-#facebox .close:hover img{
-  opacity:0.7;
-}
-
-#facebox .loading {
-  text-align: center;
-}
-
-#facebox .image {
-  text-align: center;
-}
-
-#facebox img {
-  border: 0;
-  margin: 0;
-}
-
-#facebox_overlay {
-  position: fixed;
-  top: 0px;
-  left: 0px;
-  height:100%;
-  width:100%;
-}
-
-.facebox_hide {
-  z-index:-100;
-}
-
-.facebox_overlayBG {
-  background-color: #000;
-  z-index: 99;
-}
+#facebox {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  text-align: left;
+}
+
+
+#facebox .popup{
+  position:relative;
+  border:3px solid rgba(0,0,0,0);
+  -webkit-border-radius:5px;
+  -moz-border-radius:5px;
+  border-radius:5px;
+  -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4);
+  -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);
+  box-shadow:0 0 18px rgba(0,0,0,0.4);
+}
+
+#facebox .content {
+  display:table;
+  width: 370px;
+  padding: 10px;
+  background: #fff;
+  -webkit-border-radius:4px;
+  -moz-border-radius:4px;
+  border-radius:4px;
+}
+
+#facebox .content > p:first-child{
+  margin-top:0;
+}
+#facebox .content > p:last-child{
+  margin-bottom:0;
+}
+
+#facebox .close{
+  position:absolute;
+  top:5%;
+  right:5%;
+  padding:3px;
+  background:#fff;
+		border:#FFF solid 1px;
+		border-radius: 16px;
+-moz-border-radius: 16px;
+-webkit-border-radius: 16px;
+}
+#facebox .close img{
+		width:21px;
+		height:20px;
+  opacity:1.0;
+}
+#facebox .close:hover img{
+  opacity:0.7;
+}
+
+#facebox .loading {
+  text-align: center;
+}
+
+#facebox .image {
+  text-align: center;
+}
+
+#facebox img {
+  border: 0;
+  margin: 0;
+}
+
+#facebox_overlay {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  height:100%;
+  width:100%;
+}
+
+.facebox_hide {
+  z-index:-100;
+}
+
+.facebox_overlayBG {
+  background-color: #000;
+  z-index: 99;
+}

$BJQ99(B: branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch
===================================================================
--- branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/patches/Net_UserAgent_Mobile_Mobile.php.patch	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,14 +1,14 @@
-Index: Mobile.php
-
---- data/module/Net/UserAgent/Mobile.php $B%Y!<%9(B (BASE)
-+++ data/module/Net/UserAgent/Mobile.php $B%m!<%+%k$G$NJQ99(B (LOCAL $B$,%Y!<%9(B)
-@@ -424,7 +424,8 @@
-             'blackberry9800', // Torch
-             'webOS',          // Palm Pre Experimental
-             'incognito',      // Other iPhone browser
--            'webmate'         // Other iPhone browser
-+            'webmate',         // Other iPhone browser
-+            'Windows Phone OS' // Windows Phone
-         );
- 
-         $pattern = implode("|", $useragents);
+Index: Mobile.php
+
+--- data/module/Net/UserAgent/Mobile.php $B%Y!<%9(B (BASE)
++++ data/module/Net/UserAgent/Mobile.php $B%m!<%+%k$G$NJQ99(B (LOCAL $B$,%Y!<%9(B)
+@@ -424,7 +424,8 @@
+             'blackberry9800', // Torch
+             'webOS',          // Palm Pre Experimental
+             'incognito',      // Other iPhone browser
+-            'webmate'         // Other iPhone browser
++            'webmate',         // Other iPhone browser
++            'Windows Phone OS' // Windows Phone
+         );
+ 
+         $pattern = implode("|", $useragents);

$BJQ99(B: branches/version-2_12-dev/templates/mobile_class.php
===================================================================
--- branches/version-2_12-dev/templates/mobile_class.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/templates/mobile_class.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -4,8 +4,7 @@
      *
      * @return void
      */
-    function mobileInit()
-    {
+    function mobileInit() {
         $this->init();
     }
 
@@ -14,8 +13,7 @@
      *
      * @return void
      */
-    function mobileProcess()
-    {
+    function mobileProcess() {
     }
 /*
  * Local variables:

$BJQ99(B: branches/version-2_12-dev/templates/page_class.php
===================================================================
--- branches/version-2_12-dev/templates/page_class.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/templates/page_class.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_XXX extends LC_Page_Ex 
-{
+class LC_Page_XXX extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
     }
 
     /**
@@ -61,8 +58,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/templates/page_class_extends.php
===================================================================
--- branches/version-2_12-dev/templates/page_class_extends.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/templates/page_class_extends.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,8 +33,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_XXX_Ex extends LC_Page_XXX
-{
+class LC_Page_XXX_Ex extends LC_Page_XXX {
 
     // }}}
     // {{{ functions
@@ -44,8 +43,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -54,8 +52,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -64,8 +61,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }

$BJQ99(B: branches/version-2_12-dev/templates/templates.xml
===================================================================
--- branches/version-2_12-dev/templates/templates.xml	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/templates/templates.xml	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author LOCKON CO.,LTD.
  * @version $$Id$$
  */
-class LC_Page_XXX extends LC_Page_Ex
-{
+class LC_Page_XXX extends LC_Page_Ex {
 
     // }}}
     // {{{ functions
@@ -42,8 +41,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -52,8 +50,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
     }
 
     /**
@@ -61,8 +58,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }
@@ -102,8 +98,7 @@
  * @author LOCKON CO.,LTD.
  * @version $$Id$$
  */
-class LC_Page_XXX_Ex extends LC_Page_XXX
-{
+class LC_Page_XXX_Ex extends LC_Page_XXX {
 
     // }}}
     // {{{ functions
@@ -113,8 +108,7 @@
      *
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
     }
 
@@ -123,8 +117,7 @@
      *
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
     }
 
@@ -133,8 +126,7 @@
      *
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
 }
@@ -173,4 +165,4 @@
 $$objPage-&gt;init();
 $$objPage-&gt;process();
 register_shutdown_function(array($$objPage, "destroy"));
-?&gt;</template></templates>
+?&gt;</template></templates>
\ No newline at end of file

$BJQ99(B: branches/version-2_12-dev/test/TestSuite.php
===================================================================
--- branches/version-2_12-dev/test/TestSuite.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/TestSuite.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -35,10 +35,8 @@
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
 
-class TestSuite 
-{
-    public static function suite()
-    {
+class TestSuite {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('ECCUBE');
         $suite->addTest(Page_AllTests::suite());
         $suite->addTest(DB_AllTests::suite());

$BJQ99(B: branches/version-2_12-dev/test/api_test.php
===================================================================
--- branches/version-2_12-dev/test/api_test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/api_test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -81,11 +81,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 <script type="text/javascript">
-function var_dump(obj)
-{
+function var_dump(obj) {
    var str = '';
-   $.each(obj, function (key, value)
-   {
+   $.each(obj, function (key, value) {
             if(typeof value == "object" && value != null) {
                 str += " Key: \"" + key + "\" {\n" + var_dump(value) + "}\n";
             }else{
@@ -95,8 +93,7 @@
    return str;
 }
 
-function makeSignature()
-{
+function makeSignature() {
     $('#mode').val("signature");
     $('#form').submit();
 }
@@ -182,8 +179,7 @@
             var str = var_dump(data);
             $('#dump').text(str);
         }
-        var recverror = function (result, textstatus, errorThrown)
-        {
+        var recverror = function (result, textstatus, errorThrown) {
             $('#res').text(textstatus);
         }
         $.ajax({

$BJQ99(B: branches/version-2_12-dev/test/class/SC_DbConn_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/SC_DbConn_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/SC_DbConn_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,8 +31,7 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class SC_DbConn_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_DbConn_Test extends PHPUnit_Framework_TestCase {
 
     /** SC_DbConn $B%$%s%9%?%s%9(B */
     var $objDbConn;
@@ -40,28 +39,24 @@
     var $expected;
     var $actual;
 
-    function setUp()
-    {
+    function setUp() {
         $this->objDbConn = new SC_DbConn();
         $this->objDbConn->query('BEGIN');
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         $this->objDbConn->query('ROLLBACK');
         $this->objDbConn = null;
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
 
     /**
      * $B%$%s%9%?%s%9$r<hF@$9$k%F%9%H%1!<%9(B.
      */
-    function testGetInstance()
-    {
+    function testGetInstance() {
         $this->expected = true;
         $this->actual = is_object($this->objDbConn);
 
@@ -71,8 +66,7 @@
     /**
      * SC_DbConn:query() $B$r;HMQ$7$F(B, CREATE TABLE $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
-    function testCreateTable()
-    {
+    function testCreateTable() {
         $result = $this->createTestTable();
 
         $this->expected = false;
@@ -84,8 +78,7 @@
     /**
      * SC_DbConn::getAll() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetAll()
-    {
+    function testGetAll() {
         $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
 
@@ -102,8 +95,7 @@
      * SC_DbConn::getAll() $B$N%F%9%H%1!<%9(B($B%(%i!<(B).
      */
     /*
-    function testGetAllIsError()
-    {
+    function testGetAllIsError() {
 
         // SC_DbConn::getAll() $B$O@\B3%(%i!<$,H/@8$9$k$H(B 0 $B$rJV$9(B
         $failur_dsn = "pgsql://user:pass@127.0.0.1:/xxxxx";
@@ -118,8 +110,7 @@
     /**
      * SC_DbConn::getOne() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetOne()
-    {
+    function testGetOne() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
         $this->setTestData(1, '2', 'f');
@@ -135,8 +126,7 @@
      * SC_DbConn::getOne() $B$N%F%9%H%1!<%9(B($B%(%i!<(B).
      */
     /*
-    function testGetOneIsError()
-    {
+    function testGetOneIsError() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
         $this->setTestData(1, '2', 'f');
@@ -152,8 +142,7 @@
     /**
      * SC_DbConn::getRow() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetRow()
-    {
+    function testGetRow() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
         $this->setTestData(2, '2', 'f');
@@ -167,8 +156,7 @@
     /**
      * SC_DbConn::getCol() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetCol()
-    {
+    function testGetCol() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
         $this->setTestData(2, '2', 'f');
@@ -185,8 +173,7 @@
      * SC_DbConn::autoExecute() $B$G(B INSERT $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
     /*
-    function testAutoExecuteOfInsert()
-    {
+    function testAutoExecuteOfInsert() {
         $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
 
@@ -204,8 +191,7 @@
      * SC_DbConn::autoExecute() $B$G(B UPDATE $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
     /*
-    function testAutoExecuteOfUpdate()
-    {
+    function testAutoExecuteOfUpdate() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
 
@@ -227,8 +213,7 @@
     /**
      * SC_DbConn::query() $B$G(B INSERT $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
-    function testQuery1()
-    {
+    function testQuery1() {
         $this->createTestTable();
         $sql = "INSERT INTO test_table VALUES (?, ?, ?, ?)";
         $data = array('1', '1', '1', 'f');
@@ -248,8 +233,7 @@
     /**
      * SC_DbConn::query() $B$G(B UPDATE $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
-    function testQuery2()
-    {
+    function testQuery2() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
 
@@ -272,26 +256,22 @@
     /**
      * SC_DbConn::prepare() $B$OL$;HMQ(B
      */
-    function testPrepare()
-    {
+    function testPrepare() {
     }
 
     /**
      * SC_DbConn::execute() $B$OL$;HMQ(B
      */
-    function testExecute()
-    {
+    function testExecute() {
     }
 
     /**
      * SC_DbConn::reset() $B$OL$;HMQ(B
      */
-    function testReset()
-    {
+    function testReset() {
     }
 
-    function createTestTable()
-    {
+    function createTestTable() {
         $sql = "CREATE TABLE test_table ("
             . "id SERIAL PRIMARY KEY,"
             . "column1 numeric(9),"
@@ -301,8 +281,7 @@
         return $this->objDbConn->query($sql);
     }
 
-    function setTestData($column1, $column2, $column3)
-    {
+    function setTestData($column1, $column2, $column3) {
         $fields_values = array($column1, $column2, $column3);
         $sql = "INSERT INTO test_table (column1, column2, column3) VALUES (?, ?, ?)";
         $result = $this->objDbConn->query($sql, $fields_values);

$BJQ99(B: branches/version-2_12-dev/test/class/SC_Query_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/SC_Query_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/SC_Query_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class SC_Query_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Query_Test extends PHPUnit_Framework_TestCase {
 
     /** SC_Query $B%$%s%9%?%s%9(B */
     var $objQuery;
@@ -41,30 +40,26 @@
     var $expected;
     var $actual;
 
-    function setUp()
-    {
+    function setUp() {
         $this->objQuery = new SC_Query();
         $this->objQuery->begin();
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         // MySQL $B$G$O(B CREATE TABLE $B$,%m!<%k%P%C%/$5$l$J$$$N$G(B DROP TABLE $B$r9T$&(B
         $this->dropTestTable();
         $this->objQuery->rollback();
         $this->objQuery = null;
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
 
     /**
      * $B%$%s%9%?%s%9$r<hF@$9$k%F%9%H%1!<%9(B.
      */
-    function testGetInstance()
-    {
+    function testGetInstance() {
         $this->expected = true;
         $this->actual = is_object($this->objQuery);
 
@@ -74,8 +69,7 @@
     /**
      * SC_Query::query() $B$r;HMQ$7$F(B, CREATE TABLE $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
-    function testCreateTable()
-    {
+    function testCreateTable() {
         $result = $this->createTestTable();
 
         $this->expected = false;
@@ -87,8 +81,7 @@
     /**
      * SC_Query::getAll() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetAll()
-    {
+    function testGetAll() {
         $result = $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
 
@@ -104,8 +97,7 @@
     /**
      * SC_Query::select() $B$N%F%9%H%1!<%9(B.
      */
-    function testSelect()
-    {
+    function testSelect() {
         $this->createTestTable();
         $result = $this->setTestData(1, '2', 'f');
 
@@ -125,8 +117,7 @@
     /**
      * SC_Query::getOne() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetOne()
-    {
+    function testGetOne() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
         $this->setTestData(1, '2', 'f');
@@ -141,8 +132,7 @@
     /**
      * SC_Query::getRow() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetRow()
-    {
+    function testGetRow() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
         $this->setTestData(2, '2', 'f');
@@ -156,8 +146,7 @@
     /**
      * SC_Query::getCol() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetCol()
-    {
+    function testGetCol() {
         $this->createTestTable();
         $this->setTestData(1, '1', 'f');
         $this->setTestData(2, '2', 'f');
@@ -173,8 +162,7 @@
     /**
      * SC_Query::query() $B$G(B INSERT $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
-    function testQuery1()
-    {
+    function testQuery1() {
         $this->createTestTable();
         $sql = "INSERT INTO test_table VALUES (?, ?, ?, ?)";
         $data = array('1', '1', '1', 'f');
@@ -191,8 +179,7 @@
         $this->verify();
     }
 
-    function testInsert()
-    {
+    function testInsert() {
         $this->createTestTable();
 
         $this->objQuery->insert('test_table',
@@ -214,8 +201,7 @@
     /**
      * SC_Query::query() $B$G(B UPDATE $B$r<B9T$9$k%F%9%H%1!<%9(B.
      */
-    function testQuery2()
-    {
+    function testQuery2() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
 
@@ -234,8 +220,7 @@
         $this->verify();
     }
 
-    function testUpdate()
-    {
+    function testUpdate() {
         $this->createTestTable();
         $this->setTestData(1, '2', 'f');
 
@@ -255,33 +240,28 @@
         $this->verify();
     }
 
-    function testListTables()
-    {
+    function testListTables() {
         $tables = $this->objQuery->listTables();
         $this->assertTrue(in_array('mtb_zip', $tables));
     }
 
-    function testListSequences()
-    {
+    function testListSequences() {
         $sequences = $this->objQuery->listSequences();
         $this->assertTrue(in_array('dtb_products_product_id', $sequences));
     }
 
-    function testListTableFields()
-    {
+    function testListTableFields() {
         $this->expected = array('id', 'name', 'rank', 'remarks');
         $this->actual = $this->objQuery->listTableFields('mtb_constants');
         $this->verify();
     }
 
-    function testListTableIndexes()
-    {
+    function testListTableIndexes() {
         $indexes = $this->objQuery->listTableIndexes('dtb_mobile_kara_mail');
         $this->assertTrue(in_array('dtb_mobile_kara_mail_create_date_key', $indexes));
     }
 
-    function createTestTable()
-    {
+    function createTestTable() {
         $sql = "CREATE TABLE test_table ("
             . "id SERIAL PRIMARY KEY,"
             . "column1 numeric(9),"
@@ -291,8 +271,7 @@
         return $this->objQuery->query($sql);
     }
 
-    function dropTestTable()
-    {
+    function dropTestTable() {
         $tables = $this->objQuery->listTables();
         if (in_array('test_table', $tables)) {
             $this->objQuery->query("DROP TABLE test_table");
@@ -300,8 +279,7 @@
         return;
     }
 
-    function setTestData($column1, $column2, $column3)
-    {
+    function setTestData($column1, $column2, $column3) {
         $fields_values = array($column1, $column2, $column3);
         $sql = "INSERT INTO test_table (column1, column2, column3) VALUES (?, ?, ?)";
         $result = $this->objQuery->query($sql, $fields_values);

$BJQ99(B: branches/version-2_12-dev/test/class/db/DB_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/db/DB_AllTests.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/db/DB_AllTests.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,11 +34,9 @@
  * @author Kentaro Ohkouchi
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class DB_AllTests extends PHPUnit_Framework_TestCase 
-{
+class DB_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('SC_DB');
         $suite->addTestSuite('SC_DB_DBFactory_Test');
         $suite->addTestSuite('SC_DB_MasterData_Test');

$BJQ99(B: branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,15 +32,13 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_DB_DBFactory_Test.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_DBFactory_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_DB_DBFactory_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
     // {{{ functions
 
     /* TODO
-    function testSfGetDBVersion()
-    {
+    function testSfGetDBVersion() {
         $dbFactory = SC_DB_DBFactory::getInstance();
         $objQuery = new SC_Query(DEFAULT_DSN, true, true);
         switch (DB_TYPE) {
@@ -56,16 +54,14 @@
     }
     */
 
-    function testFindTableNames()
-    {
+    function testFindTableNames() {
         $dbFactory = SC_DB_DBFactory::getInstance();
         $objQuery = new SC_Query(DEFAULT_DSN);
         $actual = $dbFactory->findTableNames('mtb_pre');
         $this->assertEquals('mtb_pref', $actual[0]);
     }
 
-    function testConcatColumn()
-    {
+    function testConcatColumn() {
 
         $params = array('column1', 'column2');
 
@@ -90,8 +86,7 @@
     /**
      * $B:rF|$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL $B$N%F%9%H(B.
      */
-    function testGetOrderYesterdaySql()
-    {
+    function testGetOrderYesterdaySql() {
 
         switch (DB_TYPE) {
         case 'pgsql':
@@ -120,8 +115,7 @@
     /**
      * $BEv7n$NGd>e9b!&Gd>e7o?t$r;;=P$9$k(B SQL $B$N%F%9%H(B.
      */
-    function testGetOrderMonthSql()
-    {
+    function testGetOrderMonthSql() {
         switch (DB_TYPE) {
         case 'pgsql':
             $expected =  "SELECT COUNT(total) FROM dtb_order "
@@ -151,8 +145,7 @@
     /**
      * $B:rF|$N%l%S%e!<=q$-9~$_7o?t$r;;=P$9$k(B SQL $B$N%F%9%H(B.
      */
-    function testGetReviewYesterdaySql()
-    {
+    function testGetReviewYesterdaySql() {
         switch (DB_TYPE) {
         case 'pgsql':
             $expected = "SELECT COUNT(*) FROM dtb_review AS A "

$BJQ99(B: branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:SC_DB_MasterData_Test.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_DB_MasterData_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_DB_MasterData_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
     // {{{ functions
@@ -41,8 +40,7 @@
     /**
      * SC_DB_MasterData::getMasterData() $B$N%F%9%H%1!<%9(B
      */
-    function testGetMasterData()
-    {
+    function testGetMasterData() {
         $columns = array('id', 'name', 'rank');
         $masterData = new SC_DB_MasterData_Ex();
         $actual = $masterData->getMasterData('mtb_pref', $columns);
@@ -62,8 +60,7 @@
     /**
      * SC_DB_MasterData::updateMasterData() $B$N%F%9%H%1!<%9(B
      */
-    function testUpdateMasterData()
-    {
+    function testUpdateMasterData() {
 
         $columns = array('id', 'name', 'rank');
         $masterData = new SC_DB_MasterData_Ex();
@@ -88,8 +85,7 @@
     /**
      * SC_DB_MasterData::createCache() $B$N%F%9%H%1!<%9(B.
      */
-    function testCreateCache()
-    {
+    function testCreateCache() {
         $masterData = new SC_DB_MasterData_Ex();
         $masterData->clearCache('mtb_constants');
         $masterData->createCache('mtb_constants', array(), true, array('id', 'remarks'));

$BJQ99(B: branches/version-2_12-dev/test/class/helper/Helper_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/Helper_AllTests.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/helper/Helper_AllTests.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -35,11 +35,9 @@
  * @author Kentaro Ohkouchi
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class Helper_AllTests extends PHPUnit_Framework_TestCase 
-{
+class Helper_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('SC_Helper');
         $suite->addTestSuite('SC_Helper_DB_Test');
         $suite->addTestSuite('SC_Helper_Session_Test');

$BJQ99(B: branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,150 +1,146 @@
-<?php
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- * Description of SC_Helper_Address_Test
- *
- * @author cyberwill
- */
-class SC_Helper_Address_Test extends PHPUnit_Framework_TestCase
-{
-    public $objQuery = "";
-    public $objAddress = "";
-    public $customer_id = "";
-
-    public $dummy = array(
-        'name01' => '$BDI2C(B',
-        'name02' => '$B=;=j(B',
-        'kana01' => '$B%D%$%+(B',
-        'kana02' => '$B%8%e%&%7%g(B',
-        'zip01' => '123',
-        'zip02' => '4567',
-        'pref' => '23',
-        'addr01' => '$B$=$NB>$N$*FO$1 ＠ h(B',
-        'addr02' => '',
-        'tel01' => '0123',
-        'tel02' => '4567',
-        'tel03' => '8901',
-        'fax01' => '',
-        'fax02' => '',
-        'fax03' => '',
-    );
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->objQuery =& SC_Query::getSingletonInstance();
-        $this->objQuery->begin();
-        $arrRet = $this->objQuery->getOne('SELECT MAX(customer_id) FROM dtb_customer');
-        $this->customer_id = $arrRet;
-        $this->objAddress = new SC_Helper_Address_Ex();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        $this->objQuery->rollback();
-    }
-
-    function testRegistAddress()
-    {
-        // $B%@%_!<$N=;=j$rEPO?(B
-        $sqlval = $this->dummy;
-        $sqlval['customer_id'] = $this->customer_id;
-        // $B8!>ZMQ$N=;=j(B02
-        $sqlval['addr02'] = $create_test = 'create test ' . time();
-        $this->objAddress->registAddress($sqlval);
-
-        // $B=;=j(B02$B$,8!>ZMQ$N$b$N$HF1$8$+3NG'(B
-        $this->objQuery->setOrder('other_deliv_id DESC');
-        $created_address = $this->objQuery->getRow('other_deliv_id, addr02', 'dtb_other_deliv', 'customer_id = ?', array($this->customer_id));
-        $this->assertEquals($create_test, $created_address['addr02']);
-
-        $sqlval['other_deliv_id'] = $created_address['other_deliv_id'];
-        // $B99?7$N8!>Z$N$?$a$K=;=j(B02$B$rJQ99(B
-        $sqlval['addr02'] = $update_test = 'update test ' . time();
-        $this->objAddress->registAddress($sqlval);
-
-        // $B=;=j(B02$B$,8!>ZMQ$N$b$N$HF1$8$+8!>Z(B
-        $this->objQuery->setOrder('other_deliv_id DESC');
-        $updated_address = $this->objQuery->getRow('addr02', 'dtb_other_deliv', 'other_deliv_id = ?', array($created_address['other_deliv_id']));
-        $this->assertEquals($update_test, $updated_address['addr02']);
-    }
-
-    /**
-     * @depends testSave
-     */
-    function testGetAddress()
-    {
-        // testSave $B$N%F%9%H$,DL$C$F$$$k$3$HA0Ds(B
-        $sqlval = $this->dummy;
-        $sqlval['customer_id'] = $this->customer_id;
-        $sqlval['addr02'] = 'get test';
-        $this->objAddress->registAddress($sqlval);
-        $this->objQuery->setOrder('other_deliv_id DESC');
-        $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
-        // DB$B$K ＠ 5$7$/5-O?$5$l!"<hF@$G$-$F$$$k$+3NG'(B
-        $address = $this->objAddress->getAddress($other_deliv_id);
-        $result = TRUE;
-        foreach ($sqlval as $key => $value) {
-            if ($value != $address[$key]) {
-                $result = FALSE;
-            }
-        }
-        $this->assertTrue($result);
-    }
-
-    /**
-     * @depends testSave
-     */
-    function testGetList()
-    {
-        // testSave $B$N%F%9%H$,DL$C$F$$$k$3$HA0Ds(B
-        $sqlval = $this->dummy;
-        $sqlval['customer_id'] = $this->customer_id;
-        $sqlval['addr02'] = 'getList test';
-        $this->objAddress->registAddress($sqlval);
-        $list = $this->objAddress->getList($this->customer_id);
-        $found = FALSE;
-        foreach ($list as $address) {
-            $check = TRUE;
-            foreach ($sqlval as $key => $value) {
-                if ($value != $address[$key]) {
-                    $check = FALSE;
-                }
-            }
-            if ($check) {
-                $found = TRUE;
-                break;
-            }
-        }
-        $this->assertTrue($found);
-    }
-
-    /**
-     * @depends testSave
-     */
-    function testDeleteAddress()
-    {
-        // testSave $B$N%F%9%H$,DL$C$F$$$k$3$HA0Ds(B
-        $sqlval = $this->dummy;
-        $sqlval['customer_id'] = $this->customer_id;
-        $sqlval['addr02'] = 'delete test';
-        $this->objAddress->registAddress($sqlval);
-        $this->objQuery->setOrder('other_deliv_id DESC');
-        $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
-        $this->objAddress->deleteAddress($other_deliv_id);
-        $result = $this->objQuery->getRow('*', 'dtb_other_deliv', 'customer_id = ? and other_deliv_id = ?', array($this->customer_id, $other_deliv_id));
-        $this->assertNull($result);
-    }
-}
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of SC_Helper_Address_Test
+ *
+ * @author cyberwill
+ */
+class SC_Helper_Address_Test extends PHPUnit_Framework_TestCase
+{
+    public $objQuery = "";
+    public $objAddress = "";
+    public $customer_id = "";
+
+    public $dummy = array(
+        'name01' => '$BDI2C(B',
+        'name02' => '$B=;=j(B',
+        'kana01' => '$B%D%$%+(B',
+        'kana02' => '$B%8%e%&%7%g(B',
+        'zip01' => '123',
+        'zip02' => '4567',
+        'pref' => '23',
+        'addr01' => '$B$=$NB>$N$*FO$1 ＠ h(B',
+        'addr02' => '',
+        'tel01' => '0123',
+        'tel02' => '4567',
+        'tel03' => '8901',
+        'fax01' => '',
+        'fax02' => '',
+        'fax03' => '',
+    );
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->objQuery =& SC_Query::getSingletonInstance();
+        $this->objQuery->begin();
+        $arrRet = $this->objQuery->getOne('SELECT MAX(customer_id) FROM dtb_customer');
+        $this->customer_id = $arrRet;
+        $this->objAddress = new SC_Helper_Address_Ex();
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+        $this->objQuery->rollback();
+    }
+
+    function testSave() {
+        // $B%@%_!<$N=;=j$rEPO?(B
+        $sqlval = $this->dummy;
+        $sqlval['customer_id'] = $this->customer_id;
+        // $B8!>ZMQ$N=;=j(B02
+        $sqlval['addr02'] = $create_test = 'create test ' . time();
+        $this->objAddress->save($sqlval);
+
+        // $B=;=j(B02$B$,8!>ZMQ$N$b$N$HF1$8$+3NG'(B
+        $this->objQuery->setOrder('other_deliv_id DESC');
+        $created_address = $this->objQuery->getRow('other_deliv_id, addr02', 'dtb_other_deliv', 'customer_id = ?', array($this->customer_id));
+        $this->assertEquals($create_test, $created_address['addr02']);
+
+        $sqlval['other_deliv_id'] = $created_address['other_deliv_id'];
+        // $B99?7$N8!>Z$N$?$a$K=;=j(B02$B$rJQ99(B
+        $sqlval['addr02'] = $update_test = 'update test ' . time();
+        $this->objAddress->save($sqlval);
+
+        // $B=;=j(B02$B$,8!>ZMQ$N$b$N$HF1$8$+8!>Z(B
+        $this->objQuery->setOrder('other_deliv_id DESC');
+        $updated_address = $this->objQuery->getRow('addr02', 'dtb_other_deliv', 'other_deliv_id = ?', array($created_address['other_deliv_id']));
+        $this->assertEquals($update_test, $updated_address['addr02']);
+    }
+
+    /**
+     * @depends testSave
+     */
+    function testGet() {
+        // testSave $B$N%F%9%H$,DL$C$F$$$k$3$HA0Ds(B
+        $sqlval = $this->dummy;
+        $sqlval['customer_id'] = $this->customer_id;
+        $sqlval['addr02'] = 'get test';
+        $this->objAddress->save($sqlval);
+        $this->objQuery->setOrder('other_deliv_id DESC');
+        $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
+        // DB$B$K ＠ 5$7$/5-O?$5$l!"<hF@$G$-$F$$$k$+3NG'(B
+        $address = $this->objAddress->get($other_deliv_id);
+        $result = TRUE;
+        foreach ($sqlval as $key => $value) {
+            if ($value != $address[$key]) {
+                $result = FALSE;
+            }
+        }
+        $this->assertTrue($result);
+    }
+
+    /**
+     * @depends testSave
+     */
+    function testGetList() {
+        // testSave $B$N%F%9%H$,DL$C$F$$$k$3$HA0Ds(B
+        $sqlval = $this->dummy;
+        $sqlval['customer_id'] = $this->customer_id;
+        $sqlval['addr02'] = 'getList test';
+        $this->objAddress->save($sqlval);
+        $list = $this->objAddress->getList($this->customer_id);
+        $found = FALSE;
+        foreach ($list as $address) {
+            $check = TRUE;
+            foreach ($sqlval as $key => $value) {
+                if ($value != $address[$key]) {
+                    $check = FALSE;
+                }
+            }
+            if ($check) {
+                $found = TRUE;
+                break;
+            }
+        }
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testSave
+     */
+    function testDelete() {
+        // testSave $B$N%F%9%H$,DL$C$F$$$k$3$HA0Ds(B
+        $sqlval = $this->dummy;
+        $sqlval['customer_id'] = $this->customer_id;
+        $sqlval['addr02'] = 'delete test';
+        $this->objAddress->save($sqlval);
+        $this->objQuery->setOrder('other_deliv_id DESC');
+        $other_deliv_id = $this->objQuery->getOne('SELECT other_deliv_id FROM dtb_other_deliv WHERE customer_id = ?', array($this->customer_id));
+        $this->objAddress->delete($other_deliv_id);
+        $result = $this->objQuery->getRow('*', 'dtb_other_deliv', 'customer_id = ? and other_deliv_id = ?', array($this->customer_id, $other_deliv_id));
+        $this->assertNull($result);
+    }
+}

$BJQ99(B: branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,14 +32,12 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_DB_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Helper_DB_Test extends PHPUnit_Framework_TestCase {
 
     /**
      * sfColumnExists() $B$N%F%9%H%1!<%9(B.
      */
-    function testSfColumnExists()
-    {
+    function testSfColumnExists() {
         $objDb = new SC_Helper_DB_Ex();
         $this->assertEquals(true, $objDb->sfColumnExists('mtb_zip', 'zipcode'));
     }

$BJQ99(B: branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,491 +1,490 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once(realpath(dirname(__FILE__)) . "/../../require.php");
-require_once(realpath(dirname(__FILE__)) . "/../../../data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php");
-
-/**
- * SC_Helper_Purchase $B$N%F%9%H%1!<%9(B.
- *
- * @package Helper
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase 
-{
-    /**
-     * @var SC_Helper_Purchase
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new SC_Helper_Purchase;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @todo Implement testCompleteOrder().
-     */
-    public function testCompleteOrder()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testCancelOrder().
-     */
-    public function testCancelOrder()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testRollbackOrder().
-     */
-    public function testRollbackOrder()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testVerifyChangeCart().
-     */
-    public function testVerifyChangeCart()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetOrderTemp().
-     */
-    public function testGetOrderTemp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetOrderTempByOrderId().
-     */
-    public function testGetOrderTempByOrderId()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testSaveOrderTemp().
-     */
-    public function testSaveOrderTemp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * getShippingTemp() $B$N%F%9%H%1!<%9(B.
-     */
-    public function testGetShippingTemp()
-    {
-        $_SESSION['shipping'] = array(
-            '0' => array('shipping_name01' => 'test01', 'shipment_item' => array('10' => array('shipment_item' => 0) ) ),
-            '1' => array('shipping_name01' => 'test02'),
-            '2' => array('shipping_name01' => 'test03', 'shipment_item' => array('11' => array('shipment_item' => 1) ) ),
-            '3' => array('shipping_name01' => 'test04', 'shipment_item' => array('12' => array('shipment_item' => 2) ) ),
-        );
-        
-        // $BBh0l0z?t(B($BJ#?t$*FO$1 ＠ h%U%i%0(B)$B$,(Bfalse$B$N>l9g!"(B$_SESSION['shipping']$B$r$=$N$^$^JV$9(B
-        $result = SC_Helper_Purchase_Ex::getShippingTemp(false);
-        $this->assertEquals($result, $_SESSION['shipping']);
-        
-        // $BBh0l0z?t(B($BJ#?t$*FO$1 ＠ h%U%i%0(B)$B$,(Btrue$B$N>l9g!"<B:]$KG[Aw$GMxMQ$5$l$k$*FO$1 ＠ h$N>pJs$N$_$rF~$l$?%G!<%?$rJV$9(B
-        $result = SC_Helper_Purchase_Ex::getShippingTemp(true);
-        $this->assertEquals(false, $result === $_SESSION['shipping']);
-        $this->assertEquals(false, $result == $_SESSION['shipping']);
-        $this->assertEquals(3, count($result));
-        
-        unset($_SESSION['shipping']);
-    }
-
-    /**
-     * @todo Implement testClearShipmentItemTemp().
-     */
-    public function testClearShipmentItemTemp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testSetShipmentItemTemp().
-     */
-    public function testSetShipmentItemTemp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetShippingPref().
-     */
-    public function testGetShippingPref()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testIsMultiple().
-     */
-    public function testIsMultiple()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testSaveShippingTemp().
-     */
-    public function testSaveShippingTemp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testUnsetShippingTemp().
-     */
-    public function testUnsetShippingTemp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testCopyFromCustomer().
-     */
-    public function testCopyFromCustomer()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testCopyFromOrder().
-     */
-    public function testCopyFromOrder()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetPaymentsByPrice().
-     */
-    public function testGetPaymentsByPrice()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetDelivDate().
-     */
-    public function testGetDelivDate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetDateArray().
-     */
-    public function testGetDateArray()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetDelivTime().
-     */
-    public function testGetDelivTime()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetDeliv().
-     */
-    public function testGetDeliv()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetPayments().
-     */
-    public function testGetPayments()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testRegisterShipping().
-     */
-    public function testRegisterShipping()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testRegisterShipmentItem().
-     */
-    public function testRegisterShipmentItem()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testRegisterOrderComplete().
-     */
-    public function testRegisterOrderComplete()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testRegisterOrder().
-     */
-    public function testRegisterOrder()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testRegisterOrderDetail().
-     */
-    public function testRegisterOrderDetail()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetOrder().
-     */
-    public function testGetOrder()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetOrderDetail().
-     */
-    public function testGetOrderDetail()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testSetDownloadableFlgTo().
-     */
-    public function testSetDownloadableFlgTo()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetShippings().
-     */
-    public function testGetShippings()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetShipmentItems().
-     */
-    public function testGetShipmentItems()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testSendOrderMail().
-     */
-    public function testSendOrderMail()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testSfUpdateOrderStatus().
-     */
-    public function testSfUpdateOrderStatus()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testSfUpdateOrderNameCol().
-     */
-    public function testSfUpdateOrderNameCol()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testIsUsePoint().
-     */
-    public function testIsUsePoint()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testIsAddPoint().
-     */
-    public function testIsAddPoint()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testCleanupSession().
-     */
-    public function testCleanupSession()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
-?>
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
+require_once(realpath(dirname(__FILE__)) . "/../../../data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php");
+
+/**
+ * SC_Helper_Purchase $B$N%F%9%H%1!<%9(B.
+ *
+ * @package Helper
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase {
+    /**
+     * @var SC_Helper_Purchase
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->object = new SC_Helper_Purchase;
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @todo Implement testCompleteOrder().
+     */
+    public function testCompleteOrder()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testCancelOrder().
+     */
+    public function testCancelOrder()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testRollbackOrder().
+     */
+    public function testRollbackOrder()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testVerifyChangeCart().
+     */
+    public function testVerifyChangeCart()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetOrderTemp().
+     */
+    public function testGetOrderTemp()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetOrderTempByOrderId().
+     */
+    public function testGetOrderTempByOrderId()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSaveOrderTemp().
+     */
+    public function testSaveOrderTemp()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * getShippingTemp() $B$N%F%9%H%1!<%9(B.
+     */
+    public function testGetShippingTemp()
+    {
+        $_SESSION['shipping'] = array(
+            '0' => array('shipping_name01' => 'test01', 'shipment_item' => array('10' => array('shipment_item' => 0) ) ),
+            '1' => array('shipping_name01' => 'test02'),
+            '2' => array('shipping_name01' => 'test03', 'shipment_item' => array('11' => array('shipment_item' => 1) ) ),
+            '3' => array('shipping_name01' => 'test04', 'shipment_item' => array('12' => array('shipment_item' => 2) ) ),
+        );
+        
+        // $BBh0l0z?t(B($BJ#?t$*FO$1 ＠ h%U%i%0(B)$B$,(Bfalse$B$N>l9g!"(B$_SESSION['shipping']$B$r$=$N$^$^JV$9(B
+        $result = SC_Helper_Purchase_Ex::getShippingTemp(false);
+        $this->assertEquals($result, $_SESSION['shipping']);
+        
+        // $BBh0l0z?t(B($BJ#?t$*FO$1 ＠ h%U%i%0(B)$B$,(Btrue$B$N>l9g!"<B:]$KG[Aw$GMxMQ$5$l$k$*FO$1 ＠ h$N>pJs$N$_$rF~$l$?%G!<%?$rJV$9(B
+        $result = SC_Helper_Purchase_Ex::getShippingTemp(true);
+        $this->assertEquals(false, $result === $_SESSION['shipping']);
+        $this->assertEquals(false, $result == $_SESSION['shipping']);
+        $this->assertEquals(3, count($result));
+        
+        unset($_SESSION['shipping']);
+    }
+
+    /**
+     * @todo Implement testClearShipmentItemTemp().
+     */
+    public function testClearShipmentItemTemp()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSetShipmentItemTemp().
+     */
+    public function testSetShipmentItemTemp()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetShippingPref().
+     */
+    public function testGetShippingPref()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testIsMultiple().
+     */
+    public function testIsMultiple()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSaveShippingTemp().
+     */
+    public function testSaveShippingTemp()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testUnsetShippingTemp().
+     */
+    public function testUnsetShippingTemp()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testCopyFromCustomer().
+     */
+    public function testCopyFromCustomer()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testCopyFromOrder().
+     */
+    public function testCopyFromOrder()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetPaymentsByPrice().
+     */
+    public function testGetPaymentsByPrice()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetDelivDate().
+     */
+    public function testGetDelivDate()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetDateArray().
+     */
+    public function testGetDateArray()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetDelivTime().
+     */
+    public function testGetDelivTime()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetDeliv().
+     */
+    public function testGetDeliv()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetPayments().
+     */
+    public function testGetPayments()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testRegisterShipping().
+     */
+    public function testRegisterShipping()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testRegisterShipmentItem().
+     */
+    public function testRegisterShipmentItem()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testRegisterOrderComplete().
+     */
+    public function testRegisterOrderComplete()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testRegisterOrder().
+     */
+    public function testRegisterOrder()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testRegisterOrderDetail().
+     */
+    public function testRegisterOrderDetail()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetOrder().
+     */
+    public function testGetOrder()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetOrderDetail().
+     */
+    public function testGetOrderDetail()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSetDownloadableFlgTo().
+     */
+    public function testSetDownloadableFlgTo()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetShippings().
+     */
+    public function testGetShippings()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetShipmentItems().
+     */
+    public function testGetShipmentItems()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSendOrderMail().
+     */
+    public function testSendOrderMail()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSfUpdateOrderStatus().
+     */
+    public function testSfUpdateOrderStatus()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSfUpdateOrderNameCol().
+     */
+    public function testSfUpdateOrderNameCol()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testIsUsePoint().
+     */
+    public function testIsUsePoint()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testIsAddPoint().
+     */
+    public function testIsAddPoint()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testCleanupSession().
+     */
+    public function testCleanupSession()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+}
+?>

$BJQ99(B: branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,14 +32,12 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class SC_Helper_Session_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Helper_Session_Test extends PHPUnit_Framework_TestCase {
 
     /**
      * getToken() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetToken()
-    {
+    function testGetToken() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
         
@@ -52,8 +50,7 @@
     /**
      * isValidToken() $B$N%F%9%H%1!<%9(B.
      */
-    function testIsValidToken()
-    {
+    function testIsValidToken() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
         
@@ -67,8 +64,7 @@
     /**
      * isValidToken() $B$N%F%9%H%1!<%9(B(POST).
      */
-    function testIsValidTokenWithPost()
-    {
+    function testIsValidTokenWithPost() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
         
@@ -83,8 +79,7 @@
     /**
      * isValidToken() $B$N%F%9%H%1!<%9(B(GET).
      */
-    function testIsValidTokenWithGET()
-    {
+    function testIsValidTokenWithGET() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
         
@@ -101,8 +96,7 @@
      *
      * $BCM$,EO$5$l$F$J$$>l9g(B
      */
-    function testIsValidTokenNotParam()
-    {
+    function testIsValidTokenNotParam() {
         $objSession = new SC_Helper_Session_Ex();
         $token = $objSession->getToken();
         

$BJQ99(B: branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,11 +32,9 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class LC_Page_Admin_Products_ProductClass_Test extends PHPUnit_Framework_TestCase 
-{
+class LC_Page_Admin_Products_ProductClass_Test extends PHPUnit_Framework_TestCase {
 
-    function setUp()
-    {
+    function setUp() {
         $this->objQuery =& SC_Query::getSingletonInstance();
         $this->objQuery->begin();
 
@@ -45,15 +43,13 @@
         $this->now = "2010-01-01 00:00:00";
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         $this->objQuery->rollback();
         $this->objQuery = null;
         $this->objPage = null;
     }
 
-    function testInit()
-    {
+    function testInit() {
 
         $this->assertEquals('products/product_class.tpl',
                             $this->objPage->tpl_mainpage);
@@ -65,13 +61,11 @@
                             $this->objPage->tpl_subtitle);
     }
 
-    function testProcess()
-    {
+    function testProcess() {
         $this->objPage->process();
     }
 
-    function testCreateSearchParams()
-    {
+    function testCreateSearchParams() {
         $keys = array('search_product_id',
                       'search_product_code',
                       'search_category_id',
@@ -109,8 +103,7 @@
         $this->verify();
     }
 
-    function testGetProductName()
-    {
+    function testGetProductName() {
         $product_id = 10000000;
         $this->expected = "$B%F%9%H>&IJ(B";
         $this->setProduct($product_id, $this->expected);
@@ -120,8 +113,7 @@
         $this->verify();
     }
 
-    function testGetProductsClass()
-    {
+    function testGetProductsClass() {
         $product_id = 10000000;
         $product_class_id = 10000;
         $this->setProductsClass($product_id, $product_class_id);
@@ -148,8 +140,7 @@
         $this->verify();
     }
 
-    function testGetAllClass()
-    {
+    function testGetAllClass() {
         $this->clearClass();
         $this->setClass(1000, "$BBg$-$5(B", 1, array('S', 'M', 'L', 'LL'));
         $this->setClass(2, "$B?'(B", 2, array("$B ＠ V(B", "$B ＠ D(B", "$B2+(B", "$BNP(B"));
@@ -162,8 +153,7 @@
         $this->verify();
     }
 
-    function testGetAllClassCategory$B5,3J(B1$B$N$_(B()
-    {
+    function testGetAllClassCategory$B5,3J(B1$B$N$_(B() {
         $this->clearClass();
         $this->setClass(1000, "$BBg$-$5(B", 1, array('S', 'M', 'L', 'LL'));
         $this->setClass(2, "$B?'(B", 2, array("$B ＠ V(B", "$B ＠ D(B", "$B2+(B", "$BNP(B"));
@@ -191,8 +181,7 @@
         $this->verify();
     }
 
-    function testGetAllClassCategory$B5,3J(B1$B$H(B3()
-    {
+    function testGetAllClassCategory$B5,3J(B1$B$H(B3() {
         $this->clearClass();
         $this->setClass(1000, "$BBg$-$5(B", 1, array('S', 'M', 'L', 'LL'));
         $this->setClass(2, "$B?'(B", 2, array("$B ＠ V(B", "$B ＠ D(B", "$B2+(B", "$BNP(B"));
@@ -304,8 +293,7 @@
         $this->verify();
     }
 
-    function testGetProductsClassAndClasscategory()
-    {
+    function testGetProductsClassAndClasscategory() {
         $product_id = 10000;
         $product_class_id = 1000;
         $class_combination_id = 200;
@@ -342,13 +330,11 @@
         $this->verify();
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
 
-    function setProduct($product_id, $name)
-    {
+    function setProduct($product_id, $name) {
         $val['product_id'] = $product_id;
         $val['name'] = $name;
         $val['creator_id'] = 1;
@@ -356,8 +342,7 @@
         $this->objQuery->insert('dtb_products', $val);
     }
 
-    function setProductsClass($product_id, $product_class_id, $class_combination_id = null)
-    {
+    function setProductsClass($product_id, $product_class_id, $class_combination_id = null) {
         $val['product_class_id'] = $product_class_id;
         $val['product_id'] = $product_id;
         $val['class_combination_id'] = $class_combination_id;
@@ -379,8 +364,7 @@
         $this->objQuery->insert('dtb_class_combination', $val);
     }
 
-    function clearClass()
-    {
+    function clearClass() {
         $this->objQuery->delete('dtb_class');
         $this->objQuery->delete('dtb_classcategory');
     }
@@ -393,8 +377,7 @@
      * @param integer $rank $B5,3J$NI=<(=g(B
      * @param array $classcategory $B5,3JJ,N`L>$NG[Ns(B
      */
-    function setClass($class_id, $class_name, $rank, $classcategory)
-    {
+    function setClass($class_id, $class_name, $rank, $classcategory) {
         $val['class_id'] = $class_id;
         $val['name'] = $class_name;
         $val['creator_id'] = 1;
@@ -413,16 +396,13 @@
     }
 }
 
-class LC_Page_Admin_Products_ProductClass_Mock extends LC_Page_Admin_Products_ProductClass 
-{
+class LC_Page_Admin_Products_ProductClass_Mock extends LC_Page_Admin_Products_ProductClass {
 
-    function authorization()
-    {
+    function authorization() {
         // quiet.
     }
 
-    function assignView()
-    {
+    function assignView() {
         // quiet.
     }
 }

$BJQ99(B: branches/version-2_12-dev/test/class/page/LC_Page_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/page/LC_Page_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/page/LC_Page_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class LC_Page_Test extends PHPUnit_Framework_TestCase 
-{
+class LC_Page_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
     // {{{ functions
@@ -47,8 +46,7 @@
      * LC_Page::sendRedirect() $B$N%F%9%H%1!<%9(B($B%(%i!<(B).
      */
     /*
-    function testSendRedirect()
-    {
+    function testSendRedirect() {
         $objPage = new LC_Page();
         $result = $objPage->sendRedirect(HTTP_URL);
 
@@ -59,8 +57,7 @@
      * LC_Page::sendRedirect() $B$N%F%9%H%1!<%9(B($B%(%i!<(B).
      */
     /*
-    function testSendRedirectIsFailed()
-    {
+    function testSendRedirectIsFailed() {
         $objPage = new LC_Page();
         $result = $objPage->sendRedirect("http://www.example.org");
 
@@ -71,8 +68,7 @@
     /**
      * LC_Page::getToken() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetToken()
-    {
+    function testGetToken() {
         $objPage = new LC_Page();
 
         $objPage->setTokenTo();
@@ -88,8 +84,7 @@
     /**
      * LC_Page::getLocation() $B$N%F%9%H%1!<%9(B.
      */
-    function testGetLocation()
-    {
+    function testGetLocation() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
         $url = $objPage->getLocation("/abouts/index.php");
@@ -103,8 +98,7 @@
      *
      * $B ＠ dBP%Q%9(B
      */
-    function testGetLocationWithFullPath()
-    {
+    function testGetLocationWithFullPath() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
         $url = $objPage->getLocation(ROOT_URLPATH . 'abouts/index.php');
@@ -118,8 +112,7 @@
      *
      * QueryString $BIUM?(B
      */
-    function testGetLocationWithQueryString()
-    {
+    function testGetLocationWithQueryString() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
 
@@ -135,8 +128,7 @@
      *
      * HTTPS_URL $B;HMQ(B
      */
-    function testGetLocationUseSSL()
-    {
+    function testGetLocationUseSSL() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
 
@@ -152,8 +144,7 @@
      *
      * DocumentRoot $B;XDj(B
      */
-    function testGetLocationWithDocumentRoot()
-    {
+    function testGetLocationWithDocumentRoot() {
         $objPage = new LC_Page();
         $documentRoot = realpath(dirname(__FILE__) . "/../../../html");
 

$BJQ99(B: branches/version-2_12-dev/test/class/page/Page_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/page/Page_AllTests.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/page/Page_AllTests.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,11 +32,9 @@
  * @author Kentaro Ohkouchi
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class Page_AllTests extends PHPUnit_Framework_TestCase 
-{
+class Page_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('Page');
         $suite->addTestSuite('LC_Page_Test');
         return $suite;

$BJQ99(B: branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,24 +32,20 @@
  * @author Kentaro Ohkouchi
  * @version $Id$
  */
-class LC_Page_Shopping_LoadPaymentModule_Test extends PHPUnit_Framework_TestCase 
-{
+class LC_Page_Shopping_LoadPaymentModule_Test extends PHPUnit_Framework_TestCase {
 
-    function setUp()
-    {
+    function setUp() {
         $this->objQuery =& SC_Query::getSingletonInstance();
         $this->objQuery->begin();
         $this->objPage = new LC_Page_Shopping_LoadPaymentModule();
     }
 
-    function tearDown()
-    {
+    function tearDown() {
         $this->objQuery->rollback();
         $this->objPage = null;
     }
 
-    function testGetOrderIdBySession()
-    {
+    function testGetOrderIdBySession() {
         $_SESSION['order_id'] = 1;
         $_GET['order_id'] = 2;
         $_POST['order_id'] = 3;
@@ -60,8 +56,7 @@
         $this->verify();
     }
 
-    function testGetOrderIdByPOST()
-    {
+    function testGetOrderIdByPOST() {
         $_GET['order_id'] = 1;
         $_POST['order_id'] = 1;
 
@@ -71,8 +66,7 @@
         $this->verify();
     }
 
-    function testGetOrderIdByGET()
-    {
+    function testGetOrderIdByGET() {
         $_GET['order_id'] = 2;
 
         $this->expected = $_GET['order_id'];
@@ -81,13 +75,11 @@
         $this->verify();
     }
 
-    function testGetOrderIdIsNull()
-    {
+    function testGetOrderIdIsNull() {
         $this->assertFalse($this->objPage->getOrderId());
     }
 
-    function testGetModulePath()
-    {
+    function testGetModulePath() {
         $order_id = 10000;
         $payment_id = 10000;
         $module_path = __FILE__;
@@ -99,8 +91,7 @@
         $this->verify();
     }
 
-    function testGetModulePathIsFailure()
-    {
+    function testGetModulePathIsFailure() {
         $order_id = 10000;
         $payment_id = 10000;
         $module_path = 'aaa';
@@ -112,13 +103,11 @@
 
     }
 
-    function verify()
-    {
+    function verify() {
         $this->assertEquals($this->expected, $this->actual);
     }
 
-    function setPayment($order_id, $payment_id, $module_path)
-    {
+    function setPayment($order_id, $payment_id, $module_path) {
         $this->objQuery->insert('dtb_order', array('order_id' => $order_id,
                                                    'customer_id' => (int) 0,
                                                    'payment_id' => $payment_id,

$BJQ99(B: branches/version-2_12-dev/test/class/util/SC_Utils_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/util/SC_Utils_Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/util/SC_Utils_Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,8 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class SC_Utils_Test extends PHPUnit_Framework_TestCase 
-{
+class SC_Utils_Test extends PHPUnit_Framework_TestCase {
 
     // }}}
     // {{{ functions
@@ -43,8 +42,7 @@
      *
      * $BJQ49L5$7(B
      */
-    function testGetRealURL_$BJQ49L5$7(B()
-    {
+    function testGetRealURL_$BJQ49L5$7(B() {
         $url = "http://www.example.jp/admin/index.php";
 
         $expected = "http://www.example.jp:/admin/index.php";
@@ -53,8 +51,7 @@
         $this->assertEquals($expected, $actual);
     }
 
-    function testGetRealURL_$BJQ49M-(B()
-    {
+    function testGetRealURL_$BJQ49M-(B() {
         $url = "http://www.example.jp/admin/../index.php";
 
         $expected = "http://www.example.jp:/index.php";
@@ -63,8 +60,7 @@
         $this->assertEquals($expected, $actual);
     }
 
-    function testGetRealURL_$B6u$N%G%#%l%/%H%j(B()
-    {
+    function testGetRealURL_$B6u$N%G%#%l%/%H%j(B() {
         $url = "http://www.example.jp/admin/..///index.php";
 
         $expected = "http://www.example.jp:/index.php";
@@ -73,8 +69,7 @@
         $this->assertEquals($expected, $actual);
     }
 
-    function testGetRealURL_Dot$B$N%G%#%l%/%H%j(B()
-    {
+    function testGetRealURL_Dot$B$N%G%#%l%/%H%j(B() {
         $url = "http://www.example.jp/admin/././../index.php";
 
         $expected = "http://www.example.jp:/index.php";
@@ -83,8 +78,7 @@
         $this->assertEquals($expected, $actual);
     }
 
-    function testIsBlank()
-    {
+    function testIsBlank() {
         $val = "";
         $this->assertTrue(SC_Utils::isBlank($val));
 
@@ -127,8 +121,7 @@
         $this->assertTrue(SC_Utils::isBlank($emptyArray));
     }
 
-    function testIsAbsoluteRealPath()
-    {
+    function testIsAbsoluteRealPath() {
         // for *NIX
         if (strpos(PHP_OS, 'WIN') === false) {
             $unix_absolute = '/usr/local';
@@ -154,8 +147,7 @@
         $this->assertFalse(SC_Utils::isAbsoluteRealPath($empty));
     }
 
-    function testRecursiveMkdir()
-    {
+    function testRecursiveMkdir() {
         $tmp_dir = sys_get_temp_dir();
         $dir = '/foo/bar';
         $results = false;

$BJQ99(B: branches/version-2_12-dev/test/class/util/Util_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/util/Util_AllTests.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/class/util/Util_AllTests.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,11 +32,9 @@
  * @author Kentaro Ohkouchi
  * @version $Id:LC_Page_Test.php 15116 2007-07-23 11:32:53Z nanasess $
  */
-class Util_AllTests extends PHPUnit_Framework_TestCase 
-{
+class Util_AllTests extends PHPUnit_Framework_TestCase {
 
-    public static function suite()
-    {
+    public static function suite() {
         $suite = new PHPUnit_Framework_TestSuite('Util');
         $suite->addTestSuite('SC_Utils_Test');
         return $suite;

$BJQ99(B: branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php
===================================================================
--- branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -87,8 +87,7 @@
 /**
  * EC-CUBE $B$N%F%9%HMQ2q0w%G!<%?$r ＠ 8@.$9$k(B
  */
-class CreateEcCubeCustomerData 
-{
+class CreateEcCubeCustomerData {
 
     /** SC_Query $B%$%s%9%?%s%9(B */
     var $objQuery;
@@ -96,8 +95,7 @@
     /**
      * $B%3%s%9%H%i%/%?(B.
      */
-    function CreateEcCubeCustomerData()
-    {
+    function CreateEcCubeCustomerData() {
         $this->objQuery = new SC_Query();
     }
 
@@ -106,8 +104,7 @@
      *
      * @return void
      */
-    function createCustomers()
-    {
+    function createCustomers() {
         lfPrintLog("createCustomers START.(" . CUSTOMERS_VOLUME . " data)");
         for ($i = 0; $i < CUSTOMERS_VOLUME; $i++) {
             lfPrintLog("----------");
@@ -161,8 +158,7 @@
 }
 
 /** $B%F%9%HMQ%9%/%j%W%H$N%m%0=PNO4X?t(B */
-function lfPrintLog($mess)
-{
+function lfPrintLog($mess) {
     $path = DATA_REALDIR . "logs/" .  basename(__FILE__, '.php') . ".log";
     GC_Utils::gfPrintLog($mess, $path);
 }

$BJQ99(B: branches/version-2_12-dev/test/createEcCubeData-v25.php
===================================================================
--- branches/version-2_12-dev/test/createEcCubeData-v25.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/test/createEcCubeData-v25.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -86,8 +86,7 @@
 /**
  * EC-CUBE $B$N%G!<%?$r ＠ 8@.$9$k(B
  */
-class CreateEcCubeData 
-{
+class CreateEcCubeData {
 
     /** SC_Query $B%$%s%9%?%s%9(B */
     var $objQuery;
@@ -113,8 +112,7 @@
     /**
      * $B%3%s%9%H%i%/%?(B.
      */
-    function CreateEcCubeData()
-    {
+    function CreateEcCubeData() {
         $this->objQuery = new SC_Query();
 
         // $B%3%^%s%I%i%$%s0z?t(B --delete
@@ -138,8 +136,7 @@
      *                            |- $B>.%+%F%4%j(B
      * @return void
      */
-    function createCategories()
-    {
+    function createCategories() {
 
         print("$B%+%F%4%j$r ＠ 8@.$7$F$$$^$9(B...\n");
 
@@ -213,8 +210,7 @@
      *
      * @return void
      */
-    function createClassData()
-    {
+    function createClassData() {
         // $B5,3J%G!<%?@8 ＠ .(B
         print("$B5,3J%G!<%?$r ＠ 8@.$7$F$$$^$9(B...\n");
 
@@ -253,8 +249,7 @@
      *
      * @return void
      */
-    function relateClass()
-    {
+    function relateClass() {
 
         print("$B>&IJ$H5,3J$N4XO"$E$1$r9T$$$^$9(B...\n");
 
@@ -273,8 +268,7 @@
      *
      * @return void
      */
-    function createProducts()
-    {
+    function createProducts() {
 
         print("$B>&IJ$r ＠ 8@.$7$F$$$^$9(B...\n");
 
@@ -313,8 +307,7 @@
      * @param $class_name string $B5,3JL>(B
      * @return void
      */
-    function createClass($class_name)
-    {
+    function createClass($class_name) {
         $sqlval = array();
         $arrRaw = array();
         // class_id$B$r<hF@(B
@@ -342,8 +335,7 @@
      * @param $classcategory_name string $B5,3JL>(B
      * @return void
      */
-    function createClassCategory($classcategory_name, $class_id, $class_name)
-    {
+    function createClassCategory($classcategory_name, $class_id, $class_name) {
         $sqlval = array();
         $arrRaw = array();
         $sqlval['classcategory_id'] = $this->objQuery->nextVal('dtb_classcategory_classcategory_id');
@@ -382,8 +374,7 @@
      * @param integer $product_id $B>&IJ(BID
      * @return void
      */
-    function createProductsClass($product_id)
-    {
+    function createProductsClass($product_id) {
 
         printf("$B>&IJ(BID %d $B$N>&IJ5,3J$r ＠ 8@.$7$F$$$^$9(B...\n", $product_id);
 
@@ -427,8 +418,7 @@
      *
      * @return void
      */
-    function relateProductsCategories()
-    {
+    function relateProductsCategories() {
 
         print("$B>&IJ$H%+%F%4%j$N4XO"$E$1$r9T$$$^$9(B...\n");
 
@@ -447,8 +437,7 @@
      * @param array $arrCategory_id $B%+%F%4%j(BID $B$NG[Ns(B
      * @return void
      */
-    function createProductsCategories($arrCategory_id, $category_name)
-    {
+    function createProductsCategories($arrCategory_id, $category_name) {
 
         $count = 0;
         printf("%s $B$N>&IJ%+%F%4%j$r ＠ 8@.$7$F$$$^$9(B...\n", $category_name);
@@ -678,8 +667,7 @@
     /**
     * $BAm%+%F%4%j?t$r7W;;$7!"(Bdtb_category$B$KBeF~$9$k(Brank$B$K;H$&(B
     */
-    function lfGetTotalCategoryrank($existingMaxRank = 0)
-    {
+    function lfGetTotalCategoryrank($existingMaxRank = 0){
         $TotalCategoryrank = (TOP_CATEGORIES_VOLUME * MIDDLE_CATEGORIES_VOLUME * SMALL_CATEGORIES_VOLUME) + (MIDDLE_CATEGORIES_VOLUME * TOP_CATEGORIES_VOLUME) + TOP_CATEGORIES_VOLUME + $existingMaxRank;
         return $TotalCategoryrank;
     }

$BJQ99(B: branches/version-2_12-dev/tests/class/Common_TestCase.php
===================================================================
--- branches/version-2_12-dev/tests/class/Common_TestCase.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/Common_TestCase.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -13,8 +13,7 @@
  * SC_Query$B$N%F%9%H0J30$O4pK\E*$K$3$N%/%i%9$r7Q>5$7$F:n ＠ .$7$F$/$@$5$$!#(B
  *
  */
-class Common_TestCase extends PHPUnit_Framework_TestCase
-{
+class Common_TestCase extends PHPUnit_Framework_TestCase {
 
   /** SC_Query $B%$%s%9%?%s%9(B */
   protected $objQuery;
@@ -24,14 +23,12 @@
   /** $B<B:]$NCM(B */
   protected $actual;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     $this->objQuery = SC_Query_Ex::getSingletonInstance();
     $this->objQuery->begin();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     $this->objQuery->rollback();
     $this->objQuery = null;
   }
@@ -40,8 +37,7 @@
    * $B3F%F%9%H(Bfunction$B$NKvHx$G8F$S=P$7!"4|BTCM$H<B:]$NCM$NHf3S$r9T$$$^$9!#(B
    * $B8F$S=P$9A0$K!"(B$expected$B$K4|BTCM$r!"(B$actual$B$K<B:]$NCM$rF3F~$7$F$/$@$5$$!#(B
    */
-  protected function verify($message = null)
-  {
+  protected function verify($message = null) {
     $this->assertEquals($this->expected, $this->actual, $message);
   }
 
@@ -53,8 +49,7 @@
    * actionExit()$B8F$S=P$7$r=q$-49$($F(Bexit()$B$5$;$J$$Nc$G$9!#(B
    */
   /**
-  public function testExit()
-  {
+  public function testExit() {
     $resp = new SC_Response_Ex();
     $resp->actionExit();
 
@@ -68,8 +63,7 @@
    * $BC<Kv<oJL$r%F%9%H%1!<%9$+$i<+M3$K ＠ _Dj$9$kNc$G$9!#(B
    */
   /**
-  public function testDeviceType()
-  {
+  public function testDeviceType() {
     $this->expected = array(DEVICE_TYPE_MOBILE, DEVICE_TYPE_SMARTPHONE);
     $this->actual = array();
 
@@ -87,8 +81,7 @@
    * $B%m%0%$%s>uBV$r%F%9%H%1!<%9$+$i<+M3$K ＠ Z$jBX$($kNc$G$9!#(B
    */
   /**
-  public function testLoginState()
-  {
+  public function testLoginState() {
     $this->expected = array(FALSE, TRUE);
     $this->actual = array();
 

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,40 +24,34 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_AccessorTest extends Common_TestCase
-{
+class SC_Date_AccessorTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex('2010','2014');
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetStartYear_startYear$B$NCM$r<hF@$9$k(B()
-    {
+    public function testGetStartYear_startYear$B$NCM$r<hF@$9$k(B() {
         $this->expected = '2010';
         $this->actual = $this->objDate->getStartYear();
 
         $this->verify("StartYear");
     }
 
-    public function testGetEndYear_endYear$B$NCM$r<hF@$9$k(B()
-    {
+    public function testGetEndYear_endYear$B$NCM$r<hF@$9$k(B() {
         $this->expected = '2014';
         $this->actual = $this->objDate->getEndYear();
 
         $this->verify("EndYear");
     }
 
-    public function testsetMonth_month$B$NCM$r ＠ _Dj$9$k(B()
-    {
+    public function testsetMonth_month$B$NCM$r ＠ _Dj$9$k(B() {
         $this->expected = '9';
         $this->objDate->setMonth('9');
         $this->actual = $this->objDate->month;
@@ -65,8 +59,7 @@
         $this->verify("Month");
     }
     
-    public function testsetDay_day$B$NCM$r ＠ _Dj$9$k(B()
-    {
+    public function testsetDay_day$B$NCM$r ＠ _Dj$9$k(B() {
         $this->expected = '28';
         $this->objDate->setDay('28');
         $this->actual = $this->objDate->day;

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,56 +24,48 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getDayTest extends Common_TestCase
-{
+class SC_Date_getDayTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetDay_$BMWAG$N?t$,(B31$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetDay_$BMWAG$N?t$,(B31$B$NG[Ns$rJV$9(B() {
         $this->expected = 31;
         $this->actual = count($this->objDate->getDay());
 
         $this->verify("$BG[Ns$ND9$5(B");
     }
 
-    public function testGetDay_$BMWAG$N:GDcCM$,(B1$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetDay_$BMWAG$N:GDcCM$,(B1$B$NG[Ns$rJV$9(B() {
         $this->expected = 1;
         $this->actual = min($this->objDate->getDay());
 
         $this->verify("$BG[Ns$N:GDcCM(B");
     }
 
-    public function testGetDay_$BMWAG$N:GBgCM$,(B31$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetDay_$BMWAG$N:GBgCM$,(B31$B$NG[Ns$rJV$9(B() {
         $this->expected = 31;
         $this->actual = max($this->objDate->getDay());
 
         $this->verify("$BG[Ns$N:GBgCM(B");
     }
 
-    public function testGetDay_TRUE$B$rM?$($?>l9gMWAG$N?t$,(B32$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetDay_TRUE$B$rM?$($?>l9gMWAG$N?t$,(B32$B$NG[Ns$rJV$9(B() {
         $this->expected = 32;
         $this->actual = count($this->objDate->getDay(true));
 
         $this->verify("$B%G%U%)%k%H$r ＠ _Dj$7$?G[Ns$ND9$5(B");
     }
 
-    public function testGetDay_TRUE$B$rM?$($?>l9g!<!<4^$^$l$k$NG[Ns$rJV$9(B()
-    {
+    public function testGetDay_TRUE$B$rM?$($?>l9g!<!<4^$^$l$k$NG[Ns$rJV$9(B() {
         $result = in_array('--', $this->objDate->getDay(true));
 
         $this->assertTrue($result, "$B%G%U%)%k%H$NCM(B");

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,40 +24,34 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getHourTest extends Common_TestCase
-{
+class SC_Date_getHourTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetHour_24$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetHour_24$B$NG[Ns$rJV$9(B() {
         $this->expected = 24;
         $this->actual = count($this->objDate->getHour());
 
         $this->verify("$BG[Ns$ND9$5(B");
     }
 
-    public function testGetHour_$BMWAG$N:GDcCM$,(B0$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetHour_$BMWAG$N:GDcCM$,(B0$B$NG[Ns$rJV$9(B() {
         $this->expected = 0;
         $this->actual = min($this->objDate->getHour());
 
         $this->verify("$BG[Ns$N:GDcCM(B");
     }
 
-    public function testGetHour_$BMWAG$N:GBgCM$,(B23$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetHour_$BMWAG$N:GBgCM$,(B23$B$NG[Ns$rJV$9(B() {
         $this->expected = 23;
         $this->actual = max($this->objDate->getHour());
 

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,24 +24,20 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getMinutesIntervalTest extends Common_TestCase
-{
+class SC_Date_getMinutesIntervalTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetMinutesInterval_$BMWAG$,(B00$B$H(B30$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMinutesInterval_$BMWAG$,(B00$B$H(B30$B$NG[Ns$rJV$9(B() {
         $this->expected = array('00'=>'00', '30'=>'30');
         $this->actual = $this->objDate->getMinutesInterval();
 

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,40 +24,34 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getMinutesTest extends Common_TestCase
-{
+class SC_Date_getMinutesTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetMinutes_$BMWAG$N?t$,(B60$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMinutes_$BMWAG$N?t$,(B60$B$NG[Ns$rJV$9(B() {
         $this->expected = 60;
         $this->actual = count($this->objDate->getMinutes());
 
         $this->verify("$BG[Ns$ND9$5(B");
     }
 
-    public function testGetMinutes_$BMWAG$N:GDcCM$,(B0$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMinutes_$BMWAG$N:GDcCM$,(B0$B$NG[Ns$rJV$9(B() {
         $this->expected = 0;
         $this->actual = min($this->objDate->getMinutes());
 
         $this->verify("$BG[Ns$N:GDcCM(B");
     }
 
-    public function testGetMinutes_$BMWAG$N:GBgCM$,(B59$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMinutes_$BMWAG$N:GBgCM$,(B59$B$NG[Ns$rJV$9(B() {
         $this->expected = 59;
         $this->actual = max($this->objDate->getMinutes());
 

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,56 +24,48 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getMonthTest extends Common_TestCase
-{
+class SC_Date_getMonthTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetMonth_$BMWAG$N?t$,(B12$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMonth_$BMWAG$N?t$,(B12$B$NG[Ns$rJV$9(B() {
         $this->expected = 12;
         $this->actual = count($this->objDate->getMonth());
 
         $this->verify("$BG[Ns$ND9$5(B");
     }
 
-    public function testGetMonth_$BMWAG$N:GDcCM$,(B1$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMonth_$BMWAG$N:GDcCM$,(B1$B$NG[Ns$rJV$9(B() {
         $this->expected = 1;
         $this->actual = min($this->objDate->getMonth());
 
         $this->verify("$BG[Ns$N:GDcCM(B");
     }
 
-    public function testGetMonth_$BMWAG$N:GBgCM$,(B12$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMonth_$BMWAG$N:GBgCM$,(B12$B$NG[Ns$rJV$9(B() {
         $this->expected = 12;
         $this->actual = max($this->objDate->getMonth());
 
         $this->verify("$BG[Ns$N:GBgCM(B");
     }
 
-    public function testGetMonth_TRUE$B$rM?$($?>l9gMWAG$N?t$,(B13$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetMonth_TRUE$B$rM?$($?>l9gMWAG$N?t$,(B13$B$NG[Ns$rJV$9(B() {
         $this->expected = 13;
         $this->actual = count($this->objDate->getMonth(true));
 
         $this->verify("$B%G%U%)%k%H$r ＠ _Dj$7$?G[Ns$ND9$5(B");
     }
 
-    public function testGetMonth_TRUE$B$rM?$($?>l9g!<!<4^$^$l$k$NG[Ns$rJV$9(B()
-    {
+    public function testGetMonth_TRUE$B$rM?$($?>l9g!<!<4^$^$l$k$NG[Ns$rJV$9(B() {
         $result = in_array('--', $this->objDate->getMonth(true));
 
         $this->assertTrue($result, "$B%G%U%)%k%H$NCM(B");

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,48 +24,41 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getYearTest extends Common_TestCase
-{
+class SC_Date_getYearTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
   
-    public function testGetYear_$BMWAG$N?t$,(B4$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$BMWAG$N?t$,(B4$B$NG[Ns$rJV$9(B() {
         $this->expected = 4;
         $this->actual = count($this->objDate->getYear());
 
         $this->verify("$BG[Ns$ND9$5(B");
     }
     
-    public function testGetYear_$B:G>.CM$,:#G/$NG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B:G>.CM$,:#G/$NG[Ns$rJV$9(B() {
         $this->expected = DATE('Y');
         $this->actual = min($this->objDate->getYear());
 
         $this->verify("$B:G>.CM!(:#G/(B");
     }
     
-    public function testGetYear_$B:GDcCM$,0z?t$NG/$NG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B:GDcCM$,0z?t$NG/$NG[Ns$rJV$9(B() {
         $this->expected = '2007';
         $this->actual = min($this->objDate->getYear('2007'));
 
         $this->verify("$B0z?t$,:GDcCM(B");
     }
     
-    public function testGetYear_$B:GDcCM$,%a%s%P!<JQ?t$NG/$NG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B:GDcCM$,%a%s%P!<JQ?t$NG/$NG[Ns$rJV$9(B() {
         $this->expected = '2004';
         $this->objDate->setStartYear('2004');
         $this->actual = min($this->objDate->getYear());
@@ -73,16 +66,14 @@
         $this->verify("$B%a%s%P!<JQ?t$,:GDcCM(B");
     }
     
-    public function testGetYear_$B:GBgCM$,(B3$BG/8e$NG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B:GBgCM$,(B3$BG/8e$NG[Ns$rJV$9(B() {
         $this->expected = DATE('Y')+3;
         $this->actual = max($this->objDate->getYear());
 
         $this->verify("$B:GBgCM!((B3$BG/8e(B");
     }
     
-    public function testGetYear_$B:GBgCM$,%a%s%PJQ?t$NG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B:GBgCM$,%a%s%PJQ?t$NG[Ns$rJV$9(B() {
         $this->expected = '2020';
         $this->objDate->setEndYear('2020');
         $this->actual = max($this->objDate->getYear());
@@ -90,14 +81,12 @@
         $this->verify("$B%a%s%P!<JQ?t$,:GBgCM(B");
     }
     
-    public function testGetYear_$B%G%U%)%k%HCM$,4^$^$l$kG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B%G%U%)%k%HCM$,4^$^$l$kG[Ns$rJV$9(B() {
         $result = in_array('----', $this->objDate->getYear(DATE('Y'), TRUE));
         $this->assertTrue($result, "$B%G%U%)%k%HCM(B");
     }
     
-    public function testGetYear_$B%G%U%)%k%HCM$N0z?t$KG/$r;XDj$7$?G[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B%G%U%)%k%HCM$N0z?t$KG/$r;XDj$7$?G[Ns$rJV$9(B() {
         $year = date('Y');
         $this->expected = array( $year => $year, $year+1 => $year+1
                                , '----' => '----'
@@ -106,8 +95,7 @@
         $this->assertSame($this->expected, $this->actual, "$B%G%U%)%k%HCM(B");
     }
 
-    public function testGetYear_$B0z?t$K;XDj$7$?%-!<$,%G%U%)%k%HCM$H$J$kG[Ns$rJV$9(B()
-    {
+    public function testGetYear_$B0z?t$K;XDj$7$?%-!<$,%G%U%)%k%HCM$H$J$kG[Ns$rJV$9(B() {
         $this->expected = 'default';
         $return = $this->objDate->getYear(DATE('Y'), TRUE, 'default');
         $this->actual = array_search('----', $return);

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,32 +24,27 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getZeroMonthTest extends Common_TestCase
-{
+class SC_Date_getZeroMonthTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetZeroMonth_$BMWAG$N?t$,(B12$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroMonth_$BMWAG$N?t$,(B12$B$NG[Ns$rJV$9(B() {
         $this->expected = 12;
         $this->actual = count($this->objDate->getZeroMonth());
 
         $this->verify("$BG[Ns$ND9$5(B");
     }
 
-    public function testGetZeroMonth_0$B$r$D$1$?7n$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroMonth_0$B$r$D$1$?7n$NG[Ns$rJV$9(B() {
         $this->expected = array('01'=>'01','02'=>'02','03'=>'03'
                                 ,'04'=>'04','05'=>'05','06'=>'06'
                                 ,'07'=>'07','08'=>'08','09'=>'09'

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,46 +24,39 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Date_getZeroYearTest extends Common_TestCase
-{
+class SC_Date_getZeroYearTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objDate = new SC_Date_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
   
-    public function testGetZeroYear_$BMWAG$N?t$,(B4$B$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroYear_$BMWAG$N?t$,(B4$B$NG[Ns$rJV$9(B() {
         $this->expected = 4;
         $this->actual = count($this->objDate->getZeroYear());
         $this->verify("$BG[Ns$ND9$5(B");
     }
     
-    public function testGetZeroYear_$B:G>.CM$,(B2$B7eI=5-$N:#G/$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroYear_$B:G>.CM$,(B2$B7eI=5-$N:#G/$NG[Ns$rJV$9(B() {
         $this->expected = DATE('y');
         $this->actual = min($this->objDate->getZeroYear());
         $this->verify("$B:G>.CM!(:#G/(B");
     }
     
-    public function testGetZeroYear_$B:GDcCM$,0z?t$NG/$N(B2$B7eI=5-$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroYear_$B:GDcCM$,0z?t$NG/$N(B2$B7eI=5-$NG[Ns$rJV$9(B() {
         $this->expected = '07';
         $this->actual = min($this->objDate->getZeroYear('2007'));
 
         $this->verify("$B0z?t$,:GDcCM(B");
     }
     
-    public function testGetZeroYear_$B:GDcCM$,%a%s%P!<JQ?t$NG/$N(B2$B7eI=5-$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroYear_$B:GDcCM$,%a%s%P!<JQ?t$NG/$N(B2$B7eI=5-$NG[Ns$rJV$9(B() {
         $this->expected = '04';
         $this->objDate->setStartYear('2004');
         $this->actual = min($this->objDate->getZeroYear());
@@ -71,16 +64,14 @@
         $this->verify("$B%a%s%P!<JQ?t$,:GDcCM(B");
     }
     
-    public function testGetZeroYear_$B:GBgCM$,(B3$BG/8e$N(B2$B7eI=5-$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroYear_$B:GBgCM$,(B3$BG/8e$N(B2$B7eI=5-$NG[Ns$rJV$9(B() {
         $this->expected = DATE('y')+3;
         $this->actual = max($this->objDate->getZeroYear());
 
         $this->verify("$B:GBgCM!((B3$BG/8e(B");
     }
     
-    public function testGetZeroYear_$B:GBgCM$,%a%s%PJQ?t$N(B2$B7eI=5-$NG[Ns$rJV$9(B()
-    {
+    public function testGetZeroYear_$B:GBgCM$,%a%s%PJQ?t$N(B2$B7eI=5-$NG[Ns$rJV$9(B() {
         $this->expected = '20';
         $this->objDate->setEndYear('2020');
         $this->actual = max($this->objDate->getZeroYear());

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,23 +5,19 @@
 /**
  *
  */
-class SC_Product_TestBase extends Common_TestCase
-{
-    protected function setUp()
-    {
+class SC_Product_TestBase extends Common_TestCase {
+    protected function setUp() {
         parent::setUp();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /**
      * DB$B$K>&IJ%/%i%9>pJs$r ＠ _Dj$7$^$9(B.
      */
-    protected function setUpProductClass()
-    {
+    protected function setUpProductClass() {
         $product_class = array(
             array(
                 'update_date' => 'CURRENT_TIMESTAMP',
@@ -62,8 +58,7 @@
                                );
 
         $this->objQuery->delete('dtb_products_class');
-        foreach ($product_class as $key => $item)
-{
+        foreach ($product_class as $key => $item) {
             $this->objQuery->insert('dtb_products_class', $item);
         }
         $this->setUpClassCategory();
@@ -73,8 +68,7 @@
     /**
      * DB$B$K@=IJ%+%F%4%j>pJs$rEPO?$7$^$9(B.
      */
-    protected function setUpClassCategory()
-    {
+    protected function setUpClassCategory() {
         $class_category = array(
             array(
                 'update_date' => 'CURRENT_TIMESTAMP',
@@ -101,8 +95,7 @@
     /** 
      * DB$B$K@=IJ>pJs$rEPO?$7$^$9(B.
      */
-    protected function setUpProducts()
-    {
+    protected function setUpProducts() {
         $products = array(
             array(
                 'update_date' => 'CURRENT_TIMESTAMP',
@@ -162,8 +155,7 @@
     /**
      * DB$B$K>&IJ%9%F!<%?%9>pJs$rEPO?$7$^$9(B.
      */
-    protected function setUpProductStatus()
-    {
+    protected function setUpProductStatus() {
         $class_category = array(
             array(
                 'update_date' => 'CURRENT_TIMESTAMP',

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_findProductCountTest extends SC_Product_TestBase
-{
+class SC_Product_findProductCountTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testFindProductCount_$B$9$Y$F$N>&IJ?t$rJV$9(B()
-    {
+    public function testFindProductCount_$B$9$Y$F$N>&IJ?t$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -34,8 +30,7 @@
         $this->verify('$B>&IJ?t(B');
     }
     
-    public function testFindProductCount_$B8!:w>r7o$K0lCW$9$k>&IJ?t$rJV$9(B()
-    {
+    public function testFindProductCount_$B8!:w>r7o$K0lCW$9$k>&IJ?t$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_findProductsOrderTest extends SC_Product_TestBase
-{
+class SC_Product_findProductsOrderTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testFindProductIdsOrder_$B>&IJ(BID$B9_=g(B()
-    {
+    public function testFindProductIdsOrder_$B>&IJ(BID$B9_=g(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -36,8 +32,7 @@
         $this->verify('$B>&IJ(BID$B9_=g(B');
     }
 
-    public function testFindProductIdsOrder_$B>&IJL>>:=g(B()
-    {
+    public function testFindProductIdsOrder_$B>&IJL>>:=g(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -51,8 +46,7 @@
         $this->verify('$B>&IJ(BID$B>:=g(B');
     }
     
-    public function testFindProductIdsOrder_arrOrderData$B$N ＠ _Dj$K$h$kJB$S=g(B()
-    {
+    public function testFindProductIdsOrder_arrOrderData$B$N ＠ _Dj$K$h$kJB$S=g(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getBuyLimitTest extends SC_Product_TestBase
-{
+class SC_Product_getBuyLimitTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetBuyLimit_$B>&IJ?tL58B$N>l9gHNGd@)8B$J$7(B()
-    {
+    public function testGetBuyLimit_$B>&IJ?tL58B$N>l9gHNGd@)8B$J$7(B() {
         
         $product = array('stock_unlimited' => '1'
                         ,'sale_limit' => null
@@ -33,8 +29,7 @@
         $this->verify('$BHNGd@)8B$J$7(B');
     }
     
-    public function testGetBuyLimit_$B>&IJHNGd?t@)8B?t$rJV$9(B()
-    {
+    public function testGetBuyLimit_$B>&IJHNGd?t@)8B?t$rJV$9(B() {
         
         $product = array('stock_unlimited' => '1'
                         ,'sale_limit' => 3
@@ -45,8 +40,7 @@
         $this->verify('$BHNGd?t@)8B(B');
     }
     
-    public function testGetBuyLimit_$B>&IJ:_8K?t$r@)8B$H$7$FJV$9(B()
-    {
+    public function testGetBuyLimit_$B>&IJ:_8K?t$r@)8B$H$7$FJV$9(B() {
         
         $product = array('stock_unlimited' => null
                         ,'sale_limit' => null
@@ -57,8 +51,7 @@
         $this->verify('$B:_8K?t@)8B(B');
     }
 
-    public function testGetBuyLimit_$BHNGd@)8B?tBg$J$j:_8K?t$J$i:_8K?t$rJV$9(B()
-    {
+    public function testGetBuyLimit_$BHNGd@)8B?tBg$J$j:_8K?t$J$i:_8K?t$rJV$9(B() {
         
         $product = array('stock_unlimited' => null
                         ,'sale_limit' => 5
@@ -69,8 +62,7 @@
         $this->verify('$BHNGd?t!d:_8K?t@)8B(B');
     }
     
-    public function testGetBuyLimit_$BHNGd@)8B?t>/$J$j:_8K?t$J$iHNGd@)8B?t(B()
-    {
+    public function testGetBuyLimit_$BHNGd@)8B?t>/$J$j:_8K?t$J$iHNGd@)8B?t(B() {
         
         $product = array('stock_unlimited' => null
                         ,'sale_limit' => 5

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getDetailAndProductsClassTest extends SC_Product_TestBase
-{
+class SC_Product_getDetailAndProductsClassTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetDetailAndProductsClass_$B>&IJ5,3J(BID$B$N>&IJ>pJs$H5,3J>pJs$rJV$9(B()
-    {
+    public function testGetDetailAndProductsClass_$B>&IJ5,3J(BID$B$N>&IJ>pJs$H5,3J>pJs$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -53,10 +49,10 @@
                 ,'status' => '1'
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
                 ,'maker_id' => null
                 ,'comment4' => null
                 ,'comment5' => null

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getDetailTest extends SC_Product_TestBase
-{
+class SC_Product_getDetailTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetDetail_$B>&IJ(BID$B$N>\:Y>pJs$rJV$9(B()
-    {
+    public function testGetDetail_$B>&IJ(BID$B$N>\:Y>pJs$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -53,10 +49,10 @@
                 ,'status' => '1'
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
                 ,'maker_id' => null
                 ,'comment4' => null
                 ,'comment5' => null

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getListsByProductIdsTest extends SC_Product_TestBase
-{
+class SC_Product_getListsByProductIdsTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetListByProductIds_$B>&IJ(BID$B;XDj$,$J$$>l9g$O6uG[Ns(B()
-    {
+    public function testGetListByProductIds_$B>&IJ(BID$B;XDj$,$J$$>l9g$O6uG[Ns(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -34,8 +30,7 @@
         $this->verify('$B>&IJ(BID$B;XDj$J$7(B');
     }
     
-    public function testGetListByProductIds_$B;XDj$N>&IJ(BID$B$G>pJs$r<hF@$9$k(B()
-    {
+    public function testGetListByProductIds_$B;XDj$N>&IJ(BID$B$G>pJs$r<hF@$9$k(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -68,10 +63,10 @@
                 ,'status' => '1'
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
             )
         );
 

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getProductStatusTest extends SC_Product_TestBase
-{
+class SC_Product_getProductStatusTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetProductStatus_$B>&IJ(BID$B$J$7$O6u$NG[Ns$rJV$9(B()
-    {
+    public function testGetProductStatus_$B>&IJ(BID$B$J$7$O6u$NG[Ns$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -36,8 +32,7 @@
         $this->verify('$B6u$NG[Ns(B');
     }
     
-    public function testGetProductStatus_$B;XDj$7$?>&IJ(BID$B$N>&IJ%9%F!<%?%9$rJV$9(B()
-    {
+    public function testGetProductStatus_$B;XDj$7$?>&IJ(BID$B$N>&IJ%9%F!<%?%9$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getProductsClassByProductIdsTest extends SC_Product_TestBase
-{
+class SC_Product_getProductsClassByProductIdsTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetProductsClassByProductIds_$B>&IJ(BID$B$J$7$O6uG[Ns$rJV$9(B()
-    {
+    public function testGetProductsClassByProductIds_$B>&IJ(BID$B$J$7$O6uG[Ns$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -36,8 +32,7 @@
         $this->verify('$B>&IJ(BID$B;XDj$J$7(B');
     }
     
-    public function testGetProductsClassByProductIds_$B;XDj$N>&IJ(BID$B$N>pJs$rJV$9(B()
-    {
+    public function testGetProductsClassByProductIds_$B;XDj$N>&IJ(BID$B$N>pJs$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -77,8 +72,7 @@
         $this->verify('$B>&IJ(BID$B;XDj(B');
     }
     
-    public function testGetProductsClassByProductIds_$B:o=|>&IJ4^$`>&IJ>pJs$rJV$9(B()
-    {
+    public function testGetProductsClassByProductIds_$B:o=|>&IJ4^$`>&IJ>pJs$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getProductsClassByQueryTest extends SC_Product_TestBase
-{
+class SC_Product_getProductsClassByQueryTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetProductsClassByQuery_$B%/%(%j$K3:Ev$9$k>&IJ>pJs$rJV$9(B()
-    {
+    public function testGetProductsClassByQuery_$B%/%(%j$K3:Ev$9$k>&IJ>pJs$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_getProductsClassTest extends SC_Product_TestBase
-{
+class SC_Product_getProductsClassTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetProductsClass_$B>&IJ5,3J(BID$B$+$i5,3J>pJs$rJV$9(B()
-    {
+    public function testGetProductsClass_$B>&IJ5,3J(BID$B$+$i5,3J>pJs$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_listsTest extends SC_Product_TestBase
-{
+class SC_Product_listsTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testlists_$B>&IJ0lMw<hF@(B()
-    {
+    public function testlists_$B>&IJ0lMw<hF@(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,24 +5,20 @@
 /**
  *
  */
-class SC_Product_reduceStockTest extends SC_Product_TestBase
-{
+class SC_Product_reduceStockTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testReduceStock_$B8:>/?t#0$O(BFalse()
-    {
+    public function testReduceStock_$B8:>/?t#0$O(BFalse() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -35,8 +31,7 @@
         $this->verify('$B8:>/?t#0(B');
     }
     
-    public function testReduceStock_$B8:>/?t(B1$B$O(BTrue()
-    {
+    public function testReduceStock_$B8:>/?t(B1$B$O(BTrue() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -49,8 +44,7 @@
         $this->verify('$B8:>/?t(B1');
     }
     
-    public function testReduceStock_$B:_8K?t$r%^%$%J%9$K$9$k?t$O(BFalse()
-    {
+    public function testReduceStock_$B:_8K?t$r%^%$%J%9$K$9$k?t$O(BFalse() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
@@ -64,8 +58,7 @@
     }
     
         
-    public function testReduceStock_$B:_8K?tL58B$N>l9g$O(BTrue()
-    {
+    public function testReduceStock_$B:_8K?tL58B$N>l9g$O(BTrue() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,30 +5,25 @@
 /**
  *
  */
-class SC_Product_setProductStatusTest extends SC_Product_TestBase
-{
+class SC_Product_setProductStatusTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testSetProductStatus_$BEPO?$7$?>&IJ%9%F!<%?%9$rJV$9(B()
-    {
+    public function testSetProductStatus_$BEPO?$7$?>&IJ%9%F!<%?%9$rJV$9(B() {
         $this->setUpProductClass();
         $this->setUpProducts();
         $this->setUpClassCategory();
         $this->setUpProductStatus();
-        $_SESSION['member_id'] = 1;
-         
+        
         $this->objProducts->setProductStatus('1001', array('2','3','4'));
 
         $this->expected = array('1001'=>array('2','3','4'));

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -5,23 +5,19 @@
 /**
  *
  */
-class SC_Product_setProductsOrderTest extends SC_Product_TestBase
-{
+class SC_Product_setProductsOrderTest extends SC_Product_TestBase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objProducts = new SC_Product_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
-    public function testSetProductsOrder_$B%G%U%)%k%H0z?t(B()
-    {
+    public function testSetProductsOrder_$B%G%U%)%k%H0z?t(B() {
         $this->objProducts->setProductsOrder('name');
 
         $this->actual = $this->objProducts->arrOrderData;
@@ -30,8 +26,7 @@
         $this->verify('$B%G%U%)%k%H0z?t(B');
     }
 
-    public function testSetProductsOrder_$B0z?t;XDj(B()
-    {
+    public function testSetProductsOrder_$B0z?t;XDj(B() {
         $this->objProducts->setProductsOrder('name', 'dtb_products_class', 'DESC');
 
         $this->actual = $this->objProducts->arrOrderData;

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,32 +24,27 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_checkUniqIdTest extends Common_TestCase
-{
+class SC_Session_checkUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testCheckUniqId_POST$BCM$,$J$$>l9g(B_True()
-    {
+    public function testCheckUniqId_POST$BCM$,$J$$>l9g(B_True() {
         $_POST = null;
         $this->expected = true;
         $this->actual = $this->objSiteSession->checkUniqId();
         $this->verify('$B%]%9%HCM6u(B');
     }
     
-    public function testCheckUniqId_POST$B$H%;%C%7%g%s$N(BUniqID$B$,0lCW$9$k>l9g(B_True()
-    {
+    public function testCheckUniqId_POST$B$H%;%C%7%g%s$N(BUniqID$B$,0lCW$9$k>l9g(B_True() {
         $_POST['uniqid'] = '1234567890';
         $_SESSION['site']['uniqid'] = '1234567890';
         
@@ -58,8 +53,7 @@
         $this->verify('$B%f%K!<%/(BID$B0lCW(B');
     }
     
-    public function testCheckUniqId_POST$B$H%;%C%7%g%s$N(BUniqID$B$,0lCW$7$J$$>l9g(B_False()
-    {
+    public function testCheckUniqId_POST$B$H%;%C%7%g%s$N(BUniqID$B$,0lCW$7$J$$>l9g(B_False() {
         $_POST['uniqid'] = '0987654321';
         $_SESSION['site']['uniqid'] = '1234567890';
         

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,32 +24,27 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_getUniqIdTest extends Common_TestCase
-{
+class SC_Session_getUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Mock();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testGetUniqId_$B ＠ _Dj:Q$_$N%f%K!<%/$J(BID$B<hF@$9$k(B()
-    {
+    public function testGetUniqId_$B ＠ _Dj:Q$_$N%f%K!<%/$J(BID$B<hF@$9$k(B() {
         $_SESSION['site']['uniqid'] = '0987654321';
         $this->expected = '0987654321';
         $this->actual = $this->objSiteSession->getUniqId();
         $this->verify('$B%f%K!<%/(BID');
     }
     
-    public function testGetUniqId_$B?7$?$K%f%K!<%/$J(BID$B<hF@$9$k(B()
-    {
+    public function testGetUniqId_$B?7$?$K%f%K!<%/$J(BID$B<hF@$9$k(B() {
         $_SESSION['site']['uniqid'] = '';
         $this->expected = '1234567890';
         $this->actual = $this->objSiteSession->getUniqId();
@@ -57,10 +52,8 @@
     }
 }
 
-class SC_SiteSession_Mock extends SC_SiteSession_Ex
-{
-    function setUniqId()
-    {
+class SC_SiteSession_Mock extends SC_SiteSession_Ex {
+    function setUniqId() {
         $_SESSION['site']['uniqid'] = '1234567890';
     }
 }
\ No newline at end of file

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,24 +24,20 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_getValueTest extends Common_TestCase
-{
+class SC_Session_getValueTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testSetNowPage_$B%;%C%7%g%s$NCM$r<hF@$9$k(B()
-    {
+    public function testSetNowPage_$B%;%C%7%g%s$NCM$r<hF@$9$k(B() {
         $this->expected = $_SERVER['SCRIPT_NAME'];
         $this->actual = $this->objSiteSession->getValue('now_page');
         $this->verify("$B%;%C%7%g%sCM(B");

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,47 +24,40 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_isPrepageTest extends Common_TestCase
-{
+class SC_Session_isPrepageTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testIsPrepage_session$B$,6u$N>l9g(B_false()
-    {
+    public function testIsPrepage_session$B$,6u$N>l9g(B_false() {
         $this->expected = false;
         $this->actual = $this->objSiteSession->isPrepage();
         $this->verify("$B%Z!<%8H=Dj(B");
     }
     
-    public function testIsPrepage_prepage$B$H(Bnowpage$B$,0c$&>l9g(B_false()
-    {
+    public function testIsPrepage_prepage$B$H(Bnowpage$B$,0c$&>l9g(B_false() {
         $this->expected = false;
         $_SESSION['site']['pre_page'] = 'test.php';
         $this->actual = $this->objSiteSession->isPrepage();
         $this->verify("$B%Z!<%8H=Dj(B");
     }
     
-    public function testIsPrepage_prepage$B$H(Bnowpage$B$,F1$8$N>l9g(B_true()
-    {
+    public function testIsPrepage_prepage$B$H(Bnowpage$B$,F1$8$N>l9g(B_true() {
         $this->expected = true;
         $_SESSION['site']['pre_page'] = $_SERVER['SCRIPT_NAME'];
         $this->actual = $this->objSiteSession->isPrepage();
         $this->verify("$B%Z!<%8H=Dj(B");
     }
     
-    public function testIsPrepage_pre_regist_success$B$,(Btrue$B$N>l9g(B_true()
-    {
+    public function testIsPrepage_pre_regist_success$B$,(Btrue$B$N>l9g(B_true() {
         $this->expected = true;
         $_SESSION['site']['pre_page'] = 'test.php';
         $_SESSION['site']['pre_regist_success'] = true;

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,24 +24,20 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_setNowPageTest extends Common_TestCase
-{
+class SC_Session_setNowPageTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testSetNowPage_now_page$B$K%Q%9$r ＠ _Dj$9$k(B()
-    {
+    public function testSetNowPage_now_page$B$K%Q%9$r ＠ _Dj$9$k(B() {
         $this->expected = 'test.php';
         $this->objSiteSession->setNowPage('test.php');
         $this->actual = $_SESSION['site']['now_page'];

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,24 +24,20 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_setRegistFlagTest extends Common_TestCase
-{
+class SC_Session_setRegistFlagTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testSetRegistFlag_TRUE$B$,%;%C%H$5$l$k(B()
-    {
+    public function testSetRegistFlag_TRUE$B$,%;%C%H$5$l$k(B() {
         $this->objSiteSession->setRegistFlag();
         $this->assertTrue($_SESSION['site']['regist_success'],'$BEPO?@.8y%U%i%0(B');
     }

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,24 +24,20 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_setUniqIdTest extends Common_TestCase
-{
+class SC_Session_setUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testSetUniqId_$B%f%K!<%/$J(BID$B ＠ _Dj$9$k(B()
-    {
+    public function testSetUniqId_$B%f%K!<%/$J(BID$B ＠ _Dj$9$k(B() {
         $this->objSiteSession->setUniqId();
         $this->assertNotEmpty($_SESSION['site']['uniqid'], '$B%f%K!<%/(BID');
     }

$BJQ99(B: branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -24,24 +24,20 @@
 $HOME = realpath(dirname(__FILE__)) . "/../../..";
 require_once($HOME . "/tests/class/Common_TestCase.php");
 
-class SC_Session_unsetUniqIdTest extends Common_TestCase
-{
+class SC_Session_unsetUniqIdTest extends Common_TestCase {
 
-    protected function setUp()
-    {
+    protected function setUp() {
         parent::setUp();
         $this->objSiteSession = new SC_SiteSession_Ex();
     }
 
-    protected function tearDown()
-    {
+    protected function tearDown() {
         parent::tearDown();
     }
 
     /////////////////////////////////////////
 
-    public function testUnsetUniqId_uniqID$B$r2r=|$9$k(B()
-    {
+    public function testUnsetUniqId_uniqID$B$r2r=|$9$k(B() {
         $_SESSION['site']['uniqid'] = '1234567890';
         $this->objSiteSession->unsetUniqId();
         $this->assertEmpty($_SESSION['site']['uniqid'], '$B6u$N%f%K!<%/(BID');

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -30,16 +30,13 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_TestBase extends Common_TestCase
-{
+class SC_Helper_Purchase_TestBase extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
@@ -47,8 +44,7 @@
   /**
    * $B%;%C%7%g%s$KG[Aw>pJs$r ＠ _Dj$7$^$9!#(B
    */
-  protected function setUpShipping($shipping)
-  {
+  protected function setUpShipping($shipping) {
     if (!$shipping) {
       $shipping = $this->getSingleShipping(); 
     }
@@ -56,8 +52,7 @@
     $_SESSION['shipping'] = $shipping;
   }
 
-  protected function getSingleShipping()
-  {
+  protected function getSingleShipping() {
     return array(
       '00001' => array(
         'shipment_id' => '00001',
@@ -66,8 +61,7 @@
     );
   }
 
-  protected function getMultipleShipping()
-  {
+  protected function getMultipleShipping() {
     return array(
       '00001' => array(
         'shipment_id' => '00001',
@@ -87,8 +81,7 @@
   /**
    * DB$B$KG[Aw>pJs$r ＠ _Dj$7$^$9!#(B
    */
-  protected function setUpShippingOnDb()
-  {
+  protected function setUpShippingOnDb() {
     $shippings = array(
       array(
         'update_date' => '2000-01-01 00:00:00',
@@ -122,8 +115,7 @@
   /**
    * DB$B$KG[Aw>&IJ>pJs$r ＠ _Dj$7$^$9!#(B
    */
-  protected function setUpShipmentItem()
-  {
+  protected function setUpShipmentItem() {
       $shipping_items = array(
         array(
           'shipping_id' => '1',
@@ -151,8 +143,7 @@
   /**
    * DB$B$K>&IJ%/%i%9>pJs$r ＠ _Dj$7$^$9(B.
    */
-  protected function setUpProductClass()
-  {
+  protected function setUpProductClass() {
       $product_class = array(
         array(
           'update_date' => '2000-01-01 00:00:00',
@@ -165,7 +156,6 @@
           'price01' => '1500',
           'price02' => '1500',
           'creator_id' => '1',
-          'stock' => '100',
           'del_flg' => '0'
         ),
         array(
@@ -175,14 +165,12 @@
           'product_type_id' => '2',
           'price02' => '2500',
           'creator_id' => '1',
-          'stock' => '50',
           'del_flg' => '0'
         )
       );
 
     $this->objQuery->delete('dtb_products_class');
-    foreach ($product_class as $key => $item)
-{
+    foreach ($product_class as $key => $item) {
       $this->objQuery->insert('dtb_products_class', $item);
     }
     $this->setUpClassCategory();
@@ -192,8 +180,7 @@
   /**
    * DB$B$K@=IJ%+%F%4%j>pJs$rEPO?$7$^$9(B.
    */
-  protected function setUpClassCategory()
-  {
+  protected function setUpClassCategory() {
     $class_category = array(
       array(
         'update_date' => '2000-01-01 00:00:00',
@@ -220,8 +207,7 @@
   /** 
    * DB$B$K@=IJ>pJs$rEPO?$7$^$9(B.
    */
- protected function setUpProducts()
- {
+ protected function setUpProducts() {
    $products = array(
      array(
        'update_date' => '2000-01-01 00:00:00',
@@ -250,8 +236,7 @@
  /**
   * DB$B$K;YJ'J}K!$N>pJs$rEPO?$7$^$9(B.
   */
- protected function setUpPaymentOptions()
- {
+ protected function setUpPaymentOptions() {
    $payment_options = array(
      array(
        'deliv_id' => '2001',
@@ -304,8 +289,7 @@
  /**
   * DB$B$KG[Aw6H<T$N>pJs$rEPO?$7$^$9(B.
   */
- protected function setUpDeliv()
- {
+ protected function setUpDeliv() {
    $deliv = array(
      array(  // $B:o=|%U%i%0(BON
        'deliv_id' => '2001',
@@ -351,8 +335,7 @@
  /**
   * DB$B$K$*FO$1;~4V$N>pJs$rEPO?$7$^$9(B.
   */
- protected function setUpDelivTime()
- {
+ protected function setUpDelivTime() {
    $deliv_time = array(
      array(
        'deliv_id' => '1002',
@@ -380,8 +363,7 @@
  /**
   * DB$B$K;YJ'J}K!$N>pJs$rEPO?$7$^$9(B.
   */
- protected function setUpPayment()
- {
+ protected function setUpPayment() {
    $payment = array(
      array(
        'update_date' => '2000-01-01 00:00:00',
@@ -448,8 +430,7 @@
  /**
   * DB$B$K<uCm>pJs$r ＠ _Dj$7$^$9(B.
   */
-  protected function setUpOrder()
-  {
+  protected function setUpOrder() {
     $order = array(
       array(
         'update_date' => '2000-01-01 00:00:00',
@@ -484,8 +465,7 @@
  /**
   * DB$B$K<uCm0l;~>pJs$r ＠ _Dj$7$^$9(B.
   */
-  protected function setUpOrderTemp()
-  {
+  protected function setUpOrderTemp() {
     $order = array(
       array(
         'update_date' => '2000-01-01 00:00:00',
@@ -513,8 +493,7 @@
  /**
   * DB$B$K<uCm>\:Y$r ＠ _Dj$7$^$9(B.
   */
- protected function setUpOrderDetail()
- {
+ protected function setUpOrderDetail() {
    $order_detail = array(
      array(
        'order_detail_id' => '1001',
@@ -564,8 +543,7 @@
  /**
   * DB$B$K8\5R>pJs$r ＠ _Dj$7$^$9!#(B
   */
- protected function setUpCustomer()
- {
+ protected function setUpCustomer() {
    $customer = array(
      array(
        'customer_id' => '1001',

$B:o=|(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,185 +0,0 @@
-<?php
-
-$HOME = realpath(dirname(__FILE__)) . "/../../../..";
-require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * SC_Helper_Purchase::cancelOrder()$B$N%F%9%H%/%i%9(B.
- *
- * @author Hiroko Tamagawa
- * @version $Id$
- */
-class SC_Helper_Purchase_cancelOrderTest extends SC_Helper_Purchase_TestBase
-{
-
-  private $helper;
-
-  protected function setUp()
-  {
-    parent::setUp();
-    $this->setUpProductClass();
-    $this->helper = new SC_Helper_Purchase_cancelOrderMock();
-  }
-
-  protected function tearDown()
-  {
-    parent::tearDown();
-  }
-
-  /////////////////////////////////////////
-  public function testCancelOrder_$B%G%U%)%k%H$N0z?t$G8F$S=P$7$?>l9g(B_$B@=IJ%/%i%9$N%G!<%?$,99?7$5$l$k(B()
-  {
-    $order_id = '1001';
-    $this->objQuery->begin();
-
-    $this->helper->cancelOrder($order_id);
-
-    $this->actual['testResult'] = $_SESSION['testResult'];
-    $this->actual['productClass'] = $this->objQuery->select(
-      'stock', 'dtb_products_class',
-      'product_class_id in (?, ?)', array('1001', '1002')
-    );
-    $this->expected = array(
-      'testResult' => array(
-        'registerOrder' => array(
-          'order_id' => '1001',
-          'params' => array(
-            'status' => ORDER_CANCEL
-          )
-        ),
-        'getOrderDetail' => array(
-          'order_id' => '1001'
-        )
-      ),
-      'productClass' => array(
-        array('stock' => '105'),
-        array('stock' => '51')
-      )
-    );
-    $this->verify();
-  }
-
-  // $B<B:]$K%H%i%s%6%/%7%g%s$r3+;O$7$?$+$I$&$+$O%F%9%H$G$-$J$$$,!"(B
-  // $BLdBj$J$/=hM}$,40N;$9$k$3$H$N$_3NG'(B
-  public function testCancelOrder_$B%H%i%s%6%/%7%g%s$,3+;O$7$F$$$J$$>l9g(B_$BFbIt$G3+;O$9$k(B()
-  {
-    $order_id = '1001';
-
-    $this->helper->cancelOrder($order_id, ORDER_NEW);
-
-    $this->actual['testResult'] = $_SESSION['testResult'];
-    $this->actual['productClass'] = $this->objQuery->select(
-      'stock', 'dtb_products_class',
-      'product_class_id in (?, ?)', array('1001', '1002')
-    );
-    $this->expected = array(
-      'testResult' => array(
-        'registerOrder' => array(
-          'order_id' => '1001',
-          'params' => array(
-            'status' => ORDER_NEW
-          )
-        ),
-        'getOrderDetail' => array(
-          'order_id' => '1001'
-        )
-      ),
-      'productClass' => array(
-        array('stock' => '105'),
-        array('stock' => '51')
-      )
-    );
-
-    $this->verify();
-  }
-
-  public function testCancelOrder_$B:o=|%U%i%0$,N)$C$F$$$k>l9g(B_DB$B99?7;~$K:o=|%U%i%0$,N)$F$i$l$k(B()
-  {
-    $order_id = '1001';
-    $this->objQuery->begin();
-
-    $this->helper->cancelOrder($order_id, ORDER_DELIV, true);
-
-    $this->actual['testResult'] = $_SESSION['testResult'];
-    $this->actual['productClass'] = $this->objQuery->select(
-      'stock', 'dtb_products_class',
-      'product_class_id in (?, ?)', array('1001', '1002')
-    );
-    $this->expected = array(
-      'testResult' => array(
-        'registerOrder' => array(
-          'order_id' => '1001',
-          'params' => array(
-            'status' => ORDER_DELIV,
-            'del_flg' => '1'
-          )
-        ),
-        'getOrderDetail' => array(
-          'order_id' => '1001'
-        )
-      ),
-      'productClass' => array(
-        array('stock' => '105'),
-        array('stock' => '51')
-      )
-    );
-
-    $this->verify();
-  }
-
-  //////////////////////////////////////////
-
-}
-
-class SC_Helper_Purchase_cancelOrderMock extends SC_Helper_Purchase
-{
-
-  function registerOrder($order_id, $params)
-  {
-    $_SESSION['testResult']['registerOrder'] = array(
-      'order_id' => $order_id,
-      'params' => $params
-    );
-  }
-
-  function getOrderDetail($order_id)
-  {
-    $_SESSION['testResult']['getOrderDetail'] = array(
-      'order_id' => $order_id
-    );
-
-    return array(
-      array(
-        'product_class_id' => '1001',
-        'quantity' => '5'
-      ),
-      array(
-        'product_class_id' => '1002',
-        'quantity' => '1'
-      )
-    );
-  }
-}
-
-

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_cleanupSessionTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_cleanupSessionTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpProductClass();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCleanupSession__$B%+!<%H$H%;%C%7%g%s$NG[Aw>pJs$,:o=|$5$l$k(B()
-  {
+  public function testCleanupSession__$B%+!<%H$H%;%C%7%g%s$NG[Aw>pJs$,:o=|$5$l$k(B() {
     // $B0z?t$N=`Hw(B
     $helper = new SC_Helper_Purchase();
     $cartSession = new SC_CartSession();

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_clearShipmentItemTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_clearShipmentItemTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testClearShipmentItem_$BG[Aw ＠ h(BID$BL$;XDj$N>l9g(B_$BA4$F$NG[Aw>&IJ$,%/%j%"$5$l$k(B()
-  {
+  public function testClearShipmentItem_$BG[Aw ＠ h(BID$BL$;XDj$N>l9g(B_$BA4$F$NG[Aw>&IJ$,%/%j%"$5$l$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     $helper = new SC_Helper_Purchase();
@@ -60,8 +56,7 @@
     $this->verify('$BG[Aw>&IJ(B');
   }
 
-  public function testClearShipmentItem_$BG[Aw ＠ h(BID$B;XDj$N>l9g(B_$B;XDj$7$?(BID$B$NG[Aw>&IJ$,%/%j%"$5$l$k(B()
-  {
+  public function testClearShipmentItem_$BG[Aw ＠ h(BID$B;XDj$N>l9g(B_$B;XDj$7$?(BID$B$NG[Aw>&IJ$,%/%j%"$5$l$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     $helper = new SC_Helper_Purchase();
@@ -75,8 +70,7 @@
     $this->verify('$BG[Aw>&IJ(B');
   }
 
-  public function testClearShipmentItem_$BB8:_$7$J$$(BID$B$r;XDj$7$?>l9g(B_$B2?$bJQ99$5$l$J$$(B()
-  {
+  public function testClearShipmentItem_$BB8:_$7$J$$(BID$B$r;XDj$7$?>l9g(B_$B2?$bJQ99$5$l$J$$(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     $helper = new SC_Helper_Purchase();
@@ -90,8 +84,7 @@
     $this->verify('$BG[Aw>&IJ(B');
   }
 
-  public function testClearShipmentItem_$B>&IJ>pJs$,G[Ns$G$J$$>l9g(B_$B2?$bJQ99$5$l$J$$(B()
-  {
+  public function testClearShipmentItem_$B>&IJ>pJs$,G[Ns$G$J$$>l9g(B_$B2?$bJQ99$5$l$J$$(B() {
     $this->setUpShipping($this->getMultipleShipping());
     // $BFbMF$rG[Ns$G$J$$$h$&$KJQ99(B
     $_SESSION['shipping']['00001'] = 'temp';

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,15 +31,12 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_completeOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_completeOrderTest extends SC_Helper_Purchase_TestBase {
 
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
-    $this->setUpOrder();
     $this->setUpOrderTemp(); // order_temp_id = '1001'
     $this->setUpShipping();
     $this->setUpCustomer();
@@ -55,15 +52,13 @@
     $this->helper = new SC_Helper_Purchase_completeOrderMock();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
   // $BE, ＠ Z$J(Bfunction$B$,8F$P$l$F$$$k$3$H$N$_3NG'(B
-  public function testCompleteOrder_$B8\5R(BID$B$,;XDj$5$l$F$$$k>l9g(B_$B9XF~F|$,99?7$5$l$k(B()
-  {
+  public function testCompleteOrder_$B8\5R(BID$B$,;XDj$5$l$F$$$k>l9g(B_$B9XF~F|$,99?7$5$l$k(B() {
     $_SESSION['customer']['customer_id'] = '1002'; // $B8\5R(BID
     $this->helper->completeOrder(ORDER_DELIV);
 
@@ -100,8 +95,7 @@
     $this->assertNotNull($last_buy_date, '$B:G=*9XF~F|(B');
   }
 
-  public function testCompleteOrder_$B8\5R(BID$B$,;XDj$5$l$F$$$J$$>l9g(B_$BFC$K%(%i!<$J$/=$N;$G$-$k(B()
-  {
+  public function testCompleteOrder_$B8\5R(BID$B$,;XDj$5$l$F$$$J$$>l9g(B_$BFC$K%(%i!<$J$/=$N;$G$-$k(B() {
     $this->helper->completeOrder(); // $B%G%U%)%k%H$N%9%F!<%?%9(B(NEW)
 
     $this->expected = array(
@@ -139,22 +133,18 @@
 
 }
 
-class SC_Helper_Purchase_completeOrderMock extends SC_Helper_Purchase
-{
+class SC_Helper_Purchase_completeOrderMock extends SC_Helper_Purchase{
 
-  function verifyChangeCart($uniqId, $objCartSession)
-  {
+  function verifyChangeCart($uniqId, $objCartSession){
     $_SESSION['testResult']['verifyChangeCart'] = array('uniqId'=>$uniqId);
   }
 
-  function getOrderTemp($uniqId)
-  {
+  function getOrderTemp($uniqId) {
     $_SESSION['testResult']['getOrderTemp'] = array('uniqId'=>$uniqId);
     return parent::getOrderTemp($uniqId);
   }
 
-  function registerOrderComplete($orderTemp, $objCartSession, $cartKey)
-  {
+  function registerOrderComplete($orderTemp, $objCartSession, $cartKey) {
     $_SESSION['testResult']['registerOrderComplete'] = array(
       'order_temp_id' => $orderTemp['order_temp_id'],
       'status' => $orderTemp['status'],
@@ -163,8 +153,7 @@
     return parent::registerOrderComplete($orderTemp, $objCartSession, $cartKey);
   }
 
-  function registerShipmentItem($order_id, $shipping_id, $shipment_item)
-  {
+  function registerShipmentItem($order_id, $shipping_id, $shipment_item) {
     $_SESSION['testResult']['registerShipmentItem'][] = array(
       'order_id' => $order_id,
       'shipping_id' => $shipping_id,
@@ -172,15 +161,13 @@
     );
   }
 
-  function registerShipping($order_id, $shipping_temp)
-  {
+  function registerShipping($order_id, $shipping_temp) {
     $_SESSION['testResult']['registerShipping'] = array(
       'order_id' => $order_id
     );
   }
 
-  function cleanupSession($order_id, $objCartSesion, $objCustomer, $cartKey)
-  {
+  function cleanupSession($order_id, $objCartSesion, $objCustomer, $cartKey) {
     $_SESSION['testResult']['cleanupSession'] = array(
       'order_id' => $order_id,
       'cartKey' => $cartKey

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,14 +31,12 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_copyFromCustomerTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_copyFromCustomerTest extends SC_Helper_Purchase_TestBase {
 
   var $customer;
   var $customer_array;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->customer = new SC_Customer();
     $this->customer->setValue('customer_id', '1001');
@@ -65,14 +63,12 @@
     $this->customer_array = array('customer_id' => '1001', 'email' => 'test ＠ example.com');
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCopyFromCustomer_$B%m%0%$%s$7$F$$$J$$>l9g(B_$B2?$b$7$J$$(B()
-  {
+  public function testCopyFromCustomer_$B%m%0%$%s$7$F$$$J$$>l9g(B_$B2?$b$7$J$$(B() {
     $dest = array();
     User_Utils::setLoginState(FALSE, $this->customer_array, $this->objQuery);
 
@@ -84,8 +80,7 @@
     $this->verify();
   }
 
-  public function testCopyFromCustomer_$B%b%P%$%k$N>l9g(B_$B%b%P%$%k$N%a!<%k%"%I%l%9$r ＠ _Dj$9$k(B()
-  {
+  public function testCopyFromCustomer_$B%b%P%$%k$N>l9g(B_$B%b%P%$%k$N%a!<%k%"%I%l%9$r ＠ _Dj$9$k(B() {
     $dest = array();
     User_Utils::setLoginState(TRUE, $this->customer_array, $this->objQuery);
     User_Utils::setDeviceType(DEVICE_TYPE_MOBILE);
@@ -121,8 +116,7 @@
     $this->verify();
   }
 
-  public function testCopyFromCustomer_$B%b%P%$%k$+$D%b%P%$%k$N%a!<%k%"%I%l%9$,$J$$>l9g(B_$BDL>o$N%a!<%k%"%I%l%9$r ＠ _Dj$9$k(B()
-  {
+  public function testCopyFromCustomer_$B%b%P%$%k$+$D%b%P%$%k$N%a!<%k%"%I%l%9$,$J$$>l9g(B_$BDL>o$N%a!<%k%"%I%l%9$r ＠ _Dj$9$k(B() {
     $dest = array();
     $prefix = 'order';
     // $B%-!<$r9J$k(B
@@ -143,8 +137,7 @@
     $this->verify();
   }
 
-  public function testCopyFromCustomer_$B%b%P%$%k$G$J$$>l9g(B_$BDL>o$N%a!<%k%"%I%l%9$r$=$N$^$^@_Dj$9$k(B()
-  {
+  public function testCopyFromCustomer_$B%b%P%$%k$G$J$$>l9g(B_$BDL>o$N%a!<%k%"%I%l%9$r$=$N$^$^@_Dj$9$k(B() {
     $dest = array();
     $prefix = 'prefix';
     // $B%-!<$r9J$k(B

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_copyFromOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_copyFromOrderTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCopyFromOrder_$B$9$Y$F%G%U%)%k%H ＠ _Dj$K$7$?>l9g(B_$B%G%U%)%k%H$N@\F,<-!&%-!<$G%3%T!<$5$l$k(B()
-  {
+  public function testCopyFromOrder_$B$9$Y$F%G%U%)%k%H ＠ _Dj$K$7$?>l9g(B_$B%G%U%)%k%H$N@\F,<-!&%-!<$G%3%T!<$5$l$k(B() {
      $dest = array();
      $src = array(
        'order_name01' => '$B ＠ +(B',
@@ -93,8 +89,7 @@
      $this->verify();
   }
 
-  public function testCopyFromOrder_$B@\F,<-!&%-!<$r ＠ _Dj$7$?>l9g(B_$B;XDj$NCM$G%3%T!<$5$l$k(B()
-  {
+  public function testCopyFromOrder_$B@\F,<-!&%-!<$r ＠ _Dj$7$?>l9g(B_$B;XDj$NCM$G%3%T!<$5$l$k(B() {
      $dest = array();
      $src = array(
        'input_name01' => '$B ＠ +(B',

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_extractShippingTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_extractShippingTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testExtractShipping__$BM=$a;XDj$5$l$?%-!<$@$1$,Cj=P$5$l$k(B()
-  {
+  public function testExtractShipping__$BM=$a;XDj$5$l$?%-!<$@$1$,Cj=P$5$l$k(B() {
     $helper = new SC_Helper_Purchase();
     $helper->arrShippingKey = array('id', 'name', 'code');
     $arrSrc = array(

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php)
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php	                        (rev 0)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,87 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getDeliv()$B$N%F%9%H%/%i%9(B.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getDelivTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpDeliv();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetDeliv_$BB8:_$7$J$$>&IJ<oJL(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
+    $product_type_id = '9999'; // $BB8:_$7$J$$(BID
+
+    $this->expected = array();
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getDeliv($product_type_id);
+
+    $this->verify('$BG[Aw6H<T(B');
+  }
+
+  public function testGetDeliv_$BB8:_$9$k>&IJ<oJL(BID$B$r;XDj$7$?>l9g(B_$B7k2L$, ＠ 5$7$$=g=x$G<hF@$G$-$k(B() {
+    $product_type_id = '1001';
+  
+    $this->expected['count'] = 2;
+    $this->expected['first'] = array(
+      'deliv_id' => '1002',
+      'product_type_id' => '1001',
+      'name' => '$BG[Aw6H<T(B02',
+      'rank' => '3'
+    );
+    $this->expected['second'] = array(
+      'deliv_id' => '1001',
+      'product_type_id' => '1001',
+      'name' => '$BG[Aw6H<T(B01',
+      'rank' => '2'
+    );
+
+    $helper = new SC_Helper_Purchase();
+    $result = $helper->getDeliv($product_type_id);
+    $this->actual['count'] = count($result);
+    $cols = array('deliv_id', 'product_type_id', 'name', 'rank');
+    $this->actual['first'] = Test_Utils::mapArray($result[0], $cols);
+    $this->actual['second'] = Test_Utils::mapArray($result[1], $cols);
+
+    $this->verify('$BG[Aw6H<T(B');
+  }
+
+  //////////////////////////////////////////
+
+}
+

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php)
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php	                        (rev 0)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,74 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getDelivTime()$B$N%F%9%H%/%i%9(B.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getDelivTimeTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpDelivTime();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetDelivTime_$BB8:_$7$J$$G[Aw6H<T(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
+    $deliv_id = '100'; // $BB8:_$7$J$$(BID
+
+    $this->expected = array();
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getDelivTime($deliv_id);
+
+    $this->verify('$B$*FO$1;~4V(B');
+  }
+
+  public function testGetDelivTime_$BB8:_$9$kG[Aw6H<T(BID$B$r;XDj$7$?>l9g(B_$B7k2L$, ＠ 5$7$$=g=x$G<hF@$G$-$k(B() {
+    $deliv_id = '1001';
+  
+    $this->expected = array(
+      '1' => '$B8aA0(B',
+      '2' => '$B8a8e(B'
+    );
+
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getDelivTime($deliv_id);
+    
+    $this->verify('$B$*FO$1;~4V(B');
+  }
+
+  //////////////////////////////////////////
+
+}
+

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,26 +31,22 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_getOrderDetailTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getOrderDetailTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
     $this->setUpOrderDetail();
     $this->setUpProductClass();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetOrderDetail_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B()
-  {
+  public function testGetOrderDetail_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
     $order_id = '9999';
 
     $this->expected = array();
@@ -59,8 +55,7 @@
     $this->verify();
   }
 
-  public function testGetOrderDetail_$BB8:_$9$k<uCm(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k<uCm>\:Y>pJs$,<hF@$G$-$k(B()
-  {
+  public function testGetOrderDetail_$BB8:_$9$k<uCm(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k<uCm>\:Y>pJs$,<hF@$G$-$k(B() {
     $order_id = '1001';
 
     $this->expected = array(
@@ -106,8 +101,7 @@
     $this->verify();
   }
 
-  public function testGetOrderDetail_$B%9%F!<%?%9<hF@%U%i%0$,(BOFF$B$N$N>l9g(B_$B%9%F!<%?%90J30$N>pJs$,<hF@$G$-$k(B()
-  {
+  public function testGetOrderDetail_$B%9%F!<%?%9<hF@%U%i%0$,(BOFF$B$N$N>l9g(B_$B%9%F!<%?%90J30$N>pJs$,<hF@$G$-$k(B() {
     $order_id = '1001';
 
     $this->expected = array(

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,24 +31,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_getOrderTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getOrderTempTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderTemp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetOrderTemp_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B()
-  {
+  public function testGetOrderTemp_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
     $order_id = '9999';
 
     $this->expected = null;
@@ -57,8 +53,7 @@
     $this->verify();
   }
 
-  public function testGetOrderTemp_$BB8:_$9$k<uCm(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k7k2L$,<hF@$G$-$k(B()
-  {
+  public function testGetOrderTemp_$BB8:_$9$k<uCm(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k7k2L$,<hF@$G$-$k(B() {
     $order_temp_id = '1002';
 
     $this->expected = array(

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,24 +31,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_getOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getOrderTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetOrder_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B()
-  {
+  public function testGetOrder_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
     $order_id = '9999';
 
     $this->expected = null;
@@ -57,8 +53,7 @@
     $this->verify();
   }
 
-  public function testGetOrder_$BB8:_$7$J$$8\5R(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B()
-  {
+  public function testGetOrder_$BB8:_$7$J$$8\5R(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
     $order_id = '1002';
     $customer_id = '9999';
 
@@ -68,8 +63,7 @@
     $this->verify();
   }
 
-  public function testGetOrder_$B8\5R(BID$B$r;XDj$7$J$+$C$?>l9g(B_$B<uCm(BID$B$KBP1~$9$k7k2L$,<hF@$G$-$k(B()
-  {
+  public function testGetOrder_$B8\5R(BID$B$r;XDj$7$J$+$C$?>l9g(B_$B<uCm(BID$B$KBP1~$9$k7k2L$,<hF@$G$-$k(B() {
     $order_id = '1002';
 
     $this->expected = array(
@@ -83,8 +77,7 @@
     $this->verify();
   }
 
-  public function testGetOrder_$BB8:_$9$k8\5R(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k7k2L$,<hF@$G$-$k(B()
-  {
+  public function testGetOrder_$BB8:_$9$k8\5R(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k7k2L$,<hF@$G$-$k(B() {
     $order_id = '1002';
     $customer_id = '1002';
 

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php)
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php	                        (rev 0)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,85 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getPaymentsByPaymentsId()$B$N%F%9%H%/%i%9(B.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getPaymentsByPaymentsIdTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpPayment();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetPaymentsByPaymentsId_$BB8:_$7$J$$;YJ'(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
+    $payment_id = '9999'; // $BB8:_$7$J$$(BID
+  
+    $this->expected = null;
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPaymentsByPaymentsId($payment_id);
+
+    $this->verify('$B;YJ'J}K!(B');
+  }
+
+  public function testGetPaymentsByPaymentsId_$BB8:_$9$k;YJ'(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k;YJ'J}K!$N>pJs$,<hF@$G$-$k(B() {
+    $payment_id = '1001';
+  
+    $this->expected = array(
+      'payment_id' => '1001',
+      'payment_method' => '$B;YJ'J}K!(B1001'
+    );
+
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPaymentsByPaymentsId($payment_id);
+    $this->actual = Test_Utils::mapArray($this->actual, array('payment_id', 'payment_method'));
+
+    $this->verify('$B;YJ'J}K!(B');
+  }
+
+  public function testGetPaymentsByPaymentsId_$B:o=|$5$l$F$$$k;YJ'(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
+    $payment_id = '1002'; // $B:o=|:Q$_$N(BID
+  
+    $this->expected = null;
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPaymentsByPaymentsId($payment_id);
+
+    $this->verify('$B;YJ'J}K!(B');
+  }
+
+  //////////////////////////////////////////
+
+}
+

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php)
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php	                        (rev 0)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,116 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getPaymentsByPrice()$B$N%F%9%H%/%i%9(B.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getPaymentsByPriceTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpPayment();
+    $this->setUpPaymentOptions();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetPaymentsByPrice_$B9XF~6b3[$,$9$Y$F$N>e8B$r>e2s$k>l9g(B_$B>e8B$N ＠ _Dj$,$J$$$b$N$@$1<hF@$G$-$k(B() {
+    $deliv_id = '1003';
+    $total = 21001;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected['count'] = 2;
+    $this->expected['first'] = array(
+      'payment_id' => '3002',
+      'payment_method' => '$B;YJ'J}K!(B3002',
+      'rule_max' => null,
+      'upper_rule' => null,
+      'note' => null,
+      'payment_image' => null,
+      'charge' => null
+    );
+    $this->expected['second_id'] = '3003';
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual['count'] = count($result);
+    $this->actual['first'] = $result[0];
+    $this->actual['second_id'] = $result[1]['payment_id'];
+
+    $this->verify();
+  }
+
+  public function testGetPaymentsByPrice_$B9XF~6b3[$,0lIt$N>e8B$r>e2s$k>l9g(B_$B>e8B$K0z$C$+$+$i$J$$$b$N$@$1<hF@$G$-$k(B() {
+    $deliv_id = '1003';
+    $total = 20500;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected = array('3002', '3003', '3005');
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual = Test_Utils::mapCols($result, 'payment_id');
+
+    $this->verify();
+  }
+
+  public function testGetPaymentsByPrice_$B9XF~6b3[$,0lIt$N2<8B$r2<2s$k>l9g(B_$B2<8B$K0z$C$+$+$i$J$$$b$N$@$1<hF@$G$-$k(B() {
+    $deliv_id = '1003';
+    $total = 11000;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected = array('3002', '3003', '3004');
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual = Test_Utils::mapCols($result, 'payment_id');
+
+    $this->verify();
+  }
+
+  public function testGetPaymentsByPrice_$B9XF~6b3[$,$9$Y$F$N2<8B$r2<2s$k>l9g(B_$B2<8B$N ＠ _Dj$,$J$$$b$N$@$1<hF@$G$-$k(B() {
+    $deliv_id = '1003';
+    $total = 9999;
+    $helper = new SC_Helper_Purchase();
+
+    $this->expected = array('3002', '3004');
+
+    $result = $helper->getPaymentsByPrice($total, $deliv_id);
+    $this->actual = Test_Utils::mapCols($result, 'payment_id');
+
+    $this->verify();
+  }
+
+
+  //////////////////////////////////////////
+
+}
+

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php ($B%3%T!<85(B: $B%j%S%8%g%s(B 22217, branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php)
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php	                        (rev 0)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,71 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Helper_Purchase::getPayments()$B$N%F%9%H%/%i%9(B.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Helper_Purchase_getPaymentsTest extends SC_Helper_Purchase_TestBase {
+
+
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpPaymentOptions();
+  }
+
+  protected function tearDown() {
+    parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testGetPayments_$BB8:_$7$J$$G[Aw6H<T(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
+    $deliv_id = '100'; // $BB8:_$7$J$$(BID
+
+    $this->expected = array();
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPayments($deliv_id);
+
+    $this->verify('$B;YJ'J}K!(B');
+  }
+
+  public function testGetPayments_$BB8:_$9$kG[Aw6H<T(BID$B$r;XDj$7$?>l9g(B_$B7k2L$, ＠ 5$7$$=g=x$G<hF@$G$-$k(B() {
+    $deliv_id = '1001';
+  
+    $this->expected = array('1002', '1001');
+
+    $helper = new SC_Helper_Purchase();
+    $this->actual = $helper->getPayments($deliv_id);
+    
+    $this->verify('$B;YJ'J}K!(B');
+  }
+
+  //////////////////////////////////////////
+
+}
+

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_getShipmentItemsTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShipmentItemsTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpShipmentItem();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetShipmentItems_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B()
-  {
+  public function testGetShipmentItems_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
     $order_id = '100'; // $BB8:_$7$J$$(BID
     $shipping_id = '1';
 
@@ -57,8 +53,7 @@
     $this->verify('$BG[Aw>pJs(B');
   }
 
-  public function testGetShipmentItems_$BB8:_$7$J$$G[Aw ＠ h(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B()
-  {
+  public function testGetShipmentItems_$BB8:_$7$J$$G[Aw ＠ h(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
     $order_id = '1';
     $shipping_id = '100'; // $BB8:_$7$J$$(BID
 
@@ -68,8 +63,7 @@
     $this->verify('$BG[Aw>pJs(B');
   }
 
-  public function testGetShipmentItems_$BB8:_$9$k<uCm(BID$B$HG[Aw ＠ h(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,<hF@$G$-$k(B()
-  {
+  public function testGetShipmentItems_$BB8:_$9$k<uCm(BID$B$HG[Aw ＠ h(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,<hF@$G$-$k(B() {
     $order_id = '1';
     $shipping_id = '1';
     
@@ -102,8 +96,7 @@
     $this->verify('$BG[Aw>pJs(B');
   }
 
-  public function testGetShipmentItems_$B>\:Y%U%i%0$r(BOFF$B$K$7$?>l9g(B_$B7k2L$K>\:Y>pJs$,4^$^$l$J$$(B()
-  {
+  public function testGetShipmentItems_$B>\:Y%U%i%0$r(BOFF$B$K$7$?>l9g(B_$B7k2L$K>\:Y>pJs$,4^$^$l$J$$(B() {
     $order_id = '1';
     $shipping_id = '1';
     

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_getShippingPrefTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShippingPrefTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
   // TODO $BMW3NG'!'0z?t$NL>A0$,$*$+$7$$!J(Bis_multiple$B$G$O$J$$$O$:!K(B
-  public function testGetShippingPref_$BJ]M-%U%i%0$,(BOFF$B$N>l9g(B_$BA4G[Aw>pJs$r<hF@$9$k(B()
-  {
+  public function testGetShippingPref_$BJ]M-%U%i%0$,(BOFF$B$N>l9g(B_$BA4G[Aw>pJs$r<hF@$9$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     $this->expected = array('$BEl5~ET(B', '$B2-Fl8)(B', '$B:k6L8)(B');
@@ -56,8 +52,7 @@
     $this->verify('$BG[Aw ＠ h$NETF;I\8)(B');
   }
 
-  public function testGetShippingPref_$BJ]M-%U%i%0$,(BON$B$N>l9g(B_$B>&IJ$N$"$kG[Aw>pJs$N$_<hF@$9$k(B()
-  {
+  public function testGetShippingPref_$BJ]M-%U%i%0$,(BON$B$N>l9g(B_$B>&IJ$N$"$kG[Aw>pJs$N$_<hF@$9$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     $this->expected = array('$BEl5~ET(B', '$B2-Fl8)(B');

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_getShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetShippingTemp_$BJ]M-%U%i%0$,(BOFF$B$N>l9g(B_$B%;%C%7%g%s>pJs$r<hF@$9$k(B()
-  {
+  public function testGetShippingTemp_$BJ]M-%U%i%0$,(BOFF$B$N>l9g(B_$B%;%C%7%g%s>pJs$r<hF@$9$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     $this->expected = $this->getMultipleShipping();
@@ -55,8 +51,7 @@
     $this->verify('$BG[Aw>pJs(B');
   }
 
-  public function testGetShippingTemp_$BJ]M-%U%i%0$,(BON$B$N>l9g(B_$B>&IJ$N$"$k>pJs$N$_<hF@$9$k(B()
-  {
+  public function testGetShippingTemp_$BJ]M-%U%i%0$,(BON$B$N>l9g(B_$B>&IJ$N$"$k>pJs$N$_<hF@$9$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     $this->expected = array(

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,25 +31,21 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_getShippingsTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_getShippingsTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpShipmentItem();
     $this->setUpShippingOnDb();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetShippings_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B()
-  {
+  public function testGetShippings_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,6u$K$J$k(B() {
     $order_id = '100'; // $BB8:_$7$J$$(BID
 
     $this->expected = array();
@@ -59,8 +55,7 @@
     $this->verify('$BG[Aw>pJs(B');
   }
 
-  public function testGetShippings_$BB8:_$9$k<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,<hF@$G$-$k(B()
-  {
+  public function testGetShippings_$BB8:_$9$k<uCm(BID$B$r;XDj$7$?>l9g(B_$B7k2L$,<hF@$G$-$k(B() {
     $order_id = '1';
   
     $this->expected['count'] = 1;
@@ -82,8 +77,7 @@
     $this->verify('$BG[Aw>pJs(B');
   }
 
-  public function testGetShippings_$B>&IJ<hF@%U%i%0$r(BOFF$B$K$7$?>l9g(B_$B7k2L$K>&IJ>pJs$,4^$^$l$J$$(B()
-  {
+  public function testGetShippings_$B>&IJ<hF@%U%i%0$r(BOFF$B$K$7$?>l9g(B_$B7k2L$K>&IJ>pJs$,4^$^$l$J$$(B() {
     $order_id = '1';
     
     $this->expected['count'] = 1;

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,70 +31,60 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_isAddPointTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_isAddPointTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsAddPoint_$B?75,CmJ8$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsAddPoint_$B?75,CmJ8$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_NEW);
 
     $this->verify('$B%]%$%s%H2C;;$9$k$+$I$&$+(B');
   }
 
-  public function testIsAddPoint_$BF~6bBT$A$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsAddPoint_$BF~6bBT$A$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PAY_WAIT);
 
     $this->verify('$B%]%$%s%H2C;;$9$k$+$I$&$+(B');
   }
 
-  public function testIsAddPoint_$BF~6b:Q$_$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsAddPoint_$BF~6b:Q$_$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PRE_END);
 
     $this->verify('$B%]%$%s%H2C;;$9$k$+$I$&$+(B');
   }
 
-  public function testIsAddPoint_$B%-%c%s%;%k$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsAddPoint_$B%-%c%s%;%k$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_CANCEL);
 
     $this->verify('$B%]%$%s%H2C;;$9$k$+$I$&$+(B');
   }
 
-  public function testIsAddPoint_$B<h$j4s$;Cf$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsAddPoint_$B<h$j4s$;Cf$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_BACK_ORDER);
 
     $this->verify('$B%]%$%s%H2C;;$9$k$+$I$&$+(B');
   }
 
-  public function testIsAddPoint_$BH/Aw:Q$_$N>l9g(B_TRUE$B$,JV$k(B()
-  {
+  public function testIsAddPoint_$BH/Aw:Q$_$N>l9g(B_TRUE$B$,JV$k(B() {
     $this->expected = TRUE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_DELIV);
 
     $this->verify('$B%]%$%s%H2C;;$9$k$+$I$&$+(B');
   }
 
-  public function testIsAddPoint_$B$=$NB>$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsAddPoint_$B$=$NB>$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PENDING);
 

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,30 +31,25 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_isUsePointTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_isUsePointTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsUsePoint_$B%9%F!<%?%9$,(Bnull$B$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsUsePoint_$B%9%F!<%?%9$,(Bnull$B$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isUsePoint(null);
 
     $this->verify('$B%]%$%s%H$r;HMQ$9$k$+$I$&$+(B');
   }
 
-  public function testIsUsePoint_$B%9%F!<%?%9$,%-%c%s%;%k$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testIsUsePoint_$B%9%F!<%?%9$,%-%c%s%;%k$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Helper_Purchase::isUsePoint(ORDER_CANCEL);
 
@@ -62,8 +57,7 @@
   }
 
   // TODO $BMW3NG'!'K\Ev$K%-%c%s%;%k$N$H$-0J30$O$9$Y$F(BTRUE$B$GNI$$$N$+!"8=:_$N;H$o$lJ}$NET9g$+(B
-  public function testIsUsePoint_$B%9%F!<%?%9$,%-%c%s%;%k0J30$N>l9g(B_TRUE$B$,JV$k(B()
-  {
+  public function testIsUsePoint_$B%9%F!<%?%9$,%-%c%s%;%k0J30$N>l9g(B_TRUE$B$,JV$k(B() {
     $this->expected = TRUE;
     $this->actual = SC_Helper_Purchase::isUsePoint(ORDER_NEW);
 

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,25 +32,21 @@
  * @version $Id$
  */
 
-class SC_Helper_Purchase_registerOrderCompleteTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerOrderCompleteTest extends SC_Helper_Purchase_TestBase {
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderTemp();
     $this->helper = new SC_Helper_Purchase_registerOrderCompleteMock();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterOrderComplete_$BITMW$JJQ?t$,4^$^$l$F$$$k>l9g(B_$BEPO?A0$K=|30$5$l$k(B()
-  {
+  public function testRegisterOrderComplete_$BITMW$JJQ?t$,4^$^$l$F$$$k>l9g(B_$BEPO?A0$K=|30$5$l$k(B() {
     // $B0z?t$N=`Hw(B
     $orderParams = array(
       'order_id' => '1001',
@@ -97,8 +93,7 @@
     $this->verify();
   }
 
-  public function testRegisterOrderComplete_$B%9%F!<%?%9$N;XDj$,$J$$>l9g(B_$B?75,<uIU07$$$H$J$k(B()
-  {
+  public function testRegisterOrderComplete_$B%9%F!<%?%9$N;XDj$,$J$$>l9g(B_$B?75,<uIU07$$$H$J$k(B() {
     // $B0z?t$N=`Hw(B
     $orderParams = array(
       'order_id' => '1001',
@@ -128,11 +123,9 @@
 
 }
 
-class SC_Helper_Purchase_registerOrderCompleteMock extends SC_Helper_Purchase
-{
+class SC_Helper_Purchase_registerOrderCompleteMock extends SC_Helper_Purchase {
 
-  function registerOrder($order_id, $params)
-  {
+  function registerOrder($order_id, $params) {
     $_SESSION['testResult']['registerOrder'] = array(
       'order_id' => $order_id,
       'status' => $params['status'],
@@ -140,24 +133,20 @@
     );
   }
 
-  function registerOrderDetail($order_id, $params)
-  {
+  function registerOrderDetail($order_id, $params) {
     $_SESSION['testResult']['registerOrderDetail'] = array(
       'order_id' => $order_id,
       'params' => $params
     );
   }
 
-  function setUniqId()
-  {}
+  function setUniqId() {}
 }
 
-class SC_CartSession_registerOrderCompleteMock extends SC_CartSession
-{
+class SC_CartSession_registerOrderCompleteMock extends SC_CartSession {
 
   // $B%+!<%H$NFbMF$r<hF@(B
-  function getCartList($cartKey)
-  {
+  function getCartList($cartKey) {
     return array(
       array(
         'productsClass' => array(

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -26,27 +26,24 @@
 
 /**
  * SC_Helper_Purchase::registerOrderDetail()$B$N%F%9%H%/%i%9(B.
+ * TODO $BB>$N(Bfunction$B$H!"(BSC_Query_Ex$B$N%$%s%9%?%s%9$N<u$1<h$jJ}$,0[$J$C$F$$$k!#(B
  *
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_registerOrderDetailTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerOrderDetailTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderDetail();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterOrderDetail_$B3:Ev$N<uCm$,B8:_$9$k>l9g(B_$B:o=|8e$K?7$7$$>pJs$,EPO?$5$l$k(B()
-  {
+  public function testRegisterOrderDetail_$B3:Ev$N<uCm$,B8:_$9$k>l9g(B_$B:o=|8e$K?7$7$$>pJs$,EPO?$5$l$k(B() {
     $params = array(
       array(
       'order_id' => '1001',
@@ -79,8 +76,7 @@
     $this->verify();
   }
 
-  public function testRegisterOrderDetail_$B3:Ev$N<uCm$,B8:_$7$J$$>l9g(B_$B?7$7$$>pJs$,DI2CEPO?$5$l$k(B()
-  {
+  public function testRegisterOrderDetail_$B3:Ev$N<uCm$,B8:_$7$J$$>l9g(B_$B?7$7$$>pJs$,DI2CEPO?$5$l$k(B() {
     $params = array(
       array(
       'order_id' => '1003',

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,26 +31,22 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_registerOrderTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerOrderTest extends SC_Helper_Purchase_TestBase {
 
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
     $this->helper = new SC_Helper_Purchase_registerOrderMock();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterOrder_$B4{$K<uCm(BID$B$,B8:_$9$k>l9g(B_$B>pJs$,99?7$5$l$k(B()
-  {
+  public function testRegisterOrder_$B4{$K<uCm(BID$B$,B8:_$9$k>l9g(B_$B>pJs$,99?7$5$l$k(B() {
     $order_id = '1001';
     $arrParams = array(
       'status' => '1',
@@ -92,8 +88,7 @@
     $this->verify();
   }
 
-  public function testRegisterOrder_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B?75,$KEPO?$5$l$k(B()
-  {
+  public function testRegisterOrder_$BB8:_$7$J$$<uCm(BID$B$r;XDj$7$?>l9g(B_$B?75,$KEPO?$5$l$k(B() {
     $order_id = '1003';
     $arrParams = array(
       'customer_id' => '1003',
@@ -136,8 +131,7 @@
     $this->verify();
   }
 
-  public function testRegisterOrder_$B<uCm(BID$B$,L$;XDj$N>l9g(B_$B?7$?$K(BID$B$,H/9T$5$l$k(B()
-  {
+  public function testRegisterOrder_$B<uCm(BID$B$,L$;XDj$N>l9g(B_$B?7$?$K(BID$B$,H/9T$5$l$k(B() {
     $order_id = '';
     $arrParams = array( // $B8\5R(BID$B$bL$;XDj(B
       'status' => '2',
@@ -187,10 +181,8 @@
 
 }
 
-class SC_Helper_Purchase_registerOrderMock extends SC_Helper_Purchase
-{
-  function sfUpdateOrderStatus($order_id, $status, $add_point, $use_point, $values)
-  {
+class SC_Helper_Purchase_registerOrderMock extends SC_Helper_Purchase {
+  function sfUpdateOrderStatus($order_id, $status, $add_point, $use_point, $values) {
     $_SESSION['testResult']['sfUpdateOrderStatus'] = array(
       'order_id' => $order_id,
       'status' => $status,
@@ -199,8 +191,7 @@
     );
   }
 
-  function sfUpdateOrderNameCol($order_id)
-  {
+  function sfUpdateOrderNameCol($order_id) {
    $_SESSION['testResult']['sfUpdateOrderNameCol'] = $order_id;
   }
 }

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_registerShipmentItemTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerShipmentItemTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpShipmentItem();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterShipmentItem_$B@=IJ%/%i%9(BID$B$,F~$C$F$$$J$$>l9g(B_$BEPO?$r9T$o$J$$(B()
-  {
+  public function testRegisterShipmentItem_$B@=IJ%/%i%9(BID$B$,F~$C$F$$$J$$>l9g(B_$BEPO?$r9T$o$J$$(B() {
     // $B0z?t$N ＠ _Dj(B
     $order_id = '1';
     $shipping_id = '1';
@@ -78,8 +74,7 @@
     $this->verify('$BEPO?$5$l$?G[Aw>&IJ>pJs(B');
   }
 
-  public function testRegisterShipmentItem_$B@=IJL>Ey$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$5$l$?CM$GEPO?$r9T$&(B()
-  {
+  public function testRegisterShipmentItem_$B@=IJL>Ey$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$5$l$?CM$GEPO?$r9T$&(B() {
     // $B0z?t$N ＠ _Dj(B
     $order_id = '1';
     $shipping_id = '1';
@@ -119,8 +114,7 @@
     $this->verify('$BEPO?$5$l$?G[Aw>&IJ>pJs(B');
   }
 
-  public function testRegisterShipmentItem_$B@=IJL>Ey$,;XDj$5$l$F$$$J$$>l9g(B_DB$B$+$i%^%9%?>pJs$r<hF@$7$FEPO?$r9T$&(B()
-  {
+  public function testRegisterShipmentItem_$B@=IJL>Ey$,;XDj$5$l$F$$$J$$>l9g(B_DB$B$+$i%^%9%?>pJs$r<hF@$7$FEPO?$r9T$&(B() {
     // $B0z?t$N ＠ _Dj(B
     $order_id = '1';
     $shipping_id = '1';
@@ -163,8 +157,7 @@
 
   }
 
-  public function testRegisterShipmentItem_DB$B$KB8:_$7$J$$%+%i%`$r;XDj$7$?>l9g(B_$B%(%i!<$J$/EPO?$G$-$k(B()
-  {
+  public function testRegisterShipmentItem_DB$B$KB8:_$7$J$$%+%i%`$r;XDj$7$?>l9g(B_$B%(%i!<$J$/EPO?$G$-$k(B() {
     // $B0z?t$N ＠ _Dj(B
     $order_id = '1';
     $shipping_id = '1';

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_registerShippingTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_registerShippingTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpShippingOnDb();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRegisterShipping_$B85!9B8:_$7$J$$<uCm(BID$B$N>l9g(B_$B?75,$K%G!<%?$,:n$i$l$k(B()
-  {
+  public function testRegisterShipping_$B85!9B8:_$7$J$$<uCm(BID$B$N>l9g(B_$B?75,$K%G!<%?$,:n$i$l$k(B() {
     $order_id = '10';
     $arrParams = array(
         '20' =>
@@ -84,8 +80,7 @@
     $this->assertNotNull($this->result[0]['update_date']);
   }
 
-  public function testRegisterShipping_$B85!9B8:_$9$k<uCm(BID$B$N>l9g(B_$B4{B8$N%G!<%?$,CV$-49$($i$l$k(B()
-  {
+  public function testRegisterShipping_$B85!9B8:_$9$k<uCm(BID$B$N>l9g(B_$B4{B8$N%G!<%?$,CV$-49$($i$l$k(B() {
     $order_id = '2';
     $arrParams = array(
         '30' =>
@@ -122,8 +117,7 @@
     $this->assertNotNull($this->result[0]['update_date']);
   }
 
-  public function testRegisterShipping_$BG[AwF|IU$,6u$N>l9g(B_$B%(%i!<$,5/$-$:JQ49=hM}$,%9%-%C%W$5$l$k(B()
-  {
+  public function testRegisterShipping_$BG[AwF|IU$,6u$N>l9g(B_$B%(%i!<$,5/$-$:JQ49=hM}$,%9%-%C%W$5$l$k(B() {
     $order_id = '2';
     $arrParams = array(
         '30' =>
@@ -160,8 +154,7 @@
     $this->assertNotNull($this->result[0]['update_date']);
   }
 
-  public function testRegisterShipping_$BHs2q0w9XF~$N>l9g(B_$BG[Aw(BID$B$, ＠ _Dj$5$l$k(B()
-  {
+  public function testRegisterShipping_$BHs2q0w9XF~$N>l9g(B_$BG[Aw(BID$B$, ＠ _Dj$5$l$k(B() {
     $order_id = '2';
     $arrParams = array(
         '30' =>

$B:o=|(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -1,165 +0,0 @@
-<?php
-
-$HOME = realpath(dirname(__FILE__)) . "/../../../..";
-require_once($HOME . "/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php");
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * SC_Helper_Purchase::rollbackOrder()$B$N%F%9%H%/%i%9(B.
- *
- * @author Hiroko Tamagawa
- * @version $Id$
- */
-class SC_Helper_Purchase_rollbackOrderTest extends SC_Helper_Purchase_TestBase
-{
-
-  private $helper;
-
-  protected function setUp()
-  {
-    parent::setUp();
-
-    $this->helper = new SC_Helper_Purchase_rollbackOrderMock();
-  }
-
-  protected function tearDown()
-  {
-    parent::tearDown();
-  }
-
-  /////////////////////////////////////////
-  public function testRollbackOrder_$B%G%U%)%k%H$N0z?t$G8F$S=P$7$?>l9g(B_$B%+!<%H$N>uBV$r%m!<%k%P%C%/$7$F85$KLa$k(B()
-  {
-    $this->objQuery->begin();
-    $order_id = '1001';
-
-    $uniqid = $this->helper->rollbackOrder($order_id);
-
-    $this->actual['testResult'] = $this->helper->testResult;
-    $this->actual['siteRegist'] = $_SESSION['site']['regist_success'];
-    $this->expected = array(
-      'testResult' => array(
-        'cancelOrder' => array(
-          'order_id' => '1001',
-          'orderStatus' => ORDER_CANCEL,
-          'is_delete' => false
-        ),
-        'getOrderTempByOrderId' => array(
-          'order_id' => '1001'
-        ),
-        'saveOrderTemp' => array(
-          'uniqid' => $uniqid,
-          'arrOrderTemp' => array(
-            'customer_id' => '2001',
-            'del_flg' => '0'
-          )
-        ),
-        'verifyChangeCart' => array(
-          'uniqid' => $uniqid
-        )
-      ),
-      'siteRegist' => true
-    );
-    $this->verify();
-  }
-
-  /**
-   * $B<B:]$K%H%i%s%6%/%7%g%s$r3+;O$7$?$+$I$&$+$O%F%9%H$G$-$J$$$,!"(B
-   * $BLdBj$J$/=hM}$,40N;$9$k$3$H$N$_3NG'(B
-   */
-  public function testRollbackOrder_$B%H%i%s%6%/%7%g%s$,3+;O$7$F$$$J$$>l9g(B_$BFbIt$G3+;O$9$k(B()
-  {
-    $order_id = '1001';
-
-    $uniqid = $this->helper->rollbackOrder($order_id, ORDER_DELIV, true);
-
-    $this->actual['testResult'] = $this->helper->testResult;
-    $this->actual['siteRegist'] = $_SESSION['site']['regist_success'];
-    $this->expected = array(
-      'testResult' => array(
-        'cancelOrder' => array(
-          'order_id' => '1001',
-          'orderStatus' => ORDER_DELIV,
-          'is_delete' => true
-        ),
-        'getOrderTempByOrderId' => array(
-          'order_id' => '1001'
-        ),
-        'saveOrderTemp' => array(
-          'uniqid' => $uniqid,
-          'arrOrderTemp' => array(
-            'customer_id' => '2001',
-            'del_flg' => '0'
-          )
-        ),
-        'verifyChangeCart' => array(
-          'uniqid' => $uniqid
-        )
-      ),
-      'siteRegist' => true
-    );
-    $this->verify();
-  }
-  //////////////////////////////////////////
-
-}
-
-class SC_Helper_Purchase_rollbackOrderMock extends SC_Helper_Purchase
-{
-  public $testResult = array();
-
-  function cancelOrder($order_id, $orderStatus, $is_delete)
-  {
-    $this->testResult['cancelOrder'] = array(
-      'order_id' => $order_id,
-      'orderStatus' => $orderStatus,
-      'is_delete' => $is_delete
-    );
-  }
-
-  function getOrderTempByOrderId($order_id)
-  {
-    $this->testResult['getOrderTempByOrderId'] = array(
-      'order_id' => $order_id
-    );
-    return array(
-      'customer_id' => '2001'
-    );
-  }
-
-  function saveOrderTemp($uniqid, $arrOrderTemp, $objCustomer)
-  {
-    $this->testResult['saveOrderTemp'] = array(
-      'uniqid' => $uniqid,
-      'arrOrderTemp' => $arrOrderTemp
-    );
-  }
-
-  function verifyChangeCart($uniqid, $objCartSession)
-  {
-    $this->testResult['verifyChangeCart'] = array(
-      'uniqid' => $uniqid
-    );
-  }
-}
-

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,25 +31,21 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_saveOrderTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_saveOrderTempTest extends SC_Helper_Purchase_TestBase {
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrderTemp();
     $this->helper = new SC_Helper_Purchase_saveOrderTempMock();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSaveOrderTemp_$B<uCm0l;~>pJs(BID$B$,6u$N>l9g(B_$B2?$b$7$J$$(B()
-  {
+  public function testSaveOrderTemp_$B<uCm0l;~>pJs(BID$B$,6u$N>l9g(B_$B2?$b$7$J$$(B(){
     $this->helper->saveOrderTemp(null,
       array(
         'customer_id' => '1003',
@@ -64,8 +60,7 @@
     $this->verify('$B7o?t$,JQ$o$C$F$$$J$$(B');
   }
 
-  public function testSaveOrderTemp_$B4{B8$N>pJs$,$J$$>l9g(B_$B>pJs$,?75,EPO?$5$l$k(B()
-  {
+  public function testSaveOrderTemp_$B4{B8$N>pJs$,$J$$>l9g(B_$B>pJs$,?75,EPO?$5$l$k(B(){
     $this->helper->saveOrderTemp('1003',
       array(
         'customer_id' => '1003',
@@ -90,8 +85,7 @@
     $this->verify('$B7o?t$,0l7oA}$($k(B');
   }
 
-  public function testSaveOrderTemp_$B4{B8$N>pJs$,$"$k>l9g(B_$B>pJs$,99?7$5$l$k(B()
-  {
+  public function testSaveOrderTemp_$B4{B8$N>pJs$,$"$k>l9g(B_$B>pJs$,99?7$5$l$k(B(){
     $this->helper->saveOrderTemp('1002',
       array(
         'customer_id' => '2002',
@@ -116,8 +110,7 @@
     $this->verify('$B7o?t$,JQ$o$i$:99?7$5$l$k(B');
   }
 
-  public function testSaveOrderTemp_$BCmJ8<T>pJs$,$"$k>l9g(B_$B>pJs$,%3%T!<$5$l$k(B()
-  {
+  public function testSaveOrderTemp_$BCmJ8<T>pJs$,$"$k>l9g(B_$B>pJs$,%3%T!<$5$l$k(B(){
     $this->helper->saveOrderTemp('1003',
       array(
         'order_temp_id' => '1003',
@@ -141,10 +134,8 @@
 
 }
 
-class SC_Helper_Purchase_saveOrderTempMock extends SC_Helper_Purchase
-{
-  function copyFromCustomer($sqlval, $objCustomer)
-  {
+class SC_Helper_Purchase_saveOrderTempMock extends SC_Helper_Purchase {
+  function copyFromCustomer($sqlval, $objCustomer) {
     echo('COPY_FROM_CUSTOMER');
   }
 }

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_saveShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_saveShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSaveShippingTemp_$B85!9B8:_$7$J$$G[Aw ＠ h(BID$B$N>l9g(B_$B?75,$KG[Ns$,:n$i$l$k(B()
-  {
+  public function testSaveShippingTemp_$B85!9B8:_$7$J$$G[Aw ＠ h(BID$B$N>l9g(B_$B?75,$KG[Ns$,:n$i$l$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     SC_Helper_Purchase::saveShippingTemp(
@@ -67,8 +63,7 @@
     $this->verify('$BEPO?$7$?G[Aw>pJs(B');
   }
 
-  public function testSaveShippingTemp_$B85!9B8:_$9$kG[Aw ＠ h(BID$B$N>l9g(B_$B>pJs$,%^!<%8$5$l$k(B()
-  {
+  public function testSaveShippingTemp_$B85!9B8:_$9$kG[Aw ＠ h(BID$B$N>l9g(B_$B>pJs$,%^!<%8$5$l$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     SC_Helper_Purchase::saveShippingTemp(

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_setDownloadableFlgToTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_setDownloadableFlgToTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSetDownloadableFlgTo_$BHNGd2A3J$,(B0$B1_$N>l9g(B_$B%U%i%0$,(BON$B$K$J$k(B()
-  {
+  public function testSetDownloadableFlgTo_$BHNGd2A3J$,(B0$B1_$N>l9g(B_$B%U%i%0$,(BON$B$K$J$k(B() {
     $input = array(
       '1001' => array('price' => 0)
     );
@@ -59,8 +55,7 @@
     $this->verify('$B%@%&%s%m!<%I2DG=%U%i%0 ＠ _Dj7k2L(B');
   }
 
-  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8BFb$+$DF~6bF|$"$j$N>l9g(B_$B%U%i%0$,(BON$B$K$J$k(B()
-  {
+  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8BFb$+$DF~6bF|$"$j$N>l9g(B_$B%U%i%0$,(BON$B$K$J$k(B() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '1', 'payment_date' => '2012-12-12')
     );
@@ -72,8 +67,7 @@
     $this->verify('$B%@%&%s%m!<%I2DG=%U%i%0 ＠ _Dj7k2L(B');
   }
 
-  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8BFb$+$DF~6bF|$J$7$N>l9g(B_$B%U%i%0$,(BOFF$B$K$J$k(B()
-  {
+  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8BFb$+$DF~6bF|$J$7$N>l9g(B_$B%U%i%0$,(BOFF$B$K$J$k(B() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '1', 'payment_date' => null)
     );
@@ -85,8 +79,7 @@
     $this->verify('$B%@%&%s%m!<%I2DG=%U%i%0 ＠ _Dj7k2L(B');
   }
 
-  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8B30$+$DF~6bF|$"$j$N>l9g(B_$B%U%i%0$,(BOFF$B$K$J$k(B()
-  {
+  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8B30$+$DF~6bF|$"$j$N>l9g(B_$B%U%i%0$,(BOFF$B$K$J$k(B() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '0', 'payment_date' => '2012-12-12')
     );
@@ -98,8 +91,7 @@
     $this->verify('$B%@%&%s%m!<%I2DG=%U%i%0 ＠ _Dj7k2L(B');
   }
 
-  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8B30$+$DF~6bF|$J$7$N>l9g(B_$B%U%i%0$,(BOFF$B$K$J$k(B()
-  {
+  public function testSetDownloadableFlgTo_$B%@%&%s%m!<%I4|8B30$+$DF~6bF|$J$7$N>l9g(B_$B%U%i%0$,(BOFF$B$K$J$k(B() {
     $input = array(
       '1001' => array('price' => 1000, 'effective' => '0', 'payment_date' => null)
     );

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,24 +31,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_setShipmentItemTempForSoleTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_setShipmentItemTempForSoleTest extends SC_Helper_Purchase_TestBase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
     $_SESSION['testResult'] = null;
   }
 
   /////////////////////////////////////////
-  public function testSetShipmentItemTempForSole__$B$$$C$?$sG[Aw>pJs$,%/%j%"$5$l$?$"$H2~$a$F;XDj$N$b$N$, ＠ _Dj$5$l$k(B()
-  {
+  public function testSetShipmentItemTempForSole__$B$$$C$?$sG[Aw>pJs$,%/%j%"$5$l$?$"$H2~$a$F;XDj$N$b$N$, ＠ _Dj$5$l$k(B() {
     $helper = new SC_Helper_Purchase_setShipmentItemTempForSoleMock();
     $cartSession = new SC_CartSession_setShipmentItemTempForSoleMock();
     $shipping_id = '1001';
@@ -71,24 +67,19 @@
 
 }
 
-class SC_Helper_Purchase_setShipmentItemTempForSoleMock extends SC_Helper_Purchase
-{
-  function clearShipmentItemTemp()
-  {
+class SC_Helper_Purchase_setShipmentItemTempForSoleMock extends SC_Helper_Purchase {
+  function clearShipmentItemTemp() {
     $_SESSION['testResult']['clearShipmentItemTemp'] = TRUE;
   }
 
-  function setShipmentItemTemp($shipping_id, $id, $quantity)
-  {
+  function setShipmentItemTemp($shipping_id, $id, $quantity) {
     $_SESSION['testResult']['shipmentItemTemp'][] = 
       array('shipping_id' => $shipping_id, 'id' => $id, 'quantity' => $quantity);
   }
 }
 
-class SC_CartSession_setShipmentItemTempForSoleMock extends SC_CartSession
-{
-  function getCartList($key)
-  {
+class SC_CartSession_setShipmentItemTempForSoleMock extends SC_CartSession {
+  function getCartList($key) {
     return array(
       array('id'=>'1', 'quantity'=>'10'),
       array('id'=>'2', 'quantity'=>'5'),

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,12 +31,10 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_setShipmentItemTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_setShipmentItemTempTest extends SC_Helper_Purchase_TestBase {
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpProductClass();
     $this->setUpProducts();
@@ -47,14 +45,12 @@
     $this->helper = new SC_Helper_Purchase();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSetShipmentItemTemp_$B@=IJ>pJs$,4{$KB8:_$9$k>l9g(B_$BB8:_$9$k>pJs$,2A3J$KH?1G$5$l$k(B()
-  {
+  public function testSetShipmentItemTemp_$B@=IJ>pJs$,4{$KB8:_$9$k>l9g(B_$BB8:_$9$k>pJs$,2A3J$KH?1G$5$l$k(B() {
     $this->helper->setShipmentItemTemp('1001', '1001', 10);
 
     $this->expected = array(
@@ -70,8 +66,7 @@
     $this->verify();
   }
 
-  public function testSetShipmentItemTemp_$B@=IJ>pJs$,B8:_$7$J$$>l9g(B_DB$B$+$i<hF@$7$?CM$,H?1G$5$l$k(B()
-  {
+  public function testSetShipmentItemTemp_$B@=IJ>pJs$,B8:_$7$J$$>l9g(B_DB$B$+$i<hF@$7$?CM$,H?1G$5$l$k(B() {
     $this->helper->setShipmentItemTemp('1001', '1002', 10);
 
     $this->expected = array(

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,12 +31,10 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_sfUpdateOrderNameColTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_sfUpdateOrderNameColTest extends SC_Helper_Purchase_TestBase {
   var $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
     $this->setUpOrderTemp();
@@ -48,14 +46,12 @@
     $this->helper = new SC_Helper_Purchase();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfUpdateOrderNameCol_TEMP$B%U%i%0$,(BOFF$B$N>l9g(B_$B<uCm%F!<%V%k$HH/Aw%F!<%V%k$,99?7$5$l$k(B()
-  {
+  public function testSfUpdateOrderNameCol_TEMP$B%U%i%0$,(BOFF$B$N>l9g(B_$B<uCm%F!<%V%k$HH/Aw%F!<%V%k$,99?7$5$l$k(B() {
     $order_id = '1002';
 
     $this->helper->sfUpdateOrderNameCol($order_id);
@@ -76,8 +72,7 @@
     $this->verify();
   }
 
-  public function testSfUpdateOrderNameCol_TEMP$B%U%i%0$,(BON$B$N>l9g(B_$B0l;~%F!<%V%k$,99?7$5$l$k(B()
-  {
+  public function testSfUpdateOrderNameCol_TEMP$B%U%i%0$,(BON$B$N>l9g(B_$B0l;~%F!<%V%k$,99?7$5$l$k(B() {
     $order_id = '1002';
 
     $this->helper->sfUpdateOrderNameCol($order_id, true);

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,28 +31,24 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_sfUpdateOrderStatusTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_sfUpdateOrderStatusTest extends SC_Helper_Purchase_TestBase {
 
   private $helper;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpOrder();
     $this->setUpCustomer();
     $this->helper = new SC_Helper_Purchase_sfUpdateOrderStatusMock();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
   // $B%*%W%7%g%s$N0z?t!'BP1~>u67!";HMQ%]%$%s%H!"2C;;%]%$%s%H(B
-  public function testSfUpdateOrderStatus_$B%*%W%7%g%s$N0z?t$,L$;XDj$N>l9g(B_DB$B$NCM$,0z$-7Q$,$l$k(B()
-  {
+  public function testSfUpdateOrderStatus_$B%*%W%7%g%s$N0z?t$,L$;XDj$N>l9g(B_DB$B$NCM$,0z$-7Q$,$l$k(B() {
     $order_id = '1001';
     $old_update_date = $this->objQuery->get('update_date', 'dtb_order', 'order_id = ?', array($order_id));
 
@@ -84,16 +80,14 @@
 
   // TODO $BDj?t$rJQ99$G$-$J$$$?$a%F%9%HIT2D(B
   /**
-  public function testSfUpdateOrderStatus_$B%]%$%s%H;HMQ$7$J$$@_Dj$N>l9g(B_$B%]%$%s%H$K4X$9$k=hM}$,9T$o$l$J$$(B()
-  {
+  public function testSfUpdateOrderStatus_$B%]%$%s%H;HMQ$7$J$$@_Dj$N>l9g(B_$B%]%$%s%H$K4X$9$k=hM}$,9T$o$l$J$$(B() {
 
 
     $this->verify();
   }
   */
 
-  public function testSfUpdateOrderStatus_$BBP1~>u67$,H/Aw:Q$_$KJQ99$5$l$?>l9g(B_$BH/AwF|$,99?7$5$l$k(B()
-  {
+  public function testSfUpdateOrderStatus_$BBP1~>u67$,H/Aw:Q$_$KJQ99$5$l$?>l9g(B_$BH/AwF|$,99?7$5$l$k(B() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -129,8 +123,7 @@
     $this->assertUpdate($new_dates, $old_dates, 'payment_date', '$BF~6bF|(B', false);  
   }
 
-  public function testSfUpdateOrderStatus_$BBP1~>u67$,F~6b:Q$_$KJQ99$5$l$?>l9g(B_$BF~6bF|$,99?7$5$l$k(B()
-  {
+  public function testSfUpdateOrderStatus_$BBP1~>u67$,F~6b:Q$_$KJQ99$5$l$?>l9g(B_$BF~6bF|$,99?7$5$l$k(B() {
     $order_id = '1002';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -161,8 +154,7 @@
     $this->assertUpdate($new_dates, $old_dates, 'payment_date', '$BF~6bF|(B');  
   }
 
-  public function testSfUpdateOrderStatus_$BJQ99A0$NBP1~>u67$,MxMQBP>]$N>l9g(B_$BJQ99A0$N;HMQ%]%$%s%H$rLa$9(B()
-  {
+  public function testSfUpdateOrderStatus_$BJQ99A0$NBP1~>u67$,MxMQBP>]$N>l9g(B_$BJQ99A0$N;HMQ%]%$%s%H$rLa$9(B() {
     $order_id = '1002';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -190,8 +182,7 @@
     $this->verify();
   }
 
-  public function testSfUpdateOrderStatus_$BJQ998e$NBP1~>u67$,MxMQBP>]$N>l9g(B_$BJQ998e$N;HMQ%]%$%s%H$r0z$/(B()
-  {
+  public function testSfUpdateOrderStatus_$BJQ998e$NBP1~>u67$,MxMQBP>]$N>l9g(B_$BJQ998e$N;HMQ%]%$%s%H$r0z$/(B() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -218,8 +209,7 @@
     $this->verify();
   }
 
-  public function testSfUpdateOrderStatus_$BJQ99A0$NBP1~>u67$,2C;;BP>]$N>l9g(B_$BJQ99A0$N2C;;%]%$%s%H$rLa$9(B()
-  {
+  public function testSfUpdateOrderStatus_$BJQ99A0$NBP1~>u67$,2C;;BP>]$N>l9g(B_$BJQ99A0$N2C;;%]%$%s%H$rLa$9(B() {
     $order_id = '1002';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -247,8 +237,7 @@
     $this->verify();
   }
 
-  public function testSfUpdateOrderStatus_$BJQ998e$NBP1~>u67$,2C;;BP>]$N>l9g(B_$BJQ998e$N2C;;%]%$%s%H$rB-$9(B()
-  {
+  public function testSfUpdateOrderStatus_$BJQ998e$NBP1~>u67$,2C;;BP>]$N>l9g(B_$BJQ998e$N2C;;%]%$%s%H$rB-$9(B() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -275,8 +264,7 @@
     $this->verify();
   }
 
-  public function testSfUpdateOrderStatus_$B2C;;%]%$%s%H$,%W%i%9$N>l9g(B_$B2q0w%F!<%V%k$,99?7$5$l$k(B()
-  {
+  public function testSfUpdateOrderStatus_$B2C;;%]%$%s%H$,%W%i%9$N>l9g(B_$B2q0w%F!<%V%k$,99?7$5$l$k(B() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -305,8 +293,7 @@
     $this->verify();
   }
 
-  public function testSfUpdateOrderStatus_$B2C;;%]%$%s%H$,Ii$G%]%$%s%H$,B-$j$F$$$k>l9g(B_$B2q0w%F!<%V%k$,99?7$5$l$k(B()
-  {
+  public function testSfUpdateOrderStatus_$B2C;;%]%$%s%H$,Ii$G%]%$%s%H$,B-$j$F$$$k>l9g(B_$B2q0w%F!<%V%k$,99?7$5$l$k(B() {
     $order_id = '1001';
     $old_dates = $this->objQuery->select(
       'update_date, commit_date, payment_date', 
@@ -337,15 +324,13 @@
 
   // TODO $B%m!<%k%P%C%/$5$l$k>l9g$O(Bexit$B$9$k$?$a%F%9%HIT2D(B.
   /**
-  public function testSfUpdateOrderStatus_$B2C;;%]%$%s%H$,Ii$G%]%$%s%H$,B-$j$F$$$J$$>l9g(B_$B2q0w%F!<%V%k$,%m!<%k%P%C%/$5$l%(%i!<$H$J$k(B()
-  {
+  public function testSfUpdateOrderStatus_$B2C;;%]%$%s%H$,Ii$G%]%$%s%H$,B-$j$F$$$J$$>l9g(B_$B2q0w%F!<%V%k$,%m!<%k%P%C%/$5$l%(%i!<$H$J$k(B() {
   }
   */
 
   //////////////////////////////////////////
 
-  function assertUpdate($new_dates, $old_dates, $key, $message, $is_update = true)
-  {
+  function assertUpdate($new_dates, $old_dates, $key, $message, $is_update = true) {
     $new_date = $new_dates[0][$key];
     $old_date = $old_dates[0][$key];
     if (empty($new_date)) $new_date = '2000-01-01 00:00:00';
@@ -359,22 +344,19 @@
   }
 }
 
-class SC_Helper_Purchase_sfUpdateOrderStatusMock extends SC_Helper_Purchase
-{
+class SC_Helper_Purchase_sfUpdateOrderStatusMock extends SC_Helper_Purchase {
 
   var $usePoint;
   var $addPoint;
 
-  function isUsePoint($status)
-  {
+  function isUsePoint($status) {
     if (is_null($this->usePoint)) {
       return parent::isUsePoint($status);
     }
     return $this->usePoint;
   }
 
-  function isAddPoint($status)
-  {
+  function isAddPoint($status) {
     if (is_null($this->addPoint)) {
       return parent::isAddPoint($status);
     }

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,11 +31,9 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_unsetAllShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_unsetAllShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
 
     // $B6u$K$9$k$@$1$J$N$GE,Ev$JCM$r ＠ _Dj(B
@@ -43,14 +41,12 @@
     $_SESSION['multiple_temp'] = 'temp02';
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testUnsetAllShippingTemp_$BJ#?tG[Aw$bGK4~$9$k%U%i%0$,(BOFF$B$N>l9g(B_$B>pJs$N0lIt$,GK4~$5$l$k(B()
-  {
+  public function testUnsetAllShippingTemp_$BJ#?tG[Aw$bGK4~$9$k%U%i%0$,(BOFF$B$N>l9g(B_$B>pJs$N0lIt$,GK4~$5$l$k(B() {
     SC_Helper_Purchase::unsetAllShippingTemp();
 
     $this->expected = array('shipping'=>TRUE, 'multiple_temp'=>FALSE);
@@ -60,8 +56,7 @@
     $this->verify('$B%;%C%7%g%s>pJs$,6u$+$I$&$+(B');
   }
 
-  public function testUnsetAllShippingTemp_$BJ#?tG[Aw$bGK4~$9$k%U%i%0$,(BON$B$N>l9g(B_$BA4$F$N>pJs$,GK4~$5$l$k(B()
-  {
+  public function testUnsetAllShippingTemp_$BJ#?tG[Aw$bGK4~$9$k%U%i%0$,(BON$B$N>l9g(B_$BA4$F$N>pJs$,GK4~$5$l$k(B() {
     SC_Helper_Purchase::unsetAllShippingTemp(TRUE);
 
     $this->expected = array('shipping'=>TRUE, 'multiple_temp'=>TRUE);

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_unsetOneShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_unsetOneShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testUnsetOneShippingTemp__$B;XDj$7$?(BID$B$NG[Aw>pJs$N$_$,GK4~$5$l$k(B()
-  {
+  public function testUnsetOneShippingTemp__$B;XDj$7$?(BID$B$NG[Aw>pJs$N$_$,GK4~$5$l$k(B() {
     $this->setUpShipping($this->getMultipleShipping());
 
     SC_Helper_Purchase::unsetOneShippingTemp('00002');

$BJQ99(B: branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,11 +31,9 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Helper_Purchase_unsetShippingTempTest extends SC_Helper_Purchase_TestBase
-{
+class SC_Helper_Purchase_unsetShippingTempTest extends SC_Helper_Purchase_TestBase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
 
     // $B6u$K$9$k$@$1$J$N$GE,Ev$JCM$r ＠ _Dj(B
@@ -43,14 +41,12 @@
     $_SESSION['multiple_temp'] = 'temp02';
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testUnsetShippingTemp__$BG[Aw>pJs$,$9$Y$FGK4~$5$l$k(B()
-  {
+  public function testUnsetShippingTemp__$BG[Aw>pJs$,$9$Y$FGK4~$5$l$k(B() {
     SC_Helper_Purchase::unsetShippingTemp(TRUE);
 
     $this->expected = array('shipping'=>TRUE, 'multiple_temp'=>TRUE);

$BJQ99(B: branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php
===================================================================
--- branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -3,8 +3,7 @@
 /**
  * $B%F%9%HMQ$K(BSC_Display$B%/%i%9$rJQ99$7$F%f!<%6%(!<%8%'%s%H$r<+:_$K ＠ _Dj$G$-$k$h$&$K$7$?%/%i%9$G$9!#(B
  */
-class SC_Display_Ex extends SC_Display
-{
+class SC_Display_Ex extends SC_Display {
 
   /** $B%F%9%HMQ$K ＠ _Dj$7$?C<Kv<oJL(B */
   static $dummyDevice = DEVICE_TYPE_PC;
@@ -15,8 +14,7 @@
    * @param     $reset  boolean
    * @return    integer $BC<Kv<oJL(BID
    */
-  public static function detectDevice($reset = FALSE)
-  {
+  public static function detectDevice($reset = FALSE) {
     return self::$dummyDevice;
   }
 
@@ -26,8 +24,7 @@
    * @static
    * @param     $deviceType $BC<Kv<oJL(BID
    */
-  public static function setDummyDevice($deviceType)
-  {
+  public static function setDummyDevice($deviceType) {
     self::$dummyDevice = $deviceType;
   }
 }

$BJQ99(B: branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php
===================================================================
--- branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -3,8 +3,7 @@
 /**
  * $B%F%9%HMQ$K(Bexit$B$7$J$$(BSC_Response$B%/%i%9$G$9!#(B
  */
-class SC_Response_Ex extends SC_Response
-{
+class SC_Response_Ex extends SC_Response {
 
   /** exit$B$7$?$+$I$&$+$rJ];}$9$k%U%i%0(B */
   var $exited = FALSE;
@@ -14,8 +13,7 @@
   /**
    * SC_Response::actionExit()$B$r%i%C%W$7!"(BPHP$B$r(Bexit$B$5$;$J$$$h$&$K$7$^$9!#(B
    */
-  function actionExit()
-  {
+  function actionExit() {
     $this->exited = TRUE;
   }
 
@@ -23,8 +21,7 @@
    * SC_Response::sendRedirect()$B$r%i%C%W$7!"(BPHP$B$r(Bexit$B$5$;$J$$$h$&$K$7$^$9!#(B
    * $B$^$?!"%j%@%$%l%/%H ＠ h$N%Q%9$r<hF@$G$-$k$h$&$K$7$^$9!#(B
    */
-  function sendRedirect($location, $arrQueryString = array(), $inheritQuerySring = false, $useSsl = null)
-  {
+  function sendRedirect($location, $arrQueryString = array(), $inheritQuerySring = false, $useSsl = null) {
     $this->exited = TRUE;
     $this->redirectPath = $location;
   }
@@ -32,16 +29,14 @@
   /**
    * actionExit()$B$,8F$P$l$?$+$I$&$+$r<hF@$7$^$9!#(B
    */
-  public function isExited()
-  {
+  public function isExited() {
     return $this->exited;
   }
 
   /**
    * sendRedirect()$B$G;XDj$5$l$?%Q%9$r<hF@$7$^$9!#(B 
    */
-  public function getRedirectPath()
-  {
+  public function getRedirectPath() {
     return $this->redirectPath;
   }
 }

$BJQ99(B: branches/version-2_12-dev/tests/class/test/util/Test_Utils.php
===================================================================
--- branches/version-2_12-dev/tests/class/test/util/Test_Utils.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/test/util/Test_Utils.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -28,8 +28,7 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class Test_Utils
-{
+class Test_Utils {
 
   /**
    * $BO"A[G[Ns$+$i;XDj$5$l$?%-!<$@$1$rH4$-=P$7$?$b$N$rJV$7$^$9(B.
@@ -40,8 +39,7 @@
    * @param map_keys $B=PNO7k2L$KF~$l$?$$%-!<$rG[Ns$G;XDj$7$^$9(B
    * @return $B;XDj$7$?%-!<$N$_$r;}$DO"A[G[Ns(B
    */
-  public static function mapArray($input_array, $map_keys)
-  {
+  public static function mapArray($input_array, $map_keys) {
     $output_array = array();
     foreach ($map_keys as $index => $map_key) {
       $output_array[$map_key] = $input_array[$map_key];
@@ -59,8 +57,7 @@
    * @param key $BCj=PBP>]$N%-!<(B
    * @return $B;XDj$N%-!<$@$1$rH4$-=P$7$?G[Ns(B
    */
-  public static function mapCols($input_array, $key)
-  {
+  public static function mapCols($input_array, $key) {
     $output_array = array();
     foreach ($input_array as $data) {
       $output_array[] = $data[$key];
@@ -77,8 +74,7 @@
    * @param orig_array $BDI2C ＠ h$NG[Ns(B
    * @param new_array $BDI2CMWAG$r;}$DG[Ns(B
    */
-  public static function array_append(&$orig_array, $new_array)
-  {
+  public static function array_append(&$orig_array, $new_array) {
     foreach ($new_array as $element) {
       $orig_array[] = $element;
     }

$BJQ99(B: branches/version-2_12-dev/tests/class/test/util/User_Utils.php
===================================================================
--- branches/version-2_12-dev/tests/class/test/util/User_Utils.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/test/util/User_Utils.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -4,8 +4,7 @@
  * $B%f!<%6$N>uBV$r%F%9%H$K9g$o$;$FJQ2=$5$;$k%f!<%F%#%j%F%#%/%i%9$G$9!#(B
  *
  */
-class User_Utils
-{
+class User_Utils {
 
   /**
    * $BC<Kv<oJL$r ＠ _Dj$7$^$9!#(B
@@ -13,8 +12,7 @@
    * @static
    * @param deviceType  $BC<Kv<oJL(BID
    */
-  public static function setDeviceType($deviceType)
-  {
+  public static function setDeviceType($deviceType) {
     SC_Display_Ex::setDummyDevice($deviceType);
   }
 
@@ -24,8 +22,7 @@
    * @static
    * @param isLogin true:$B%m%0%$%s$7$F$$$k!"(Bfalse:$B%m%0%$%s$7$F$$$J$$(B
    */
-  public static function setLoginState($isLogin, $customer = null, $objQuery = null)
-  {
+  public static function setLoginState($isLogin, $customer = null, $objQuery = null) {
     if (!$isLogin) {
       $_SESSION['customer']['customer_id'] = null;
       $_SESSION['customer']['email'] = null;
@@ -41,8 +38,7 @@
   /**
    * $B%f!<%6>pJs$r30It$+$i ＠ _Dj$7$J$+$C$?>l9g$N%G%U%)%k%HCM$r<hF@$7$^$9!#(B
    */
-  private static function getDefaultCustomer()
-  {
+  private static function getDefaultCustomer() {
     $arrValue['customer_id'] = '999999998';
     $arrValue['name01'] = '$BID;z(B';
     $arrValue['name02'] = '$BL>A0(B';

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_arrayDefineIndexesTest extends Common_TestCase
-{
+class SC_Utils_arrayDefineIndexesTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testArrayDefineIndexes_$B%A%'%C%/BP>]$N%-!<$,$9$Y$FB8:_$9$k>l9g(B_$BG[Ns$KJQ2=$,$J$$(B()
-  {
+  public function testArrayDefineIndexes_$B%A%'%C%/BP>]$N%-!<$,$9$Y$FB8:_$9$k>l9g(B_$BG[Ns$KJQ2=$,$J$$(B() {
     $input_array = array('apple' => '$B$j$s$4(B', 'banana' => '$B%P%J%J(B', 'orange' => '$B%*%l%s%8(B');
     $defineIndexes = array('banana', 'orange');
 
@@ -57,8 +53,7 @@
     $this->verify();
   }
 
-  public function testArrayDefineIndexes_$B%A%'%C%/BP>]$N%-!<$,0lItB8:_$7$J$$>l9g(B_$BG[Ns$KDI2C$5$l$k(B()
-  {
+  public function testArrayDefineIndexes_$B%A%'%C%/BP>]$N%-!<$,0lItB8:_$7$J$$>l9g(B_$BG[Ns$KDI2C$5$l$k(B() {
     $input_array = array('apple' => '$B$j$s$4(B', 'banana' => '$B%P%J%J(B', 'orange' => '$B%*%l%s%8(B');
     $defineIndexes = array('tomato', 'banana', 'kiwi');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_clearCompliedTemplateTest extends Common_TestCase
-{
+class SC_Utils_clearCompliedTemplateTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function test__$B%3%s%Q%$%k:Q$_$N%U%!%$%k$rG[CV$9$k%G%#%l%/%H%j$,6u$K$J$k(B()
-  {
+  public function test__$B%3%s%Q%$%k:Q$_$N%U%!%$%k$rG[CV$9$k%G%#%l%/%H%j$,6u$K$J$k(B() {
     SC_Utils::clearCompliedTemplate();
 
     $this->expected = array();

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,27 +31,23 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_copyDirectoryTest extends Common_TestCase
-{
+class SC_Utils_copyDirectoryTest extends Common_TestCase {
 
   static $TMP_DIR;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
     self::$TMP_DIR = realpath(dirname(__FILE__)) . "/../../../tmp";
     SC_Helper_FileManager::deleteFile(self::$TMP_DIR);
     mkdir(self::$TMP_DIR, 0700, true);
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testCopyDirectory_$BB8:_$9$k%Q%9$N>l9g(B_$B;XDj$7$?%Q%90J2<$,:F5"E*$K%3%T!<$5$l$k(B()
-  {
+  public function testCopyDirectory_$BB8:_$9$k%Q%9$N>l9g(B_$B;XDj$7$?%Q%90J2<$,:F5"E*$K%3%T!<$5$l$k(B() {
     /**
      * tests/tmp/src
      *             /dir10
@@ -77,8 +73,7 @@
     $this->verify('$B%3%T!<$5$l$?%U%!%$%k0lMw(B');
   }
 
-  public function testCopyDirectory_$BB8:_$7$J$$%Q%9$N>l9g(B_$B2?$b5/$3$i$J$$(B()
-  {
+  public function testCopyDirectory_$BB8:_$7$J$$%Q%9$N>l9g(B_$B2?$b5/$3$i$J$$(B() {
     /**
      * tests/tmp/src
      *             /dir10
@@ -96,8 +91,7 @@
     $this->verify('$B%3%T!<$5$l$?%U%!%$%k0lMw(B');
   }
 
-  public function testCopyDirectory_$B%3%T!<@h$N%G%#%l%/%H%j$,85!9B8:_$9$k>l9g(B_$B>e=q$-$5$l$k(B()
-  {
+  public function testCopyDirectory_$B%3%T!<@h$N%G%#%l%/%H%j$,85!9B8:_$9$k>l9g(B_$B>e=q$-$5$l$k(B() {
     /**
      * tests/tmp/src
      *             /dir10
@@ -125,8 +119,7 @@
 
   }
 
-  public function testCopyDirectory_$B%3%T!<@h$N%U%!%$%k$,85!9B8:_$9$k>l9g(B_$B>e=q$-$5$l$k(B()
-  {
+  public function testCopyDirectory_$B%3%T!<@h$N%U%!%$%k$,85!9B8:_$9$k>l9g(B_$B>e=q$-$5$l$k(B() {
     /**
      * tests/tmp/src
      *             /dir10

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_encodeRFC3986Test extends Common_TestCase
-{
+class SC_Utils_encodeRFC3986Test extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testEncodeRFC3986_$B%A%k%@$,4^$^$l$k>l9g(B_$B%(%s%3!<%I$5$l$J$$(B()
-  {
+  public function testEncodeRFC3986_$B%A%k%@$,4^$^$l$k>l9g(B_$B%(%s%3!<%I$5$l$J$$(B() {
     $input = 'http://www.example.co.jp/~';
     $this->expected = 'http%3A%2F%2Fwww.example.co.jp%2F~';
     $this->actual = SC_Utils::encodeRFC3986($input);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_getHash2ArrayTest extends Common_TestCase
-{
+class SC_Utils_getHash2ArrayTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testGetHash2Array_$BI,?\%-!<;XDj$,$J$$>l9g(B_$BCM$N$_$NG[Ns$,JV$k(B()
-  {
+  public function testGetHash2Array_$BI,?\%-!<;XDj$,$J$$>l9g(B_$BCM$N$_$NG[Ns$,JV$k(B() {
     $input_array = array('apple' => '$B$j$s$4(B', 'banana' => '$B%P%J%J(B', 'orange' => '$B%*%l%s%8(B');
     $this->expected = array('$B$j$s$4(B', '$B%P%J%J(B', '$B%*%l%s%8(B');
     $this->actual = SC_Utils::getHash2Array($input_array);
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testGetHash2Array_$BI,?\%-!<;XDj$,$"$k>l9g(B_$B;XDj%-!<$NCM$N$_$NG[Ns$,JV$k(B()
-  {
+  public function testGetHash2Array_$BI,?\%-!<;XDj$,$"$k>l9g(B_$B;XDj%-!<$NCM$N$_$NG[Ns$,JV$k(B() {
     $input_array = array('apple' => '$B$j$s$4(B', 'banana' => '$B%P%J%J(B', 'orange' => '$B%*%l%s%8(B');
     $requires = array('banana', 'apple');
     $this->expected = array('$B$j$s$4(B', '$B%P%J%J(B');

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,24 +31,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_getRealURLTest extends Common_TestCase
-{
+class SC_Utils_getRealURLTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
   // TODO $B%]!<%HHV9f$N$?$a$N%3%m%s$,I,$:F~$C$F$7$^$&$N$O(BOK?
-  public function testGetRealURL_$B?F%G%#%l%/%H%j$X$N;2>H$r4^$`>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B()
-  {
+  public function testGetRealURL_$B?F%G%#%l%/%H%j$X$N;2>H$r4^$`>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B() {
     $input = 'http://www.example.jp/aaa/../index.php';
     $this->expected = 'http://www.example.jp:/index.php';
     $this->actual = SC_Utils::getRealURL($input);
@@ -56,8 +52,7 @@
     $this->verify();
   }
 
-  public function testGetRealURL_$B?F%G%#%l%/%H%j$X$N;2>H$rJ#?t2s4^$`>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B()
-  {
+  public function testGetRealURL_$B?F%G%#%l%/%H%j$X$N;2>H$rJ#?t2s4^$`>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B() {
     $input = 'http://www.example.jp/aaa/bbb/../../ccc/ddd/../index.php';
     $this->expected = 'http://www.example.jp:/ccc/index.php';
     $this->actual = SC_Utils::getRealURL($input);
@@ -65,8 +60,7 @@
     $this->verify();
   }
 
-  public function testGetRealURL_$B%+%l%s%H%G%#%l%/%H%j$X$N;2>H$r4^$`>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B()
-  {
+  public function testGetRealURL_$B%+%l%s%H%G%#%l%/%H%j$X$N;2>H$r4^$`>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B() {
     $input = 'http://www.example.jp/aaa/./index.php';
     $this->expected = 'http://www.example.jp:/aaa/index.php';
     $this->actual = SC_Utils::getRealURL($input);
@@ -74,8 +68,7 @@
     $this->verify();
   }
 
-  public function testGetRealURL_https$B$N>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B()
-  {
+  public function testGetRealURL_https$B$N>l9g(B_$B ＠ 5$7$/%Q!<%9$G$-$k(B() {
     $input = 'https://www.example.jp/aaa/./index.php';
     $this->expected = 'https://www.example.jp:/aaa/index.php';
     $this->actual = SC_Utils::getRealURL($input);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_Test extends Common_TestCase
-{
+class SC_Utils_Test extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsAbsoluteRealPath_$B ＠ dBP%Q%9$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsAbsoluteRealPath_$B ＠ dBP%Q%9$N>l9g(B_true$B$,JV$k(B() {
 
     if (strpos(PHP_OS, 'WIN')) {
       $input = 'C:/Program Files/username/hoge/hoge.txt';
@@ -60,8 +56,7 @@
     $this->verify();
   }
 
-  public function testIsAbsoluteRealPath_$BAjBP%Q%9$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsAbsoluteRealPath_$BAjBP%Q%9$N>l9g(B_true$B$,JV$k(B() {
 
     if (strpos(PHP_OS, 'WIN')) {
       $input = './system32/hoge/hoge.txt';

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -34,24 +34,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_isAppInnerUrlTest extends Common_TestCase
-{
+class SC_Utils_isAppInnerUrlTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
   /**
-  public function testIsAppInnerUrl_$BHs(BSSL$B$+$D%"%W%jFb(BURL$B$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsAppInnerUrl_$BHs(BSSL$B$+$D%"%W%jFb(BURL$B$N>l9g(B_true$B$,JV$k(B() {
     $input = 'http://sample.eccube.jp/admin/';
     $this->expected = true;
     $this->actual = SC_Utils::isAppInnerUrl($input);
@@ -59,8 +55,7 @@
     $this->verify();
   }
 
-  public function testIsAppInnerUrl_$BHs(BSSL$B$+$D%"%W%j30(BURL$B$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsAppInnerUrl_$BHs(BSSL$B$+$D%"%W%j30(BURL$B$N>l9g(B_false$B$,JV$k(B() {
     $input = 'http://outside.eccube.jp/admin/';
     $this->expected = false;
     $this->actual = SC_Utils::isAppInnerUrl($input);
@@ -68,8 +63,7 @@
     $this->verify();
   }
 
-  public function testIsAppInnerUrl_SSL$B$+$D%"%W%jFb(BURL$B$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsAppInnerUrl_SSL$B$+$D%"%W%jFb(BURL$B$N>l9g(B_true$B$,JV$k(B() {
     $input = 'https://sample.eccube.jp/admin/';
     $this->expected = true;
     $this->actual = SC_Utils::isAppInnerUrl($input);
@@ -77,8 +71,7 @@
     $this->verify();
   }
 
-  public function testIsAppInnerUrl_SSL$B$+$D%"%W%j30(BURL$B$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsAppInnerUrl_SSL$B$+$D%"%W%j30(BURL$B$N>l9g(B_false$B$,JV$k(B() {
     $input = 'https://outside.eccube.jp/admin/';
     $this->expected = false;
     $this->actual = SC_Utils::isAppInnerUrl($input);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,113 +31,94 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_isBlankTest extends Common_TestCase
-{
+class SC_Utils_isBlankTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testIsBlank_0$B%P%$%HJ8;zNs$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsBlank_0$B%P%$%HJ8;zNs$N>l9g(B_true$B$,JV$k(B() {
     $input = '';
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_$BA43Q%9%Z!<%9$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsBlank_$BA43Q%9%Z!<%9$N>l9g(B_true$B$,JV$k(B() {
     $input = '$B!!(B';
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy$B;XDj$J$7$GA43Q%9%Z!<%9$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_greedy$B;XDj$J$7$GA43Q%9%Z!<%9$N>l9g(B_false$B$,JV$k(B() {
     $input = '$B!!(B';
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_$B6u$NG[Ns$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsBlank_$B6u$NG[Ns$N>l9g(B_true$B$,JV$k(B() {
     $input = array();
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_$B%M%9%H$7$?G[Ns$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsBlank_$B%M%9%H$7$?G[Ns$N>l9g(B_true$B$,JV$k(B() {
     $input = array(array(array()));
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy$B;XDj$J$7$G%M%9%H$7$?G[Ns$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_greedy$B;XDj$J$7$G%M%9%H$7$?G[Ns$N>l9g(B_false$B$,JV$k(B() {
     $input = array(array(array()));
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_$B6u$G$J$$G[Ns$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_$B6u$G$J$$G[Ns$N>l9g(B_false$B$,JV$k(B() {
     $input = array(array(array('1')));
     $this->assertFalse(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy$B;XDj$J$7$G6u$G$J$$G[Ns$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_greedy$B;XDj$J$7$G6u$G$J$$G[Ns$N>l9g(B_false$B$,JV$k(B() {
     $input = array(array(array('1')));
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_$BA43Q%9%Z!<%9$H6uGr$NAH$_9g$o$;$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsBlank_$BA43Q%9%Z!<%9$H6uGr$NAH$_9g$o$;$N>l9g(B_true$B$,JV$k(B() {
     $input = "$B!!(B\n$B!!(B";
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy$B;XDj$J$7$GA43Q%9%Z!<%9$H6uGr$NAH$_9g$o$;$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_greedy$B;XDj$J$7$GA43Q%9%Z!<%9$H6uGr$NAH$_9g$o$;$N>l9g(B_false$B$,JV$k(B() {
     $input = "$B!!(B\n$B!!(B";
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_$BA43Q%9%Z!<%9$HHs6uGr$NAH$_9g$o$;$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_$BA43Q%9%Z!<%9$HHs6uGr$NAH$_9g$o$;$N>l9g(B_false$B$,JV$k(B() {
     $input = '$B!!(BA$B!!(B';
     $this->assertFalse(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_greedy$B;XDj$J$7$GA43Q%9%Z!<%9$HHs6uGr$NAH$_9g$o$;$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_greedy$B;XDj$J$7$GA43Q%9%Z!<%9$HHs6uGr$NAH$_9g$o$;$N>l9g(B_false$B$,JV$k(B() {
     $input = '$B!!(BA$B!!(B';
     $this->assertFalse(SC_Utils::isBlank($input, false), $input);
   }
 
-  public function testIsBlank_$B?tCM$N%<%m$rF~NO$7$?>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_$B?tCM$N%<%m$rF~NO$7$?>l9g(B_false$B$,JV$k(B() {
     $input = 0;
     $this->assertFalse(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_$BCM$,6u$NG[Ns$rF~NO$7$?>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsBlank_$BCM$,6u$NG[Ns$rF~NO$7$?>l9g(B_true$B$,JV$k(B() {
     $input = array("");
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_$B$9$Y$F$N%[%o%$%H%9%Z!<%9$rJB$Y$?>l9g(B_true$B$,JV$k(B()
-  {
+  public function testIsBlank_$B$9$Y$F$N%[%o%$%H%9%Z!<%9$rJB$Y$?>l9g(B_true$B$,JV$k(B() {
     $input = " \t$B!!(B\n\r\x0B\0";
     $this->assertTrue(SC_Utils::isBlank($input), $input);
   }
 
-  public function testIsBlank_$BDL>o$NJ8;z$,4^$^$l$F$$$k>l9g(B_false$B$,JV$k(B()
-  {
+  public function testIsBlank_$BDL>o$NJ8;z$,4^$^$l$F$$$k>l9g(B_false$B$,JV$k(B() {
     $input = " AB \n\t";
     $this->assertFalse(SC_Utils::isBlank($input), $input);
   }

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfIsInternalDomainTest extends Common_TestCase
-{
+class SC_Utils_sfIsInternalDomainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testsfIsInternalDomain_$B%I%a%$%s$,0lCW$9$k>l9g(B_true$B$,JV$k(B()
-  {
+  public function testsfIsInternalDomain_$B%I%a%$%s$,0lCW$9$k>l9g(B_true$B$,JV$k(B() {
     $url = 'http://test.local/html/index.php';
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInternalDomain($url);
@@ -55,8 +51,7 @@
     $this->verify($url);
   }
 
-  public function testsfIsInternalDomain_$B%"%s%+!<$r4^$`(BURL$B$N>l9g(B_true$B$,JV$k(B()
-  {
+  public function testsfIsInternalDomain_$B%"%s%+!<$r4^$`(BURL$B$N>l9g(B_true$B$,JV$k(B() {
     $url = 'http://test.local/html/index.php#hoge';
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInternalDomain($url);
@@ -64,8 +59,7 @@
     $this->verify($url);
   }
 
-  public function testsfIsInternalDomain_$B%I%a%$%s$,0lCW$7$J$$>l9g(B_false$B$,JV$k(B()
-  {
+  public function testsfIsInternalDomain_$B%I%a%$%s$,0lCW$7$J$$>l9g(B_false$B$,JV$k(B() {
     $url = 'http://test.local.jp/html/index.php';
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInternalDomain($url);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_jsonDecodeTest extends Common_TestCase
-{
+class SC_Utils_jsonDecodeTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testJsonDecode__JSON$B7A<0$K%(%s%3!<%I$5$l$?J8;zNs$+$i(Barray$B$KJQ49$5$l$k(B()
-  {
+  public function testJsonDecode__JSON$B7A<0$K%(%s%3!<%I$5$l$?J8;zNs$+$i(Barray$B$KJQ49$5$l$k(B() {
     $input = '{"a":1,"b":2,"c":3,"d":4,"e":5}';
 
     $obj = new stdClass;

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_jsonEncodeTest extends Common_TestCase
-{
+class SC_Utils_jsonEncodeTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testJsonEncode__JSON$B7A<0$K%(%s%3!<%I$5$l$?J8;zNs$,JV$k(B()
-  {
+  public function testJsonEncode__JSON$B7A<0$K%(%s%3!<%I$5$l$?J8;zNs$,JV$k(B() {
     $input = array('a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5);
     $this->expected = '{"a":1,"b":2,"c":3,"d":4,"e":5}';
     $this->actual = SC_Utils::jsonEncode($input);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,27 +31,23 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_recursiveMkdirTest extends Common_TestCase
-{
+class SC_Utils_recursiveMkdirTest extends Common_TestCase {
 
   static $TMP_DIR;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     self::$TMP_DIR = realpath(dirname(__FILE__)) . "/../../../tmp";
     SC_Helper_FileManager::deleteFile(self::$TMP_DIR);
     mkdir(self::$TMP_DIR, 0777, true);
 // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRecursiveMkdir_$B%Q!<%_%C%7%g%s$r;XDj$7$?>l9g(B_$B;XDj$N%Q!<%_%C%7%g%s$G%G%#%l%/%H%j$,:n$i$l$k(B()
-  {
+  public function testRecursiveMkdir_$B%Q!<%_%C%7%g%s$r;XDj$7$?>l9g(B_$B;XDj$N%Q!<%_%C%7%g%s$G%G%#%l%/%H%j$,:n$i$l$k(B() {
     $path = realpath(dirname(__FILE__)) . "/../../../tmp/dir1/dir2/dir3/";
     $mode = 0755;
 
@@ -62,8 +58,7 @@
     $this->verify('$B:n ＠ .$7$?%G%#%l%/%H%j$N%Q!<%_%C%7%g%s(B');
   }
 
-  public function testRecursiveMkdir_$B%Q!<%_%C%7%g%s$r;XDj$7$J$$>l9g(B_0777$B$G%G%#%l%/%H%j$,:n$i$l$k(B()
-  {
+  public function testRecursiveMkdir_$B%Q!<%_%C%7%g%s$r;XDj$7$J$$>l9g(B_0777$B$G%G%#%l%/%H%j$,:n$i$l$k(B() {
     $path = realpath(dirname(__FILE__)) . "/../../../tmp/dir1/dir2/dir3/";
 
     $result = SC_Utils::recursiveMkdir($path);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,46 +31,39 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_repeatStrWithSeparatorTest extends Common_TestCase
-{
+class SC_Utils_repeatStrWithSeparatorTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testRepeatStrWithSeparator_$BH?I|2s?t$,(B0$B2s$N>l9g(B_$B7k2L$,(B0$B%P%$%HJ8;zNs$K$J$k(B()
-  {
+  public function testRepeatStrWithSeparator_$BH?I|2s?t$,(B0$B2s$N>l9g(B_$B7k2L$,(B0$B%P%$%HJ8;zNs$K$J$k(B() {
     $this->expected = '';
     $this->actual = SC_Utils::repeatStrWithSeparator('EC$B%5%$%H(B', 0, '#');
 
     $this->verify('$BO"7k:Q$_$NJ8;zNs(B');
   }
 
-  public function testRepeatStrWithSeparator_$BH?I|2s?t$,(B1$B2s$N>l9g(B_$B6h ＠ Z$jJ8;z$,F~$i$J$$(B()
-  {
+  public function testRepeatStrWithSeparator_$BH?I|2s?t$,(B1$B2s$N>l9g(B_$B6h ＠ Z$jJ8;z$,F~$i$J$$(B() {
     $this->expected = 'EC$B%5%$%H(B';
     $this->actual = SC_Utils::repeatStrWithSeparator('EC$B%5%$%H(B', 1, '#');
 
     $this->verify('$BO"7k:Q$_$NJ8;zNs(B');
   }
 
-  public function testRepeatStrWithSeparator_$BH?I|2s?t$,(B2$B2s0J>e$N>l9g(B_$B6h ＠ Z$jJ8;z$,F~$C$F=PNO$5$l$k(B()
-  {
+  public function testRepeatStrWithSeparator_$BH?I|2s?t$,(B2$B2s0J>e$N>l9g(B_$B6h ＠ Z$jJ8;z$,F~$C$F=PNO$5$l$k(B() {
     $this->expected = 'EC$B%5%$%H(B#EC$B%5%$%H(B#EC$B%5%$%H(B#EC$B%5%$%H(B#EC$B%5%$%H(B';
     $this->actual = SC_Utils::repeatStrWithSeparator('EC$B%5%$%H(B', 5, '#');
 
     $this->verify('$BO"7k:Q$_$NJ8;zNs(B');
   }
 
-  public function testRepeatStrWithSeparator_$B6h ＠ Z$jJ8;z$,L$;XDj$N>l9g(B_$B%+%s%^6h ＠ Z$j$H$J$k(B()
-  {
+  public function testRepeatStrWithSeparator_$B6h ＠ Z$jJ8;z$,L$;XDj$N>l9g(B_$B%+%s%^6h ＠ Z$j$H$J$k(B() {
     $this->expected = 'EC$B%5%$%H(B,EC$B%5%$%H(B,EC$B%5%$%H(B';
     $this->actual = SC_Utils::repeatStrWithSeparator('EC$B%5%$%H(B', 3);
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfArrCombineTest extends Common_TestCase
-{
+class SC_Utils_sfArrCombineTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfArrCombine_$BF~NO$NG[Ns$,6u$N>l9g(B_$B7k2L$b6u$K$J$k(B()
-  {
+  public function testSfArrCombine_$BF~NO$NG[Ns$,6u$N>l9g(B_$B7k2L$b6u$K$J$k(B() {
     $keys = array();
     $values = array();
 
@@ -58,8 +54,7 @@
   }
 
   // TODO $BMW3NG'!!%-!<$NJ}$,C;$$>l9g$O%(%i!<$GNI$$$N$G$O!)(B
-  public function testSfArrCombine_$BF~NO$N%-!<G[Ns$NJ}$,C;$$>l9g(B_$BM>$C$?CM$NG[Ns$NMWAG$OL5;k$5$l$k(B()
-  {
+  public function testSfArrCombine_$BF~NO$N%-!<G[Ns$NJ}$,C;$$>l9g(B_$BM>$C$?CM$NG[Ns$NMWAG$OL5;k$5$l$k(B() {
     $keys = array('apple', 'banana');
     $values = array('$B$j$s$4(B', '$B%P%J%J(B', '$B%*%l%s%8(B', '$BM|(B');
 
@@ -73,8 +68,7 @@
     $this->verify();
   }
 
-  public function testSfArrCombine_$BF~NO$N%-!<G[Ns$NJ}$,D9$$>l9g(B_$BM>$C$?%-!<$NG[Ns$NMWAG$O6u$K$J$k(B()
-  {
+  public function testSfArrCombine_$BF~NO$N%-!<G[Ns$NJ}$,D9$$>l9g(B_$BM>$C$?%-!<$NG[Ns$NMWAG$O6u$K$J$k(B() {
     $keys = array('apple', 'banana', 'orange', 'pear');
     $values = array('$B$j$s$4(B', '$B%P%J%J(B');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,15 +31,13 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfArrKeyValueTest extends Common_TestCase
-{
+class SC_Utils_sfArrKeyValueTest extends Common_TestCase {
 
   var $arrList;
   var $keyname;
   var $valuename;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
 
     $this->arrList = array(
@@ -52,14 +50,12 @@
     $this->valuename = 'testvalue';
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfArrKeyValue_$B:GBgD9$,G[Ns$h$jC;$$>l9g(B_$B:GBgD9$G%+%C%H$5$l$k(B()
-  {
+  public function testSfArrKeyValue_$B:GBgD9$,G[Ns$h$jC;$$>l9g(B_$B:GBgD9$G%+%C%H$5$l$k(B() {
     $len_max = 3;
 
     $this->expected = array(
@@ -72,8 +68,7 @@
     $this->verify();
   }
 
-  public function testSfArrKeyValue_$B:GBgD9$,;XDj$5$l$F$$$J$$>l9g(B_$BA4MWAG$,=PNO$5$l$k(B()
-  {
+  public function testSfArrKeyValue_$B:GBgD9$,;XDj$5$l$F$$$J$$>l9g(B_$BA4MWAG$,=PNO$5$l$k(B() {
     $this->expected = array(
       '1011' => '2001',
       '2022' => '2002',
@@ -85,8 +80,7 @@
     $this->verify();
   }
 
-  public function testSfArrKeyValue_$B%-!<%5%$%:$,C;$$>l9g(B_$B%-!<%5%$%:$G%+%C%H$5$l$k(B()
-  {
+  public function testSfArrKeyValue_$B%-!<%5%$%:$,C;$$>l9g(B_$B%-!<%5%$%:$G%+%C%H$5$l$k(B() {
     $len_max = 5;
     $keysize = 1;
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfArrayIntersectKeysTest extends Common_TestCase
-{
+class SC_Utils_sfArrayIntersectKeysTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfArrayIntersectKeys_$B;XDj%-!<$K4^$^$l$k$b$N$,$J$$>l9g(B_$B6u$NG[Ns$,JV$k(B()
-  {
+  public function testSfArrayIntersectKeys_$B;XDj%-!<$K4^$^$l$k$b$N$,$J$$>l9g(B_$B6u$NG[Ns$,JV$k(B() {
     $input_array = array('apple' => '$B$j$s$4(B', 'banana' => '$B%P%J%J(B', 'orange' => '$B%*%l%s%8(B');
     $key_array = array('kiwi', 'tomato');
 
@@ -57,8 +53,7 @@
     $this->verify();
   }
 
-  public function testSfArrayIntersctKeys_$B;XDj%-!<$K4^$^$l$k$b$N$,$"$k>l9g(B_$B4^$^$l$k$b$N$@$1$,JV$k(B()
-  {
+  public function testSfArrayIntersctKeys_$B;XDj%-!<$K4^$^$l$k$b$N$,$"$k>l9g(B_$B4^$^$l$k$b$N$@$1$,JV$k(B() {
     $input_array = array('apple' => '$B$j$s$4(B', 'banana' => '$B%P%J%J(B', 'orange' => '$B%*%l%s%8(B');
     $key_array = array('orange', 'apple');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfCalcIncTaxTest extends Common_TestCase
-{
+class SC_Utils_sfCalcIncTaxTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfCalcIncTax_$B;M<N8^F~$N>l9g(B_$B;M<N8^F~$N7k2L$K$J$k(B()
-  {
+  public function testSfCalcIncTax_$B;M<N8^F~$N>l9g(B_$B;M<N8^F~$N7k2L$K$J$k(B() {
     $this->expected = array(141, 152);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 1); // 1:$B;M<N8^F~(B
     $this->actual[1] = SC_Utils::sfCalcIncTax(150, 1, 1); // 1:$B;M<N8^F~(B
@@ -54,8 +50,7 @@
     $this->verify('$B ＠ G9~2A3J(B');
   }
 
-  public function testSfCalcIncTax_$B ＠ Z$j<N$F$N>l9g(B_$B ＠ Z$j<N$F$N7k2L$K$J$k(B()
-  {
+  public function testSfCalcIncTax_$B ＠ Z$j<N$F$N>l9g(B_$B ＠ Z$j<N$F$N7k2L$K$J$k(B() {
     $this->expected = array(142, 153);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 2, 2); // 2:$B ＠ Z$j<N$F(B
     $this->actual[1] = SC_Utils::sfCalcIncTax(150, 2, 2); // 2:$B ＠ Z$j<N$F(B
@@ -63,8 +58,7 @@
     $this->verify('$B ＠ G9~2A3J(B');
   }
 
-  public function testSfCalcIncTax_$B ＠ Z$j>e$2$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B()
-  {
+  public function testSfCalcIncTax_$B ＠ Z$j>e$2$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B() {
     $this->expected = array(142, 152);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 3); // 3:$B ＠ Z$j>e$2(B
     $this->actual[1] = SC_Utils::sfCalcIncTax(150, 1, 3); // 3:$B ＠ Z$j>e$2(B
@@ -72,8 +66,7 @@
     $this->verify('$B ＠ G9~2A3J(B');
   }
 
-  public function testSfCalcIncTax_$B$=$l0J30$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B()
-  {
+  public function testSfCalcIncTax_$B$=$l0J30$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B() {
     $this->expected = array(142, 152);
     $this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 4);
     $this->actual[1] = SC_Utils::sfCalcIncTax(150, 1, 4);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,27 +31,23 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfCopyDirTest extends Common_TestCase
-{
+class SC_Utils_sfCopyDirTest extends Common_TestCase {
 
   static $TMP_DIR;
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
     self::$TMP_DIR = realpath(dirname(__FILE__)) . "/../../../tmp";
     SC_Helper_FileManager::deleteFile(self::$TMP_DIR);
     mkdir(self::$TMP_DIR, 0777, true);
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfCopyDir_$B%G%#%l%/%H%j$G$J$$>l9g(B_false$B$rJV$72?$b$7$J$$(B()
-  {
+  public function testSfCopyDir_$B%G%#%l%/%H%j$G$J$$>l9g(B_false$B$rJV$72?$b$7$J$$(B() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     $fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
     fwrite($fp, "hello");
@@ -70,8 +66,7 @@
     $this->verify();
   }
 
-  public function testSfCopyDir_$B%3%T!<@h$N%G%#%l%/%H%j$,B8:_$7$J$$>l9g(B_$B?7$?$K:n ＠ .$9$k(B()
-  {
+  public function testSfCopyDir_$B%3%T!<@h$N%G%#%l%/%H%j$,B8:_$7$J$$>l9g(B_$B?7$?$K:n ＠ .$9$k(B() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     $fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
     fwrite($fp, "hello");
@@ -93,8 +88,7 @@
 
   // TODO CVS$B0J2<$N(BEntries$B$J$I$O%3%T!<$5$l$J$$$,!"(BCVS$B$H$$$&?F%G%#%l%/%H%j$O%3%T!<$5$l$F$7$^$&!#(B
   // $B$=$b$=$b!"(BCVS$B$@$1FCJL07$$$9$k0UL#$,$J$$$h$&$J!D(B
-  public function testSfCopyDir_$B%3%T!<@h$N%G%#%l%/%H%j$,B8:_$9$k>l9g(B_$B$=$N$^$^%3%T!<$9$k(B()
-  {
+  public function testSfCopyDir_$B%3%T!<@h$N%G%#%l%/%H%j$,B8:_$9$k>l9g(B_$B$=$N$^$^%3%T!<$9$k(B() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     mkdir(self::$TMP_DIR . "/dst", 0777, true); // $B%3%T!<@h$b:n ＠ .$7$F$*$/(B
     $fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
@@ -135,8 +129,7 @@
     $this->verify();
   }
 
-  public function testSfCopyDir_$B>e=q$-%U%i%0$,(BON$B$N>l9g(B_$BF1L>%U%!%$%k$,>e=q$-$5$l$k(B()
-  {
+  public function testSfCopyDir_$B>e=q$-%U%i%0$,(BON$B$N>l9g(B_$BF1L>%U%!%$%k$,>e=q$-$5$l$k(B() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     mkdir(self::$TMP_DIR . "/dst", 0777, true); // $B%3%T!<@h$b:n ＠ .$7$F$*$/(B
     $fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
@@ -165,8 +158,7 @@
     $this->verify();
   }
 
-  public function testSfCopyDir_$B>e=q$-%U%i%0$,(BON$B$+$D=q$-9~$_8"8B$,$J$$>l9g(B_$BF1L>%U%!%$%k$,>e=q$-$5$l$J$$(B()
-  {
+  public function testSfCopyDir_$B>e=q$-%U%i%0$,(BON$B$+$D=q$-9~$_8"8B$,$J$$>l9g(B_$BF1L>%U%!%$%k$,>e=q$-$5$l$J$$(B() {
     mkdir(self::$TMP_DIR . "/src", 0777, true);
     mkdir(self::$TMP_DIR . "/dst", 0777, true); // $B%3%T!<@h$b:n ＠ .$7$F$*$/(B
     $fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfCutStringTest extends Common_TestCase
-{
+class SC_Utils_sfCutStringTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfCutString_$B%^%k%A%P%$%H;XDj$G;XDjD9$h$j(B2$BJ8;z0J>eD9$$>l9g(B_$B;XDjD9$G%+%C%H$5$l$k(B()
-  {
+  public function testSfCutString_$B%^%k%A%P%$%H;XDj$G;XDjD9$h$j(B2$BJ8;z0J>eD9$$>l9g(B_$B;XDjD9$G%+%C%H$5$l$k(B() {
     $input = '$B$"$$$&$($*(BABC$B!"$3$s$K$A$O!#(B';
     $this->expected = '$B$"$$$&$($*(BABC$B!"$3$s$K$A(B...';
     $this->actual = SC_Utils::sfCutString($input, 13, false);
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testSfCutString_$B%^%k%A%P%$%H;XDj$G;XDjD9$h$j(B1$BJ8;zD9$$>l9g(B_$B%+%C%H$5$l$J$$(B()
-  {
+  public function testSfCutString_$B%^%k%A%P%$%H;XDj$G;XDjD9$h$j(B1$BJ8;zD9$$>l9g(B_$B%+%C%H$5$l$J$$(B() {
     $input = '$B$"$$$&$($*(BABC$B!"$3$s$K$A$O(B';
     $this->expected = '$B$"$$$&$($*(BABC$B!"$3$s$K$A$O(B';
     $this->actual = SC_Utils::sfCutString($input, 13, false);
@@ -64,8 +59,7 @@
     $this->verify();
   }
 
-  public function testSfCutString_$B%^%k%A%P%$%H;XDj$G;XDjD90JFb$N>l9g(B_$B%+%C%H$5$l$J$$(B()
-  {
+  public function testSfCutString_$B%^%k%A%P%$%H;XDj$G;XDjD90JFb$N>l9g(B_$B%+%C%H$5$l$J$$(B() {
     $input = '$B$"$$$&$($*(BABC$B!"$3$s$K$A(B';
     $this->expected = '$B$"$$$&$($*(BABC$B!"$3$s$K$A(B';
     $this->actual = SC_Utils::sfCutString($input, 13, false);
@@ -73,8 +67,7 @@
     $this->verify();
   }
 
-  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD9$h$j(B3$BJ8;z0J>eD9$$>l9g(B_$B;XDjD9$G%+%C%H$5$l$k(B()
-  {
+  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD9$h$j(B3$BJ8;z0J>eD9$$>l9g(B_$B;XDjD9$G%+%C%H$5$l$k(B() {
     $input = 'hello, world!!';
     $this->expected = 'hello, worl...';
     $this->actual = SC_Utils::sfCutString($input, 11);
@@ -82,8 +75,7 @@
     $this->verify();
   }
 
-  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD9$h$j(B2$BJ8;zD9$$>l9g(B_$B%+%C%H$5$l$J$$(B()
-  {
+  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD9$h$j(B2$BJ8;zD9$$>l9g(B_$B%+%C%H$5$l$J$$(B() {
     $input = 'hello, world!';
     $this->expected = 'hello, world!';
     $this->actual = SC_Utils::sfCutString($input, 11);
@@ -91,8 +83,7 @@
     $this->verify();
   }
 
-  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD9$h$j(B1$BJ8;zD9$$>l9g(B_$B%+%C%H$5$l$J$$(B()
-  {
+  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD9$h$j(B1$BJ8;zD9$$>l9g(B_$B%+%C%H$5$l$J$$(B() {
     $input = 'hello, world';
     $this->expected = 'hello, world';
     $this->actual = SC_Utils::sfCutString($input, 11);
@@ -100,8 +91,7 @@
     $this->verify();
   }
 
-  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD90JFb$N>l9g(B_$B%+%C%H$5$l$J$$(B()
-  {
+  public function testSfCutString_1$B%P%$%H;XDj$G;XDjD90JFb$N>l9g(B_$B%+%C%H$5$l$J$$(B() {
     $input = 'hello, worl';
     $this->expected = 'hello, worl';
     $this->actual = SC_Utils::sfCutString($input, 11);
@@ -110,8 +100,7 @@
   }
 
   // [$B$^$G$N>l9g(B
-  public function testSfCutString_$B3(J8;z$r4^$s$G%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B1()
-  {
+  public function testSfCutString_$B3(J8;z$r4^$s$G%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B1() {
     $input = "hello[emoji:135], world.";
     $this->expected = 'hello...';
     $this->actual = SC_Utils::sfCutString($input, 6);
@@ -120,8 +109,7 @@
   }
 
   // ]$B$ND>A0$^$G$N>l9g(B
-  public function testSfCutString_$B3(J8;z$r4^$s$G%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B2()
-  {
+  public function testSfCutString_$B3(J8;z$r4^$s$G%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B2() {
     $input = "hello[emoji:135], world.";
     $this->expected = 'hello...';
     $this->actual = SC_Utils::sfCutString($input, 15);
@@ -130,8 +118,7 @@
   }
 
   // $B:G=i$N3(J8;z$NESCf(B
-  public function testSfCutString_$BJ#?t$N3(J8;z$r4^$s$G$$$F%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B1()
-  {
+  public function testSfCutString_$BJ#?t$N3(J8;z$r4^$s$G$$$F%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B1() {
     $input = "hello[emoji:100][emoji:20], world![emoji:10]";
     $this->expected = 'hello...';
     $this->actual = SC_Utils::sfCutString($input, 10);
@@ -140,8 +127,7 @@
   }
 
   // 2$B$D$a$N3(J8;z$NESCf(B
-  public function testSfCutString_$BJ#?t$N3(J8;z$r4^$s$G$$$F%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B2()
-  {
+  public function testSfCutString_$BJ#?t$N3(J8;z$r4^$s$G$$$F%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B2() {
     $input = "hello[emoji:100][emoji:20], world![emoji:10]";
     $this->expected = 'hello[emoji:100]...';
     $this->actual = SC_Utils::sfCutString($input, 20);
@@ -150,8 +136,7 @@
   }
 
   // 3$B$D$a$N3(J8;z$NESCf(B
-  public function testSfCutString_$BJ#?t$N3(J8;z$r4^$s$G$$$F%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B3()
-  {
+  public function testSfCutString_$BJ#?t$N3(J8;z$r4^$s$G$$$F%+%C%H$5$l$k>l9g(B_$BCfESH>C<$J3(J8;z$,%+%C%H$5$l$k(B3() {
     $input = "hello[emoji:100][emoji:20], world![emoji:10]";
     $this->expected = 'hello[emoji:100][emoji:20], wo...';
     $this->actual = SC_Utils::sfCutString($input, 30);
@@ -160,8 +145,7 @@
   }
 
   // TODO $BMW3NG'(B $B;0E@%j!<%@IU$1$J$$>l9g$O!"(Blen$B$HHf3S$7$?J}$,NI$$$N$G$O!)(B
-  public function testSfCutString_$B;0E@%j!<%@IU2C;XDj$,$J$$>l9g(B_$BIU2C$5$l$J$$(B()
-  {
+  public function testSfCutString_$B;0E@%j!<%@IU2C;XDj$,$J$$>l9g(B_$BIU2C$5$l$J$$(B() {
     $input = 'hello, world';
     $this->expected = 'hello';
     $this->actual = SC_Utils::sfCutString($input, 5, true, false);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfDBDatetoTimeTest extends Common_TestCase
-{
+class SC_Utils_sfDBDatetoTimeTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfDbDatetoTime_$B;~9o$K%^%$%/%mIC$,4^$^$l$F$$$k>l9g(B_$B%^%$%/%mIC$rL5;k$7$FJQ49$G$-$k(B()
-  {
+  public function testSfDbDatetoTime_$B;~9o$K%^%$%/%mIC$,4^$^$l$F$$$k>l9g(B_$B%^%$%/%mIC$rL5;k$7$FJQ49$G$-$k(B() {
     
     $this->expected = mktime(10, 20, 30, 10, 31, 2012);
     $this->actual = SC_Utils::sfDbDatetoTime('2012-10-31 10:20:30.000002');
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testSfDbDatetoTime_$B;~9o$K%^%$%/%mIC$,4^$^$l$F$$$J$$>l9g(B_$B$=$N$^$^JQ49$G$-$k(B()
-  {
+  public function testSfDbDatetoTime_$B;~9o$K%^%$%/%mIC$,4^$^$l$F$$$J$$>l9g(B_$B$=$N$^$^JQ49$G$-$k(B() {
     
     $this->expected = mktime(10, 20, 30, 10, 31, 2012);
     $this->actual = SC_Utils::sfDbDatetoTime('2012-10-31 10:20:30');

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfDispDBDateTest extends Common_TestCase
-{
+class SC_Utils_sfDispDBDateTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfDispDBDate_$BG/$,;XDj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfDispDBDate_$BG/$,;XDj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $dbdate = '-01-23 01:12:24';
     
     $this->expected = '';
@@ -55,8 +51,7 @@
 
     $this->verify();
   }
-  public function testSfDispDBDate_$B7n$,;XDj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfDispDBDate_$B7n$,;XDj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $dbdate = '2012--23 01:12:24';
     
     $this->expected = '';
@@ -64,8 +59,7 @@
 
     $this->verify();
   }
-  public function testSfDispDBDate_$BF|$,;XDj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfDispDBDate_$BF|$,;XDj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $dbdate = '2012-01- 01:12:24';
     
     $this->expected = '';
@@ -73,8 +67,7 @@
 
     $this->verify();
   }
-  public function testSfDispDBDate_$BG/7nF|$9$Y$FB8:_$9$k>l9g(B_$B%U%)!<%^%C%H:Q$_J8;zNs$,JV$k(B()
-  {
+  public function testSfDispDBDate_$BG/7nF|$9$Y$FB8:_$9$k>l9g(B_$B%U%)!<%^%C%H:Q$_J8;zNs$,JV$k(B() {
     $dbdate = '2012-1-23 1:12:24';
     
     $this->expected = '2012/01/23 01:12';
@@ -82,8 +75,7 @@
 
     $this->verify();
   }
-  public function testSfDispDBDate_$B;~9oI=<(%U%i%0$,(BOFF$B$N>l9g(B_$B;~9o$J$7$N%U%)!<%^%C%H:Q$_J8;zNs$,JV$k(B()
-  {
+  public function testSfDispDBDate_$B;~9oI=<(%U%i%0$,(BOFF$B$N>l9g(B_$B;~9o$J$7$N%U%)!<%^%C%H:Q$_J8;zNs$,JV$k(B() {
     $dbdate = '2012-1-23 1:12:24';
     
     $this->expected = '2012/01/23';

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfEncodeFileTest extends Common_TestCase
-{
+class SC_Utils_sfEncodeFileTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfEncodeFile_$B%U%!%$%k$, ＠ 5>o$K3+$1$?>l9g(B_$B%U%!%$%k$,%(%s%3!<%I$5$l=PNO ＠ h$N%Q%9$,<hF@$G$-$k(B()
-  {
+  public function testSfEncodeFile_$B%U%!%$%k$, ＠ 5>o$K3+$1$?>l9g(B_$B%U%!%$%k$,%(%s%3!<%I$5$l=PNO ＠ h$N%Q%9$,<hF@$G$-$k(B() {
     $outdir = realpath(dirname(__FILE__)) . "/../../../tmp/enc_output/";
     SC_Helper_FileManager::deleteFile($outdir);
     mkdir($outdir, 0777, TRUE);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,30 +31,25 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfErrorHeaderTest extends Common_TestCase
-{
+class SC_Utils_sfErrorHeaderTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfErrorHeader_print$B%U%i%0$,(BON$B$N>l9g(B_$B;XDj$7$?%a%C%;!<%8$,=PNO$5$l$k(B()
-  {
+  public function testSfErrorHeader_print$B%U%i%0$,(BON$B$N>l9g(B_$B;XDj$7$?%a%C%;!<%8$,=PNO$5$l$k(B() {
     global $GLOBAL_ERR; 
     $this->expectOutputString($GLOBAL_ERR . '<div id="errorHeader">ERROR MESSAGE</div>');
     SC_Utils::sfErrorHeader('ERROR MESSAGE', TRUE);
   }
 
-  public function testSfErrorHeader_print$B%U%i%0$,(BOFF$B$N>l9g(B_$B;XDj$7$?%a%C%;!<%8$,%0%m!<%P%kJQ?t$K3JG<$5$l$k(B()
-  {
+  public function testSfErrorHeader_print$B%U%i%0$,(BOFF$B$N>l9g(B_$B;XDj$7$?%a%C%;!<%8$,%0%m!<%P%kJQ?t$K3JG<$5$l$k(B() {
     global $GLOBAL_ERR;
     $this->expectOutputString('');
     $old_err = $GLOBAL_ERR;

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,37 +32,31 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfFlushTest extends Common_TestCase
-{
+class SC_Utils_sfFlushTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfFlush_IE$B$N>l9g(B_$B%U%i%C%7%e$5$l$k(B()
-  {
+  public function testSfFlush_IE$B$N>l9g(B_$B%U%i%C%7%e$5$l$k(B() {
     $this->expectOutputString('');
     echo 'Hello, World!!';
     SC_Utils::sfFlush(TRUE);
   }
 
-  public function testSfFlush_$BJ8;zNs$r;XDj$7$?>l9g(B_$B%U%i%C%7%e$5$l$k(B()
-  {
+  public function testSfFlush_$BJ8;zNs$r;XDj$7$?>l9g(B_$B%U%i%C%7%e$5$l$k(B() {
     $this->expectOutputString('');
     echo 'Hello, World!!';
     SC_Utils::sfFlush('Hello');
   }
 
-  public function testSfFlush_$B;29M(B_$B$3$N4X?t$r8F$P$J$$$H%P%C%U%!$K=PNO$,;D$k(B()
-  {
+  public function testSfFlush_$B;29M(B_$B$3$N4X?t$r8F$P$J$$$H%P%C%U%!$K=PNO$,;D$k(B() {
     $this->expectOutputString('Hello, World!!');
     echo 'Hello, World!!';
   }

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetAddPointTest extends Common_TestCase
-{
+class SC_Utils_sfGetAddPointTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetAddPoint_$B7W;;7k2L$, ＠ 5$K$J$k>l9g(B_$BCM$,$=$N$^$^JV$k(B()
-  {
+  public function testSfGetAddPoint_$B7W;;7k2L$, ＠ 5$K$J$k>l9g(B_$BCM$,$=$N$^$^JV$k(B() {
     $totalpoint = 100;
     $use_point = 2000;
     $point_rate = 4;
@@ -58,8 +54,7 @@
     $this->verify();
   }
 
-  public function testSfGetAddPoint_$B7W;;7k2L$,Ii$K$J$k>l9g(B_0$B$,JV$k(B()
-  {
+  public function testSfGetAddPoint_$B7W;;7k2L$,Ii$K$J$k>l9g(B_0$B$,JV$k(B() {
     $totalpoint = 70;
     $use_point = 2000;
     $point_rate = 4;

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,32 +31,27 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetAddressTest extends Common_TestCase
-{
+class SC_Utils_sfGetAddressTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpAddress();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function test_$B=;=j$,%R%C%H$7$J$$>l9g(B_$B6u$NG[Ns$,JV$k(B()
-  {
+  public function test_$B=;=j$,%R%C%H$7$J$$>l9g(B_$B6u$NG[Ns$,JV$k(B() {
     $this->expected = array();
     $this->actual = SC_Utils::sfGetAddress('9999999');
 
     $this->verify('$BM9JXHV9f8!:w7k2L(B');
   }
 
-  public function test_$B=;=j$,0l7o$@$1%R%C%H$9$k>l9g(B_$B=;=j%G!<%?$,<hF@$G$-$k(B()
-  {
+  public function test_$B=;=j$,0l7o$@$1%R%C%H$9$k>l9g(B_$B=;=j%G!<%?$,<hF@$G$-$k(B() {
     $this->expected = array(
       array(
         'state' => '1',    // $BKL3$F;(B
@@ -73,8 +68,7 @@
   // $B:#$N;EMM$G$O$3$l$G(BOK$B$+$b$7$l$J$$$,!"$=$b$=$b0l7oL\$7$+;H$o$J$$$N$J$i(B
   // $data_list[0]$B$rJV$7$?J}$,NI$$$N$G$O(B?
   /**
-  public function test_$B=;=j$,Fs7o0J>e%R%C%H$9$k>l9g(B_$BD.L>$r>C$7$?=;=j%G!<%?$,<hF@$G$-$k(B()
-  {
+  public function test_$B=;=j$,Fs7o0J>e%R%C%H$9$k>l9g(B_$BD.L>$r>C$7$?=;=j%G!<%?$,<hF@$G$-$k(B() {
     $this->expected = array(
       array(
         'state' => '5',    // $B=)ED8)(B
@@ -93,8 +87,7 @@
   }
   */
 
-  public function test_$B=;=j$KC"$7=q$-$,4^$^$l$k>l9g(B_$BC"$7=q$-$,>C5n$5$l$k(B()
-  {
+  public function test_$B=;=j$KC"$7=q$-$,4^$^$l$k>l9g(B_$BC"$7=q$-$,>C5n$5$l$k(B() {
     $this->expected = array(
       array(
         'state' => '1',    // $BKL3$F;(B
@@ -107,8 +100,7 @@
     $this->verify('$BM9JXHV9f8!:w7k2L(B');
   }
 
-  public function test_$B=;=j$KCm0UJ88@$,$"$k>l9g(B_$BD.L>$,>C5n$5$l$k(B()
-  {
+  public function test_$B=;=j$KCm0UJ88@$,$"$k>l9g(B_$BD.L>$,>C5n$5$l$k(B() {
     $this->expected = array(
       array(
         'state' => '1',    // $BKL3$F;(B
@@ -121,8 +113,7 @@
     $this->verify('$BM9JXHV9f8!:w7k2L(B');
   }
 
-  public function test_$B=;=j$KHVCO$N ＠ bL@$,4^$^$l$k>l9g(B_$BD.L>$,>C5n$5$l$k(B()
-  {
+  public function test_$B=;=j$KHVCO$N ＠ bL@$,4^$^$l$k>l9g(B_$BD.L>$,>C5n$5$l$k(B() {
     $this->expected = array(
       array(
         'state' => '8',    // $B0q>k8)(B
@@ -137,8 +128,7 @@
 
   //////////////////////////////////////////
 
-  protected function setUpAddress()
-  {
+  protected function setUpAddress() {
 
     $address = array(
       array(

$B%3%T!<$K$h$kDI2C(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php ($B%3%T!<85(B: $B%j%S%8%g%s(B 22580, branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php)
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php	                        (rev 0)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -0,0 +1,67 @@
+<?php
+
+$HOME = realpath(dirname(__FILE__)) . "/../../../..";
+require_once($HOME . "/tests/class/Common_TestCase.php");
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * SC_Utils::sfGetBrothersArray()$B$N%F%9%H%/%i%9(B.
+ *
+ *
+ * @author Hiroko Tamagawa
+ * @version $Id$
+ */
+class SC_Utils_sfGetBrothersArrayTest extends Common_TestCase {
+
+
+  protected function setUp() {
+    // parent::setUp();
+  }
+
+  protected function tearDown() {
+    // parent::tearDown();
+  }
+
+  /////////////////////////////////////////
+  public function testSfGetBrothersArray__$BM?$($i$l$?(BID$B$N7;DoMWAG$@$1$,Cj=P$5$l$k(B() {
+    $input_array = array(
+      array('parent_id' => '1001', 'child_id' => '1001001'),
+      array('parent_id' => '1002', 'child_id' => '1002001'),
+      array('parent_id' => '1002', 'child_id' => '1002002'),
+      array('parent_id' => '1003', 'child_id' => '1003001'),
+      array('parent_id' => '1004', 'child_id' => '1004001')
+    );
+    $this->expected = array('1002001', '1002002', '1004001');
+    $this->actual = SC_Utils::sfGetBrothersArray(
+      $input_array, 
+      'parent_id',
+      'child_id', 
+      array('1002001', '1004001')
+    );
+    $this->verify();
+  }
+
+  //////////////////////////////////////////
+
+}
+

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetCSVListTest extends Common_TestCase
-{
+class SC_Utils_sfGetCSVListTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetCSVList_$BG[Ns$,6u$N>l9g(B_false$B$,JV$k(B()
-  {
+  public function testSfGetCSVList_$BG[Ns$,6u$N>l9g(B_false$B$,JV$k(B() {
     
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfGetCSVList(array());
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testSfGetCSVList_$BG[Ns$KMWAG$,B8:_$9$k>l9g(B_CSV$B7A<0$KJQ49$7$?J8;zNs$,JV$k(B()
-  {
+  public function testSfGetCSVList_$BG[Ns$KMWAG$,B8:_$9$k>l9g(B_CSV$B7A<0$KJQ49$7$?J8;zNs$,JV$k(B() {
     
     $this->expected = '"1$B$DL\$NMWAG(B","$B%+%s%^$r(B,$B4^$`MWAG(B","3$B$DL\$NMWAG(B"' . "\r\n";
     $this->actual = SC_Utils::sfGetCSVList(

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,31 +31,26 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetCheckedTest extends Common_TestCase
-{
+class SC_Utils_sfGetCheckedTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetChecked_$B0z?t$,0lCW$9$k>l9g(B_$B%A%'%C%/:Q$_$NJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetChecked_$B0z?t$,0lCW$9$k>l9g(B_$B%A%'%C%/:Q$_$NJ8;zNs$,JV$k(B() {
     $this->expected = 'checked="checked"';
     $this->actual = SC_Utils::sfGetChecked('1', '1');
 
     $this->verify();
   }
 
-  public function testSfGetChecked_$B0z?t$,0lCW$7$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetChecked_$B0z?t$,0lCW$7$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $this->expected = '';
     $this->actual = SC_Utils::sfGetChecked('2', '1');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,24 +31,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetClassCatCountTest extends Common_TestCase
-{
+class SC_Utils_sfGetClassCatCountTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpClassCat();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetClassCatCount__$B5,3JJ,N`$N7o?t$,(BID$B$4$H$K<hF@$G$-$k(B()
-  {
+  public function testSfGetClassCatCount__$B5,3JJ,N`$N7o?t$,(BID$B$4$H$K<hF@$G$-$k(B() {
     
     $this->expected = array(
       '1001' => '2',
@@ -61,8 +57,7 @@
 
   //////////////////////////////////////////
 
-  protected function setUpClassCat()
-  {
+  protected function setUpClassCat() {
     $classes = array(
       array(
         'class_id' => '1001',

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,30 +31,25 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetCommaListTest extends Common_TestCase
-{
+class SC_Utils_sfGetCommaListTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetCommaList_$BG[Ns$,6u$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testSfGetCommaList_$BG[Ns$,6u$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfGetCommaList(array());
 
     $this->verify('$BO"7k:Q$_$NJ8;zNs(B');
   }
 
-  public function testSfGetCommaList_$B%9%Z!<%9%U%i%0$,N)$C$F$$$k>l9g(B_$B%9%Z!<%9IU$-$GO"7k$5$l$k(B()
-  {
+  public function testSfGetCommaList_$B%9%Z!<%9%U%i%0$,N)$C$F$$$k>l9g(B_$B%9%Z!<%9IU$-$GO"7k$5$l$k(B() {
     $this->expected = '$B$j$s$4(B, $B%_%+%s(B, $B%P%J%J(B';
     $this->actual = SC_Utils::sfGetCommaList(
       array('$B$j$s$4(B', '$B%_%+%s(B', '$B%P%J%J(B'),
@@ -64,8 +59,7 @@
     $this->verify('$BO"7k:Q$_$NJ8;zNs(B');
   }
 
-  public function testSfGetCommaList_$B%9%Z!<%9%U%i%0$,E]$l$F$$$k>l9g(B_$B%9%Z!<%9IU$-$GO"7k$5$l$k(B()
-  {
+  public function testSfGetCommaList_$B%9%Z!<%9%U%i%0$,E]$l$F$$$k>l9g(B_$B%9%Z!<%9IU$-$GO"7k$5$l$k(B() {
     $this->expected = '$B$j$s$4(B,$B%_%+%s(B,$B%P%J%J(B';
     $this->actual = SC_Utils::sfGetCommaList(
       array('$B$j$s$4(B', '$B%_%+%s(B', '$B%P%J%J(B'),
@@ -76,8 +70,7 @@
   }
 
   // TODO $BMW3NG'!'(Barrpop$B$NLr3d(B
-  public function testSfGetCommaList_$B=|30%j%9%H$,;XDj$5$l$F$$$k>l9g(B_$B%9%Z!<%9IU$-$GO"7k$5$l$k(B()
-  {
+  public function testSfGetCommaList_$B=|30%j%9%H$,;XDj$5$l$F$$$k>l9g(B_$B%9%Z!<%9IU$-$GO"7k$5$l$k(B() {
     $this->expected = '$B$j$s$4(B, $B%P%J%J(B';
     $this->actual = SC_Utils::sfGetCommaList(
       array('$B$j$s$4(B', '$B%_%+%s(B', '$B%P%J%J(B'),

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,24 +33,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetEnabledTest extends Common_TestCase
-{
+class SC_Utils_sfGetEnabledTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
   // TODO $BMW3NG'(B $B<B:]$K$O;H$o$l$F$$$J$$(B?
-  public function testSfGetEnabled_false$B$r;XDj$7$?>l9g(B_$BL58z2=$9$k$?$a$NJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetEnabled_false$B$r;XDj$7$?>l9g(B_$BL58z2=$9$k$?$a$NJ8;zNs$,JV$k(B() {
     
     $this->expected = ' disabled="disabled"';
     $this->actual = SC_Utils::sfGetEnabled(false);
@@ -58,8 +54,7 @@
     $this->verify();
   }
 
-  public function testSfGetEnabled_true$B$r;XDj$7$?>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetEnabled_true$B$r;XDj$7$?>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     
     $this->expected = '';
     $this->actual = SC_Utils::sfGetEnabled(true);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,24 +31,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetErrorColorTest extends Common_TestCase
-{
+class SC_Utils_sfGetErrorColorTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
   // TODO $BMW3NG'(B $B<B:]$K$O;H$o$l$F$$$J$$(B?
-  public function testSfGetErrorColor_$B0z?t$,6u$G$J$$>l9g(B_$BGX7J?'JQ99MQ$NJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetErrorColor_$B0z?t$,6u$G$J$$>l9g(B_$BGX7J?'JQ99MQ$NJ8;zNs$,JV$k(B() {
     
     $this->expected = 'background-color:#ffe8e8';
     $this->actual = SC_Utils::sfGetErrorColor('value');
@@ -56,8 +52,7 @@
     $this->verify();
   }
 
-  public function testSfGetErrorColor_$B0z?t$,6u$N>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetErrorColor_$B0z?t$,6u$N>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     
     $this->expected = '';
     $this->actual = SC_Utils::sfGetErrorColor();

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,23 +33,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetHashString_authTypeHmacTest extends Common_TestCase
-{
+class SC_Utils_sfGetHashString_authTypeHmacTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetHashString_$B0E9f2=$"$j$N ＠ _Dj$K$J$C$F$$$k>l9g(B_$BJ8;zNs$,JQ49$5$l$k(B()
-  {
+  public function testSfGetHashString_$B0E9f2=$"$j$N ＠ _Dj$K$J$C$F$$$k>l9g(B_$BJ8;zNs$,JQ49$5$l$k(B() {
     $input = 'hello, world';
     $salt = 'sample';
 
@@ -58,8 +54,7 @@
     $this->assertNotEquals('$BF~NOA08e$NJ8;zNs(B', $input, $output);
   }
 
-  public function testSfGetHashString_$B0E9f2=$"$j$N ＠ _Dj$K$J$C$F$$$F(Bsalt$B$,$J$$>l9g(B_$BJ8;zNs$,JQ49$5$l$k(B()
-  {
+  public function testSfGetHashString_$B0E9f2=$"$j$N ＠ _Dj$K$J$C$F$$$F(Bsalt$B$,$J$$>l9g(B_$BJ8;zNs$,JQ49$5$l$k(B() {
     $input = 'hello, world';
     $output = SC_Utils::sfGetHashString($input);
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,24 +33,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetHashString_authTypePlainTest extends Common_TestCase
-{
+class SC_Utils_sfGetHashString_authTypePlainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
   /**
-  public function testSfGetHashString_$B0E9f2=$J$7$N ＠ _Dj$K$J$C$F$$$k>l9g(B_$BJ8;zNs$,JQ49$5$l$J$$(B()
-  {
+  public function testSfGetHashString_$B0E9f2=$J$7$N ＠ _Dj$K$J$C$F$$$k>l9g(B_$BJ8;zNs$,JQ49$5$l$J$$(B() {
     $input = 'hello, world';
 
     $this->expected = $input;

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,69 +31,36 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetProductClassIdTest extends Common_TestCase
-{
+class SC_Utils_sfGetProductClassIdTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
     $this->setUpProductsClass();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetProductClassId_$BB8:_$9$k@=IJ(BID$B$N$_$r;XDj$7$?>l9g(B_$B%+%F%4%j(B0$B$NBP1~$9$k@=IJ%/%i%9$,<hF@$G$-$k(B()
-  {
+  public function testSfGetProductClassId_$BB8:_$9$k(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k@=IJ%/%i%9$,<hF@$G$-$k(B() {
     
-    $this->expected = '2001';
-    $this->actual = SC_Utils::sfGetProductClassId('2001');
-
-    $this->verify('$B<hF@$7$?@=IJ%/%i%9(B');
-  }
-
-  public function testSfGetProductClassId_$BB8:_$9$k@=IJ(BID$B$N$_$r;XDj$7$F%+%F%4%j(B0$B$N@=IJ%/%i%9$,B8:_$7$J$1$l$P(B_null$B$,JV$k(B()
-  {
-    
-    $this->expected = null;
+    $this->expected = '1001';
     $this->actual = SC_Utils::sfGetProductClassId('1001');
 
-    $this->verify('$B<hF ＠ 7k2L$,6u(B');
-  }
-
-  public function testSfGetProductClassId_$BB8:_$9$k@=IJ(BID$B$H%+%F%4%j(BID$B$r;XDj$7$?>l9g(B_$BBP1~$9$k@=IJ%/%i%9$,<hF@$G$-$k(B()
-  {
-    
-    $this->expected = '1002';
-    $this->actual = SC_Utils::sfGetProductClassId('1001', '2');
-
     $this->verify('$B<hF@$7$?@=IJ%/%i%9(B');
   }
 
-  public function testSfGetProductClassId_$BB8:_$9$k@=IJ(BID$B$HB8:_$7$J$$%+%F%4%j(BID$B$r;XDj$7$?>l9g(B_null$B$,JV$k(B()
-  {
-    
+  public function testSfGetProductClassId_$BB8:_$7$J$$(BID$B$r;XDj$7$?>l9g(B_null$B$,JV$k(B() {
     $this->expected = null;
-    $this->actual = SC_Utils::sfGetProductClassId('1001', '999');
-
-    $this->verify('$B<hF ＠ 7k2L$,6u(B');
-  }
-
-  public function testSfGetProductClassId_$BB8:_$7$J$$@=IJ(BID$B$r;XDj$7$?>l9g(B_null$B$,JV$k(B()
-  {
-    $this->expected = null;
     $this->actual = SC_Utils::sfGetProductClassId('9999');
 
     $this->verify('$B<hF ＠ 7k2L$,6u(B');
   }
 
   //////////////////////////////////////////
-  protected function setUpProductsClass()
-  {
+  protected function setUpProductsClass() {
     $products_class = array(
       array(
         'product_class_id' => '2001',
@@ -109,7 +76,8 @@
         'classcategory_id1' => '1',
         'creator_id' => '1',
         'update_date' => 'CURRENT_TIMESTAMP'
-      ),
+      )
+      /** $BF1$8(Bproduct_id$B$,(B2$B$D$"$k%1!<%9$O8=>u(Bfail$B$9$k$N$G$$$C$?$s%3%a%s%H%"%&%H(B
       array(
         'product_class_id' => '1002',
         'product_id' => '1001',
@@ -118,11 +86,11 @@
         'creator_id' => '1',
         'update_date' => 'CURRENT_TIMESTAMP'
       )
+      */
     );
 
     $this->objQuery->delete('dtb_products_class');
-    foreach ($products_class as $item)
-{
+    foreach ($products_class as $item) {
       $this->objQuery->insert('dtb_products_class', $item);
     }
   }

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,31 +31,26 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetRandomStringTest extends Common_TestCase
-{
+class SC_Utils_sfGetRandomStringTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
   // $B%i%s%@%`$JJ8;zNs<hF@$J$N$G!"J8;zNsD9$N$_3NG'$7$^$9!#(B
-  public function testSfGetRandomString_$BJ8;zNsD9L$;XDj$N>l9g(B_$BD9$5(B1$B$NJ8;zNs$,<hF@$G$-$k(B()
-  {
+  public function testSfGetRandomString_$BJ8;zNsD9L$;XDj$N>l9g(B_$BD9$5(B1$B$NJ8;zNs$,<hF@$G$-$k(B() {
     $this->expected = 1;
     $this->actual = strlen(SC_Utils::sfGetRandomString());
     
     $this->verify('$BJ8;zNsD9(B');
   }
 
-  public function testSfGetRandomString_$BJ8;zNsD9;XDj$"$j$N>l9g(B_$B;XDj$7$?D9$5$NJ8;zNs$,<hF@$G$-$k(B()
-  {
+  public function testSfGetRandomString_$BJ8;zNsD9;XDj$"$j$N>l9g(B_$B;XDj$7$?D9$5$NJ8;zNs$,<hF@$G$-$k(B() {
     $this->expected = 10;
     $this->actual = strlen(SC_Utils::sfGetRandomString(10));
     

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetSearchPageMaxTest extends Common_TestCase
-{
+class SC_Utils_sfGetSearchPageMaxTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetSearchPageMax_$B ＠ 5$N ＠ 0?t$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$NCM$,JV$k(B()
-  {
+  public function testSfGetSearchPageMax_$B ＠ 5$N ＠ 0?t$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$NCM$,JV$k(B() {
     
     $this->expected = 100;
     $this->actual = SC_Utils::sfGetSearchPageMax(100);
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testSfGetSearchPageMax_$B ＠ 5$N>.?t$,;XDj$5$l$F$$$k>l9g(B_$B ＠ 0?t$KJQ49$5$l$k(B()
-  {
+  public function testSfGetSearchPageMax_$B ＠ 5$N>.?t$,;XDj$5$l$F$$$k>l9g(B_$B ＠ 0?t$KJQ49$5$l$k(B() {
     
     $this->expected = 99;
     $this->actual = SC_Utils::sfGetSearchPageMax(99.5);
@@ -64,8 +59,7 @@
     $this->verify();
   }
 
-  public function testSfGetSearchPageMax_$BIi$N?t$,;XDj$5$l$F$$$k>l9g(B_$B%G%U%)%k%HCM$,JV$k(B()
-  {
+  public function testSfGetSearchPageMax_$BIi$N?t$,;XDj$5$l$F$$$k>l9g(B_$B%G%U%)%k%HCM$,JV$k(B() {
     
     $this->expected = SEARCH_PMAX;
     $this->actual = SC_Utils::sfGetSearchPageMax(-50);
@@ -73,8 +67,7 @@
     $this->verify();
   }
 
-  public function testSfGetSearchPageMax_$B;XDj$,$J$$>l9g(B_$B%G%U%)%k%HCM$,JV$k(B()
-  {
+  public function testSfGetSearchPageMax_$B;XDj$,$J$$>l9g(B_$B%G%U%)%k%HCM$,JV$k(B() {
     
     $this->expected = SEARCH_PMAX;
     $this->actual = SC_Utils::sfGetSearchPageMax();

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetTimestampTest extends Common_TestCase
-{
+class SC_Utils_sfGetTimestampTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetTimestamp_$BG/$, ＠ _Dj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetTimestamp_$BG/$, ＠ _Dj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $year = '';
     $month = '10';
     $day = '23';
@@ -57,8 +53,7 @@
     $this->verify();
   }
 
-  public function testSfGetTimestamp_$B7n$, ＠ _Dj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetTimestamp_$B7n$, ＠ _Dj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $year = '2012';
     $month = '';
     $day = '13';
@@ -68,8 +63,7 @@
     $this->verify();
   }
 
-  public function testSfGetTimestamp_$BF|$, ＠ _Dj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfGetTimestamp_$BF|$, ＠ _Dj$5$l$F$$$J$$>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $year = '1999';
     $month = '09';
     $day = '';
@@ -79,8 +73,7 @@
     $this->verify();
   }
 
-  public function testSfGetTimestamp_$BG/7nF|$9$Y$F ＠ _Dj$5$l$F$$$k>l9g(B_$BO"7k$5$l$?J8;zNs$,JV$k(B()
-  {
+  public function testSfGetTimestamp_$BG/7nF|$9$Y$F ＠ _Dj$5$l$F$$$k>l9g(B_$BO"7k$5$l$?J8;zNs$,JV$k(B() {
     $year = '1999';
     $month = '09';
     $day = '23';
@@ -91,8 +84,7 @@
     $this->verify();
   }
 
-  public function testSfGetTimestamp_$B:G=*;~9o%U%i%0$,(BON$B$N>l9g(B_$B;~9o$,?<Lk$N$b$N$K$J$k(B()
-  {
+  public function testSfGetTimestamp_$B:G=*;~9o%U%i%0$,(BON$B$N>l9g(B_$B;~9o$,?<Lk$N$b$N$K$J$k(B() {
     $year = '1999';
     $month = '09';
     $day = '23';

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetUnderChildrenArrayTest extends Common_TestCase
-{
+class SC_Utils_sfGetUnderChildrenArrayTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfGetUnderChildrenArray__$BM?$($i$l$??F(BID$B$r;}$DMWAG$@$1$,Cj=P$5$l$k(B()
-  {
+  public function testSfGetUnderChildrenArray__$BM?$($i$l$??F(BID$B$r;}$DMWAG$@$1$,Cj=P$5$l$k(B() {
     $input_array = array(
       array('parent_id' => '1001', 'child_id' => '1001001'),
       array('parent_id' => '1002', 'child_id' => '1002001'),

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -32,23 +32,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfGetUniqRandomIdTest extends Common_TestCase
-{
+class SC_Utils_sfGetUniqRandomIdTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function test_prefix$B;XDj$,L5$$>l9g(B_21$BJ8;z$N%i%s%@%`$JJ8;zNs$, ＠ 8@.$5$l$k(B()
-  {
+  public function test_prefix$B;XDj$,L5$$>l9g(B_21$BJ8;z$N%i%s%@%`$JJ8;zNs$, ＠ 8@.$5$l$k(B() {
     $output1 = SC_Utils::sfGetUniqRandomId();
     $output2 = SC_Utils::sfGetUniqRandomId();
 
@@ -57,8 +53,7 @@
     $this->assertNotEquals($output1, $output2, '$B ＠ 8@.7k2L$,%i%s%@%`$K$J$k(B');
   }
 
-  public function test_prefix$B;XDj$,$"$k>l9g(B_prefix$B$N$"$H$K(B21$BJ8;z$N%i%s%@%`$JJ8;zNs$, ＠ 8@.$5$l$k(B()
-  {
+  public function test_prefix$B;XDj$,$"$k>l9g(B_prefix$B$N$"$H$K(B21$BJ8;z$N%i%s%@%`$JJ8;zNs$, ＠ 8@.$5$l$k(B() {
     $output1 = SC_Utils::sfGetUniqRandomId('hello');
     $output2 = SC_Utils::sfGetUniqRandomId('hello');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfIsHTTPSTest extends Common_TestCase
-{
+class SC_Utils_sfIsHTTPSTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsHTTPS_$B4D6-JQ?t$K(BSSL$B$r<($9CM$,F~$C$F$$$k>l9g(B_true$B$,JV$k(B()
-  {
+  public function testSfIsHTTPS_$B4D6-JQ?t$K(BSSL$B$r<($9CM$,F~$C$F$$$k>l9g(B_true$B$,JV$k(B() {
     $_SERVER['HTTPS'] = 'on';
     $this->expected = true;
     $this->actual = SC_Utils::sfIsHTTPS();
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testSfIsHTTPS_$B4D6-JQ?t$KHs(BSSL$B$r<($9CM$,F~$C$F$$$k>l9g(B_false$B$,JV$k(B()
-  {
+  public function testSfIsHTTPS_$B4D6-JQ?t$KHs(BSSL$B$r<($9CM$,F~$C$F$$$k>l9g(B_false$B$,JV$k(B() {
     $_SERVER['HTTPS'] = 'off';
     $this->expected = false;
     $this->actual = SC_Utils::sfIsHTTPS();
@@ -64,8 +59,7 @@
     $this->verify();
   }
 
-  public function testSfIsHTTPS_$B4D6-JQ?t$KCM$,F~$C$F$$$J$$>l9g(B_false$B$,JV$k(B()
-  {
+  public function testSfIsHTTPS_$B4D6-JQ?t$KCM$,F~$C$F$$$J$$>l9g(B_false$B$,JV$k(B() {
     unset($_SERVER['HTTPS']);
     $this->expected = false;
     $this->actual = SC_Utils::sfIsHTTPS();

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,62 +31,53 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfIsIntTest extends Common_TestCase
-{
+class SC_Utils_sfIsIntTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsInt_0$B%P%$%HJ8;zNs$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testSfIsInt_0$B%P%$%HJ8;zNs$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('');
 
     $this->verify('$B ＠ 0?t$+$I$&$+(B');
   }
 
-  public function testSfIsInt_int$B$N:GBgD9$h$jD9$$>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testSfIsInt_int$B$N:GBgD9$h$jD9$$>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('10000000000');
 
     $this->verify('$B ＠ 0?t$+$I$&$+(B');
   }
 
-  public function testSfIsInt_int$B$N:GBgCM%.%j%.%j$N>l9g(B_TRUE$B$,JV$k(B()
-  {
+  public function testSfIsInt_int$B$N:GBgCM%.%j%.%j$N>l9g(B_TRUE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('2147483647');
 
     $this->verify('$B ＠ 0?t$+$I$&$+(B');
   }
 
-  public function testSfIsInt_int$B$N:GBgCM$rD6$($k>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testSfIsInt_int$B$N:GBgCM$rD6$($k>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('2147483648');
 
     $this->verify('$B ＠ 0?t$+$I$&$+(B');
   }
 
-  public function testSfIsInt_$B?tCM$G$J$$>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testSfIsInt_$B?tCM$G$J$$>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('HELLO123');
 
     $this->verify('$B ＠ 0?t$+$I$&$+(B');
   }
 
-  public function testSfIsInt_$B ＠ 5$N ＠ 0?t$N>l9g(B_TRUE$B$,JV$k(B()
-  {
+  public function testSfIsInt_$B ＠ 5$N ＠ 0?t$N>l9g(B_TRUE$B$,JV$k(B() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInt('123456789');
 
@@ -95,8 +86,7 @@
 
   // TODO $B!V ＠ 0?t$+$I$&$+!W$H$$$&4X?tL>$J$N$G$3$3$O(BFALSE$B$K$J$k$Y$-$G$O!)(B
   /**
-  public function testSfIsInt_$B ＠ 5$N>.?t$N>l9g(B_FALSE$B$,JV$k(B()
-  {
+  public function testSfIsInt_$B ＠ 5$N>.?t$N>l9g(B_FALSE$B$,JV$k(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsInt('123.456');
 
@@ -104,8 +94,7 @@
   }
   */
 
-  public function testSfIsInt_$BIi$N ＠ 0?t$N>l9g(B_TRUE$B$,JV$k(B()
-  {
+  public function testSfIsInt_$BIi$N ＠ 0?t$N>l9g(B_TRUE$B$,JV$k(B() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInt('-12345678');
 
@@ -114,8 +103,7 @@
 
   // TODO $BJ8;zNsD9$G%A%'%C%/$7$F$$$k$N$GIi$N>l9g$OHO0O$,>.$5$/$J$C$F$$$k(B
   /**
-  public function testSfIsInt_$BIi$N ＠ 0?t$G7e?t$,:GBg$N>l9g(B_TRUE$B$,JV$k(B()
-  {
+  public function testSfIsInt_$BIi$N ＠ 0?t$G7e?t$,:GBg$N>l9g(B_TRUE$B$,JV$k(B() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsInt('-123456789');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,23 +33,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfIsMatchHashPassword_authTypeHmacTest extends Common_TestCase
-{
+class SC_Utils_sfIsMatchHashPassword_authTypeHmacTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsMatchHashPassword_$B%O%C%7%e2=8e$NJ8;zNs$,0lCW$9$k>l9g(B_true$B$,JV$k(B()
-  {
+  public function testSfIsMatchHashPassword_$B%O%C%7%e2=8e$NJ8;zNs$,0lCW$9$k>l9g(B_true$B$,JV$k(B() {
     $pass = 'ec-cube';
     $salt = 'salt';
     $hashpass = SC_Utils_Ex::sfGetHashString($pass, $salt);
@@ -60,8 +56,7 @@
     $this->verify('$B%Q%9%o!<%IJ8;zNsHf3S7k2L(B');
   }
 
-  public function testSfIsMatchHashPassword_$B%O%C%7%e2=8e$NJ8;zNs$,0lCW$7$J$$>l9g(B_false$B$,JV$k(B()
-  {
+  public function testSfIsMatchHashPassword_$B%O%C%7%e2=8e$NJ8;zNs$,0lCW$7$J$$>l9g(B_false$B$,JV$k(B() {
     $pass = 'ec-cube';
     $salt = 'salt';
     $hashpass = 'ec-cube';
@@ -72,8 +67,7 @@
     $this->verify('$B%Q%9%o!<%IJ8;zNsHf3S7k2L(B');
   }
 
-  public function testSfIsMatchHashPassword_salt$B$,L$;XDj$N>l9g(B_$B5l%P!<%8%g%s$N0E9f2=$GHf3S$5$l$k(B()
-  {
+  public function testSfIsMatchHashPassword_salt$B$,L$;XDj$N>l9g(B_$B5l%P!<%8%g%s$N0E9f2=$GHf3S$5$l$k(B() {
     $pass = 'ec-cube';
     $hashpass = sha1($pass . ':' . AUTH_MAGIC);
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,24 +33,20 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfIsMatchHashPassword_authTypePlainTest extends Common_TestCase
-{
+class SC_Utils_sfIsMatchHashPassword_authTypePlainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
   /**
-  public function testSfIsMatchHashPassword_$BJ8;zNs$,0lCW$9$k>l9g(B_true$B$,JV$k(B()
-  {
+  public function testSfIsMatchHashPassword_$BJ8;zNs$,0lCW$9$k>l9g(B_true$B$,JV$k(B() {
     $pass = 'ec-cube';
     $hashpass = 'ec-cube';
 
@@ -60,8 +56,7 @@
     $this->verify('$B%Q%9%o!<%IJ8;zNsHf3S7k2L(B');
   }
 
-  public function testSfIsMatchHashPassword_$BJ8;zNs$,0lCW$7$J$$>l9g(B_false$B$,JV$k(B()
-  {
+  public function testSfIsMatchHashPassword_$BJ8;zNs$,0lCW$7$J$$>l9g(B_false$B$,JV$k(B() {
     $pass = 'ec-cube';
     $hashpass = 'EC-cube';
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfIsSuccessTest extends Common_TestCase
-{
+class SC_Utils_sfIsSuccessTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsSuccess_$BG'>Z$K<:GT$7$F$$$k>l9g(B_false$B$,JV$k(B()
-  {
+  public function testSfIsSuccess_$BG'>Z$K<:GT$7$F$$$k>l9g(B_false$B$,JV$k(B() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS + 1;
 
@@ -57,8 +53,7 @@
     $this->verify('$BG'>Z2DH](B');
   }
 
-  public function testSfIsSuccess_$BG'>Z ＠ .8y$G%j%U%!%i$,$J$$>l9g(B_true$B$,JV$k(B()
-  {
+  public function testSfIsSuccess_$BG'>Z ＠ .8y$G%j%U%!%i$,$J$$>l9g(B_true$B$,JV$k(B() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS;
 
@@ -69,8 +64,7 @@
   }
 
   // TODO $B ＠ 55,$N%I%a%$%s$G$"$k$3$H$O3NG'$7$F$$$k$,!"4IM}2hLL$+$i$H$$$&$N$O%A%'%C%/$7$F$$$J$$$N$G$O!)(B
-  public function testSfIsSuccess_$BG'>Z ＠ .8y$G%j%U%!%i$, ＠ 5$7$$>l9g(B_true$B$,JV$k(B()
-  {
+  public function testSfIsSuccess_$BG'>Z ＠ .8y$G%j%U%!%i$, ＠ 5$7$$>l9g(B_true$B$,JV$k(B() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS;
     $_SERVER['HTTP_REFERER'] = 'http://test.local/hoge/fuga';
@@ -81,8 +75,7 @@
     $this->verify('$BG'>Z2DH](B');
   }
 
-  public function testSfIsSuccess_$BG'>Z ＠ .8y$G%j%U%!%i$,IT ＠ 5$J>l9g(B_false$B$,JV$k(B()
-  {
+  public function testSfIsSuccess_$BG'>Z ＠ .8y$G%j%U%!%i$,IT ＠ 5$J>l9g(B_false$B$,JV$k(B() {
     $objSess = new SC_Session_Mock();
     $objSess->is_success = SUCCESS;
     $_SERVER['HTTP_REFERER'] = 'http://test.jp.local/hoge/fuga';
@@ -97,13 +90,11 @@
 
 }
 
-class SC_Session_Mock extends SC_Session
-{
+class SC_Session_Mock extends SC_Session {
 
   public $is_success;
 
-  function IsSuccess()
-  {
+  function IsSuccess() {
     return $this->is_success;
   }
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,38 +31,32 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfIsZeroFillingTest extends Common_TestCase
-{
+class SC_Utils_sfIsZeroFillingTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfIsZeroFilling_$B7e?t$,(B1$B$N>l9g(B_FALSE$B$rJV$9(B()
-  {
+  public function testSfIsZeroFilling_$B7e?t$,(B1$B$N>l9g(B_FALSE$B$rJV$9(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsZeroFilling('0');
 
     $this->verify('$B%<%m5M$a$5$l$F$$$k$+$I$&$+(B');
   }
 
-  public function testSfIsZeroFilling_$B7e?t$,(B2$B0J>e$G(B0$BKd$a$5$l$F$$$J$$>l9g(B_FALSE$B$rJV$9(B()
-  {
+  public function testSfIsZeroFilling_$B7e?t$,(B2$B0J>e$G(B0$BKd$a$5$l$F$$$J$$>l9g(B_FALSE$B$rJV$9(B() {
     $this->expected = FALSE;
     $this->actual = SC_Utils::sfIsZeroFilling('12');
 
     $this->verify('$B%<%m5M$a$5$l$F$$$k$+$I$&$+(B');
   }
 
-  public function testSfIsZeroFilling_$B7e?t$,(B2$B0J>e$G(B0$BKd$a$5$l$F$$$k>l9g(B_TRUE$B$rJV$9(B()
-  {
+  public function testSfIsZeroFilling_$B7e?t$,(B2$B0J>e$G(B0$BKd$a$5$l$F$$$k>l9g(B_TRUE$B$rJV$9(B() {
     $this->expected = TRUE;
     $this->actual = SC_Utils::sfIsZeroFilling('01');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfMakeHiddenArrayest extends Common_TestCase
-{
+class SC_Utils_sfMakeHiddenArrayest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfMakeHiddenArray__$BB?CJG[Ns$,(B1$B<!85G[Ns$KJQ49$5$l$k(B()
-  {
+  public function testSfMakeHiddenArray__$BB?CJG[Ns$,(B1$B<!85G[Ns$KJQ49$5$l$k(B() {
     $input_array = array(
       'vegetable' => '$BLn:Z(B',
       'fruit' => array(

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,31 +31,26 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfMbConvertEncodingTest extends Common_TestCase
-{
+class SC_Utils_sfMbConvertEncodingTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfMbConvertEncoding_MS932$B$N>l9g(B_$B%(%i!<$,5/$-$J$$(B()
-  {
+  public function testSfMbConvertEncoding_MS932$B$N>l9g(B_$B%(%i!<$,5/$-$J$$(B() {
     $input = '$B$"$$$&$($*!":#F|$ONI$$E75$$G$9!#(B';
     $encode = 'MS932';
 
     $this->assertNotNull(SC_Utils::sfMbConvertEncoding($input, $encode), '$BJQ497k2L(B');
   }
 
-  public function testSfMbConvertEncoding_UTF8$B$N>l9g(B_$B%(%i!<$,5/$-$J$$(B()
-  {
+  public function testSfMbConvertEncoding_UTF8$B$N>l9g(B_$B%(%i!<$,5/$-$J$$(B() {
     $input = '$B$"$$$&$($*!":#F|$ONI$$E75$$G$9!#(B';
     $encode = 'UTF8';
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfMultiplyTest extends Common_TestCase
-{
+class SC_Utils_sfMultiplyTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfMultiply__$B3]$1;;$N7k2L$,JV$k(B()
-  {
+  public function testSfMultiply__$B3]$1;;$N7k2L$,JV$k(B() {
     $this->expected = 520;
     $this->actual = SC_Utils::sfMultiply(13, 40);
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,39 +31,33 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfNoImageMainListTest extends Common_TestCase
-{
+class SC_Utils_sfNoImageMainListTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfNoImageMainList_$B%U%!%$%kL>$,6u$N>l9g(B_$B%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B()
-  {
+  public function testSfNoImageMainList_$B%U%!%$%kL>$,6u$N>l9g(B_$B%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B() {
     $this->expected = 'noimage_main_list.jpg';
     $this->actual = SC_Utils::sfNoImageMainList('');
 
     $this->verify();
   }
 
-  public function testSfNoImageMainList_$B%G%#%l%/%H%j$,;XDj$5$l$F$$$k>l9g(B_$B$=$N%G%#%l%/%H%j0J2<$G%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B()
-  {
+  public function testSfNoImageMainList_$B%G%#%l%/%H%j$,;XDj$5$l$F$$$k>l9g(B_$B$=$N%G%#%l%/%H%j0J2<$G%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B() {
     $this->expected = 'aaa/bbb/noimage_main_list.jpg';
     $this->actual = SC_Utils::sfNoImageMainList('aaa/bbb/');
 
     $this->verify();
   }
 
-  public function testSfNoImageMainList_$B%U%!%$%kL>$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$5$l$?%U%!%$%kL>$,JV$k(B()
-  {
+  public function testSfNoImageMainList_$B%U%!%$%kL>$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$5$l$?%U%!%$%kL>$,JV$k(B() {
     $this->expected = 'aaa/bbb/ccc.png';
     $this->actual = SC_Utils::sfNoImageMainList('aaa/bbb/ccc.png');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,39 +31,33 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfNoImageMainTest extends Common_TestCase
-{
+class SC_Utils_sfNoImageMainTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfNoImageMain_$B%U%!%$%kL>$,6u$N>l9g(B_$B%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B()
-  {
+  public function testSfNoImageMain_$B%U%!%$%kL>$,6u$N>l9g(B_$B%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B() {
     $this->expected = 'noimage_main.png';
     $this->actual = SC_Utils::sfNoImageMain('');
 
     $this->verify();
   }
 
-  public function testSfNoImageMain_$B%G%#%l%/%H%j$,;XDj$5$l$F$$$k>l9g(B_$B$=$N%G%#%l%/%H%j0J2<$G%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B()
-  {
+  public function testSfNoImageMain_$B%G%#%l%/%H%j$,;XDj$5$l$F$$$k>l9g(B_$B$=$N%G%#%l%/%H%j0J2<$G%G%U%)%k%H$N%U%!%$%kL>$,JV$k(B() {
     $this->expected = 'aaa/bbb/noimage_main.png';
     $this->actual = SC_Utils::sfNoImageMain('aaa/bbb/');
 
     $this->verify();
   }
 
-  public function testSfNoImageMain_$B%U%!%$%kL>$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$5$l$?%U%!%$%kL>$,JV$k(B()
-  {
+  public function testSfNoImageMain_$B%U%!%$%kL>$,;XDj$5$l$F$$$k>l9g(B_$B;XDj$5$l$?%U%!%$%kL>$,JV$k(B() {
     $this->expected = 'aaa/bbb/ccc.png';
     $this->actual = SC_Utils::sfNoImageMain('aaa/bbb/ccc.png');
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_getSfPassLenTest extends Common_TestCase
-{
+class SC_Utils_getSfPassLenTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfPassLen_$BF~NO$,(B0$B$N>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B()
-  {
+  public function testSfPassLen_$BF~NO$,(B0$B$N>l9g(B_0$B%P%$%HJ8;zNs$,JV$k(B() {
     $input = '';
     $this->expected = '';
     $this->actual = SC_Utils::sfPassLen($input);
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testSfPassLen_$BF~NO$, ＠ 5$N?t$N>l9g(B_$BF~NO$HF1$8J8;z?t$N%"%9%?%j%9%/$,JV$k(B()
-  {
+  public function testSfPassLen_$BF~NO$, ＠ 5$N?t$N>l9g(B_$BF~NO$HF1$8J8;z?t$N%"%9%?%j%9%/$,JV$k(B() {
     $input = 17;
     $this->expected = '*****************';
     $this->actual = SC_Utils::sfPassLen($input);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -33,23 +33,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfPrePointTest extends Common_TestCase
-{
+class SC_Utils_sfPrePointTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfPrePoint_$B;M<N8^F~$N ＠ _Dj$N>l9g(B_$B;M<N8^F~$5$l$?CM$,JV$k(B()
-  {
+  public function testSfPrePoint_$B;M<N8^F~$N ＠ _Dj$N>l9g(B_$B;M<N8^F~$5$l$?CM$,JV$k(B() {
     $rule = 1; // $B;M<N8^F~(B
 
     $this->expected = 10;
@@ -58,8 +54,7 @@
     $this->verify();
   }
 
-  public function testSfPrePoint_$B ＠ Z$j<N$F$N ＠ _Dj$N>l9g(B_$B ＠ Z$j<N$F$5$l$?CM$,JV$k(B()
-  {
+  public function testSfPrePoint_$B ＠ Z$j<N$F$N ＠ _Dj$N>l9g(B_$B ＠ Z$j<N$F$5$l$?CM$,JV$k(B() {
     $rule = 2; // $B ＠ Z$j<N$F(B 
 
     $this->expected = 9;
@@ -68,8 +63,7 @@
     $this->verify();
   }
 
-  public function testSfPrePoint_$B ＠ Z$j>e$2$N ＠ _Dj$N>l9g(B_$B ＠ Z$j>e$2$5$l$?CM$,JV$k(B()
-  {
+  public function testSfPrePoint_$B ＠ Z$j>e$2$N ＠ _Dj$N>l9g(B_$B ＠ Z$j>e$2$5$l$?CM$,JV$k(B() {
     $rule = 3; // $B ＠ Z$j>e$2(B
 
     $this->expected = 10;
@@ -78,8 +72,7 @@
     $this->verify();
   }
 
-  public function testSfPrePoint_$BB8:_$7$J$$A*Br;h$N>l9g(B_$B ＠ Z$j>e$2$5$l$?CM$,JV$k(B()
-  {
+  public function testSfPrePoint_$BB8:_$7$J$$A*Br;h$N>l9g(B_$B ＠ Z$j>e$2$5$l$?CM$,JV$k(B() {
     $rule = 4; // $BB8:_$7$J$$A*Br;h(B
 
     $this->expected = 10;
@@ -88,8 +81,7 @@
     $this->verify();
   }
 
-  public function testSfPrePoint_$B4]$aJ}K!$N;XDj$,$J$$>l9g(B_$BDj?t$G;XDj$5$l$?CM$,;H$o$l$k(B()
-  {
+  public function testSfPrePoint_$B4]$aJ}K!$N;XDj$,$J$$>l9g(B_$BDj?t$G;XDj$5$l$?CM$,;H$o$l$k(B() {
     $this->expected = array(9, 9);
     $this->actual = array(
       SC_Utils::sfPrePoint(100, 9.4),

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,25 +31,21 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfPrintRTest extends Common_TestCase
-{
+class SC_Utils_sfPrintRTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
   // TODO $B4D6-$K$h$j=PNO7A<0$,0[$J$k$?$a!"%F%9%HIT2D(B($B%G%P%C%0MQ$J$N$G!"%F%9%H$7$J$/$F$b$h$5$=$&(B)
   /**
-  public function testSfPrintR__$B;XDj$7$?%*%V%8%'%/%H$N>pJs$,=PNO$5$l$k(B()
-  {
+  public function testSfPrintR__$B;XDj$7$?%*%V%8%'%/%H$N>pJs$,=PNO$5$l$k(B() {
     $output = '<div style="font-size: 12px;color: #00FF00;">' . "\n"
       . '<strong>**$B%G%P%C%0Cf(B**</strong><br />' . "\n"
       . '<pre>' . "\n"

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfRmDupSlashTest extends Common_TestCase
-{
+class SC_Utils_sfRmDupSlashTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfRmDupSlash_$BHs(BSSL$B$N>l9g(B_$B%9%-!<%^ItJ,0J30$N=EJ#%9%i%C%7%e$,(B1$B$D$K$J$k(B()
-  {
+  public function testSfRmDupSlash_$BHs(BSSL$B$N>l9g(B_$B%9%-!<%^ItJ,0J30$N=EJ#%9%i%C%7%e$,(B1$B$D$K$J$k(B() {
     $input = 'http://www.example.co.jp///aaa//bb/co.php';
     $this->expected = 'http://www.example.co.jp/aaa/bb/co.php';
     $this->actual = SC_Utils::sfRmDupSlash($input);
@@ -55,8 +51,7 @@
     $this->verify();
   }
 
-  public function testSfRmDupSlash_SSL$B$N>l9g(B_$B%9%-!<%^ItJ,0J30$N=EJ#%9%i%C%7%e$,(B1$B$D$K$J$k(B()
-  {
+  public function testSfRmDupSlash_SSL$B$N>l9g(B_$B%9%-!<%^ItJ,0J30$N=EJ#%9%i%C%7%e$,(B1$B$D$K$J$k(B() {
     $input = 'https://www.example.co.jp///aaa//bb/co.php';
     $this->expected = 'https://www.example.co.jp/aaa/bb/co.php';
     $this->actual = SC_Utils::sfRmDupSlash($input);
@@ -64,8 +59,7 @@
     $this->verify();
   }
 
-  public function testSfRmDupSlash_$B>e5-0J30$N>l9g(B_$B$9$Y$F$N=EJ#%9%i%C%7%e$,(B1$B$D$K$J$k(B()
-  {
+  public function testSfRmDupSlash_$B>e5-0J30$N>l9g(B_$B$9$Y$F$N=EJ#%9%i%C%7%e$,(B1$B$D$K$J$k(B() {
     $input = 'hoge//www.example.co.jp///aaa//bb/co.php';
     $this->expected = 'hoge/www.example.co.jp/aaa/bb/co.php';
     $this->actual = SC_Utils::sfRmDupSlash($input);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfSetErrorStyleTest extends Common_TestCase
-{
+class SC_Utils_sfSetErrorStyleTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfSetErrorStyle__$BGX7J?'JQ99MQ$NJ8;zNs$,JV$k(B()
-  {
+  public function testSfSetErrorStyle__$BGX7J?'JQ99MQ$NJ8;zNs$,JV$k(B() {
     
     $this->expected = 'style="background-color:#ffe8e8"';
     $this->actual = SC_Utils::sfSetErrorStyle();

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfSwapArrayTest extends Common_TestCase
-{
+class SC_Utils_sfSwapArrayTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfSwapArray_$B%+%i%`L>$"$j$N;XDj$N>l9g(B_$B%-!<$KL>>N$,F~$k(B()
-  {
+  public function testSfSwapArray_$B%+%i%`L>$"$j$N;XDj$N>l9g(B_$B%-!<$KL>>N$,F~$k(B() {
     $input_array = array(
       array('id' => '1001', 'name' => 'name1001'),
       array('id' => '1002', 'name' => 'name1002')
@@ -62,8 +58,7 @@
     $this->verify();
   }
 
-  public function testSfSwapArray_$B%+%i%`L>$J$7$N;XDj$N>l9g(B_$B%-!<$KL>>N$,F~$i$J$$(B()
-  {
+  public function testSfSwapArray_$B%+%i%`L>$J$7$N;XDj$N>l9g(B_$B%-!<$KL>>N$,F~$i$J$$(B() {
     $input_array = array(
       array('id' => '1001', 'name' => 'name1001'),
       array('id' => '1002', 'name' => 'name1002')

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfTaxTest extends Common_TestCase
-{
+class SC_Utils_sfTaxTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTax_$B;M<N8^F~$N>l9g(B_$B;M<N8^F~$N7k2L$K$J$k(B()
-  {
+  public function testSfTax_$B;M<N8^F~$N>l9g(B_$B;M<N8^F~$N7k2L$K$J$k(B() {
     $this->expected = array(1, 2);
     $this->actual[0] = SC_Utils::sfTax(140, 1, 1); // 1:$B;M<N8^F~(B
     $this->actual[1] = SC_Utils::sfTax(150, 1, 1); // 1:$B;M<N8^F~(B
@@ -54,8 +50,7 @@
     $this->verify('$B ＠ G3[(B');
   }
 
-  public function testSfTax_$B ＠ Z$j<N$F$N>l9g(B_$B ＠ Z$j<N$F$N7k2L$K$J$k(B()
-  {
+  public function testSfTax_$B ＠ Z$j<N$F$N>l9g(B_$B ＠ Z$j<N$F$N7k2L$K$J$k(B() {
     $this->expected = array(2, 3);
     $this->actual[0] = SC_Utils::sfTax(140, 2, 2); // 2:$B ＠ Z$j<N$F(B
     $this->actual[1] = SC_Utils::sfTax(150, 2, 2); // 2:$B ＠ Z$j<N$F(B
@@ -63,8 +58,7 @@
     $this->verify('$B ＠ G3[(B');
   }
 
-  public function testSfTax_$B ＠ Z$j>e$2$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B()
-  {
+  public function testSfTax_$B ＠ Z$j>e$2$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B() {
     $this->expected = array(2, 2);
     $this->actual[0] = SC_Utils::sfTax(140, 1, 3); // 3:$B ＠ Z$j>e$2(B
     $this->actual[1] = SC_Utils::sfTax(150, 1, 3); // 3:$B ＠ Z$j>e$2(B
@@ -72,8 +66,7 @@
     $this->verify('$B ＠ G3[(B');
   }
 
-  public function testSfTax_$B$=$l0J30$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B()
-  {
+  public function testSfTax_$B$=$l0J30$N>l9g(B_$B ＠ Z$j>e$2$N7k2L$K$J$k(B() {
     $this->expected = array(2, 2);
     $this->actual[0] = SC_Utils::sfTax(140, 1, 4);
     $this->actual[1] = SC_Utils::sfTax(150, 1, 4);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,47 +31,40 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfTermMonthTest extends Common_TestCase
-{
+class SC_Utils_sfTermMonthTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTermMonth_$BDy$aF|$,7nKv$h$jAa$$>l9g(B_$B ＠ _Dj$7$?Dy$aF|$NDL$j$K$J$k(B()
-  {
+  public function testSfTermMonth_$BDy$aF|$,7nKv$h$jAa$$>l9g(B_$B ＠ _Dj$7$?Dy$aF|$NDL$j$K$J$k(B() {
     $this->expected = array('2012/9/16', '2012/10/15 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2012, 10, 15);
 
     $this->verify();
   }
 
-  public function testSfTermMonth_$B3:Ev7n$NKvF|$,Dy$aF|$h$jAa$$>l9g(B_$BKvF|$K9g$o$;$i$l$k(B()
-  {
+  public function testSfTermMonth_$B3:Ev7n$NKvF|$,Dy$aF|$h$jAa$$>l9g(B_$BKvF|$K9g$o$;$i$l$k(B() {
     $this->expected = array('2012/9/1', '2012/9/30 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2012, 9, 31);
 
     $this->verify();
   }
 
-  public function testSfTermMonth_$BA07n$NKvF|$,Dy$aF|$h$jAa$$>l9g(B_$BKvF|$K9g$o$;$i$l$k(B()
-  {
+  public function testSfTermMonth_$BA07n$NKvF|$,Dy$aF|$h$jAa$$>l9g(B_$BKvF|$K9g$o$;$i$l$k(B() {
     $this->expected = array('2012/10/1', '2012/10/31 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2012, 10, 31);
 
     $this->verify();
   }
 
-  public function testSfTermMonth_$BG/$r$^$?$0>l9g(B_$BA07n$,A0G/==Fs7n$K$J$k(B()
-  {
+  public function testSfTermMonth_$BG/$r$^$?$0>l9g(B_$BA07n$,A0G/==Fs7n$K$J$k(B() {
     $this->expected = array('2012/12/16', '2013/1/15 23:59:59');
     $this->actual = SC_Utils::sfTermMonth(2013, 1, 15);
 

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,22 +31,18 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfTrimTest extends Common_TestCase
-{
+class SC_Utils_sfTrimTest extends Common_TestCase {
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTrim_$BJ8F,$HESCf$K%[%o%$%H%9%Z!<%9$,$"$k>l9g(B_$BJ8F,$@$1$,=|5n$G$-$k(B()
-  {
+  public function testSfTrim_$BJ8F,$HESCf$K%[%o%$%H%9%Z!<%9$,$"$k>l9g(B_$BJ8F,$@$1$,=|5n$G$-$k(B() {
     $this->expected = '$B$"!!$$(B $B$&$((B' . chr(0x0D) . '$B$*(B';
     // 0x0A=CR, 0x0d=LF
     $this->actual = SC_Utils::sfTrim(chr(0x0A) . chr(0x0D) . ' $B!!$"!!$$(B $B$&$((B' . chr(0x0D) . '$B$*(B');
@@ -54,8 +50,7 @@
     $this->verify('$B%H%j%`7k2L(B');
   }
   
-  public function testSfTrim_$BESCf$HJ8Kv$K%[%o%$%H%9%Z!<%9$,$"$k>l9g(B_$BJ8Kv$@$1$,=|5n$G$-$k(B()
-  {
+  public function testSfTrim_$BESCf$HJ8Kv$K%[%o%$%H%9%Z!<%9$,$"$k>l9g(B_$BJ8Kv$@$1$,=|5n$G$-$k(B() {
     $this->expected = '$B$"!!$$(B $B$&$((B' . chr(0x0D) . '$B$*(B';
     // 0x0A=CR, 0x0d=LF
     $this->actual = SC_Utils::sfTrim('$B$"!!$$(B $B$&$((B' .chr(0x0D) . '$B$*(B $B!!(B' . chr(0x0A) . chr(0x0D));

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,31 +31,26 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfTrimURLTest extends Common_TestCase
-{
+class SC_Utils_sfTrimURLTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfTrimURL_URL$B$,%9%i%C%7%e$G=*$o$k>l9g(B_$B%9%i%C%7%e$,<h$j=|$+$l$k(B()
-  {
+  public function testSfTrimURL_URL$B$,%9%i%C%7%e$G=*$o$k>l9g(B_$B%9%i%C%7%e$,<h$j=|$+$l$k(B() {
     $input = 'http://www.example.co.jp/';
     $this->expected = 'http://www.example.co.jp';
     $this->actual = SC_Utils::sfTrimURL($input);
     $this->verify();
   }
 
-  public function testSfTrimURL_URL$BKvHx$K%9%i%C%7%e$,$J$$>l9g(B_$BJ8;zNs$KJQ2=$,$J$$(B()
-  {
+  public function testSfTrimURL_URL$BKvHx$K%9%i%C%7%e$,$J$$>l9g(B_$BJ8;zNs$KJQ2=$,$J$$(B() {
     $input = 'http://www.example.co.jp';
     $this->expected = $input;
     $this->actual = SC_Utils::sfTrimURL($input);

$BJQ99(B: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php
===================================================================
--- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php	2013-05-02 08:16:21 UTC (rev 22795)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php	2013-05-02 09:11:36 UTC (rev 22796)
@@ -31,23 +31,19 @@
  * @author Hiroko Tamagawa
  * @version $Id$
  */
-class SC_Utils_sfUpDirNameTest extends Common_TestCase
-{
+class SC_Utils_sfUpDirNameTest extends Common_TestCase {
 
 
-  protected function setUp()
-  {
+  protected function setUp() {
     // parent::setUp();
   }
 
-  protected function tearDown()
-  {
+  protected function tearDown() {
     // parent::tearDown();
   }
 
   /////////////////////////////////////////
-  public function testSfUpDirName__1$B3,AX>e$N%G%#%l%/%H%jL>$,<hF@$G$-$k(B()
-  {
+  public function testSfUpDirName__1$B3,AX>e$N%G%#%l%/%H%jL>$,<hF@$G$-$k(B() {
     $_SERVER['SCRIPT_NAME'] = 'dir1/dir2/updir/current';
 
     $this->expected = 'updir';


