[Svn-src-all:3655] [version-2_12-dev 22567] #2043 (typo修正・ソース整形・ソースコメントの改善 for 2.12.4)
shutta
admin ＠ mail.ec-cube.net
2013年 2月 18日 (月) 19:09:56 JST
Subversion committed to /home/svn/open 22567
http://svn.ec-cube.net/open_trac/changeset/22567
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2013-02-18 19:09:54 +0900 (月, 18 2月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2043 (typo修正・ソース整形・ソースコメントの改善 for 2.12.4)
Zend Framework PHP 標準コーディング規約のコーディングスタイルへ準拠。
classおよびfunctionの開始波括弧「{」のスタイルを修正。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/SC_AdminView.php
U branches/version-2_12-dev/data/class/SC_Batch.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
U branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.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
U 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
U branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php
U branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.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
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
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
U branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_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
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
U branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php
U branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_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
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
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/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/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
U 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
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
U branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.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
U 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
U 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
変更: branches/version-2_12-dev/data/class/SC_AdminView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_AdminView.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_AdminView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -21,12 +21,15 @@
* 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;
変更: branches/version-2_12-dev/data/class/SC_Batch.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Batch.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Batch.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Batch {
+class SC_Batch
+{
// }}}
// {{{ functions
@@ -39,5 +40,6 @@
* @param mixed $argv コマンドライン引数
* @return mixed バッチの実行結果
*/
- function execute($argv = '') {}
+ function execute($argv = '')
+ {}
}
変更: branches/version-2_12-dev/data/class/SC_CartSession.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CartSession.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_CartSession.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -27,7 +27,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_CartSession {
+class SC_CartSession
+{
/** ユニークIDを指定する. */
var $key_tmp;
@@ -35,7 +36,8 @@
var $cartSession;
/* コンストラクタ */
- function __construct($cartKey = 'cart') {
+ function __construct($cartKey = 'cart')
+ {
if (!isset($_SESSION[$cartKey])) {
$_SESSION[$cartKey] = array();
}
@@ -43,7 +45,8 @@
}
// 商品購入処理中のロック
- function saveCurrentCart($key_tmp, $productTypeId) {
+ function saveCurrentCart($key_tmp, $productTypeId)
+ {
$this->key_tmp = 'savecart_' . $key_tmp;
// すでに情報がなければ現状のカート情報を記録しておく
if (count($_SESSION[$this->key_tmp]) == 0) {
@@ -58,7 +61,8 @@
}
// 商品購入中の変更があったかをチェックする。
- function getCancelPurchase($productTypeId) {
+ function getCancelPurchase($productTypeId)
+ {
$ret = isset($this->cartSession[$productTypeId]['cancel_purchase'])
? $this->cartSession[$productTypeId]['cancel_purchase'] : '';
$this->cartSession[$productTypeId]['cancel_purchase'] = false;
@@ -66,7 +70,8 @@
}
// 購入処理中に商品に変更がなかったかを判定
- function checkChangeCart($productTypeId) {
+ function checkChangeCart($productTypeId)
+ {
$change = false;
$max = $this->getMax($productTypeId);
for ($i = 1; $i <= $max; $i++) {
@@ -94,7 +99,8 @@
}
// 次に割り当てるカートのIDを取得する
- function getNextCartID($productTypeId) {
+ function getNextCartID($productTypeId)
+ {
$count = array();
foreach ($this->cartSession[$productTypeId] as $key => $value) {
$count[] = $this->cartSession[$productTypeId][$key]['cart_no'];
@@ -110,7 +116,8 @@
* @return string 商品ごとの合計価格(税込み)
* @deprecated SC_CartSession::getCartList() を使用してください
*/
- 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'])
@@ -128,7 +135,8 @@
}
// 値のセット
- 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'])
@@ -140,7 +148,8 @@
}
// カート内商品の最大要素番号を取得する。
- function getMax($productTypeId) {
+ function getMax($productTypeId)
+ {
$max = 0;
if (count($this->cartSession[$productTypeId]) > 0) {
foreach ($this->cartSession[$productTypeId] as $key => $value) {
@@ -155,7 +164,8 @@
}
// カート内商品数量の合計
- function getTotalQuantity($productTypeId) {
+ function getTotalQuantity($productTypeId)
+ {
$total = 0;
$max = $this->getMax($productTypeId);
for ($i = 0; $i <= $max; $i++) {
@@ -165,7 +175,8 @@
}
// 全商品の合計価格
- function getAllProductsTotal($productTypeId) {
+ function getAllProductsTotal($productTypeId)
+ {
// 税込み合計
$total = 0;
$max = $this->getMax($productTypeId);
@@ -189,7 +200,8 @@
}
// 全商品の合計税金
- function getAllProductsTax($productTypeId) {
+ function getAllProductsTax($productTypeId)
+ {
// 税合計
$total = 0;
$max = $this->getMax($productTypeId);
@@ -203,7 +215,8 @@
}
// 全商品の合計ポイント
- function getAllProductsPoint($productTypeId) {
+ function getAllProductsPoint($productTypeId)
+ {
// ポイント合計
$total = 0;
if (USE_POINT !== false) {
@@ -228,7 +241,8 @@
}
// カートへの商品追加
- 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'];
@@ -252,7 +266,8 @@
}
// 前頁のURLを記録しておく
- function setPrevURL($url, $excludePaths = array()) {
+ function setPrevURL($url, $excludePaths = array())
+ {
// 前頁として記録しないページを指定する。
$arrExclude = array(
'/shopping/'
@@ -273,12 +288,14 @@
}
// 前頁のURLを取得する
- function getPrevURL() {
+ function getPrevURL()
+ {
return isset($_SESSION['prev_url']) ? $_SESSION['prev_url'] : '';
}
// キーが一致した商品の削除
- 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) {
@@ -287,11 +304,13 @@
}
}
- 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];
}
@@ -299,7 +318,8 @@
* セッション中の商品情報データの調整。
* productsClass項目から、不必要な項目を削除する。
*/
- function adjustSessionProductsClass(&$arrProductsClass) {
+ function adjustSessionProductsClass(&$arrProductsClass)
+ {
$arrNecessaryItems = array(
'product_id' => true,
'product_class_id' => true,
@@ -332,7 +352,8 @@
* @param integer $productTypeId 商品種別ID
* @return array カート内商品一覧の配列
*/
- function getCartList($productTypeId) {
+ function getCartList($productTypeId)
+ {
$objProduct = new SC_Product_Ex();
$max = $this->getMax($productTypeId);
$arrRet = array();
@@ -372,7 +393,8 @@
*
* @return array すべてのカートの内容
*/
- function getAllCartList() {
+ function getAllCartList()
+ {
$results = array();
$cartKeys = $this->getKeys();
$i = 0;
@@ -393,7 +415,8 @@
* @param integer $productTypeId 商品種別ID
* @return array 商品規格ID の配列
*/
- function getAllProductClassID($productTypeId) {
+ function getAllProductClassID($productTypeId)
+ {
$max = $this->getMax($productTypeId);
$productClassIDs = array();
for ($i = 0; $i <= $max; $i++) {
@@ -410,7 +433,8 @@
* @param integer $productTypeId 商品種別ID
* @return void
*/
- function delAllProducts($productTypeId) {
+ function delAllProducts($productTypeId)
+ {
$max = $this->getMax($productTypeId);
for ($i = 0; $i <= $max; $i++) {
unset($this->cartSession[$productTypeId][$i]);
@@ -418,7 +442,8 @@
}
// 商品の削除
- 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) {
@@ -428,7 +453,8 @@
}
// 数量の増加
- 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);
@@ -436,7 +462,8 @@
}
// 数量の減少
- 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);
@@ -450,7 +477,8 @@
* @param integer $productTypeId 商品種別ID
* @return integer 該当商品規格の数量
*/
- 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) {
@@ -467,7 +495,8 @@
* @param integer $productTypeId 商品種別ID
* @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) {
@@ -483,7 +512,8 @@
* @param integer $productTypeId 商品種別ID
* @return integer 商品規格ID
*/
- 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'];
@@ -505,7 +535,8 @@
* @param string $productTypeId 商品種別ID
* @return string エラーが発生した場合はエラーメッセージ
*/
- function checkProducts($productTypeId) {
+ function checkProducts($productTypeId)
+ {
$objProduct = new SC_Product_Ex();
$objDelivery = new SC_Helper_Delivery_Ex();
$arrDeliv = $objDelivery->getList($productTypeId);
@@ -560,7 +591,8 @@
* @param integer $productTypeId 商品種別ID
* @return boolean 送料無料の場合 true
*/
- function isDelivFree($productTypeId) {
+ function isDelivFree($productTypeId)
+ {
$objDb = new SC_Helper_DB_Ex();
$subtotal = $this->getAllProductsTotal($productTypeId);
@@ -674,7 +706,8 @@
*
* @return array 商品種別IDの配列
*/
- function getKeys() {
+ function getKeys()
+ {
$keys = array_keys($this->cartSession);
// 数量が 0 の商品種別は削除する
foreach ($keys as $key) {
@@ -692,7 +725,8 @@
* @param integer $key 商品種別ID
* @return void
*/
- function registerKey($key) {
+ function registerKey($key)
+ {
$_SESSION['cartKey'] = $key;
}
@@ -701,7 +735,8 @@
*
* @return void
*/
- function unsetKey() {
+ function unsetKey()
+ {
unset($_SESSION['cartKey']);
}
@@ -710,7 +745,8 @@
*
* @return integer 商品種別ID
*/
- function getKey() {
+ function getKey()
+ {
return $_SESSION['cartKey'];
}
@@ -719,7 +755,8 @@
*
* @return boolean カートが複数商品種別の場合 true
*/
- function isMultiple() {
+ function isMultiple()
+ {
return count($this->getKeys()) > 1;
}
@@ -729,7 +766,8 @@
* @param integer $product_type_id 商品種別ID
* @return boolean 指定の商品種別がカートに含まれる場合 true
*/
- function hasProductType($product_type_id) {
+ function hasProductType($product_type_id)
+ {
return in_array($product_type_id, $this->getKeys());
}
}
変更: branches/version-2_12-dev/data/class/SC_CheckError.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CheckError.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_CheckError.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -26,12 +26,14 @@
* [概要] エラーチェッククラス
*----------------------------------------------------------------------
*/
-class SC_CheckError {
+class SC_CheckError
+{
var $arrErr = array();
var $arrParam;
// チェック対象の値が含まれる配列をセットする。
- function __construct($array = '') {
+ function __construct($array = '')
+ {
if ($array != '') {
$this->arrParam = $array;
} else {
@@ -40,7 +42,8 @@
}
- function doFunc($value, $arrFunc) {
+ function doFunc($value, $arrFunc)
+ {
foreach ($arrFunc as $key) {
$this->$key($value);
}
@@ -52,7 +55,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象 value[2] = 許可するタグが格納された配列
* @return void
*/
- function HTML_TAG_CHECK($value) {
+ function HTML_TAG_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -80,7 +84,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象
* @return void
*/
- function EXIST_CHECK($value) {
+ function EXIST_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -99,7 +104,8 @@
* @param array $value value[0] = 判定対象 value[1] = 項目名
* @return void
*/
- function EXIST_CHECK_REVERSE($value) {
+ function EXIST_CHECK_REVERSE($value)
+ {
if (isset($this->arrErr[$value[0]])) {
return;
}
@@ -116,7 +122,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象
* @return void
*/
- function SPTAB_CHECK($value) {
+ function SPTAB_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -133,7 +140,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象
* @return void
*/
- function NO_SPTAB($value) {
+ function NO_SPTAB($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -144,7 +152,8 @@
}
/* ゼロで開始されている数値の判定 */
- function ZERO_START($value) {
+ function ZERO_START($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -161,7 +170,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象
* @return void
*/
- function SELECT_CHECK($value) {
+ function SELECT_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -178,7 +188,8 @@
* @param array $value value[0] = 項目名1 value[1] = 項目名2 value[2] = 判定対象文字列1 value[3] = 判定対象文字列2
* @return void
*/
- function EQUAL_CHECK($value) {
+ function EQUAL_CHECK($value)
+ {
if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
return;
}
@@ -196,7 +207,8 @@
* @param array $value value[0] = 項目名1 value[1] = 項目名2 value[2] = 判定対象文字列1 value[3] = 判定対象文字列2
* @return void
*/
- function DIFFERENT_CHECK($value) {
+ function DIFFERENT_CHECK($value)
+ {
if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
return;
}
@@ -214,7 +226,8 @@
* @param array $value value[0] = 項目名1 value[1] = 項目名2 value[2] = 判定対象文字列1 value[3] = 判定対象文字列2
* @return void
*/
- function GREATER_CHECK($value) {
+ function GREATER_CHECK($value)
+ {
if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[3]])) {
return;
}
@@ -232,7 +245,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 最大文字数(半角も全角も1文字として数える)
* @return void
*/
- function MAX_LENGTH_CHECK($value) {
+ function MAX_LENGTH_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -250,7 +264,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 最小文字数(半角も全角も1文字として数える)
* @return void
*/
- function MIN_LENGTH_CHECK($value) {
+ function MIN_LENGTH_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -268,7 +283,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 最大数]
* @return void
*/
- function MAX_CHECK($value) {
+ function MAX_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -286,7 +302,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 最小数
* @return void
*/
- function MIN_CHECK($value) {
+ function MIN_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -303,7 +320,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象文字列
* @return void
*/
- function NUM_CHECK($value) {
+ function NUM_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -320,7 +338,8 @@
* @param array $value value[0] = 項目名 value[1] = 判定対象文字列
* @return void
*/
- function NUM_POINT_CHECK($value) {
+ function NUM_POINT_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -330,7 +349,8 @@
}
}
- function ALPHA_CHECK($value) {
+ function ALPHA_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -353,7 +373,8 @@
* [5]: 電話番号総数 (指定なしの場合、TEL_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;
@@ -394,7 +415,8 @@
value[0] : 項目名
value[1] : 判定対象要素名
*/
- function FULL_EXIST_CHECK($value) {
+ function FULL_EXIST_CHECK($value)
+ {
$max = count($value);
$this->createParam($value);
// 既に該当項目にエラーがある場合は、判定しない。
@@ -422,7 +444,8 @@
value[0] : 項目名
value[1] : 判定対象要素名
*/
- function ALL_EXIST_CHECK($value) {
+ function ALL_EXIST_CHECK($value)
+ {
$max = count($value);
// 既に該当項目にエラーがある場合は、判定しない。
@@ -453,7 +476,8 @@
value[0] : 項目名
value[1] : 判定対象要素名
*/
- function ONE_EXIST_CHECK($value) {
+ function ONE_EXIST_CHECK($value)
+ {
$max = count($value);
$this->createParam($value);
// 既に該当項目にエラーがある場合は、判定しない。
@@ -481,7 +505,8 @@
value[0] : 項目名
value[1] : 判定対象要素名
*/
- function TOP_EXIST_CHECK($value) {
+ function TOP_EXIST_CHECK($value)
+ {
$max = count($value);
$this->createParam($value);
@@ -514,7 +539,8 @@
/* カタカナの判定 */
// 入力文字がカナ以外ならエラーを返す
// value[0] = 項目名 value[1] = 判定対象文字列
- function KANA_CHECK($value) {
+ function KANA_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -527,7 +553,8 @@
/* カタカナの判定2 (タブ、スペースは許可する) */
// 入力文字がカナ以外ならエラーを返す
// value[0] = 項目名 value[1] = 判定対象文字列
- function KANABLANK_CHECK($value) {
+ function KANABLANK_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -540,7 +567,8 @@
/* 英数字の判定 */
// 入力文字が英数字以外ならエラーを返す
// value[0] = 項目名 value[1] = 判定対象文字列
- function ALNUM_CHECK($value) {
+ function ALNUM_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -553,7 +581,8 @@
/* 英数記号の判定 */
// 入力文字が英数記号以外ならエラーを返す
// value[0] = 項目名 value[1] = 判定対象文字列
- function GRAPH_CHECK($value) {
+ function GRAPH_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -566,7 +595,8 @@
/* 必須選択の判定 */
// 入力値で0が許されない場合エラーを返す
// value[0] = 項目名 value[1] = 判定対象
- function ZERO_CHECK($value) {
+ function ZERO_CHECK($value)
+ {
$this->createParam($value);
if ($this->arrParam[$value[1]] == '0') {
$this->arrErr[$value[1]] = '※ ' . $value[0] . 'は1以上を入力してください。<br />';
@@ -576,7 +606,8 @@
/* 桁数の判定 (最小最大)*/
// 入力文字の桁数判定 → 最小桁数＜入力文字列＜最大桁数
// value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 最小桁数 value[3] = 最大桁数
- function NUM_RANGE_CHECK($value) {
+ function NUM_RANGE_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -591,7 +622,8 @@
/* 桁数の判定 */
// 入力文字の桁数判定 → 入力文字列 = 桁数 以外はNGの場合
// value[0] = 項目名 value[1] = 判定対象文字列 value[2] = 桁数
- function NUM_COUNT_CHECK($value) {
+ function NUM_COUNT_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -610,7 +642,8 @@
* [1]: 判定対象を格納している配列キー
* @return void
*/
- function EMAIL_CHECK($value) {
+ function EMAIL_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -659,7 +692,8 @@
/* メールアドレスに使用できる文字の判定 */
// メールアドレスに使用する文字を正規表現で判定する
// value[0] = 項目名 value[1] = 判定対象メールアドレス
- function EMAIL_CHAR_CHECK($value) {
+ function EMAIL_CHAR_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -672,7 +706,8 @@
/* URL形式の判定 */
// URLを正規表現で判定する。デフォルトでhttp://があってもOK
// value[0] = 項目名 value[1] = 判定対象URL
- function URL_CHECK($value) {
+ function URL_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -683,7 +718,8 @@
/* IPアドレスの判定 */
// value[0] = 項目名 value[1] = 判定対象IPアドレス文字列
- function IP_CHECK($value) {
+ function IP_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -706,7 +742,8 @@
/* 拡張子の判定 */
// 受け取りがない場合エラーを返す
// value[0] = 項目名 value[1] = 判定対象 value[2]=array(拡張子)
- function FILE_EXT_CHECK($value) {
+ function FILE_EXT_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]]) || count($value[2]) == 0) {
return;
}
@@ -732,7 +769,8 @@
/* ファイルが存在するかチェックする */
// 受け取りがない場合エラーを返す
// value[0] = 項目名 value[1] = 判定対象 value[2] = 指定ディレクトリ
- function FIND_FILE($value) {
+ function FIND_FILE($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -755,7 +793,8 @@
/* ファイルが上げられたか確認 */
// 受け取りがない場合エラーを返す
// value[0] = 項目名 value[1] = 判定対象 value[2] = 指定サイズ(KB)
- function FILE_EXIST_CHECK($value) {
+ function FILE_EXIST_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -768,7 +807,8 @@
/* ファイルサイズの判定 */
// 受け取りがない場合エラーを返す
// value[0] = 項目名 value[1] = 判定対象 value[2] = 指定サイズ(KB)
- function FILE_SIZE_CHECK($value) {
+ function FILE_SIZE_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -786,7 +826,8 @@
/* ファイル名の判定 */
// 入力文字が英数字,'_','-'以外ならエラーを返す
// value[0] = 項目名 value[1] = 判定対象文字列
- function FILE_NAME_CHECK($value) {
+ function FILE_NAME_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -799,7 +840,8 @@
/* ファイル名の判定(アップロード以外の時) */
// 入力文字が英数字,'_','-'以外ならエラーを返す
// value[0] = 項目名 value[1] = 判定対象文字列
- function FILE_NAME_CHECK_BY_NOUPLOAD($value) {
+ function FILE_NAME_CHECK_BY_NOUPLOAD($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -814,7 +856,8 @@
// value[1] = YYYY
// value[2] = MM
// value[3] = DD
- function CHECK_DATE($value) {
+ function CHECK_DATE($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -837,7 +880,8 @@
// value[3] = DD
// value[4] = HH
// value[5] = mm
- function CHECK_DATE2($value) {
+ function CHECK_DATE2($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -857,7 +901,8 @@
// value[0] = 項目名
// value[1] = YYYY
// value[2] = MM
- function CHECK_DATE3($value) {
+ function CHECK_DATE3($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -878,7 +923,8 @@
// value[1] = YYYY
// value[2] = MM
// value[3] = DD
- function CHECK_BIRTHDAY($value) {
+ function CHECK_BIRTHDAY($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -923,7 +969,8 @@
// value[5] = end_year
// value[6] = end_month
// value[7] = end_day
- function CHECK_SET_TERM($value) {
+ function CHECK_SET_TERM($value)
+ {
// 期間指定
if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[5]])) {
@@ -973,7 +1020,8 @@
// value[13] = end_second
/*-----------------------------------------------------------------*/
- function CHECK_SET_TERM2($value) {
+ function CHECK_SET_TERM2($value)
+ {
// 期間指定
if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[8]])) {
@@ -1016,7 +1064,8 @@
// value[3] = start_month
// value[4] = end_year
// value[5] = end_month
- function CHECK_SET_TERM3($value) {
+ function CHECK_SET_TERM3($value)
+ {
// 期間指定
if (isset($this->arrErr[$value[2]]) || isset($this->arrErr[$value[4]])) {
@@ -1041,7 +1090,8 @@
}
//ディレクトリ存在チェック
- function DIR_CHECK($value) {
+ function DIR_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -1052,7 +1102,8 @@
}
// ドメインチェック
- function DOMAIN_CHECK($value) {
+ function DOMAIN_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -1064,7 +1115,8 @@
/* 携帯メールアドレスの判定 */
// メールアドレスを正規表現で判定する
// value[0] = 項目名 value[1] = 判定対象メールアドレス
- function MOBILE_EMAIL_CHECK($value) {
+ function MOBILE_EMAIL_CHECK($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -1083,7 +1135,8 @@
* @access public
* @return void
*/
- function CHECK_REGIST_CUSTOMER_EMAIL($value) {
+ function CHECK_REGIST_CUSTOMER_EMAIL($value)
+ {
if (isset($this->arrErr[$value[1]])) {
return;
}
@@ -1109,7 +1162,8 @@
*
* @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;
}
@@ -1130,7 +1184,8 @@
* @param array $value [0] => 項目名, [1] => 評価する文字列
* @return void
*/
- function EVAL_CHECK($value) {
+ function EVAL_CHECK($value)
+ {
if (isset($this->arrErr[$value[0]])) {
return;
}
@@ -1151,7 +1206,8 @@
* @param string 評価する文字列
* @return bool パラメーターとして適切な文字列か
*/
- function evalCheck($value) {
+ function evalCheck($value)
+ {
return @eval('return is_scalar(' . $value . ');');
}
@@ -1162,7 +1218,8 @@
* @param array $value 配列
* @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] = '';
@@ -1177,7 +1234,8 @@
* @param string $string チェックする文字列
* @return boolean 値が10進数の数値表現のみの場合 true
*/
- function numelicCheck($string) {
+ function numelicCheck($string)
+ {
/*
* XXX 10進数の数値表現か否かを調べたいだけだが,
* ctype_digit() は文字列以外 false を返す.
変更: branches/version-2_12-dev/data/class/SC_ClassAutoloader.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_ClassAutoloader.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_ClassAutoloader.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,14 +28,16 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_ClassAutoloader {
+class SC_ClassAutoloader
+{
/**
* クラスのオートローディング本体
*
* LC_* には対応していない。
* @return void
*/
- public static function autoload($class) {
+ public static function autoload($class)
+ {
$arrClassNamePart = explode('_', $class);
$is_ex = end($arrClassNamePart) === 'Ex';
$count = count($arrClassNamePart);
変更: branches/version-2_12-dev/data/class/SC_Cookie.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Cookie.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Cookie.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -25,18 +25,21 @@
* クッキー用クラス
*
*/
-class SC_Cookie {
+class SC_Cookie
+{
var $expire;
// コンストラクタ
- function __construct($day = COOKIE_EXPIRE) {
+ function __construct($day = COOKIE_EXPIRE)
+ {
// 有効期限
$this->expire = time() + ($day * 24 * 3600);
}
// クッキー書き込み
- function setCookie($key, $val) {
+ function setCookie($key, $val)
+ {
setcookie($key, $val, $this->expire, ROOT_URLPATH, DOMAIN_NAME);
}
@@ -45,7 +48,8 @@
*
* EC-CUBE をURLパスルート以外にインストールしている場合、上位ディレクトリの値も(劣後ではあるが)取得する点に留意。
*/
- function getCookie($key) {
+ function getCookie($key)
+ {
return isset($_COOKIE[$key]) ? $_COOKIE[$key] : null;
}
}
変更: branches/version-2_12-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Customer.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Customer.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,12 +24,14 @@
/* [名称] SC_Customer
* [概要] 会員管理クラス
*/
-class SC_Customer {
+class SC_Customer
+{
/** 会員情報 */
var $customer_data;
- function getCustomerDataFromEmailPass($pass, $email, $mobile = false) {
+ function getCustomerDataFromEmailPass($pass, $email, $mobile = false)
+ {
// 小文字に変換
$email = strtolower($email);
$sql_mobile = $mobile ? ' OR email_mobile = ?' : '';
@@ -62,7 +64,8 @@
* @return boolean 該当する会員が存在する場合は true、それ以外の場合
* は false を返す。
*/
- function checkMobilePhoneId() {
+ function checkMobilePhoneId()
+ {
//docomo用にデータを取り出す。
if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') {
if ($_SESSION['mobile']['phone_id'] == '' && strlen($_SESSION['mobile']['phone_id']) == 0) {
@@ -87,7 +90,8 @@
* @return boolean 該当する会員が存在し、パスワードが合っている場合は true、
* それ以外の場合は false を返す。
*/
- function getCustomerDataFromMobilePhoneIdPass($pass) {
+ function getCustomerDataFromMobilePhoneIdPass($pass)
+ {
//docomo用にデータを取り出す。
if (SC_MobileUserAgent_Ex::getCarrier() == 'docomo') {
if ($_SESSION['mobile']['phone_id'] == '' && strlen($_SESSION['mobile']['phone_id']) == 0) {
@@ -117,7 +121,8 @@
*
* @return void
*/
- function updateMobilePhoneId() {
+ function updateMobilePhoneId()
+ {
if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) {
return;
}
@@ -135,7 +140,8 @@
}
// パスワードを確認せずにログイン
- function setLogin($email) {
+ function setLogin($email)
+ {
// 本登録された会員のみ
$sql = 'SELECT * FROM dtb_customer WHERE (email = ? OR email_mobile = ?) AND del_flg = 0 AND status = 2';
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -146,7 +152,8 @@
}
// セッション情報を最新の情報に更新する
- 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();
@@ -156,14 +163,16 @@
}
// ログイン情報をセッションに登録し、ログに書き込む
- function startSession() {
+ function startSession()
+ {
$_SESSION['customer'] = $this->customer_data;
// セッション情報の保存
GC_Utils_Ex::gfPrintLog('access : user='.$this->customer_data['customer_id'] ."\t".'ip='. $this->getRemoteHost(), CUSTOMER_LOG_REALFILE, false);
}
// ログアウト $_SESSION['customer']を解放し、ログに書き込む
- function EndSession() {
+ function EndSession()
+ {
// セッション情報破棄の前にcustomer_idを保存
$customer_id = $_SESSION['customer']['customer_id'];
@@ -183,7 +192,8 @@
}
// ログインに成功しているか判定する。
- function isLoginSuccess($dont_check_email_mobile = false) {
+ function isLoginSuccess($dont_check_email_mobile = false)
+ {
// ログイン時のメールアドレスとDBのメールアドレスが一致している場合
if (isset($_SESSION['customer']['customer_id'])
&& SC_Utils_Ex::sfIsInt($_SESSION['customer']['customer_id'])
@@ -204,7 +214,8 @@
}
// パラメーターの取得
- function getValue($keyname) {
+ function getValue($keyname)
+ {
// ポイントはリアルタイム表示
if ($keyname == 'point') {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -217,12 +228,14 @@
}
// パラメーターのセット
- function setValue($keyname, $val) {
+ function setValue($keyname, $val)
+ {
$_SESSION['customer'][$keyname] = $val;
}
// パラメーターがNULLかどうかの判定
- function hasValue($keyname) {
+ function hasValue($keyname)
+ {
if (isset($_SESSION['customer'][$keyname])) {
return !SC_Utils_Ex::isBlank($_SESSION['customer'][$keyname]);
}
@@ -230,7 +243,8 @@
}
// 誕生日月であるかどうかの判定
- function isBirthMonth() {
+ function isBirthMonth()
+ {
if (isset($_SESSION['customer']['birth'])) {
$arrRet = preg_split('|[- :/]|', $_SESSION['customer']['birth']);
$birth_month = intval($arrRet[1]);
@@ -251,7 +265,8 @@
*
* @return string $_SERVER['REMOTE_HOST'] 又は $_SERVER['REMOTE_ADDR']の文字列
*/
- function getRemoteHost() {
+ function getRemoteHost()
+ {
if (!empty($_SERVER['REMOTE_HOST'])) {
return $_SERVER['REMOTE_HOST'];
@@ -263,7 +278,8 @@
}
//受注関連の会員情報を更新
- 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));
@@ -281,7 +297,8 @@
* @param string $login_pass ログインパスワード
* @return boolean ログインに成功した場合 true; 失敗した場合 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) &&
変更: branches/version-2_12-dev/data/class/SC_CustomerList.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CustomerList.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_CustomerList.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,11 +24,13 @@
/* [名称] SC_CustomerList
* [概要] 会員検索用クラス
*/
-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();
@@ -326,12 +328,14 @@
}
// 検索用SQL
- 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);
}
- function getListMailMagazine($is_mobile = false) {
+ function getListMailMagazine($is_mobile = false)
+ {
$colomn = $this->getMailMagazineColumn($is_mobile);
$this->select = "
@@ -343,13 +347,15 @@
}
// 検索総数カウント用SQL
- function getListCount() {
+ function getListCount()
+ {
$this->select = 'SELECT COUNT(customer_id) FROM dtb_customer ';
return $this->getSql(1);
}
// CSVダウンロード用SQL
- function getListCSV($arrColumnCSV) {
+ function getListCSV($arrColumnCSV)
+ {
$this->arrColumnCSV = $arrColumnCSV;
$i = 0;
foreach ($this->arrColumnCSV as $val) {
@@ -362,7 +368,8 @@
return $this->getSql(2);
}
- function getWhere() {
+ function getWhere()
+ {
return array($this->where, $this->arrVal);
}
}
変更: branches/version-2_12-dev/data/class/SC_Date.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Date.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Date.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,39 +22,47 @@
*/
/* 日時表示用クラス */
-class SC_Date {
+class SC_Date
+{
var $start_year;
var $month;
var $day;
var $end_year;
// コンストラクタ
- 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;
}
@@ -68,7 +76,8 @@
* string 「選択なし」は指定された値の下に付加する。
* @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;
@@ -92,7 +101,8 @@
return $year_array;
}
- function getZeroYear($year = '') {
+ function getZeroYear($year = '')
+ {
if ($year) $this->setStartYear($year);
$year = $this->start_year;
@@ -110,7 +120,8 @@
return $year_array;
}
- function getZeroMonth() {
+ function getZeroMonth()
+ {
$month_array = array();
for ($i=1; $i <= 12; $i++) {
@@ -120,7 +131,8 @@
return $month_array;
}
- function getMonth($default = false) {
+ function getMonth($default = false)
+ {
$month_array = array();
if ($default) $month_array[''] = '--';
@@ -131,7 +143,8 @@
return $month_array;
}
- function getDay($default = false) {
+ function getDay($default = false)
+ {
$day_array = array();
if ($default) $day_array[''] = '--';
@@ -143,7 +156,8 @@
return $day_array;
}
- function getHour() {
+ function getHour()
+ {
$hour_array = array();
for ($i=0; $i<=23; $i++) {
@@ -153,7 +167,8 @@
return $hour_array;
}
- function getMinutes() {
+ function getMinutes()
+ {
$minutes_array = array();
for ($i=0; $i<=59; $i++) {
@@ -163,7 +178,8 @@
return $minutes_array;
}
- function getMinutesInterval() {
+ function getMinutesInterval()
+ {
$minutes_array = array('00'=>'00', '30'=>'30');
return $minutes_array;
変更: branches/version-2_12-dev/data/class/SC_Display.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Display.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Display.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -27,7 +27,8 @@
* @author Ryuichi Tokugami
* @version $Id$
*/
-class SC_Display{
+class SC_Display
+{
var $response;
@@ -48,14 +49,16 @@
* 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 で実装した方が良さげ
$objCartSess = new SC_CartSession_Ex();
$objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
@@ -67,7 +70,8 @@
* @param LC_Page $page LC_Page インスタンス
* @param $is_admin boolean 管理画面を扱う場合 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);
@@ -82,18 +86,21 @@
*
* SC_Response::reload() のラッパーです.
*/
- function reload($queryString = array(), $removeQueryString = false) {
+ function reload($queryString = array(), $removeQueryString = false)
+ {
$this->response->reload($queryString, $removeQueryString);
}
- function noAction() {
+ function noAction()
+ {
return;
}
/**
* ヘッダを追加する.
*/
- function addHeader($name, $value) {
+ function addHeader($name, $value)
+ {
$this->response->addHeader($name, $value);
}
@@ -101,7 +108,8 @@
* デバイス毎の出力方法を自動で変更する、ファサード
* Enter description here ...
*/
- function setDevice($device = DEVICE_TYPE_PC) {
+ function setDevice($device = DEVICE_TYPE_PC)
+ {
switch ($device) {
case DEVICE_TYPE_MOBILE:
@@ -126,7 +134,8 @@
/**
* SC_View インスタンスを設定する.
*/
- function setView($view) {
+ function setView($view)
+ {
$this->view = $view;
}
@@ -141,7 +150,8 @@
* @param $reset boolean
* @return integer 端末種別ID
*/
- 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();
@@ -156,15 +166,18 @@
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);
}
}
変更: branches/version-2_12-dev/data/class/SC_FormParam.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_FormParam.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_FormParam.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,7 +29,8 @@
* @package SC
* @author LOCKON CO.,LTD.
*/
-class SC_FormParam {
+class SC_FormParam
+{
/**
* 何も入力されていないときに表示する値
@@ -61,7 +62,8 @@
/**
* コンストラクタ
*/
- function __construct() {
+ function __construct()
+ {
$this->check_dir = IMAGE_SAVE_REALDIR;
// SC_FormParamのフックポイント
@@ -81,7 +83,8 @@
*
* @deprecated 2.12.0 #1702
*/
- function initParam() {
+ function initParam()
+ {
$this->disp_name = array();
$this->keyname = array();
$this->length = array();
@@ -92,7 +95,8 @@
}
// パラメーターの追加
- 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;
@@ -106,7 +110,8 @@
// パラメーターの入力
// $arrVal :$arrVal['keyname']・・の配列を一致したキーのインスタンスに格納する
// $seq :trueの場合、$arrVal[0]~の配列を登録順にインスタンスに格納する
- function setParam($arrVal, $seq = false) {
+ function setParam($arrVal, $seq = false)
+ {
if (!is_array($arrVal)) return;
if (!$seq) {
foreach ($arrVal as $key => $val) {
@@ -120,7 +125,8 @@
}
// 画面表示用タイトル生成
- function setHtmlDispNameArray() {
+ function setHtmlDispNameArray()
+ {
foreach ($this->keyname as $index => $key) {
$find = false;
foreach ($this->arrCheck[$index] as $val) {
@@ -144,12 +150,14 @@
}
// 画面表示用タイトル取得
- function getHtmlDispNameArray() {
+ function getHtmlDispNameArray()
+ {
return $this->html_disp_name;
}
// 複数列パラメーターの取得
- function setParamList($arrVal2d, $keyname) {
+ function setParamList($arrVal2d, $keyname)
+ {
// DBの件数を取得する。
$no = 1;
foreach ($arrVal2d as $arrVal) {
@@ -159,7 +167,8 @@
}
}
- 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;
}
@@ -170,7 +179,8 @@
}
// キーに対応した値をセットする。
- function setValue($key, $value) {
+ function setValue($key, $value)
+ {
if (!in_array($key, $this->keyname)) {
// TODO 警告発生
return;
@@ -178,14 +188,16 @@
$this->arrValue[$key] = $value;
}
- function toLower($key) {
+ function toLower($key)
+ {
if (isset($this->arrValue[$key])) {
$this->arrValue[$key] = strtolower($this->arrValue[$key]);
}
}
// エラーチェック
- function checkError($br = true) {
+ function checkError($br = true)
+ {
$arrErr = array();
foreach ($this->keyname as $index => $key) {
@@ -302,7 +314,8 @@
* @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]);
@@ -316,7 +329,8 @@
* @param mixed $value 変換する値. 配列の場合は再帰的に実行する.
* @param string $convert mb_convert_kana の変換オプション
*/
- function recursionConvParam(&$value, $convert) {
+ function recursionConvParam(&$value, $convert)
+ {
if (is_array($value)) {
foreach ($value as $key => $val) {
$this->recursionConvParam($value[$key], $convert);
@@ -334,7 +348,8 @@
* @param array $arrKey 対象のキー
* @return array 連想配列
*/
- function getHashArray($arrKey = array()) {
+ function getHashArray($arrKey = array())
+ {
$arrRet = array();
foreach ($this->keyname as $keyname) {
if (empty($arrKey) || in_array($keyname, $arrKey)) {
@@ -345,7 +360,8 @@
}
// DB格納用配列の作成
- function getDbArray() {
+ function getDbArray()
+ {
$dbArray = array();
foreach ($this->keyname as $index => $key) {
if ($this->input_db[$index]) {
@@ -361,24 +377,28 @@
* @param array $arrKey 対象のキー
* @return array 縦横を入れ替えた配列
*/
- function getSwapArray($arrKey = array()) {
+ function getSwapArray($arrKey = array())
+ {
$arrTmp = $this->getHashArray($arrKey);
return SC_Utils_Ex::sfSwapArray($arrTmp);
}
// 項目名一覧の取得
- function getTitleArray() {
+ function getTitleArray()
+ {
return $this->disp_name;
}
// 項目数を返す
- function getCount() {
+ function getCount()
+ {
$count = count($this->keyname);
return $count;
}
// フォームに渡す用のパラメーターを返す
- function getFormParamList() {
+ function getFormParamList()
+ {
$formParamList = array();
foreach ($this->keyname as $index => $key) {
// キー名
@@ -398,12 +418,14 @@
*
* @return array キー名の一覧
*/
- function getKeyList() {
+ function getKeyList()
+ {
return $this->keyname;
}
// キー名と一致した値を返す
- function getValue($keyname, $default = '') {
+ function getValue($keyname, $default = '')
+ {
$ret = null;
foreach ($this->keyname as $key) {
if ($key == $keyname) {
@@ -429,7 +451,8 @@
/**
* @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])) {
@@ -445,7 +468,8 @@
* @param boolean $has_wide_space 全角空白も削除する場合 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);
}
@@ -458,7 +482,8 @@
* @param boolean $has_wide_space 全角空白も削除する場合 true
* @return void
*/
- function recursionTrim(&$value, $has_wide_space = true) {
+ function recursionTrim(&$value, $has_wide_space = true)
+ {
$pattern = '/^[ \r\n\t]*(.*?)[ \r\n\t]*$/u';
if (is_array($value)) {
foreach ($value as $key => $val) {
@@ -482,7 +507,8 @@
* @param string $prefix パラメーター名の接頭辞
* @return array 検索結果引き継ぎ用の連想配列.
*/
- function getSearchArray($prefix = 'search_') {
+ function getSearchArray($prefix = 'search_')
+ {
$arrResults = array();
foreach ($this->keyname as $key) {
if (preg_match('/^' . $prefix . '/', $key)) {
@@ -498,7 +524,8 @@
* 1次キーが添字なのが特徴だったと思われる。
* @deprecated 2.12.0 必要ならば getFormParamList メソッドに引数を追加するなどで実現可能
*/
- function getFormDispArray() {
+ function getFormDispArray()
+ {
$formDispArray = array();
foreach ($this->keyname as $index => $key) {
// キー名
@@ -518,7 +545,8 @@
* addParamの逆の関数
* カスタマイズおよびプラグインで使用されるのを想定
*/
- function removeParam($keyname) {
+ function removeParam($keyname)
+ {
$index = array_search($keyname, $this->keyname);
if ($index !== FALSE) {
@@ -561,7 +589,8 @@
* @param string $target 上書きしたい項目名(disp_name,length,convert等)
* @param mixed $value 指定した内容に上書きする
*/
- function overwriteParam($keyname, $target, $value) {
+ function overwriteParam($keyname, $target, $value)
+ {
$index = array_search($keyname, $this->keyname);
if ($index !== FALSE) {
変更: branches/version-2_12-dev/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Fpdf.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Fpdf.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,8 +29,10 @@
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();
// デフォルトの設定
$this->tpl_pdf = PDF_TEMPLATE_REALDIR . $tpl_pdf; // テンプレートファイル
@@ -66,7 +68,8 @@
$this->pageno = $this->setSourceFile($this->tpl_pdf);
}
- function setData($arrData) {
+ function setData($arrData)
+ {
$this->arrData = $arrData;
// ページ番号よりIDを取得
@@ -92,7 +95,8 @@
}
- function setShopData() {
+ function setShopData()
+ {
// ショップ情報
$objDb = new SC_Helper_DB_Ex();
@@ -129,7 +133,8 @@
$this->Image($logo_file, 124, 46, 40);
}
- function setMessageData() {
+ function setMessageData()
+ {
// メッセージ
$this->lfText(27, 70, $this->arrData['msg1'], 8); //メッセージ1
$this->lfText(27, 74, $this->arrData['msg2'], 8); //メッセージ2
@@ -138,7 +143,8 @@
$this->lfText(158, 288, $text, 8); //作成日
}
- function setOrderData() {
+ function setOrderData()
+ {
$arrOrder = array();
// DBから受注情報を読み込む
$this->lfGetOrderData($this->arrData['order_id']);
@@ -263,7 +269,8 @@
* @param string $str 入力文字列
* @return string 変更後の文字列
*/
- function setEtcData() {
+ function setEtcData()
+ {
$this->Cell(0, 10, '', 0, 1, 'C', 0, '');
$this->SetFont('Gothic', 'B', 9);
$this->MultiCell(0, 6, '＜ 備考 ＞', 'T', 2, 'L', 0, '');
@@ -272,7 +279,8 @@
$this->MultiCell(0, 4, $text, '', 2, 'L', 0, '');
}
- function createPdf() {
+ function createPdf()
+ {
// PDFをブラウザに送信
ob_clean();
if ($this->pdf_download == 1) {
@@ -291,7 +299,8 @@
}
// PDF_Japanese::Text へのパーサー
- function lfText($x, $y, $text, $size = 0, $style = '') {
+ function lfText($x, $y, $text, $size = 0, $style = '')
+ {
// 退避
$bak_font_style = $this->FontStyle;
$bak_font_size = $this->FontSizePt;
@@ -304,7 +313,8 @@
}
// 受注データの取得
- function lfGetOrderData($order_id) {
+ function lfGetOrderData($order_id)
+ {
if (SC_Utils_Ex::sfIsInt($order_id)) {
// DBから受注情報を読み込む
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -328,7 +338,8 @@
}
// 受注詳細データの取得
- 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';
$where = 'order_id = ?';
変更: branches/version-2_12-dev/data/class/SC_Image.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Image.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Image.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,17 +22,20 @@
*/
//---- アップロードファイル加工クラス(thumb.phpとセットで使用する)
-class SC_Image {
+class SC_Image
+{
var $tmp_dir;
- function __construct($tmp_dir) {
+ function __construct($tmp_dir)
+ {
// ヘッダファイル読込
$this->tmp_dir = rtrim($tmp_dir, '/') . '/';
}
//--- 一時ファイル生成(サムネイル画像生成用)
- function makeTempImage($keyname, $max_width, $max_height) {
+ function makeTempImage($keyname, $max_width, $max_height)
+ {
// 一意なIDを取得する。
$mainname = uniqid('').'.';
// 拡張子以外を置き換える。
@@ -43,7 +46,8 @@
}
//--- ファイルを指定保存DIRへ移動
- function moveTempImage($filename, $save_dir) {
+ function moveTempImage($filename, $save_dir)
+ {
// コピー元ファイル、コピー先ディレクトリが存在する場合にのみ実行する
$from_path = $this->tmp_dir.$filename;
$to_path = $save_dir.'/'.$filename;
@@ -57,7 +61,8 @@
}
//---- 指定ファイルを削除
- function deleteImage($filename, $dir) {
+ function deleteImage($filename, $dir)
+ {
if (file_exists($dir.'/'.$filename)) {
unlink($dir.'/'.$filename);
}
@@ -73,7 +78,8 @@
* @param integer $newFileName 新ファイル名
* @param array 新ファイル名を格納した配列
*/
- function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = '') {
+ function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = '')
+ {
// 画像の最大横幅（単位：ピクセル）
$ThmMaxWidth = LARGE_IMAGE_WIDTH;
変更: branches/version-2_12-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Initial.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Initial.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -27,14 +27,16 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Initial {
+class SC_Initial
+{
// {{{ cunstructor
/**
* コンストラクタ.
*/
- function __construct() {
+ function __construct()
+ {
/** EC-CUBEのバージョン */
define('ECCUBE_VERSION', '2.12.3-dev');
@@ -49,7 +51,8 @@
* @access protected
* @return void
*/
- function init() {
+ function init()
+ {
$this->requireInitialConfig();
$this->defineDSN(); // requireInitialConfig メソッドより後で実行
$this->defineDirectoryIndex();
@@ -69,7 +72,8 @@
* @access protected
* @return void
*/
- function requireInitialConfig() {
+ function requireInitialConfig()
+ {
define('CONFIG_REALFILE', realpath(dirname(__FILE__)) . '/../config/config.php');
if (file_exists(CONFIG_REALFILE)) {
@@ -84,7 +88,8 @@
* @return void
* @deprecated 下位互換用
*/
- function defineDSN() {
+ function defineDSN()
+ {
if (defined('DB_TYPE') && defined('DB_USER') && defined('DB_PASSWORD')
&& defined('DB_SERVER') && defined('DB_PORT') && defined('DB_NAME')
) {
@@ -98,7 +103,8 @@
/**
* @deprecated
*/
- function setErrorReporting() {
+ function setErrorReporting()
+ {
error_reporting(E_ALL & ~E_NOTICE);
// PHP 5.3.0対応
if (error_reporting() > 6143) {
@@ -114,7 +120,8 @@
* @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);
@@ -149,7 +156,8 @@
* @access protected
* @return void
*/
- function defineDirectoryIndex() {
+ function defineDirectoryIndex()
+ {
// DirectoryIndex の実ファイル名
if (!defined('DIR_INDEX_FILE')) {
@@ -180,7 +188,8 @@
* @access protected
* @return void
*/
- function defineParameter() {
+ function defineParameter()
+ {
$errorMessage
= '<div style="color: #F00; font-weight: bold; background-color: #FEB; text-align: center">'
@@ -223,7 +232,8 @@
* @access protected
* @return void
*/
- function complementParameter() {
+ function complementParameter()
+ {
}
/**
@@ -234,7 +244,8 @@
* @access protected
* @return void
*/
- function createCacheDir() {
+ function createCacheDir()
+ {
if (defined('HTML_REALDIR')) {
umask(0);
if (!file_exists(COMPILE_REALDIR)) {
@@ -261,7 +272,8 @@
* @access protected
* @return void
*/
- function defineConstants() {
+ function defineConstants()
+ {
// LC_Page_Error用
/** 指定商品ページがない */
define('PRODUCT_NOT_FOUND', 1);
@@ -428,7 +440,8 @@
*
* @return void
*/
- function stripslashesDeepGpc() {
+ function stripslashesDeepGpc()
+ {
// Strip magic quotes from request data.
if (get_magic_quotes_gpc()
&& version_compare(PHP_VERSION, '5.0.0', '>=')) {
@@ -458,7 +471,8 @@
* @access protected
* @return void
*/
- function resetSuperglobalsRequest() {
+ function resetSuperglobalsRequest()
+ {
$_REQUEST = array_merge($_GET, $_POST);
}
@@ -469,7 +483,8 @@
* @param mixed $value 定数の値。
* @return void
*/
- function defineIfNotDefined($name, $value = null) {
+ function defineIfNotDefined($name, $value = null)
+ {
if (!defined($name)) {
define($name, $value);
}
@@ -480,7 +495,8 @@
*
* @return void
*/
- function setTimezone() {
+ function setTimezone()
+ {
date_default_timezone_set('Asia/Tokyo');
}
}
変更: branches/version-2_12-dev/data/class/SC_InstallView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_InstallView.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_InstallView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -21,8 +21,10 @@
* 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;
変更: branches/version-2_12-dev/data/class/SC_MobileEmoji.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileEmoji.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_MobileEmoji.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
/**
* 携帯端末の絵文字を扱うクラス
*/
-class SC_MobileEmoji {
+class SC_MobileEmoji
+{
/**
* 絵文字タグを各キャリア用の文字コードに変換する
* output buffering 用コールバック関数
@@ -38,7 +39,8 @@
* @param string 入力
* @return string 出力
*/
- 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);
}
@@ -49,7 +51,8 @@
* @param string $index 絵文字番号
* @return string 絵文字を表す Shift JIS の文字列を返す。
*/
- function indexToCode($index) {
+ function indexToCode($index)
+ {
$carrier = SC_MobileUserAgent_Ex::getCarrier();
if ($carrier === false) {
return MOBILE_EMOJI_SUBSTITUTE;
変更: branches/version-2_12-dev/data/class/SC_MobileImage.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileImage.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_MobileImage.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,7 +29,8 @@
/**
* 画像変換クラス
*/
-class SC_MobileImage {
+class SC_MobileImage
+{
/**
* 画像を端末の解像度に合わせて変換する
* output buffering 用コールバック関数
@@ -37,7 +38,8 @@
* @param string 入力
* @return string 出力
*/
- static function handler($buffer) {
+ static function handler($buffer)
+ {
// 端末情報を取得する
$carrier = SC_MobileUserAgent_Ex::getCarrier();
変更: branches/version-2_12-dev/data/class/SC_MobileUserAgent.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileUserAgent.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_MobileUserAgent.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -27,7 +27,8 @@
* 対象とする携帯端末は $_SERVER から決定する。
* すべてのメソッドはクラスメソッド。
*/
-class SC_MobileUserAgent {
+class SC_MobileUserAgent
+{
/**
* 携帯端末のキャリアを表す文字列を取得する。
*
@@ -36,7 +37,8 @@
* @return string|false 携帯端末のキャリアを表す文字列を返す。
* 携帯端末ではない場合は false を返す。
*/
- function getCarrier() {
+ function getCarrier()
+ {
$objAgent =& Net_UserAgent_Mobile::singleton();
if (Net_UserAgent_Mobile::isError($objAgent)) {
return false;
@@ -66,7 +68,8 @@
*
* @return string|false 取得したIDを返す。取得できなかった場合は false を返す。
*/
- function getId() {
+ function getId()
+ {
$objAgent =& Net_UserAgent_Mobile::singleton();
if (Net_UserAgent_Mobile::isError($objAgent)) {
return false;
@@ -84,7 +87,8 @@
*
* @return string 携帯端末のモデルを表す文字列を返す。
*/
- function getModel() {
+ function getModel()
+ {
$objAgent =& Net_UserAgent_Mobile::singleton();
if (Net_UserAgent_Mobile::isError($objAgent)) {
return 'Unknown';
@@ -107,7 +111,8 @@
*
* @return boolean サポートしている場合は true、それ以外の場合は false を返す。
*/
- function isSupported() {
+ function isSupported()
+ {
$objAgent =& Net_UserAgent_Mobile::singleton();
// 携帯端末だと認識されたが、User-Agent の形式が未知の場合
@@ -137,7 +142,8 @@
*
* @return boolean サポートしている場合は true、それ以外の場合は false を返す。
*/
- function isMobile() {
+ function isMobile()
+ {
$objAgent =& Net_UserAgent_Mobile::singleton();
if (Net_UserAgent_Mobile::isError($objAgent)) {
return false;
変更: branches/version-2_12-dev/data/class/SC_MobileView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileView.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_MobileView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -21,12 +21,15 @@
* 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;
変更: branches/version-2_12-dev/data/class/SC_PageNavi.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_PageNavi.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_PageNavi.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,12 +28,14 @@
$objPage->tpl_pageno = $_POST['pageno'];
・$func_nameに指定するJavaScriptの例
// ページナビで使用する
- function fnNaviPage(pageno) {
+ function fnNaviPage(pageno)
+ {
document.form1['pageno'].value = pageno;
document.form1.submit();
}
*/
-class SC_PageNavi {
+class SC_PageNavi
+{
var $now_page; // 現在のページ番号
var $max_page; // 最終のページ番号
var $start_row; // 開始レコード
@@ -41,7 +43,8 @@
var $arrPagenavi = array(); // ページ
// コンストラクタ
- 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';
//現在ページ($now_page)が正しい数値でない場合
変更: branches/version-2_12-dev/data/class/SC_Product.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Product.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Product.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @author Kentaro Ohkouchi
* @version $Id$
*/
-class SC_Product {
+class SC_Product
+{
/** 規格名一覧 */
var $arrClassName;
@@ -59,7 +60,8 @@
* @param string $order 並び替えの順序 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);
}
@@ -72,7 +74,8 @@
* @param array $arrVal 検索パラメーターの配列
* @return array 商品IDの配列
*/
- function findProductIdsOrder(&$objQuery, $arrVal = array()) {
+ function findProductIdsOrder(&$objQuery, $arrVal = array())
+ {
$table = 'dtb_products AS alldtl';
$objQuery->setGroupBy('alldtl.product_id');
@@ -106,7 +109,8 @@
* @param array $arrVal 検索パラメーターの配列
* @return array 対象商品ID数
*/
- function findProductCount(&$objQuery, $arrVal = array()) {
+ function findProductCount(&$objQuery, $arrVal = array())
+ {
$table = 'dtb_products AS alldtl';
return $objQuery->count($table, '', $arrVal);
@@ -122,7 +126,8 @@
* @param SC_Query $objQuery SC_Query インスタンス
* @return array 商品一覧の配列
*/
- function lists(&$objQuery) {
+ function lists(&$objQuery)
+ {
$col = <<< __EOS__
product_id
,product_code_min
@@ -164,7 +169,8 @@
* @param array $arrProductId 商品ID
* @return array 商品一覧の配列 (キー: 商品ID)
*/
- function getListByProductIds(&$objQuery, $arrProductId = array()) {
+ function getListByProductIds(&$objQuery, $arrProductId = array())
+ {
if (empty($arrProductId)) {
return array();
}
@@ -205,7 +211,8 @@
* @param integer $productId 商品ID
* @return array 商品詳細情報の配列
*/
- function getDetail($productId) {
+ function getDetail($productId)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrProduct = $objQuery->getRow('*', $this->alldtlSQL('product_id = ?'),
'product_id = ?',
@@ -224,7 +231,8 @@
* @param integer $productClassId 商品規格ID
* @return array 商品詳細情報と商品規格の配列
*/
- function getDetailAndProductsClass($productClassId) {
+ function getDetailAndProductsClass($productClassId)
+ {
$result = $this->getProductsClass($productClassId);
$result = array_merge($result, $this->getDetail($result['product_id']));
@@ -241,7 +249,8 @@
* @param boolean $has_deleted 削除された商品規格も含む場合 true; 初期値 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);
@@ -343,7 +352,8 @@
* @param array $params 検索パラメーターの配列
* @return array 商品規格の配列
*/
- function getProductsClassByQuery(&$objQuery, $params) {
+ function getProductsClassByQuery(&$objQuery, $params)
+ {
// 末端の規格を取得
$col = <<< __EOS__
T1.product_id,
@@ -396,7 +406,8 @@
* @param integer $productClassId 商品規格ID
* @return array 商品規格の配列
*/
- 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);
@@ -411,7 +422,8 @@
* @param boolean $has_deleted 削除された商品規格も含む場合 true; 初期値 false
* @return array 商品規格の配列
*/
- function getProductsClassByProductIds($productIds = array(), $has_deleted = false) {
+ function getProductsClassByProductIds($productIds = array(), $has_deleted = false)
+ {
if (empty($productIds)) {
return array();
}
@@ -432,7 +444,8 @@
* @param boolean $has_deleted 削除された商品規格も含む場合 true; 初期値 false
* @return array すべての組み合わせの商品規格の配列
*/
- function getProductsClassFullByProductId($productId, $has_deleted = false) {
+ function getProductsClassFullByProductId($productId, $has_deleted = false)
+ {
$arrRet = $this->getProductsClassByProductIds(array($productId), $has_deleted);
return $arrRet;
@@ -444,7 +457,8 @@
* @param array 商品ID の配列
* @return array 商品IDをキーにした商品ステータスIDの配列
*/
- function getProductStatus($productIds) {
+ function getProductStatus($productIds)
+ {
if (empty($productIds)) {
return array();
}
@@ -469,7 +483,8 @@
* @param integer $productId 商品ID
* @param array $productStatusIds ON にする商品ステータスIDの配列
*/
- function setProductStatus($productId, $productStatusIds) {
+ function setProductStatus($productId, $productStatusIds)
+ {
$val['product_id'] = $productId;
$val['creator_id'] = $_SESSION['member_id'];
@@ -495,7 +510,8 @@
* @return integer 商品詳細の結果から求めた販売制限数.
* @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']);
@@ -520,7 +536,8 @@
* @param integer $quantity 減少させる在庫数
* @return boolean 在庫の減少に成功した場合 true; 失敗した場合 false
*/
- function reduceStock($productClassId, $quantity) {
+ function reduceStock($productClassId, $quantity)
+ {
if ($quantity == 0) {
return false;
@@ -548,7 +565,8 @@
* @param array $arrProducts 商品情報の配列
* @return array 旧バージョン互換用のデータ
*/
- static function setPriceTaxTo(&$arrProducts) {
+ 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']);
@@ -582,7 +600,8 @@
* @param array $arrProducts 商品情報の配列
* @return void
*/
- static function setIncTaxToProducts(&$arrProducts) {
+ static function setIncTaxToProducts(&$arrProducts)
+ {
foreach ($arrProducts as &$arrProduct) {
SC_Product_Ex::setIncTaxToProduct($arrProduct);
}
@@ -594,7 +613,8 @@
* @param array $arrProducts 商品情報の配列
* @return void
*/
- static function setIncTaxToProduct(&$arrProduct) {
+ 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;
@@ -607,7 +627,8 @@
* @param string $where_products_class 商品規格情報の WHERE 句
* @return string 商品詳細の 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 . ')';
}
@@ -714,7 +735,8 @@
* @param string $where 商品詳細の WHERE 句
* @return string 商品規格詳細の SQL
*/
- function prdclsSQL($where = '') {
+ function prdclsSQL($where = '')
+ {
$where_clause = '';
if (!SC_Utils_Ex::isBlank($where)) {
$where_clause = ' WHERE ' . $where;
変更: branches/version-2_12-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Query.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Query.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,7 +29,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Query {
+class SC_Query
+{
var $option = '';
var $where = '';
@@ -48,7 +49,8 @@
* @param boolean $force_run エラーが発生しても処理を続行する場合 true
* @param boolean $new 新規に接続を行うかどうか
*/
- function __construct($dsn = '', $force_run = false, $new = false) {
+ function __construct($dsn = '', $force_run = false, $new = false)
+ {
if ($dsn == '') {
$dsn = array('phptype' => DB_TYPE,
@@ -98,7 +100,8 @@
* @param boolean $new 新規に接続を行うかどうか
* @return SC_Query シングルトンの SC_Query インスタンス
*/
- 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);
@@ -118,7 +121,8 @@
* @deprecated PEAR::isError() を使用して下さい
* @return boolean
*/
- function isError() {
+ function isError()
+ {
if (PEAR::isError($this->conn)) {
return true;
}
@@ -133,7 +137,8 @@
* @param array $arrWhereVal プレースホルダ
* @return integer 件数
*/
- function count($table, $where = '', $arrWhereVal = array()) {
+ function count($table, $where = '', $arrWhereVal = array())
+ {
return $this->get('COUNT(*)', $table, $where, $arrWhereVal);
}
@@ -145,7 +150,8 @@
* @param array $arrWhereVal プレースホルダ
* @return boolean 有無
*/
- 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);
@@ -162,7 +168,8 @@
* @param integer $fetchmode 使用するフェッチモード。デフォルトは MDB2_FETCHMODE_ASSOC。
* @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);
}
@@ -173,7 +180,8 @@
* @param boolean $disp trueの場合、画面出力を行う.
* @return string SQL文
*/
- function getLastQuery($disp = true) {
+ function getLastQuery($disp = true)
+ {
$sql = $this->conn->last_query;
if ($disp) {
echo $sql . ";<br />\n";
@@ -187,7 +195,8 @@
* @return MDB2_OK 成功した場合は MDB2_OK;
* 失敗した場合は PEAR::Error オブジェクト
*/
- function commit() {
+ function commit()
+ {
return $this->conn->commit();
}
@@ -197,7 +206,8 @@
* @return MDB2_OK 成功した場合は MDB2_OK;
* 失敗した場合は PEAR::Error オブジェクト
*/
- function begin() {
+ function begin()
+ {
return $this->conn->beginTransaction();
}
@@ -207,7 +217,8 @@
* @return MDB2_OK 成功した場合は MDB2_OK;
* 失敗した場合は PEAR::Error オブジェクト
*/
- function rollback() {
+ function rollback()
+ {
return $this->conn->rollback();
}
@@ -216,7 +227,8 @@
*
* @return boolean トランザクションが開始されている場合 true
*/
- function inTransaction() {
+ function inTransaction()
+ {
return $this->conn->inTransaction();
}
@@ -227,7 +239,8 @@
*
* FIXME MDB2::exec() の実装であるべき
*/
- function exec($str, $arrVal = array()) {
+ function exec($str, $arrVal = array())
+ {
return $this->query($str, $arrVal);
}
@@ -240,7 +253,8 @@
* @param integer $fetchmode 使用するフェッチモード。デフォルトは DB_FETCHMODE_ASSOC。
* @return boolean 結果
*/
- 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);
@@ -272,7 +286,8 @@
* @param integer $fetchmode 使用するフェッチモード。デフォルトは DB_FETCHMODE_ASSOC。
* @return array データを含む2次元配列。失敗した場合に 0 または DB_Error オブジェクトを返します。
*/
- function getAll($sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC) {
+ function getAll($sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
+ {
$sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -305,7 +320,8 @@
* @param mixed $arrWhereVal プレースホルダ(参照)
* @return string 構築済みの SELECT 文
*/
- function getSql($cols, $from = '', $where = '', &$arrWhereVal = null) {
+ function getSql($cols, $from = '', $where = '', &$arrWhereVal = null)
+ {
$dbFactory = SC_DB_DBFactory_Ex::getInstance();
$sqlse = "SELECT $cols";
@@ -341,7 +357,8 @@
* @param string $str 付与する SQL 文
* @return SC_Query 自分自身のインスタンス
*/
- function setOption($str) {
+ function setOption($str)
+ {
$this->option = $str;
return $this;
}
@@ -355,7 +372,8 @@
* @param integer $offset OFFSET 句に付与する値
* @return SC_Query 自分自身のインスタンス
*/
- function setLimitOffset($limit, $offset = 0) {
+ function setLimitOffset($limit, $offset = 0)
+ {
if (is_numeric($limit) && is_numeric($offset)) {
$this->conn->setLimit($limit, $offset);
}
@@ -370,7 +388,8 @@
* @param string $str GROUP BY 句に付与する文字列
* @return SC_Query 自分自身のインスタンス
*/
- function setGroupBy($str) {
+ function setGroupBy($str)
+ {
if (strlen($str) == 0) {
$this->groupby = '';
} else {
@@ -387,7 +406,8 @@
* @param string $str WHERE 句に付与する AND 条件の文字列
* @return SC_Query 自分自身のインスタンス
*/
- function andWhere($str) {
+ function andWhere($str)
+ {
if ($this->where != '') {
$this->where .= ' AND ' . $str;
} else {
@@ -404,7 +424,8 @@
* @param string $str WHERE 句に付与する OR 条件の文字列
* @return SC_Query 自分自身のインスタンス
*/
- function orWhere($str) {
+ function orWhere($str)
+ {
if ($this->where != '') {
$this->where .= ' OR ' . $str;
} else {
@@ -422,7 +443,8 @@
* @param mixed $arrWhereVal プレースホルダ
* @return SC_Query 自分自身のインスタンス
*/
- function setWhere($where = '', $arrWhereVal = array()) {
+ function setWhere($where = '', $arrWhereVal = array())
+ {
$this->where = $where;
$this->arrWhereVal = $arrWhereVal;
return $this;
@@ -436,7 +458,8 @@
* @param string $str ORDER BY 句に付与する文字列
* @return SC_Query 自分自身のインスタンス
*/
- function setOrder($str) {
+ function setOrder($str)
+ {
if (strlen($str) == 0) {
$this->order = '';
} else {
@@ -453,7 +476,8 @@
* @param integer $limit LIMIT 句に設定する値
* @return SC_Query 自分自身のインスタンス
*/
- function setLimit($limit) {
+ function setLimit($limit)
+ {
if (is_numeric($limit)) {
$this->conn->setLimit($limit);
}
@@ -468,7 +492,8 @@
* @param integer $offset OFFSET 句に設定する値
* @return SC_Query 自分自身のインスタンス
*/
- function setOffset($offset) {
+ function setOffset($offset)
+ {
if (is_numeric($offset)) {
$this->conn->setLimit($this->conn->limit, $offset);
}
@@ -486,7 +511,8 @@
* @param string $arrFromVal FROM 句・WHERE 句で使用するプレースホルダ配列
* @return integer|DB_Error|boolean 挿入件数またはエラー(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;
@@ -543,7 +569,8 @@
* @param array $arrRawSqlVal 追加カラム用のプレースホルダ配列
* @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;
@@ -598,7 +625,8 @@
* @param array $arrWhereVal プレースホルダに挿入する値
* @return integer MAX文の実行結果
*/
- function max($col, $table, $where = '', $arrWhereVal = array()) {
+ function max($col, $table, $where = '', $arrWhereVal = array())
+ {
$ret = $this->get("MAX($col)", $table, $where, $arrWhereVal);
return $ret;
}
@@ -612,7 +640,8 @@
* @param array $arrWhereVal プレースホルダに挿入する値
* @return integer MIN文の実行結果
*/
- function min($col, $table, $where = '', $arrWhereVal = array()) {
+ function min($col, $table, $where = '', $arrWhereVal = array())
+ {
$ret = $this->get("MIN($col)", $table, $where, $arrWhereVal);
return $ret;
}
@@ -626,7 +655,8 @@
* @param array $arrWhereVal プレースホルダに挿入する値
* @return mixed SQL の実行結果
*/
- function get($col, $table = '', $where = '', $arrWhereVal = array()) {
+ function get($col, $table = '', $where = '', $arrWhereVal = array())
+ {
$sqlse = $this->getSql($col, $table, $where, $arrWhereVal);
// SQL文の実行
$ret = $this->getOne($sqlse, $arrWhereVal);
@@ -640,7 +670,8 @@
* @param array $arrVal プレースホルダに挿入する値
* @return mixed SQL の実行結果
*/
- function getOne($sql, $arrVal = array()) {
+ function getOne($sql, $arrVal = array())
+ {
$sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -673,7 +704,8 @@
* @param integer $fetchmode 使用するフェッチモード。デフォルトは MDB2_FETCHMODE_ASSOC。
* @return array array('カラム名' => '値', ...)の連想配列
*/
- 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);
@@ -706,7 +738,8 @@
* @param array $arrWhereVal プレースホルダに挿入する値
* @return array SQL の実行結果の配列
*/
- 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);
@@ -737,7 +770,8 @@
* @param array $arrWhereVal プレースホルダ
* @return
*/
- function delete($table, $where = '', $arrWhereVal = array()) {
+ function delete($table, $where = '', $arrWhereVal = array())
+ {
if (strlen($where) <= 0) {
$sqlde = "DELETE FROM $table";
} else {
@@ -753,7 +787,8 @@
* @param string $seq_name 取得するシーケンス名
* @param integer 次のシーケンス値
*/
- function nextVal($seq_name) {
+ function nextVal($seq_name)
+ {
return $this->conn->nextID($seq_name);
}
@@ -763,7 +798,8 @@
* @param string $seq_name 取得するシーケンス名
* @return integer 現在のシーケンス値
*/
- function currVal($seq_name) {
+ function currVal($seq_name)
+ {
return $this->conn->currID($seq_name);
}
@@ -774,7 +810,8 @@
* @param integer $start 設定するシーケンス値
* @return MDB2_OK
*/
- function setVal($seq_name, $start) {
+ function setVal($seq_name, $start)
+ {
$objManager =& $this->conn->loadModule('Manager');
// XXX 値変更の役割のため、存在チェックは行なわない。存在しない場合、ここでエラーとなる。
@@ -802,7 +839,8 @@
* @param mixed $result_types 返値の型指定またはDML実行(MDB2_PREPARE_MANIP)
* @return array SQL の実行結果の配列
*/
- 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);
@@ -827,7 +865,8 @@
*
* @return array シーケンス名の配列
*/
- function listSequences() {
+ function listSequences()
+ {
$objManager =& $this->conn->loadModule('Manager');
return $objManager->listSequences();
}
@@ -837,7 +876,8 @@
*
* @return array テーブル名の配列
*/
- function listTables() {
+ function listTables()
+ {
return $this->dbFactory->listTables($this);
}
@@ -847,7 +887,8 @@
* @param string $table テーブル名
* @return array 指定のテーブルのカラム名の配列
*/
- function listTableFields($table) {
+ function listTableFields($table)
+ {
$objManager =& $this->conn->loadModule('Manager');
return $objManager->listTableFields($table);
}
@@ -858,7 +899,8 @@
* @param string $table テーブル名
* @return array 指定のテーブルのインデックス一覧
*/
- function listTableIndexes($table) {
+ function listTableIndexes($table)
+ {
$objManager =& $this->conn->loadModule('Manager');
return $objManager->listTableIndexes($table);
}
@@ -871,7 +913,8 @@
* @param array $definition フィールド名など 通常のフィールド指定時は、$definition=array('fields' => array('フィールド名' => array()));
* MySQLのtext型フィールドを指定する場合は $definition['length'] = 'text_field(NNN)' が必要
*/
- 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);
@@ -883,7 +926,8 @@
* @param string $table テーブル名
* @param string $name インデックス名
*/
- function dropIndex($table, $name) {
+ function dropIndex($table, $name)
+ {
$objManager =& $this->conn->loadModule('Manager');
return $objManager->dropIndex($table, $name);
}
@@ -894,7 +938,8 @@
* @param string $table テーブル名
* @return array テーブル情報の配列
*/
- function getTableInfo($table) {
+ function getTableInfo($table)
+ {
$objManager =& $this->conn->loadModule('Reverse');
return $objManager->tableInfo($table, NULL);
}
@@ -910,7 +955,8 @@
* @param string $val クォートを行う文字列
* @return string クォートされた文字列
*/
- function quote($val) {
+ function quote($val)
+ {
return $this->conn->quote($val);
}
@@ -921,7 +967,8 @@
* @param array プレースホルダの連想配列
* @return array テーブルに存在する列のみ抽出した連想配列
*/
- function extractOnlyColsOf($table, $arrParams) {
+ function extractOnlyColsOf($table, $arrParams)
+ {
$arrCols = $this->listTableFields($table);
$arrResults = array();
foreach ($arrParams as $key => $val) {
@@ -941,7 +988,8 @@
* @param mixed $result_types 返値の型指定またはDML実行(MDB2_PREPARE_MANIP)、nullは指定無し
* @return MDB2_Statement_Common プリペアドステートメントインスタンス
*/
- 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);
@@ -958,7 +1006,8 @@
* @param array $arrVal プレースホルダに挿入する配列
* @return MDB2_Result 結果セットのインスタンス
*/
- function execute(&$sth, $arrVal = array()) {
+ function execute(&$sth, $arrVal = array())
+ {
$arrStartInfo =& $this->lfStartDbTraceLog($sth, $arrVal);
$affected =& $sth->execute((array)$arrVal);
@@ -984,7 +1033,8 @@
* @param array $arrVal プレースホルダ
* @return string トレースしたエラー文字列
*/
- 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";
@@ -1001,7 +1051,8 @@
/**
* エラー処理
*/
- function error($msg) {
+ function error($msg)
+ {
$msg = "DB処理でエラーが発生しました。\n" . $msg;
if (!$this->force_run) {
trigger_error($msg, E_USER_ERROR);
@@ -1020,7 +1071,8 @@
* @param mixed $result_types 返値の型指定またはDML実行(MDB2_PREPARE_MANIP)
* @return array 実行結果の配列
*/
- 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);
@@ -1047,7 +1099,8 @@
* @param array $arrVal プレースホルダに挿入する配列
* @return void
*/
- private function lfStartDbTraceLog(&$objSth, &$arrVal) {
+ private function lfStartDbTraceLog(&$objSth, &$arrVal)
+ {
if (!defined('SQL_QUERY_LOG_MODE') || SQL_QUERY_LOG_MODE === 0) {
return;
}
@@ -1082,7 +1135,8 @@
* @param array $arrVal プレースホルダに挿入する配列
* @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;
}
@@ -1113,7 +1167,8 @@
* @param string $dsn データソース名
* @return SC_Query プールしたインスタンス
*/
- static function setPoolInstance(&$objThis, $dsn = '') {
+ static function setPoolInstance(&$objThis, $dsn = '')
+ {
$key_str = serialize($dsn);
return SC_Query_Ex::$arrPoolInstance[$key_str] = $objThis;
}
@@ -1124,7 +1179,8 @@
* @param string $dsn データソース名
* @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];
変更: branches/version-2_12-dev/data/class/SC_Response.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Response.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Response.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -27,7 +27,8 @@
* @author Ryuichi Tokugami
* @version $Id$
*/
-class SC_Response{
+class SC_Response
+{
/**
* コンテンツタイプ
@@ -48,12 +49,14 @@
/**
* レスポンス出力を書き込む.
*/
- function write() {
+ function write()
+ {
$this->sendHeader();
echo $this->body;
}
- function sendHeader() {
+ function sendHeader()
+ {
// HTTPのヘッダ
foreach ($this->header as $name => $head) {
header($name.': '.$head);
@@ -63,19 +66,23 @@
}
}
- 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]);
}
@@ -83,7 +90,8 @@
* アプリケーションのexit処理をする。以降の出力は基本的に停止する。
* 各クラス内部で勝手にexitするな！
*/
- function actionExit() {
+ function actionExit()
+ {
// ローカルフックポイント処理
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$arrBacktrace = debug_backtrace();
@@ -114,7 +122,8 @@
* @return void
* @static
*/
- function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) {
+ function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null)
+ {
// ローカルフックポイント処理
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
@@ -215,7 +224,8 @@
* @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);
}
@@ -223,7 +233,8 @@
/**
* @static
*/
- function reload($arrQueryString = array(), $removeQueryString = false) {
+ function reload($arrQueryString = array(), $removeQueryString = false)
+ {
// 現在の URL を取得
$netUrl = new Net_URL($_SERVER['REQUEST_URI']);
@@ -235,11 +246,13 @@
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;
}
@@ -258,7 +271,8 @@
* @license http://www.gnu.org/licenses/fdl.html GFDL (邦訳)
* @static
*/
- function sendHttpStatus($statusCode) {
+ function sendHttpStatus($statusCode)
+ {
$protocol = $_SERVER['SERVER_PROTOCOL'];
$httpVersion = (strpos($protocol, '1.1') !== false) ? '1.1' : '1.0';
$messages = array(
変更: branches/version-2_12-dev/data/class/SC_SelectSql.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SelectSql.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_SelectSql.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,7 +22,8 @@
*/
/* ---- SQL文を作るクラス ---- */
-class SC_SelectSql {
+class SC_SelectSql
+{
var $sql;
@@ -34,14 +35,16 @@
var $arrVal;
//-- コンストラクタ。
- function __construct($array = '') {
+ function __construct($array = '')
+ {
if (is_array($array)) {
$this->arrSql = $array;
}
}
//-- SQL分生成
- function getSql($mode = '') {
+ function getSql($mode = '')
+ {
$this->sql = $this->select .' '. $this->where .' '. $this->group .' ';
if ($mode == 2) {
@@ -52,13 +55,15 @@
}
// 検索用
- function addSearchStr($val) {
+ function addSearchStr($val)
+ {
$return = '%' .$val. '%';
return $return;
}
//-- 範囲検索（○ ~ ○ まで）
- function selectRange($from, $to, $column) {
+ function selectRange($from, $to, $column)
+ {
// ある単位のみ検索($from = $to)
if ($from == $to) {
@@ -81,7 +86,8 @@
}
//-- 期間検索（○年○月○日か~○年○月○日まで）
- 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();
// 開始期間の構築
@@ -120,7 +126,8 @@
}
// checkboxなどで同一カラム内で単一、もしくは複数選択肢が有る場合 例: AND ( sex = xxx OR sex = xxx OR sex = xxx) AND ...
- function setItemTerm($arr, $ItemStr) {
+ function setItemTerm($arr, $ItemStr)
+ {
$return = array();
foreach ($arr as $data) {
@@ -145,7 +152,8 @@
}
// NULL値が必要な場合
- function setItemTermWithNull($arr, $ItemStr) {
+ function setItemTermWithNull($arr, $ItemStr)
+ {
$return = array();
$item = " {$ItemStr} IS NULL ";
@@ -163,7 +171,8 @@
return $return;
}
// NULLもしくは''で検索する場合
- function setItemTermWithNullAndSpace($arr, $ItemStr) {
+ function setItemTermWithNullAndSpace($arr, $ItemStr)
+ {
$return = array();
$count = count($arr);
$item = " {$ItemStr} IS NULL OR {$ItemStr} = '' ";
@@ -188,7 +197,8 @@
'value' => $_POST['show_site1']);
*/
- function setWhereByOR($arrWhere) {
+ function setWhereByOR($arrWhere)
+ {
$count = count($arrWhere);
@@ -210,7 +220,8 @@
}
}
- function setWhere($where) {
+ function setWhere($where)
+ {
if ($where != '') {
if ($this->where) {
@@ -223,26 +234,30 @@
}
}
- 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;
}
}
変更: branches/version-2_12-dev/data/class/SC_SendMail.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SendMail.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_SendMail.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,7 +22,8 @@
*/
// テキスト/HTML メール送信
-class SC_SendMail {
+class SC_SendMail
+{
var $to; // 送信先
var $subject; // 題名
@@ -38,7 +39,8 @@
*
* @return void
*/
- function __construct() {
+ function __construct()
+ {
$this->arrRecip = array();
$this->to = '';
$this->subject = '';
@@ -61,12 +63,14 @@
}
// 送信先の設定
- function setRecip($key, $recipient) {
+ function setRecip($key, $recipient)
+ {
$this->arrRecip[$key] = $recipient;
}
// 宛先の設定
- function setTo($to, $to_name = '') {
+ function setTo($to, $to_name = '')
+ {
if ($to != '') {
$this->to = $this->getNameAddress($to_name, $to);
$this->setRecip('To', $to);
@@ -74,12 +78,14 @@
}
// 送信元の設定
- function setFrom($from, $from_name = '') {
+ function setFrom($from, $from_name = '')
+ {
$this->from = $this->getNameAddress($from_name, $from);
}
// CCの設定
- function setCc($cc, $cc_name = '') {
+ function setCc($cc, $cc_name = '')
+ {
if ($cc != '') {
$this->cc = $this->getNameAddress($cc_name, $cc);
$this->setRecip('Cc', $cc);
@@ -87,7 +93,8 @@
}
// BCCの設定
- function setBCc($bcc) {
+ function setBCc($bcc)
+ {
if ($bcc != '') {
$this->bcc = $bcc;
$this->setRecip('Bcc', $bcc);
@@ -95,25 +102,29 @@
}
// Reply-Toの設定
- function setReplyTo($reply_to) {
+ function setReplyTo($reply_to)
+ {
if ($reply_to != '') {
$this->reply_to = $reply_to;
}
}
// Return-Pathの設定
- function setReturnPath($return_path) {
+ function setReturnPath($return_path)
+ {
$this->return_path = $return_path;
}
// 件名の設定
- 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);
}
// 本文の設定
- function setBody($body) {
+ function setBody($body)
+ {
// iso-2022-jpだと特殊文字が？で送信されるのでJISを使用する
$this->body = mb_convert_encoding($body, 'JIS', CHAR_CODE);
}
@@ -123,7 +134,8 @@
*
* @deprecated 2.12.2 (#1912)
*/
- function setHost($host) {
+ function setHost($host)
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
$this->host = $host;
$arrHost = array(
@@ -140,7 +152,8 @@
*
* @deprecated 2.12.2 (#1912)
*/
- function setPort($port) {
+ function setPort($port)
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
$this->port = $port;
$arrHost = array(
@@ -152,7 +165,8 @@
}
// 名前<メールアドレス>の形式を生成
- function getNameAddress($name, $mail_address) {
+ function getNameAddress($name, $mail_address)
+ {
if ($name != '') {
// 制御文字を変換する。
$_name = $name;
@@ -165,11 +179,13 @@
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);
}
@@ -185,7 +201,8 @@
$cc -> カーボンコピー
$bcc -> ブラインドカーボンコピー
*/
- 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 ='')
+ {
// 宛先設定
$this->setTo($to);
// 件名設定
@@ -212,7 +229,8 @@
}
// ヘッダーを返す
- function getBaseHeader() {
+ function getBaseHeader()
+ {
// 送信するメールの内容と送信先
$arrHeader = array();
$arrHeader['MIME-Version'] = '1.0';
@@ -235,14 +253,16 @@
}
// ヘッダーを返す
- function getTEXTHeader() {
+ function getTEXTHeader()
+ {
$arrHeader = $this->getBaseHeader();
$arrHeader['Content-Type'] = 'text/plain; charset="ISO-2022-JP"';
return $arrHeader;
}
// ヘッダーを返す
- function getHTMLHeader() {
+ function getHTMLHeader()
+ {
$arrHeader = $this->getBaseHeader();
$arrHeader['Content-Type'] = 'text/html; charset="ISO-2022-JP"';
return $arrHeader;
@@ -253,7 +273,8 @@
*
* @return array|string メーラーバックエンドに応じた送信先
*/
- function getRecip() {
+ function getRecip()
+ {
switch ($this->backend) {
// PEAR::Mail_mail#send は、(他のメーラーバックエンドと異なり) 第1引数を To: として扱う。Cc: や Bcc: は、ヘッダー情報から処理する。
case 'mail':
@@ -273,7 +294,8 @@
*
* @return void
*/
- function sendMail($isHtml = false) {
+ function sendMail($isHtml = false)
+ {
$header = $isHtml ? $this->getHTMLHeader() : $this->getTEXTHeader();
$recip = $this->getRecip();
// メール送信
@@ -294,7 +316,8 @@
*
* @return void
*/
- function sendHtmlMail() {
+ function sendHtmlMail()
+ {
return $this->sendMail(true);
}
@@ -304,7 +327,8 @@
* @param string $backend Pear::Mail のバックエンド
* @return array メーラーバックエンドに応じたパラメーターの配列
*/
- function getBackendParams($backend) {
+ function getBackendParams($backend)
+ {
switch ($backend) {
case 'mail':
$arrParams = array();
変更: branches/version-2_12-dev/data/class/SC_Session.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Session.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_Session.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,7 +22,8 @@
*/
/* セッション管理クラス */
-class SC_Session {
+class SC_Session
+{
/** ログインユーザ名 */
var $login_id;
@@ -43,7 +44,8 @@
var $uniqid;
/* コンストラクタ */
- function __construct() {
+ function __construct()
+ {
// セッション情報の保存
if (isset($_SESSION['cert'])) {
$this->sid = session_id();
@@ -64,7 +66,8 @@
}
}
/* 認証成功の判定 */
- function IsSuccess() {
+ function IsSuccess()
+ {
if ($this->cert == CERT_STRING) {
$masterData = new SC_DB_MasterData_Ex();
$admin_path = preg_replace('/\/+/', '/', $_SERVER['SCRIPT_NAME']);
@@ -82,22 +85,26 @@
}
/* セッションの書き込み */
- function SetSession($key, $val) {
+ function SetSession($key, $val)
+ {
$_SESSION[$key] = $val;
}
/* セッションの読み込み */
- function GetSession($key) {
+ function GetSession($key)
+ {
return $_SESSION[$key];
}
/* セッションIDの取得 */
- function GetSID() {
+ function GetSID()
+ {
return $this->sid;
}
/** ユニークIDの取得 **/
- function getUniqId() {
+ function getUniqId()
+ {
// ユニークIDがセットされていない場合はセットする。
if (empty($_SESSION['uniqid'])) {
$this->setUniqId();
@@ -106,13 +113,15 @@
}
/** ユニークIDのセット **/
- function setUniqId() {
+ function setUniqId()
+ {
// 予測されないようにランダム文字列を付与する。
$this->SetSession('uniqid', SC_Utils_Ex::sfGetUniqRandomId());
}
// 関連セッションのみ破棄する。
- function logout() {
+ function logout()
+ {
unset($_SESSION['cert']);
unset($_SESSION['login_id']);
unset($_SESSION['authority']);
変更: branches/version-2_12-dev/data/class/SC_SessionFactory.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SessionFactory.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_SessionFactory.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -41,7 +41,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_SessionFactory {
+class SC_SessionFactory
+{
// }}}
// {{{ functions
@@ -51,7 +52,8 @@
*
* @return SC_SessionFactory
*/
- function getInstance() {
+ function getInstance()
+ {
$type = defined('SESSION_KEEP_METHOD')
? SESSION_KEEP_METHOD
@@ -86,14 +88,16 @@
* セッションの初期化を行う.
*
*/
- function initSession() {}
+ function initSession()
+ {}
/**
* Cookieを使用するかどうかを返す.
*
* @return boolean
*/
- function useCookie() {}
+ function useCookie()
+ {}
}
/*
変更: branches/version-2_12-dev/data/class/SC_SiteSession.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SiteSession.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_SiteSession.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,9 +22,11 @@
*/
/* カートセッション管理クラス */
-class SC_SiteSession {
+class SC_SiteSession
+{
/* コンストラクタ */
- function __construct() {
+ function __construct()
+ {
// 前ページでの登録成功判定を引き継ぐ
$_SESSION['site']['pre_regist_success'] =
isset($_SESSION['site']['regist_success'])
@@ -39,7 +41,8 @@
}
/* 前ページが正当であるかの判定 */
- 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;
@@ -48,17 +51,20 @@
return false;
}
- function setNowPage($path) {
+ function setNowPage($path)
+ {
$_SESSION['site']['now_page'] = $path;
}
/* 値の取得 */
- function getValue($keyname) {
+ function getValue($keyname)
+ {
return $_SESSION['site'][$keyname];
}
/* ユニークIDの取得 */
- function getUniqId() {
+ function getUniqId()
+ {
// ユニークIDがセットされていない場合はセットする。
if (!isset($_SESSION['site']['uniqid']) || $_SESSION['site']['uniqid'] == '') {
$this->setUniqId();
@@ -67,13 +73,15 @@
}
/* ユニークIDのセット */
- function setUniqId() {
+ function setUniqId()
+ {
// 予測されないようにランダム文字列を付与する。
$_SESSION['site']['uniqid'] = SC_Utils_Ex::sfGetUniqRandomId();
}
/* ユニークIDのチェック */
- function checkUniqId() {
+ function checkUniqId()
+ {
if (!empty($_POST['uniqid'])) {
if ($_POST['uniqid'] != $_SESSION['site']['uniqid']) {
return false;
@@ -83,12 +91,14 @@
}
/* ユニークIDの解除 */
- function unsetUniqId() {
+ function unsetUniqId()
+ {
$_SESSION['site']['uniqid'] = '';
}
/* 登録成功を記録 */
- function setRegistFlag() {
+ function setRegistFlag()
+ {
$_SESSION['site']['regist_success'] = true;
}
}
変更: branches/version-2_12-dev/data/class/SC_SiteView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SiteView.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_SiteView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -21,8 +21,10 @@
* 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) {
@@ -30,7 +32,8 @@
}
}
- function init() {
+ function init()
+ {
parent::init();
$this->_smarty->template_dir = TEMPLATE_REALDIR;
@@ -39,7 +42,8 @@
$this->assignTemplatePath(DEVICE_TYPE_PC);
}
- function setPrevURL() {
+ function setPrevURL()
+ {
$objCartSess = new SC_CartSession_Ex();
$objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
}
変更: branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_SmartphoneUserAgent.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -26,7 +26,8 @@
*
* @auther Yu Nobira
*/
-class SC_SmartphoneUserAgent {
+class SC_SmartphoneUserAgent
+{
/**
* スマートフォンかどうかを判別する。
@@ -34,7 +35,8 @@
*
* @return boolean
*/
- function isSmartphone() {
+ function isSmartphone()
+ {
$nu = new Net_UserAgent_Mobile();
// SPでかつPC表示OFFの場合
return $nu->isSmartphone() && !SC_SmartphoneUserAgent_Ex::getSmartphonePcFlag();
@@ -45,7 +47,8 @@
*
* @return boolean
*/
- function isNonSmartphone() {
+ function isNonSmartphone()
+ {
return !SC_SmartphoneUserAgent_Ex::isSmartphone();
}
@@ -54,7 +57,8 @@
*
* @return string
*/
- function getSmartphonePcFlag() {
+ function getSmartphonePcFlag()
+ {
$_SESSION['pc_disp'] = empty($_SESSION['pc_disp']) ? false : $_SESSION['pc_disp'];
return $_SESSION['pc_disp'];
}
@@ -62,14 +66,16 @@
/**
* PC表示ON
*/
- function setPcDisplayOn() {
+ function setPcDisplayOn()
+ {
$_SESSION['pc_disp'] = true;
}
/**
* PC表示OFF
*/
- function setPcDisplayOff() {
+ function setPcDisplayOff()
+ {
$_SESSION['pc_disp'] = false;
}
}
変更: branches/version-2_12-dev/data/class/SC_SmartphoneView.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SmartphoneView.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_SmartphoneView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -21,12 +21,15 @@
* 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;
変更: branches/version-2_12-dev/data/class/SC_UploadFile.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_UploadFile.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_UploadFile.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,7 +22,8 @@
*/
/* アップロードファイル管理クラス */
-class SC_UploadFile {
+class SC_UploadFile
+{
var $temp_dir;
var $save_dir;
@@ -57,14 +58,16 @@
var $image = array();
// ファイル管理クラス
- 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;
}
// ファイル情報追加
- 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;
@@ -75,7 +78,8 @@
$this->image[] = $image;
}
// サムネイル画像の作成
- 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);
@@ -89,7 +93,8 @@
}
// アップロードされたファイルを保存する。
- function makeTempFile($keyname, $rename = IMAGE_RENAME) {
+ function makeTempFile($keyname, $rename = IMAGE_RENAME)
+ {
$objErr = new SC_CheckError_Ex();
$cnt = 0;
$arrKeyname = array_flip($this->keyname);
@@ -136,7 +141,8 @@
}
// アップロードされたダウンロードファイルを保存する。
- function makeTempDownFile($keyname='down_file') {
+ function makeTempDownFile($keyname='down_file')
+ {
$objErr = new SC_CheckError_Ex();
$cnt = 0;
$arrKeyname = array_flip($this->keyname);
@@ -167,7 +173,8 @@
}
// 画像を削除する。
- function deleteFile($keyname) {
+ function deleteFile($keyname)
+ {
$objImage = new SC_Image_Ex($this->temp_dir);
$cnt = 0;
foreach ($this->keyname as $val) {
@@ -184,7 +191,8 @@
}
// 画像を削除する。
- function deleteKikakuFile($keyname) {
+ function deleteKikakuFile($keyname)
+ {
$objImage = new SC_Image_Ex($this->temp_dir);
$cnt = 0;
foreach ($this->keyname as $val) {
@@ -201,7 +209,8 @@
}
// 一時ファイルパスを取得する。
- function getTempFilePath($keyname) {
+ function getTempFilePath($keyname)
+ {
$cnt = 0;
$filepath = '';
foreach ($this->keyname as $val) {
@@ -216,7 +225,8 @@
}
// 一時ファイルを保存ディレクトリに移す
- function moveTempFile() {
+ function moveTempFile()
+ {
$objImage = new SC_Image_Ex($this->temp_dir);
for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
@@ -237,7 +247,8 @@
}
// ダウンロード一時ファイルを保存ディレクトリに移す
- 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] != '') {
@@ -254,7 +265,8 @@
}
// HIDDEN用のファイル名配列を返す
- function getHiddenFileList() {
+ function getHiddenFileList()
+ {
$cnt = 0;
$arrRet = array();
foreach ($this->keyname as $val) {
@@ -270,7 +282,8 @@
}
// HIDDENで送られてきたファイル名を取得する
- function setHiddenFileList($arrPOST) {
+ function setHiddenFileList($arrPOST)
+ {
$cnt = 0;
foreach ($this->keyname as $val) {
$key = 'temp_' . $val;
@@ -285,7 +298,8 @@
}
}
- function setHiddenKikakuFileList($arrPOST) {
+ function setHiddenKikakuFileList($arrPOST)
+ {
$cnt = 0;
foreach ($this->keyname as $val) {
$key = 'temp_' . $val;
@@ -301,7 +315,8 @@
}
// フォームに渡す用のファイル情報配列を返す
- 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) {
@@ -340,7 +355,8 @@
}
// フォームに渡す用のダウンロードファイル情報を返す
- function getFormDownFile() {
+ function getFormDownFile()
+ {
$arrRet = '';
for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') {
@@ -351,7 +367,8 @@
}
return $arrRet;
}
- function getFormKikakuDownFile() {
+ function getFormKikakuDownFile()
+ {
$arrRet = array();
$cnt = 0;
foreach ($this->keyname as $val) {
@@ -366,7 +383,8 @@
}
// DB保存用のファイル名配列を返す
- function getDBFileList() {
+ function getDBFileList()
+ {
$cnt = 0;
$dbFileList = array();
foreach ($this->keyname as $val) {
@@ -381,7 +399,8 @@
}
// DBで保存されたファイル名配列をセットする
- function setDBFileList($arrVal) {
+ function setDBFileList($arrVal)
+ {
$cnt = 0;
foreach ($this->keyname as $val) {
if (isset($arrVal[$val]) && $arrVal[$val] != '') {
@@ -392,14 +411,16 @@
}
// DBで保存されたダウンロードファイル名をセットする
- function setDBDownFile($arrVal) {
+ function setDBDownFile($arrVal)
+ {
if (isset($arrVal['down_realfilename']) && $arrVal['down_realfilename'] != '') {
$this->save_file[0] = $arrVal['down_realfilename'];
}
}
// DBで保存されたダウンロードファイル名をセットする(setDBDownFileと統合予定)
- 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)];
@@ -408,7 +429,8 @@
}
// 画像をセットする
- function setDBImageList($arrVal) {
+ function setDBImageList($arrVal)
+ {
$cnt = 0;
foreach ($this->keyname as $val) {
if ($arrVal[$val] != '' && $val == 'tv_products_image') {
@@ -419,7 +441,8 @@
}
// DB上のファイルの内削除要求があったファイルを削除する。
- function deleteDBFile($arrVal) {
+ function deleteDBFile($arrVal)
+ {
$objImage = new SC_Image_Ex($this->temp_dir);
$cnt = 0;
foreach ($this->keyname as $val) {
@@ -433,7 +456,8 @@
}
// DB上のダウンロードファイルの内削除要求があったファイルを削除する。
- function deleteDBDownFile($arrVal) {
+ function deleteDBDownFile($arrVal)
+ {
$objImage = new SC_Image_Ex($this->temp_dir);
$cnt = 0;
if ($arrVal['down_realfilename'] != '') {
@@ -444,7 +468,8 @@
}
// 必須判定
- function checkExists($keyname = '') {
+ function checkExists($keyname = '')
+ {
$cnt = 0;
$arrRet = array();
foreach ($this->keyname as $val) {
@@ -466,7 +491,8 @@
}
// 拡大率を指定して画像保存
- function saveResizeImage($keyname, $to_w, $to_h) {
+ function saveResizeImage($keyname, $to_w, $to_h)
+ {
$path = '';
// keynameの添付ファイルを取得
@@ -487,7 +513,8 @@
* @param int $keyname
* @return string
*/
- function lfGetTmpImageName($rename, $keyname = '', $uploadfile = '') {
+ function lfGetTmpImageName($rename, $keyname = '', $uploadfile = '')
+ {
if ($rename === true) {
// 一意なIDを取得し、画像名をリネームし保存
変更: branches/version-2_12-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_View.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/SC_View.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,18 +23,21 @@
require_once realpath(dirname(__FILE__)) . '/../module/Smarty/libs/Smarty.class.php';
-class SC_View {
+class SC_View
+{
var $_smarty;
var $objPage;
// コンストラクタ
- function __construct() {
+ function __construct()
+ {
$this->init();
}
- function init() {
+ function init()
+ {
$this->_smarty = new Smarty;
$this->_smarty->left_delimiter = '<!--{';
$this->_smarty->right_delimiter = '}-->';
@@ -72,12 +75,14 @@
}
// テンプレートに値を割り当てる
- function assign($val1, $val2) {
+ function assign($val1, $val2)
+ {
$this->_smarty->assign($val1, $val2);
}
// テンプレートの処理結果を取得
- function fetch($template) {
+ function fetch($template)
+ {
return $this->_smarty->fetch($template);
}
@@ -88,7 +93,8 @@
* @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')) {
@@ -111,7 +117,8 @@
* @param LC_Page_Ex $objPage
* @return void
*/
- function setPage($objPage) {
+ function setPage($objPage)
+ {
$this->objPage = $objPage;
}
@@ -119,7 +126,8 @@
* Smartyのfilterをセットします.
* @return void
*/
- function registFilter() {
+ function registFilter()
+ {
$this->_smarty->register_prefilter(array(&$this, 'prefilter_transform'));
$this->_smarty->register_outputfilter(array(&$this, 'outputfilter_transform'));
}
@@ -130,7 +138,8 @@
* @param Smarty_Compiler $smarty Smartyのコンパイラクラス
* @return string $source ソース
*/
- function prefilter_transform($source, &$smarty) {
+ function prefilter_transform($source, &$smarty)
+ {
if (!is_null($this->objPage)) {
// フックポイントを実行.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
@@ -145,7 +154,8 @@
* @param Smarty_Compiler $smarty Smartyのコンパイラクラス
* @return string $source ソース
*/
- function outputfilter_transform($source, &$smarty) {
+ function outputfilter_transform($source, &$smarty)
+ {
if (!is_null($this->objPage)) {
// フックポイントを実行.
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
@@ -155,7 +165,8 @@
}
// テンプレートの処理結果を表示
- function display($template, $no_error = false) {
+ function display($template, $no_error = false)
+ {
if (!$no_error) {
global $GLOBAL_ERR;
if (!defined('OUTPUT_ERR')) {
@@ -174,7 +185,8 @@
}
// オブジェクト内の変数をすべて割り当てる。
- function assignobj($obj) {
+ function assignobj($obj)
+ {
$data = get_object_vars($obj);
foreach ($data as $key => $value) {
@@ -183,7 +195,8 @@
}
// 連想配列内の変数をすべて割り当てる。
- function assignarray($array) {
+ function assignarray($array)
+ {
foreach ($array as $key => $val) {
$this->_smarty->assign($key, $val);
}
@@ -194,7 +207,8 @@
*
* @param integer $device_type_id 端末種別ID
*/
- function assignTemplatePath($device_type_id) {
+ function assignTemplatePath($device_type_id)
+ {
// テンプレート変数を割り当て
$this->assign('TPL_URLPATH', SC_Helper_PageLayout_Ex::getUserDir($device_type_id, true));
@@ -209,7 +223,8 @@
}
// デバッグ
- function debug($var = true) {
+ function debug($var = true)
+ {
$this->_smarty->debugging = $var;
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,7 +29,8 @@
* @version $Id$
*/
-abstract class SC_Api_Abstract {
+abstract class SC_Api_Abstract
+{
/** 認証タイプ */
const API_AUTH_TYPE_REFERER = '1'; // リファラー
@@ -55,9 +56,11 @@
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);
@@ -65,15 +68,18 @@
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;
@@ -84,22 +90,27 @@
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);
@@ -109,7 +120,8 @@
return $this->objFormParam->getHashArray();
}
- public function getRequestValidate() {
+ public function getRequestValidate()
+ {
$arrParam = $this->objFormParam->getHashArray();
if (!SC_Utils_Ex::isBlank($arrParam)) {
return $arrParam;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/SC_Api_Operation.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
*/
-class SC_Api_Operation {
+class SC_Api_Operation
+{
/** API_DEBUG_MODE */
const API_DEBUG_MODE = false;
@@ -57,7 +58,8 @@
* @param string $member_password ログインパスワード文字列
* @return boolean ログイン情報が有効な場合 true
*/
- protected function checkMemberAccount($member_id, $member_password) {
+ protected function checkMemberAccount($member_id, $member_password)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
//パスワード、saltの取得
$cols = 'password, salt';
@@ -81,7 +83,8 @@
* @param string $password ログインパスワード
* @return boolean ログインに成功した場合 true; 失敗した場合 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;
@@ -95,7 +98,8 @@
*
* @return boolean チェックに成功した場合 true; 失敗した場合 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;
@@ -116,7 +120,8 @@
* @param array リクエストパラメータ
* @return boolean 署名認証に成功した場合 true; 失敗した場合 false
*/
- protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig) {
+ protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig)
+ {
if (SC_Utils_Ex::isBlank($arrParam['Signature'])) {
return false;
}
@@ -170,7 +175,8 @@
* @param string 実行処理名
* @return boolean チェックに成功した場合 true; 失敗した場合 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);
@@ -188,7 +194,8 @@
* @param string $access_key
* @return string 秘密鍵文字列
*/
- 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;
@@ -201,7 +208,8 @@
* @param array リクエストパラメータ
* @return boolean 権限がある場合 true; 無い場合 false
*/
- protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig) {
+ protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig)
+ {
if (SC_Utils_Ex::isBlank($operation_name)) {
return false;
}
@@ -264,7 +272,8 @@
* @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'));
@@ -278,7 +287,8 @@
* @param array $arrPost リクエストパラメーター
* @return array(string レスポンス名, array レスポンス配列)
*/
- public function doApiAction($arrPost) {
+ public function doApiAction($arrPost)
+ {
// 実行時間計測用
$start_time = microtime(true);
@@ -373,7 +383,8 @@
* @param float $start_time 実行時間計測用開始時間
* @return array エコー情報配列 (XML用の _attributes 指定入り）
*/
- 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'])))),
@@ -388,7 +399,8 @@
}
// TODO: ここらへんは SC_Displayに持って行きたい所だが・・
- 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);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/SC_Api_Utils.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
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/';
@@ -52,7 +53,8 @@
* @param string $access_key
* @return string 秘密鍵文字列
*/
- 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);
}
@@ -78,7 +80,8 @@
* @param string $operation_name
* @return array 設定配列
*/
- public function getApiConfig($operation_name) {
+ public function getApiConfig($operation_name)
+ {
// 設定優先度 DB > plugin default > base
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'operation_name Like ? AND del_flg = 0 AND enable = 1';
@@ -111,7 +114,8 @@
* @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;
}
@@ -128,7 +132,8 @@
* @param array $arrParam リクエストパラメーター
* @return object APIオペレーションクラスオブジェクト
*/
- public function loadApiOperation($operation_name, $arrParam = array()) {
+ public function loadApiOperation($operation_name, $arrParam = array())
+ {
// API_UPLOADのほうが優先
// API_UPLOAD > API_CLASS_EX > API_CLASS
if (file_exists(API_UPLOAD_REALDIR . $operation_name . '.php')) {
@@ -154,7 +159,8 @@
*
* @return array $arrFiles
*/
- public function getApiDirFiles() {
+ public function getApiDirFiles()
+ {
$arrFiles = array();
// Core API ディレクトリ
if (is_dir(API_CLASS_EX_REALDIR)) {
@@ -182,19 +188,22 @@
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(
変更: branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/AddrFromZip.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = '郵便番号から住所を検索します。';
@@ -39,7 +40,8 @@
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'];
@@ -57,12 +59,14 @@
return false;
}
- protected function lfInitParam(&$objFormParam) {
+ protected function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('郵便番号1', 'zip1', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('郵便番号2', 'zip2', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
}
- public function getResponseGroupName() {
+ public function getResponseGroupName()
+ {
return 'AddressResponse';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/BrowseNodeLookup.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = 'カテゴリ取得';
@@ -39,7 +40,8 @@
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'];
@@ -103,12 +105,14 @@
return false;
}
- protected function lfInitParam(&$objFormParam) {
+ protected function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('対象カテゴリID', 'BrowseNodeId', INT_LEN, 'a', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('返答種別', 'ResponseGroup', INT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
}
- public function getResponseGroupName() {
+ public function getResponseGroupName()
+ {
return 'BrowseNodes';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/CartAdd.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartAdd.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/CartAdd.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = 'カートへの商品追加';
@@ -39,20 +40,24 @@
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';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/CartClear.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartClear.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/CartClear.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = 'カートのクリア';
@@ -39,20 +40,24 @@
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';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/CartCreate.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartCreate.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/CartCreate.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = 'カートの新規作成';
@@ -39,20 +40,24 @@
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';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/CartGet.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartGet.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/CartGet.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = 'カートの取得';
@@ -39,20 +40,24 @@
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';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/CartModify.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/CartModify.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/CartModify.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = 'カートの修正';
@@ -39,20 +40,24 @@
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';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/Default.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/Default.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/Default.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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';
@@ -39,19 +40,23 @@
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)
+ {
}
}
変更: branches/version-2_12-dev/data/class/api/operations/GetVersion.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/GetVersion.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/GetVersion.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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';
@@ -39,20 +40,24 @@
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';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/ItemLookup.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/ItemLookup.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/ItemLookup.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = '商品詳細情報を取得します。';
@@ -39,7 +40,8 @@
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();
@@ -74,7 +76,8 @@
return false;
}
- protected function checkErrorExtended($arrParam) {
+ protected function checkErrorExtended($arrParam)
+ {
switch ($arrParam['IdType']) {
case 'product_code':
break;
@@ -88,7 +91,8 @@
}
}
- protected function lfInitParam(&$objFormParam) {
+ protected function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('商品コンディション', 'Condition', STEXT_LEN, 'a', array('ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('商品ID種別', 'IdType', STEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('指定ID', 'ItemId', STEXT_LEN, 'a', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -101,7 +105,8 @@
$objFormParam->addParam('関連タグソート', 'TagSort', STEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
}
- public function getResponseGroupName() {
+ public function getResponseGroupName()
+ {
return 'Item';
}
}
変更: branches/version-2_12-dev/data/class/api/operations/ItemSearch.php
===================================================================
--- branches/version-2_12-dev/data/class/api/operations/ItemSearch.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/api/operations/ItemSearch.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
*/
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 = '商品検索・商品一覧情報を取得します。';
@@ -39,7 +40,8 @@
protected $default_is_log = '0';
protected $default_sub_data = '';
- public function doAction($arrParam) {
+ public function doAction($arrParam)
+ {
$arrRequest = $this->doInitParam($arrParam);
if (!$this->isParamError()) {
@@ -91,7 +93,8 @@
return false;
}
- protected function lfInitParam(&$objFormParam) {
+ protected function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('カテゴリID', 'BrowseNode', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('キーワード', 'Keywords', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メーカー名', 'Manufacturer', STEXT_LEN, 'a', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -99,7 +102,8 @@
$objFormParam->addParam('ソート', 'Sort', STEXT_LEN, 'a', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
}
- public function getResponseGroupName() {
+ public function getResponseGroupName()
+ {
return 'Items';
}
@@ -110,7 +114,8 @@
* @return array
* TODO: LC_Page_Products_List::lfGetProductsList() と共通化
*/
- protected function getProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct) {
+ protected function getProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct)
+ {
$arrOrderVal = array();
@@ -184,7 +189,8 @@
* @return array
* TODO: LC_Page_Products_List:;lfGetSearchCondition() と共通化
*/
- protected function getSearchCondition($arrSearchData) {
+ protected function getSearchCondition($arrSearchData)
+ {
$searchCondition = array(
'where' => '',
'arrval' => array(),
@@ -253,7 +259,8 @@
* @param Array $arrStatusImage スタータス画像配列
* @return Array $arrProducts 商品一覧情報
*/
- 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++) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Batch_Update extends SC_Batch {
+class SC_Batch_Update extends SC_Batch
+{
/**
* 変換したいファイルの拡張子をカンマ区切りで羅列.
@@ -48,7 +49,8 @@
* @param string $target アップデータファイルのディレクトリパス
* @return void
*/
- function execute($target = '.') {
+ function execute($target = '.')
+ {
$msg = '';
$oldMask = umask(0);
$bkupDistInfoArray = array(); //バックアップファイル用のdistinfoファイル内容
@@ -195,7 +197,8 @@
* @return array $dir より下層に存在するパス名の配列
* @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) {
@@ -212,7 +215,8 @@
*
* @param string $path 絶対パス
*/
- function lfMkdirRecursive($path) {
+ function lfMkdirRecursive($path)
+ {
$path = dirname($path);
// HTML_REALDIR/DATA_REALDIRの判別
@@ -235,7 +239,8 @@
}
}
- function makeDistInfo($bkupDistInfoArray) {
+ function makeDistInfo($bkupDistInfoArray)
+ {
$src = "<?php\n"
. '$distifo = array(' . "\n";
@@ -247,7 +252,8 @@
return $src;
}
- function printLog($msg) {
+ function printLog($msg)
+ {
GC_Utils_Ex::gfPrintLog($msg, DATA_REALDIR . 'logs/ownersstore_batch_update.log');
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @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 に応じた DBFactory インスタンスを生成する.
@@ -36,7 +37,8 @@
* @param string $db_type 任意のインスタンスを返したい場合は DB_TYPE 文字列を指定
* @return mixed DBFactory インスタンス
*/
- function getInstance($db_type = DB_TYPE) {
+ function getInstance($db_type = DB_TYPE)
+ {
switch ($db_type) {
case 'mysql':
return new SC_DB_DBFactory_MYSQL();
@@ -59,7 +61,8 @@
* @param mixed $dsn データソース名
* @return mixed データソース名またはDB接続パラメータの連想配列
*/
- function getDSN($dsn = '') {
+ function getDSN($dsn = '')
+ {
if (empty($dsn)) {
if (defined('DEFAULT_DSN')) {
$dsn = array('phptype' => DB_TYPE,
@@ -83,7 +86,8 @@
* @param string $dsn データソース名
* @return string データベースのバージョン
*/
- function sfGetDBVersion($dsn = '') { return null; }
+ function sfGetDBVersion($dsn = '')
+ { return null; }
/**
* MySQL 用の SQL 文に変更する.
@@ -91,7 +95,8 @@
* @param string $sql SQL 文
* @return string MySQL 用に置換した SQL 文
*/
- function sfChangeMySQL($sql) { return null; }
+ function sfChangeMySQL($sql)
+ { return null; }
/**
* 昨日の売上高・売上件数を算出する SQL を返す.
@@ -99,7 +104,8 @@
* @param string $method SUM または COUNT
* @return string 昨日の売上高・売上件数を算出する SQL
*/
- function getOrderYesterdaySql($method) { return null; }
+ function getOrderYesterdaySql($method)
+ { return null; }
/**
* 当月の売上高・売上件数を算出する SQL を返す.
@@ -107,28 +113,32 @@
* @param string $method SUM または COUNT
* @return string 当月の売上高・売上件数を算出する SQL
*/
- function getOrderMonthSql($method) { return null; }
+ function getOrderMonthSql($method)
+ { return null; }
/**
* 昨日のレビュー書き込み件数を算出する SQL を返す.
*
* @return string 昨日のレビュー書き込み件数を算出する SQL
*/
- function getReviewYesterdaySql() { return null; }
+ function getReviewYesterdaySql()
+ { return null; }
/**
* メール送信履歴の start_date の検索条件の SQL を返す.
*
* @return string 検索条件の SQL
*/
- function getSendHistoryWhereStartdateSql() { return null; }
+ function getSendHistoryWhereStartdateSql()
+ { return null; }
/**
* ダウンロード販売の検索条件の SQL を返す.
*
* @return string 検索条件の SQL
*/
- function getDownloadableDaysWhereSql() { return null; }
+ function getDownloadableDaysWhereSql()
+ { return null; }
/**
* 文字列連結を行う.
@@ -136,7 +146,8 @@
* @param array $columns 連結を行うカラム名
* @return string 連結後の SQL 文
*/
- function concatColumn($columns) { return null; }
+ function concatColumn($columns)
+ { return null; }
/**
* テーブルを検索する.
@@ -147,7 +158,8 @@
* @param string $expression 検索文字列
* @return array テーブル名の配列
*/
- function findTableNames($expression = '') { return array(); }
+ function findTableNames($expression = '')
+ { return array(); }
/**
* インデックス作成の追加定義を取得する
@@ -158,7 +170,8 @@
* @param string $name 対象カラム名
* @return array インデックス設定情報配列
*/
- function sfGetCreateIndexDefinition($table, $name, $definition) { return $definition; }
+ function sfGetCreateIndexDefinition($table, $name, $definition)
+ { return $definition; }
/**
* 各 DB に応じた SC_Query での初期化を行う
@@ -166,7 +179,8 @@
* @param SC_Query $objQuery SC_Query インスタンス
* @return void
*/
- function initObjQuery(SC_Query &$objQuery) {
+ function initObjQuery(SC_Query &$objQuery)
+ {
}
/**
@@ -174,7 +188,8 @@
*
* @return array テーブル名の配列
*/
- function listTables(SC_Query &$objQuery) {
+ function listTables(SC_Query &$objQuery)
+ {
$objManager =& $objQuery->conn->loadModule('Manager');
return $objManager->listTables();
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/db/SC_DB_MasterData.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -41,7 +41,8 @@
* @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
@@ -69,7 +70,8 @@
* を表すカラム名を格納した配列
* @return array マスターデータ
*/
- function getMasterData($name, $columns = array()) {
+ function getMasterData($name, $columns = array())
+ {
$columns = $this->getDefaultColumnName($columns);
@@ -101,7 +103,8 @@
* @param bool $autoCommit トランザクションを自動的に commit する場合 true
* @return integer マスターデータの登録数
*/
- function registMasterData($name, $columns, $masterData, $autoCommit = true) {
+ function registMasterData($name, $columns, $masterData, $autoCommit = true)
+ {
$columns = $this->getDefaultColumnName($columns);
@@ -136,7 +139,8 @@
* @param bool $autoCommit トランザクションを自動的に commit する場合 true
* @return integer マスターデータの更新数
*/
- function updateMasterData($name, $columns, $masterData, $autoCommit = true) {
+ function updateMasterData($name, $columns, $masterData, $autoCommit = true)
+ {
$columns = $this->getDefaultColumnName($columns);
@@ -170,7 +174,8 @@
* @param bool $autoCommit トランザクションを自動的に commit する場合 true
* @return integer マスターデータの更新数
*/
- function insertMasterData($name, $key, $value, $comment, $autoCommit = true) {
+ function insertMasterData($name, $key, $value, $comment, $autoCommit = true)
+ {
$columns = $this->getDefaultColumnName();
@@ -202,7 +207,8 @@
* @param bool $autoCommit トランザクションを自動的に commit する場合 true
* @return integer マスターデータの削除数
*/
- function deleteMasterData($name, $autoCommit = true) {
+ function deleteMasterData($name, $autoCommit = true)
+ {
$this->objQuery =& SC_Query_Ex::getSingletonInstance();
if ($autoCommit) {
$this->objQuery->begin();
@@ -224,7 +230,8 @@
* @param string $name マスターデータ名
* @return bool 消去した場合 true
*/
- function clearCache($name) {
+ function clearCache($name)
+ {
$masterDataFile = MASTER_DATA_REALDIR . $name . '.php';
if (is_file($masterDataFile)) {
unlink($masterDataFile);
@@ -251,7 +258,8 @@
* [2] => 表示順 を表すカラム名を格納した配列
* @return bool キャッシュの生成に成功した場合 true
*/
- function createCache($name, $columns = array(), $isDefine = false, $commentColumn = array()) {
+ function createCache($name, $columns = array(), $isDefine = false, $commentColumn = array())
+ {
// マスターデータを取得
$masterData = $this->getDbMasterData($name, $columns);
@@ -300,7 +308,8 @@
* を表すカラム名を格納した配列
* @return array マスターデータ
*/
- function getDbMasterData($name, $columns = array()) {
+ function getDbMasterData($name, $columns = array())
+ {
$columns = $this->getDefaultColumnName($columns);
@@ -332,7 +341,8 @@
* を表すカラム名を格納した配列
* @return array カラム名を格納した配列
*/
- function getDefaultColumnName($columns = array()) {
+ function getDefaultColumnName($columns = array())
+ {
if (!empty($columns)) {
return $columns;
@@ -349,7 +359,8 @@
* @param array $comments コメントの配列
* @return string 定数定義の文字列
*/
- function getMasterDataAsDefine($masterData, $comments = array()) {
+ function getMasterDataAsDefine($masterData, $comments = array())
+ {
$data = '';
foreach ($masterData as $key => $val) {
if (!empty($comments[$key])) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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 インスタンス */
var $objQuery;
@@ -43,7 +44,8 @@
* @param string $dsn データソース名
* @return string データベースのバージョン
*/
- function sfGetDBVersion($dsn = '') {
+ function sfGetDBVersion($dsn = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
$val = $objQuery->getOne('select version()');
return 'MySQL ' . $val;
@@ -56,7 +58,8 @@
* @param string $sql SQL 文
* @return string MySQL 用に置換した SQL 文
*/
- function sfChangeMySQL($sql) {
+ function sfChangeMySQL($sql)
+ {
// 改行、タブを1スペースに変換
$sql = preg_replace("/[\r\n\t]/",' ',$sql);
// ILIKE検索をLIKE検索に変換する
@@ -75,7 +78,8 @@
*
* @return array 文字コード情報
*/
- function getCharSet() {
+ function getCharSet()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrRet = $objQuery->getAll("SHOW VARIABLES LIKE 'char%'");
return $arrRet;
@@ -87,7 +91,8 @@
* @param string $method SUM または COUNT
* @return string 昨日の売上高・売上件数を算出する 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) '
@@ -100,7 +105,8 @@
* @param string $method SUM または COUNT
* @return string 当月の売上高・売上件数を算出する 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') = ? "
@@ -113,7 +119,8 @@
*
* @return string 昨日のレビュー書き込み件数を算出する 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 '
@@ -128,7 +135,8 @@
*
* @return string 検索条件の SQL
*/
- function getSendHistoryWhereStartdateSql() {
+ function getSendHistoryWhereStartdateSql()
+ {
return 'start_date BETWEEN date_add(CURRENT_TIMESTAMP,INTERVAL -5 minute) AND date_add(CURRENT_TIMESTAMP,INTERVAL 5 minute)';
}
@@ -138,7 +146,8 @@
* @param string $dtb_order_alias
* @return string 検索条件の 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))))';
}
@@ -148,7 +157,8 @@
* @param mixed $type
* @return string 検索条件のSQL
*/
- function getOrderTotalDaysWhereSql($type) {
+ function getOrderTotalDaysWhereSql($type)
+ {
switch ($type) {
case 'month':
$format = '%m';
@@ -184,7 +194,8 @@
*
* @return string 年代抽出部分の SQL
*/
- function getOrderTotalAgeColSql() {
+ function getOrderTotalAgeColSql()
+ {
return 'TRUNC((YEAR(create_date) - YEAR(order_birth)) - (RIGHT(create_date, 5) < RIGHT(order_birth, 5)), -1)';
}
@@ -194,7 +205,8 @@
* @param array $columns 連結を行うカラム名
* @return string 連結後の SQL 文
*/
- function concatColumn($columns) {
+ function concatColumn($columns)
+ {
$sql = 'concat(';
$i = 0;
$total = count($columns);
@@ -217,7 +229,8 @@
* @param string $expression 検索文字列
* @return array テーブル名の配列
*/
- function findTableNames($expression = '') {
+ function findTableNames($expression = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sql = 'SHOW TABLES LIKE '. $objQuery->quote('%' . $expression . '%');
$arrColList = $objQuery->getAll($sql);
@@ -232,7 +245,8 @@
* @param string $sql SQL文
* @return string 変換後の SQL 文
*/
- function sfChangeILIKE($sql) {
+ function sfChangeILIKE($sql)
+ {
$changesql = preg_replace('/(^|[^\w])ILIKE([^\w]|$)/i', '$1LIKE$2', $sql);
return $changesql;
}
@@ -244,7 +258,8 @@
* @param string $sql SQL文
* @return string 変換後の SQL 文
*/
- function sfChangeRANDOM($sql) {
+ function sfChangeRANDOM($sql)
+ {
$changesql = preg_replace('/(^|[^\w])RANDOM\(/i', '$1RAND(', $sql);
return $changesql;
}
@@ -256,7 +271,8 @@
* @param string $sql SQL文
* @return string 変換後の SQL 文
*/
- function sfChangeTrunc($sql) {
+ function sfChangeTrunc($sql)
+ {
$changesql = preg_replace('/(^|[^\w])TRUNC([^\w]|$)/i', '$1TRUNCATE$2', $sql);
return $changesql;
}
@@ -268,7 +284,8 @@
* @param string $sql SQL文
* @return string 変換後の SQL 文
*/
- 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);
@@ -289,7 +306,8 @@
* @param string $name 対象カラム名
* @return array インデックス設定情報配列
*/
- function sfGetCreateIndexDefinition($table, $name, $definition) {
+ function sfGetCreateIndexDefinition($table, $name, $definition)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrTblInfo = $objQuery->getTableInfo($table);
foreach ($arrTblInfo as $fieldInfo) {
@@ -309,7 +327,8 @@
*
* @return string
*/
- function getDummyFromClauseSql() {
+ function getDummyFromClauseSql()
+ {
return 'FROM DUAL';
}
@@ -319,7 +338,8 @@
* @param SC_Query $objQuery SC_Query インスタンス
* @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'");
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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のバージョンを取得する.
@@ -40,7 +41,8 @@
* @param string $dsn データソース名
* @return string データベースのバージョン
*/
- function sfGetDBVersion($dsn = '') {
+ function sfGetDBVersion($dsn = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
$val = $objQuery->getOne('select version()');
$arrLine = explode(' ' , $val);
@@ -56,7 +58,8 @@
* @param string $sql SQL 文
* @return string MySQL 用に置換した SQL 文
*/
- function sfChangeMySQL($sql) {
+ function sfChangeMySQL($sql)
+ {
return $sql;
}
@@ -66,7 +69,8 @@
* @param string $method SUM または COUNT
* @return string 昨日の売上高・売上件数を算出する 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') "
@@ -79,7 +83,8 @@
* @param string $method SUM または COUNT
* @return string 当月の売上高・売上件数を算出する 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') = ? "
@@ -92,7 +97,8 @@
*
* @return string 昨日のレビュー書き込み件数を算出する 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 '
@@ -107,7 +113,8 @@
*
* @return string 検索条件の SQL
*/
- function getSendHistoryWhereStartdateSql() {
+ function getSendHistoryWhereStartdateSql()
+ {
return "start_date BETWEEN current_timestamp + '- 5 minutes' AND current_timestamp + '5 minutes'";
}
@@ -117,7 +124,8 @@
* @param string $dtb_order_alias
* @return string 検索条件の SQL
*/
- function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
+ function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order')
+ {
$baseinfo = SC_Helper_DB_Ex::sfGetBasisData();
//downloadable_daysにNULLが入っている場合(無期限ダウンロード可能時)もあるので、NULLの場合は0日に補正
$downloadable_days = $baseinfo['downloadable_days'];
@@ -144,7 +152,8 @@
* @param mixed $type
* @return string 検索条件のSQL
*/
- function getOrderTotalDaysWhereSql($type) {
+ function getOrderTotalDaysWhereSql($type)
+ {
switch ($type) {
case 'month':
$format = 'MM';
@@ -180,7 +189,8 @@
*
* @return string 年代抽出部分の SQL
*/
- function getOrderTotalAgeColSql() {
+ function getOrderTotalAgeColSql()
+ {
return 'TRUNC(CAST(EXTRACT(YEAR FROM AGE(create_date, order_birth)) AS INT), -1)';
}
@@ -190,7 +200,8 @@
* @param array $columns 連結を行うカラム名
* @return string 連結後の SQL 文
*/
- function concatColumn($columns) {
+ function concatColumn($columns)
+ {
$sql = '';
$i = 0;
$total = count($columns);
@@ -213,7 +224,8 @@
* @param string $expression 検索文字列
* @return array テーブル名の配列
*/
- function findTableNames($expression = '') {
+ function findTableNames($expression = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sql = ' SELECT c.relname AS name, '
. ' CASE c.relkind '
@@ -237,7 +249,8 @@
*
* @return array 文字コード情報
*/
- function getCharSet() {
+ function getCharSet()
+ {
// 未実装
return array();
}
@@ -247,7 +260,8 @@
*
* @return string
*/
- function getDummyFromClauseSql() {
+ function getDummyFromClauseSql()
+ {
return '';
}
@@ -257,7 +271,8 @@
* MDB2_Driver_Manager_pgsql#listTables の不具合回避を目的として独自実装している。
* @return array テーブル名の配列
*/
- function listTables(SC_Query &$objQuery) {
+ function listTables(SC_Query &$objQuery)
+ {
$col = 'tablename';
$from = 'pg_tables';
$where = "schemaname NOT IN ('pg_catalog', 'information_schema', 'sys')";
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Bar.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,7 +22,8 @@
*/
// 棒グラフ生成クラス
-class SC_Graph_Bar extends SC_Graph_Line_Ex{
+class SC_Graph_Bar extends SC_Graph_Line_Ex
+{
// コンストラクタ
function __construct(
$bgw = BG_WIDTH, $bgh = BG_HEIGHT, $left = LINE_LEFT, $top = LINE_TOP,
@@ -31,7 +32,8 @@
}
// グラフの描画
- function drawGraph() {
+ function drawGraph()
+ {
$this->drawYLine();
$this->drawXLine(true);
@@ -50,7 +52,8 @@
}
// 棒グラフの描画
- function drawBar($line_no) {
+ function drawBar($line_no)
+ {
$arrPointList = $this->arrPointList[$line_no];
// データ数を数える
$count = count($arrPointList);
@@ -79,7 +82,8 @@
}
// ラベルを描画する
- function drawLabel($line_no) {
+ function drawLabel($line_no)
+ {
$arrData = $this->arrDataList[$line_no];
$arrPointList = $this->arrPointList[$line_no];
$count = count($arrPointList);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Base.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -130,7 +130,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Graph_Base {
+class SC_Graph_Base
+{
// {{{ properties
@@ -181,7 +182,8 @@
var $ARR_GRID_COLOR;
// コンストラクタ
- function __construct($bgw, $bgh, $left, $top) {
+ function __construct($bgw, $bgh, $left, $top)
+ {
$this->init();
// 画像作成
$this->bgw = $bgw;
@@ -210,7 +212,8 @@
}
// リサンプル(画像を滑らかに縮小する)
- function resampled() {
+ function resampled()
+ {
$new_width = $this->bgw * 0.8;
$new_height = $this->bgh * 0.8;
$tmp_image = imagecreatetruecolor($new_width, $new_height);
@@ -220,7 +223,8 @@
}
// オブジェクトカラーの設定
- function setColorList($arrRGB) {
+ function setColorList($arrRGB)
+ {
$this->arrRGB = $arrRGB;
$count = count($this->arrRGB);
// 通常色の設定
@@ -234,12 +238,14 @@
}
// 影のありなし
- function setShadeOn($shade_on) {
+ function setShadeOn($shade_on)
+ {
$this->shade_on = $shade_on;
}
// 画像を出力する
- function outputGraph($header = true, $filename = '') {
+ function outputGraph($header = true, $filename = '')
+ {
if ($header) {
header('Content-type: image/png');
}
@@ -254,7 +260,8 @@
}
// 描画時のテキスト幅を求める
- function getTextWidth($text, $font_size) {
+ function getTextWidth($text, $font_size)
+ {
$text_len = strlen($text);
$ret = $font_size * $text_len * TEXT_RATE;
/*
@@ -267,7 +274,8 @@
}
// テキストを出力する
- 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)
+ {
// 時計回りに角度を変更
$angle = -$angle;
// ラベル背景
@@ -299,7 +307,8 @@
}
// タイトルを出力する
- function drawTitle($text, $font_size = TITLE_FONT_SIZE) {
+ function drawTitle($text, $font_size = TITLE_FONT_SIZE)
+ {
// 出力位置の算出
$text_width = $this->getTextWidth($text, $font_size);
$left = ($this->bgw - $text_width) / 2;
@@ -308,7 +317,8 @@
}
// ログを出力する
- 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;
@@ -319,7 +329,8 @@
}
// カラーラベルを描画
- function drawLegend($legend_max = '', $clabelbg = true) {
+ function drawLegend($legend_max = '', $clabelbg = true)
+ {
// 凡例が登録されていなければ中止
if (count($this->arrLegend) <= 0) {
return;
@@ -368,7 +379,8 @@
}
// カラーラベル背景の描画
- function drawClabelBG($left, $top, $right, $bottom) {
+ function drawClabelBG($left, $top, $right, $bottom)
+ {
// 影の描画
if ($this->shade_on) {
imagefilledrectangle($this->image, $left + 2, $top + 2, $right + 2, $bottom + 2, $this->shade_color);
@@ -379,7 +391,8 @@
}
// 凡例をセットする
- function setLegend($arrLegend) {
+ function setLegend($arrLegend)
+ {
$this->arrLegend = array_values((array)$arrLegend);
}
@@ -394,7 +407,8 @@
* @access protected
* @return void
*/
- function init() {
+ function init()
+ {
// 凡例背景
$this->ARR_LEGENDBG_COLOR = array(245,245,245);
// ラベル背景
@@ -436,7 +450,8 @@
* @param integer $e 角度
* @return array 円の中心点と直径から弧の終端座標の配列
*/
- function lfGetArcPos($cx, $cy, $cw, $ch, $e) {
+ function lfGetArcPos($cx, $cy, $cw, $ch, $e)
+ {
// 三角関数用の角度を求める
$s = 90 - $e;
$r = $cw / 2;
@@ -447,7 +462,8 @@
}
/** 画像にテキストを描画する */
- 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);
// 表示角度
@@ -457,7 +473,8 @@
}
/** 表示色の取得 */
- function lfGetImageColor($image, $array) {
+ function lfGetImageColor($image, $array)
+ {
if (count($array) != 3) {
return NULL;
}
@@ -466,7 +483,8 @@
}
/** 影用表示色の取得 */
- function lfGetImageDarkColor($image, $array) {
+ function lfGetImageDarkColor($image, $array)
+ {
if (count($array) != 3) {
return NULL;
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Line.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,7 +22,8 @@
*/
// 折れ線グラフ生成クラス
-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;
@@ -54,12 +55,14 @@
}
// X軸ラベルの角度セット
- function setXLabelAngle($Angle) {
+ function setXLabelAngle($Angle)
+ {
$this->XLabelAngle = $Angle;
}
// Y軸タイトル
- function drawYTitle() {
+ function drawYTitle()
+ {
// Y軸にタイトルを入れる
if ($this->YTitle != '') {
$text_width = $this->getTextWidth($this->YTitle, FONT_SIZE);
@@ -70,7 +73,8 @@
}
// X軸タイトル
- function drawXTitle() {
+ function drawXTitle()
+ {
// Y軸にタイトルを入れる
if ($this->XTitle != '') {
$text_width = $this->getTextWidth($this->XTitle, FONT_SIZE);
@@ -81,7 +85,8 @@
}
// Y軸の描画
- function drawYLine() {
+ function drawYLine()
+ {
imageline($this->image, $this->left, $this->top, $this->left, $this->top + $this->area_height, $this->flame_color);
// 目盛り幅を求める(中間点は自動)
$size = $this->area_height / (LINE_Y_SCALE * 2);
@@ -106,7 +111,8 @@
}
// X軸の描画
- 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);
@@ -149,12 +155,14 @@
}
// グリッド表示
- function setYGridOn($ygrid_on) {
+ function setYGridOn($ygrid_on)
+ {
$this->ygrid_on = $ygrid_on;
}
// ポイントの描画
- function setMark($line_no, $left, $top, $size = LINE_MARK_SIZE) {
+ function setMark($line_no, $left, $top, $size = LINE_MARK_SIZE)
+ {
// 偶数に変換しておく
$size += $size % 2;
$array = array(
@@ -169,7 +177,8 @@
}
// Y軸目盛りに値を入れる
- function setYScale() {
+ function setYScale()
+ {
// 1目盛りの値
$number = intval($this->graph_max / LINE_Y_SCALE);
// 目盛り幅を求める
@@ -185,7 +194,8 @@
}
//
- function setMax($arrData) {
+ function setMax($arrData)
+ {
// データの最大値を取得する。
$data_max = max($arrData);
// 10の何倍かを取得
@@ -201,7 +211,8 @@
}
// グラフの描画
- function drawGraph() {
+ function drawGraph()
+ {
// グラフ背景を描画
$this->drawYLine();
$this->drawXLine();
@@ -226,7 +237,8 @@
}
// ラインを描画する
- function drawLine($line_no) {
+ function drawLine($line_no)
+ {
$arrPointList = $this->arrPointList[$line_no];
$count = count($arrPointList);
@@ -242,7 +254,8 @@
}
// マークを描画する
- function drawMark($line_no) {
+ function drawMark($line_no)
+ {
$arrPointList = $this->arrPointList[$line_no];
$count = count($arrPointList);
for ($i = 0; $i < $count; $i++) {
@@ -253,7 +266,8 @@
}
// ラベルを描画する
- function drawLabel($line_no) {
+ function drawLabel($line_no)
+ {
$arrData = $this->arrDataList[$line_no];
$arrPointList = $this->arrPointList[$line_no];
$count = count($arrPointList);
@@ -268,7 +282,8 @@
}
// データをセットする
- function setData($arrData) {
+ function setData($arrData)
+ {
$this->arrDataList[$this->line_max] = array_values((array)$arrData);
$this->setMax($this->arrDataList[$this->line_max]);
// 値の描画変換率
@@ -289,17 +304,20 @@
}
// X軸ラベルをセットする
- function setXLabel($arrXLabel) {
+ function setXLabel($arrXLabel)
+ {
$this->arrXLabel = array_values((array)$arrXLabel);
}
// X軸タイトルをセットする
- function setXTitle($title) {
+ function setXTitle($title)
+ {
$this->XTitle = $title;
}
// Y軸タイトルをセットする
- function setYTitle($title) {
+ function setYTitle($title)
+ {
$this->YTitle = $title;
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/graph/SC_Graph_Pie.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,7 +22,8 @@
*/
// 円グラフ生成クラス
-class SC_Graph_Pie extends SC_Graph_Base_Ex{
+class SC_Graph_Pie extends SC_Graph_Base_Ex
+{
var $cw;
var $ch;
var $cz;
@@ -32,7 +33,8 @@
var $arrData;
// コンストラクタ
- 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);
// サイズ設定
$this->setSize(PIE_WIDTH, PIE_HEIGHT, PIE_THICK);
@@ -41,7 +43,8 @@
}
// データを360°値に変換する
- function getCircleData($array) {
+ function getCircleData($array)
+ {
$total = '';
$new_total = '';
if (!is_array($array)) {
@@ -72,20 +75,23 @@
}
// 円の位置設定を行う
- function setPosition($cx, $cy) {
+ function setPosition($cx, $cy)
+ {
$this->cx = $cx;
$this->cy = $cy;
}
// 円のサイズ設定を行う
- function setSize($cw, $ch, $cz = 0) {
+ function setSize($cw, $ch, $cz = 0)
+ {
$this->cw = $cw;
$this->ch = $ch;
$this->cz = $cz;
}
// 影の描画
- 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);
@@ -94,12 +100,14 @@
}
// データをセットする
- function setData($arrData) {
+ function setData($arrData)
+ {
$this->arrData = array_values($arrData);
}
// 円グラフを描画する
- function drawGraph() {
+ function drawGraph()
+ {
$x = $this->cx;
$y = $this->cy;
$z = $this->cz;
@@ -197,7 +205,8 @@
}
// 円グラフのラベルを描画する
- function drawLabel($arrRad) {
+ function drawLabel($arrRad)
+ {
$rd_max = count($arrRad);
$start = 0;
for ($i = 0; $i < $rd_max; $i++) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -36,7 +36,8 @@
* @param array $sqlval
* @return array()
*/
- function registAddress($sqlval) {
+ function registAddress($sqlval)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$customer_id = $sqlval['customer_id'];
$other_deliv_id = $sqlval['other_deliv_id'];
@@ -76,7 +77,8 @@
* @param integer $other_deliv_id
* @return array()
*/
- function getAddress($other_deliv_id) {
+ function getAddress($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;
@@ -89,7 +91,8 @@
* @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');
//スマートフォン用の処理
@@ -105,7 +108,8 @@
* @param integer $delivId
* @return void
*/
- function deleteAddress($other_deliv_id) {
+ function deleteAddress($other_deliv_id)
+ {
$where = 'other_deliv_id = ?';
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->delete('dtb_other_deliv', $where, array($other_deliv_id));
@@ -117,7 +121,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function setFormParam(&$objFormParam) {
+ function setFormParam(&$objFormParam)
+ {
SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
$objFormParam->addParam('', 'other_deliv_id');
}
@@ -128,7 +133,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function errorCheck(&$objFormParam) {
+ function errorCheck(&$objFormParam)
+ {
$objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam);
return $objErr->arrErr;
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -12,7 +12,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_CSV {
+class SC_Helper_CSV
+{
// {{{ properties
@@ -28,7 +29,8 @@
/**
* デフォルトコンストラクタ.
*/
- function __construct() {
+ function __construct()
+ {
$this->init();
}
@@ -41,7 +43,8 @@
* @access private
* @return void
*/
- function init() {
+ function init()
+ {
$this->arrSubnavi = array(
1 => 'product',
2 => 'customer',
@@ -69,7 +72,8 @@
* @param boolean $is_download true:ダウンロード用出力までさせる false:CSVの内容を返す(旧方式、メモリを食います。）
* @return mixed $is_download = true時 成功失敗フラグ(boolean) 、$is_downalod = false時 string
*/
- function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false) {
+ function sfDownloadCsv($csv_id, $where = '', $arrVal = array(), $order = '', $is_download = false)
+ {
// CSV出力タイトル行の作成
$arrOutput = SC_Utils_Ex::sfSwapArray($this->sfGetCsvOutput($csv_id, 'status = ' . CSV_COLUMN_STATUS_FLG_ENABLE));
if (count($arrOutput) <= 0) return false; // 失敗終了
@@ -115,7 +119,8 @@
* @param array $order SQL の ORDER BY 句
* @return array CSV 項目の配列
*/
- 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';
@@ -141,7 +146,8 @@
* @param array sfGetCsvOutputで取得した内容（またはそれと同等の配列)
* @return boolean true:インポート可能、false:インポート不可
*/
- function sfIsImportCSVFrame(&$arrCSVFrame) {
+ function sfIsImportCSVFrame(&$arrCSVFrame)
+ {
$result = true;
foreach ($arrCSVFrame as $val) {
if ($val['status'] != CSV_COLUMN_STATUS_FLG_ENABLE
@@ -162,7 +168,8 @@
* @param array sfGetCsvOutputで取得した内容（またはそれと同等の配列)
* @return boolean true:更新可能、false:新規追加のみ不可
*/
- function sfIsUpdateCSVFrame(&$arrCSVFrame) {
+ function sfIsUpdateCSVFrame(&$arrCSVFrame)
+ {
$result = true;
foreach ($arrCSVFrame as $val) {
if ($val['status'] != CSV_COLUMN_STATUS_FLG_ENABLE
@@ -181,7 +188,8 @@
* @param resource $fp fopenを使用して作成したファイルポインタ
* @return integer CSV のカウント数
*/
- function sfGetCSVRecordCount($fp) {
+ function sfGetCSVRecordCount($fp)
+ {
$count = 0;
while (!feof($fp)) {
$arrCSV = fgetcsv($fp, CSV_LINE_MAX);
@@ -201,7 +209,8 @@
* @param mixed $data 出力データ
* @return boolean true (true:固定 false:中断)
*/
- function cbOutputCSV($data) {
+ function cbOutputCSV($data)
+ {
$line = $this->sfArrayToCSV($data);
$line = mb_convert_encoding($line, 'SJIS-Win');
$line .= "\r\n";
@@ -220,7 +229,8 @@
* @param boolean $is_download true:ダウンロード用出力までさせる false:CSVの内容を返す(旧方式、メモリを食います。）
* @return mixed $is_download = true時 成功失敗フラグ(boolean) 、$is_downalod = false時 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();
// ヘッダ構築
@@ -264,7 +274,8 @@
* @param string $arrayDelimiter
* @return string 結果行
*/
- 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 '';
@@ -301,7 +312,8 @@
* @param string $prefix
* @return void
*/
- function lfDownloadCsv($arrData, $prefix = '') {
+ function lfDownloadCsv($arrData, $prefix = '')
+ {
if ($prefix == '') {
$dir_name = SC_Utils_Ex::sfUpDirName();
@@ -331,7 +343,8 @@
* @param string $prefix
* @return void
*/
- function lfDownloadCSVFile($filepath, $prefix = '') {
+ function lfDownloadCSVFile($filepath, $prefix = '')
+ {
$file_name = $prefix . date('YmdHis') . '.csv';
/* HTTPヘッダの出力 */
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,7 +29,8 @@
* @author Hirokazu Fukuda
* @version $Id$
*/
-class SC_Helper_Customer {
+class SC_Helper_Customer
+{
/**
* 会員情報の登録・編集処理を行う.
@@ -39,7 +40,8 @@
* @access public
* @return integer 登録編集したユーザーのcustomer_id
*/
- function sfEditCustomerData($arrData, $customer_id = null) {
+ function sfEditCustomerData($arrData, $customer_id = null)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -124,7 +126,8 @@
* @param integer $add_point 加算ポイント
* @return array 最終ポイントの配列
*/
- 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));
@@ -154,7 +157,8 @@
* @param string $email メールアドレス
* @return integer 0:登録可能 1:登録済み 2:再登録制限期間内削除ユーザー 3:自分のアドレス
*/
- function sfCheckRegisterUserFromEmail($email) {
+ function sfCheckRegisterUserFromEmail($email)
+ {
$objCustomer = new SC_Customer_Ex();
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -202,7 +206,8 @@
* @param string $email チェック対象のメールアドレス
* @return boolean メールアドレスが重複する場合 true
*/
- function sfCustomerEmailDuplicationCheck($customer_id, $email) {
+ function sfCustomerEmailDuplicationCheck($customer_id, $email)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrResults = $objQuery->getRow('email, email_mobile',
@@ -224,7 +229,8 @@
* @access public
* @return array 会員情報の配列を返す
*/
- function sfGetCustomerData($customer_id, $mask_flg = true) {
+ function sfGetCustomerData($customer_id, $mask_flg = true)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 会員情報DB取得
@@ -261,7 +267,8 @@
* @access public
* @return array 対象会員データ
*/
- function sfGetCustomerDataFromId($customer_id, $add_where = '', $arrAddVal = array()) {
+ function sfGetCustomerDataFromId($customer_id, $add_where = '', $arrAddVal = array())
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
if ($add_where == '') {
@@ -285,7 +292,8 @@
* @access public
* @return string 会員登録キーの文字列
*/
- function sfGetUniqSecretKey() {
+ function sfGetUniqSecretKey()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
do {
@@ -304,7 +312,8 @@
* @access public
* @return integer 会員ID
*/
- function sfGetCustomerId($uniqid, $check_status = false) {
+ function sfGetCustomerId($uniqid, $check_status = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'secret_key = ?';
@@ -324,7 +333,8 @@
* @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) {
@@ -348,7 +358,8 @@
* @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) {
@@ -367,7 +378,8 @@
* @access public
* @return void
*/
- function sfCustomerCommonParam(&$objFormParam) {
+ function sfCustomerCommonParam(&$objFormParam)
+ {
$objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(フリガナ・姓)', 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
@@ -393,7 +405,8 @@
* @param boolean $is_mypage マイページの場合 true
* @return void
*/
- function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false) {
+ function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false)
+ {
$objFormParam->addParam('パスワード', 'password', PASSWORD_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
$objFormParam->addParam('パスワード確認用の質問の答え', 'reminder_answer', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('パスワード確認用の質問', 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -423,7 +436,8 @@
* @access public
* @return array エラーの配列
*/
- function sfCustomerEntryErrorCheck(&$objFormParam) {
+ function sfCustomerEntryErrorCheck(&$objFormParam)
+ {
$objErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck($objFormParam);
$objErr = SC_Helper_Customer_Ex::sfCustomerRegisterErrorCheck($objErr);
@@ -452,7 +466,8 @@
* @access public
* @return array エラーの配列
*/
- function sfCustomerMypageErrorCheck(&$objFormParam, $isAdmin = false) {
+ function sfCustomerMypageErrorCheck(&$objFormParam, $isAdmin = false)
+ {
$objFormParam->toLower('email_mobile');
$objFormParam->toLower('email_mobile02');
@@ -480,7 +495,8 @@
* @access private
* @return array エラー情報の配列
*/
- function sfCustomerCommonErrorCheck(&$objFormParam) {
+ function sfCustomerCommonErrorCheck(&$objFormParam)
+ {
$objFormParam->convParam();
$objFormParam->toLower('email');
$objFormParam->toLower('email02');
@@ -504,7 +520,8 @@
* @param boolean $isAdmin 管理画面チェック時:true
* @return SC_CheckError $objErr エラー情報
*/
- function sfCustomerRegisterErrorCheck(&$objErr, $isAdmin = false) {
+ function sfCustomerRegisterErrorCheck(&$objErr, $isAdmin = false)
+ {
$objErr->doFunc(array('生年月日', 'year', 'month', 'day'), array('CHECK_BIRTHDAY'));
$objErr->doFunc(array('パスワード', 'password', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN) ,array('NUM_RANGE_CHECK'));
@@ -531,7 +548,8 @@
* @access public
* @return void
*/
- function sfSetSearchParam(&$objFormParam) {
+ function sfSetSearchParam(&$objFormParam)
+ {
$objFormParam->addParam('会員ID', 'search_customer_id', ID_MAX_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前', 'search_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(フリガナ)', 'search_kana', STEXT_LEN, 'CKV', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'KANABLANK_CHECK'));
@@ -580,7 +598,8 @@
* @access public
* @return array エラー配列
*/
- function sfCheckErrorSearchParam(&$objFormParam) {
+ function sfCheckErrorSearchParam(&$objFormParam)
+ {
// パラメーターの基本チェック
$arrErr = $objFormParam->checkError();
// エラーチェック対象のパラメータ取得
@@ -627,7 +646,8 @@
* @param string $limitMode ページングを利用するか判定用フラグ
* @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
*/
- function sfGetSearchData($arrParam, $limitMode = '') {
+ function sfGetSearchData($arrParam, $limitMode = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
@@ -661,7 +681,8 @@
* @param string $login_email メールアドレス
* @return boolean 仮会員の場合 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';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @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
@@ -63,7 +64,8 @@
* テーブルが存在しない場合 false,
* 引数 $add == false でカラムが存在しない場合 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);
@@ -101,7 +103,8 @@
* @return bool データが存在する場合 true, データの追加に成功した場合 true,
* $add == false で, データが存在しない場合 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);
@@ -130,7 +133,8 @@
* @param string $col 取得カラムを指定する
* @return array 店舗基本情報の配列
*/
- function sfGetBasisData($force = false, $col = '') {
+ function sfGetBasisData($force = false, $col = '')
+ {
static $data = array();
if ($force || empty($data)) {
@@ -157,7 +161,8 @@
* @param boolean $generate キャッシュファイルが無い時、DBのデータを基にキャッシュを生成するか
* @return array 店舗基本情報の配列
*/
- function sfGetBasisDataCache($generate = false){
+ function sfGetBasisDataCache($generate = false)
+ {
// テーブル名
$name = 'dtb_baseinfo';
// キャッシュファイルパス
@@ -189,7 +194,8 @@
*
* @return bool キャッシュデータファイル生成結果
*/
- function sfCreateBasisDataCache() {
+ function sfCreateBasisDataCache()
+ {
// テーブル名
$name = 'dtb_baseinfo';
// キャッシュファイルパス
@@ -222,7 +228,8 @@
* @return int
* @deprecated
*/
- function sfGetBasisCount() {
+ function sfGetBasisCount()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->count('dtb_baseinfo');
@@ -233,14 +240,16 @@
*
* @return boolean 有無
*/
- function sfGetBasisExists() {
+ function sfGetBasisExists()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->exists('dtb_baseinfo');
}
/* 選択中のアイテムのルートカテゴリIDを取得する */
- function sfGetRootId() {
+ function sfGetRootId()
+ {
if (!$this->g_root_on) {
$this->g_root_on = true;
@@ -276,7 +285,8 @@
* @param integer $order_status 対応状況
* @return array オーダー前ポイントの配列
*/
- 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'];
@@ -308,7 +318,8 @@
* @param bool $count_check 登録商品数のチェックを行う場合 true
* @return array カテゴリツリーの配列
*/
- 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,';
@@ -354,7 +365,8 @@
* @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 {
@@ -378,7 +390,8 @@
* @param bool $count_check 登録商品数のチェックを行う場合 true
* @return array カテゴリツリーの配列
*/
- function sfGetMultiCatTree($product_id, $count_check = false) {
+ function sfGetMultiCatTree($product_id, $count_check = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = '';
$col .= ' cat.category_id,';
@@ -426,7 +439,8 @@
* @param integer $category_id カテゴリID
* @return string 親カテゴリを連結した文字列
*/
- function sfGetCatCombName($category_id) {
+ function sfGetCatCombName($category_id)
+ {
// 商品が属するカテゴリIDを縦に取得
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrCatID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id);
@@ -451,7 +465,8 @@
* @param integer $category_id カテゴリID
* @return array 指定したカテゴリIDのカテゴリ
*/
- function sfGetCat($category_id) {
+ function sfGetCat($category_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// カテゴリを取得する
@@ -467,7 +482,8 @@
* @param integer $category_id カテゴリID
* @return array 指定したカテゴリIDの大カテゴリ
*/
- function sfGetFirstCat($category_id) {
+ function sfGetFirstCat($category_id)
+ {
// 商品が属するカテゴリIDを縦に取得
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrRet = array();
@@ -492,7 +508,8 @@
* @param string $head カテゴリ名のプレフィックス文字列
* @return array カテゴリツリーの配列
*/
- 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,7 +548,8 @@
* @param bool $parent_zero 親カテゴリの Value=0 の場合 true
* @return array カテゴリツリーの配列
*/
- function sfGetLevelCatList($parent_zero = true) {
+ function sfGetLevelCatList($parent_zero = true)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// カテゴリ名リストを取得
@@ -580,7 +598,8 @@
* @return array 選択中の商品のカテゴリIDの配列
*
*/
- function sfGetCategoryId($product_id, $category_id = 0, $closed = false) {
+ function sfGetCategoryId($product_id, $category_id = 0, $closed = false)
+ {
if ($closed) {
$status = '';
} else {
@@ -607,7 +626,8 @@
* @param integer $product_id プロダクトID
* @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,
@@ -628,7 +648,8 @@
* @param integer $product_id プロダクトID
* @return void
*/
- function addProductAfterCategories($category_id, $product_id) {
+ function addProductAfterCategories($category_id, $product_id)
+ {
$sqlval = array('category_id' => $category_id,
'product_id' => $product_id);
@@ -660,7 +681,8 @@
* @param integer $product_id プロダクトID
* @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));
@@ -673,7 +695,8 @@
* @param integer $product_id プロダクトID
* @return void
*/
- function updateProductCategories($arrCategory_id, $product_id) {
+ function updateProductCategories($arrCategory_id, $product_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 現在のカテゴリ情報を取得
@@ -706,7 +729,8 @@
* @param boolean $is_force_all_count 全カテゴリの集計を強制する場合 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) {
@@ -883,7 +907,8 @@
* @param integer $id ID
* @param array 子ID の配列
*/
- 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;
}
@@ -897,7 +922,8 @@
* @param integer $id ID番号
* @return array 子IDの配列
*/
- function sfGetChildrenArray($table, $pid_name, $id_name, $id) {
+ function sfGetChildrenArray($table, $pid_name, $id_name, $id)
+ {
$arrChildren = array();
$arrRet = array($id);
@@ -918,7 +944,8 @@
* @param array $arrPID 親IDの配列
* @return array 子IDの配列
*/
- 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)) . ')';
@@ -938,7 +965,8 @@
* @param integer $id ID
* @return array 親IDの配列
*/
- 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;
}
@@ -952,7 +980,8 @@
* @param integer $id ID
* @return array 親IDの配列
*/
- function sfGetParentsArray($table, $pid_name, $id_name, $id) {
+ function sfGetParentsArray($table, $pid_name, $id_name, $id)
+ {
$arrParents = array();
$ret = $id;
@@ -967,7 +996,8 @@
}
/* 子ID所属する親IDを取得する */
- function sfGetParentsArraySub($table, $pid_name, $id_name, $child) {
+ function sfGetParentsArraySub($table, $pid_name, $id_name, $child)
+ {
if (SC_Utils_Ex::isBlank($child)) {
return false;
}
@@ -985,7 +1015,8 @@
* @param integer $category_id カテゴリID
* @return array 商品を検索する場合の配列
*/
- function sfGetCatWhere($category_id) {
+ function sfGetCatWhere($category_id)
+ {
// 子カテゴリIDの取得
$arrRet = SC_Helper_DB_Ex::sfGetChildrenArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
@@ -1004,7 +1035,8 @@
* @param array $arrWhereVal プレースホルダ
* @return array SELECT ボックス用リストの配列
*/
- 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');
@@ -1029,7 +1061,8 @@
* @param string $andwhere SQL の AND 条件である WHERE 句
* @return void
*/
- function sfRankUp($table, $colname, $id, $andwhere = '') {
+ function sfRankUp($table, $colname, $id, $andwhere = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
$where = "$colname = ?";
@@ -1080,7 +1113,8 @@
* @param string $andwhere SQL の AND 条件である WHERE 句
* @return void
*/
- function sfRankDown($table, $colname, $id, $andwhere = '') {
+ function sfRankDown($table, $colname, $id, $andwhere = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
$where = "$colname = ?";
@@ -1131,7 +1165,8 @@
* @param string $where SQL の AND 条件である WHERE 句
* @return void
*/
- function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = '') {
+ function sfMoveRank($tableName, $keyIdColumn, $keyId, $pos, $where = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -1258,7 +1293,8 @@
* @param array $arrId IDの配列
* @return array 特定のカラムの配列
*/
- 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 = '';
@@ -1290,7 +1326,8 @@
* @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;
}
@@ -1329,7 +1366,8 @@
* @param array $addwhere SQL の AND 条件である WHERE 句
* @return bool レコードが存在する場合 true
*/
- function sfIsRecord($table, $col, $arrVal, $addwhere = '') {
+ function sfIsRecord($table, $col, $arrVal, $addwhere = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrCol = preg_split('/[, ]/', $col);
@@ -1362,7 +1400,8 @@
* @param SC_Query $objQuery SC_Query インスタンス
* @return void
*/
- function sfCountMaker($objQuery) {
+ function sfCountMaker($objQuery)
+ {
$sql = '';
//テーブル内容の削除
@@ -1386,7 +1425,8 @@
* @return array 選択中の商品のメーカーIDの配列
*
*/
- function sfGetMakerId($product_id, $maker_id = 0, $closed = false) {
+ function sfGetMakerId($product_id, $maker_id = 0, $closed = false)
+ {
if ($closed) {
$status = '';
} else {
@@ -1420,7 +1460,8 @@
* @param bool $products_check 商品の存在するカテゴリのみ取得する場合 true
* @return array カテゴリツリーの配列
*/
- function sfGetMakerList($addwhere = '', $products_check = false) {
+ function sfGetMakerList($addwhere = '', $products_check = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'del_flg = 0';
@@ -1457,7 +1498,8 @@
* @param integer $price 計算対象の金額
* @return integer 税金額
*/
- function sfTax($price) {
+ function sfTax($price)
+ {
// 店舗基本情報を取得
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
@@ -1471,7 +1513,8 @@
* @param integer $price 計算対象の金額
* @return integer 税金付与した金額
*/
- function sfCalcIncTax($price, $tax = null, $tax_rule = null) {
+ function sfCalcIncTax($price, $tax = null, $tax_rule = null)
+ {
// 店舗基本情報を取得
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
$tax = $tax === null ? $CONF['tax'] : $tax;
@@ -1487,7 +1530,8 @@
* @param integer $use_point
* @return integer 加算ポイント
*/
- function sfGetAddPoint($totalpoint, $use_point) {
+ function sfGetAddPoint($totalpoint, $use_point)
+ {
// 店舗基本情報を取得
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
@@ -1502,7 +1546,8 @@
* @param string $sqlFilePath SQL ファイルのパス
* @return void
*/
- function sfExecSqlByFile($sqlFilePath) {
+ function sfExecSqlByFile($sqlFilePath)
+ {
if (file_exists($sqlFilePath)) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -1523,7 +1568,8 @@
* @param integer $product_id 商品ID
* @return bool 商品規格が存在する場合:true, それ以外:false
*/
- function sfHasProductClass($product_id) {
+ function sfHasProductClass($product_id)
+ {
if (!SC_Utils_Ex::sfIsInt($product_id)) return false;
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -1539,7 +1585,8 @@
* @param array $arrData 登録するデータ
* @return void
*/
- static function registerBasisData($arrData) {
+ static function registerBasisData($arrData)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrData = $objQuery->extractOnlyColsOf('dtb_baseinfo', $arrData);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Delivery.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -37,7 +37,8 @@
* @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
* @return array
*/
- public function get($deliv_id, $has_deleted = false) {
+ public function get($deliv_id, $has_deleted = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 配送業者一覧の取得
@@ -72,7 +73,8 @@
* @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
* @return array
*/
- public function getList($product_type_id = null, $has_deleted = false) {
+ public function getList($product_type_id = null, $has_deleted = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = '*';
$where = '';
@@ -99,7 +101,8 @@
* @param array $sqlval
* @return integer $deliv_id
*/
- public function save($sqlval) {
+ public function save($sqlval)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -210,7 +213,8 @@
* @param integer $deliv_id 配送方法ID
* @return void
*/
- public function delete($deliv_id) {
+ public function delete($deliv_id)
+ {
$objDb = new SC_Helper_DB_Ex();
// ランク付きレコードの削除
$objDb->sfDeleteRankRecord('dtb_deliv', 'deliv_id', $deliv_id);
@@ -222,7 +226,8 @@
* @param integer $deliv_id 配送方法ID
* @return void
*/
- public function rankUp($deliv_id) {
+ public function rankUp($deliv_id)
+ {
$objDb = new SC_Helper_DB_Ex();
$objDb->sfRankUp('dtb_deliv', 'deliv_id', $deliv_id);
}
@@ -233,7 +238,8 @@
* @param integer $deliv_id 配送方法ID
* @return void
*/
- public function rankDown($deliv_id) {
+ public function rankDown($deliv_id)
+ {
$objDb = new SC_Helper_DB_Ex();
$objDb->sfRankDown('dtb_deliv', 'deliv_id', $deliv_id);
}
@@ -244,7 +250,8 @@
* @param array $arrDeliv
* @return boolean
*/
- public function checkExist($arrDeliv) {
+ 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']));
@@ -261,7 +268,8 @@
* @param string $type 値のタイプ
* @return array
*/
- public static function getIDValueList($type = 'name') {
+ public static function getIDValueList($type = 'name')
+ {
return SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', $type);
}
@@ -271,7 +279,8 @@
* @param integer $deliv_id 配送業者ID
* @return array お届け時間の配列
*/
- public static function getDelivTime($deliv_id) {
+ 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));
@@ -288,7 +297,8 @@
* @param integer $deliv_id 配送業者ID
* @return array 有効な支払方法IDの配列
*/
- public static function getPayments($deliv_id) {
+ 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);
@@ -301,7 +311,8 @@
* @param integer $deliv_id 配送業者ID
* @return string 指定の都道府県, 配送業者の配送料金
*/
- public static function getDelivFee($pref_id, $deliv_id = 0) {
+ public static function getDelivFee($pref_id, $deliv_id = 0)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
if (!is_array($pref_id)) {
$pref_id = array($pref_id);
@@ -328,7 +339,8 @@
* @param integer $deliv_id 配送業者ID
* @return array 配送料金の配列
*/
- public static function getDelivFeeList($deliv_id) {
+ public static function getDelivFeeList($deliv_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->setOrder('pref');
$col = 'fee_id, fee, pref';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,13 +5,15 @@
// japanese.php のバグ回避
$GLOBALS[SJIS_widths] = $SJIS_widths;
-class SC_Helper_FPDI extends PDF_Japanese {
+class SC_Helper_FPDI extends PDF_Japanese
+{
/**
* PDF_Japanese の明朝フォントに加えゴシックフォントを追加定義
*
* @return void
*/
- function AddSJISFont() {
+ function AddSJISFont()
+ {
parent::AddSJISFont();
$cw = $GLOBALS['SJIS_widths'];
$c_map = '90msp-RKSJ-H';
@@ -24,7 +26,8 @@
*
* PDF_Japanese#SJISMultiCell をベースにカスタマイズ。
*/
- 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;
// ここで SJIS に変換する。そのため、このメソッドの中では、PDF_Japanese#Cell を直接呼ぶ。
@@ -144,7 +147,8 @@
*
* FIXME: 後の列の高さが大きい場合、表示が乱れる。
*/
- function FancyTable($header, $data, $w) {
+ function FancyTable($header, $data, $w)
+ {
// Colors, line width and bold font
$this->SetFillColor(216, 216, 216);
$this->SetTextColor(0);
@@ -185,16 +189,19 @@
$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);
}
// 文字コードSJIS変換 -> japanese.phpで使用出来る文字コードはSJIS-winのみ
- function lfConvSjis($conv_str) {
+ function lfConvSjis($conv_str)
+ {
return mb_convert_encoding($conv_str, 'SJIS-win', CHAR_CODE);
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_FileManager.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_FileManager {
+class SC_Helper_FileManager
+{
/**
* 指定パス配下のディレクトリ取得する.
@@ -36,7 +37,8 @@
* @param string $dir 取得するディレクトリパス
* @return void
*/
- function sfGetFileList($dir) {
+ function sfGetFileList($dir)
+ {
$arrFileList = array();
$arrDirList = array();
@@ -90,7 +92,8 @@
* @param string $dir ディレクトリ
* @return void
*/
- function sfGetDirSize($dir) {
+ function sfGetDirSize($dir)
+ {
$bytes = 0;
if (file_exists($dir)) {
// ディレクトリの場合下層ファイルの総量を取得
@@ -128,7 +131,8 @@
* | 区切りで格納
* @return array ツリー生成用の配列
*/
- function sfGetFileTree($dir, $tree_status) {
+ function sfGetFileTree($dir, $tree_status)
+ {
$cnt = 0;
$arrTree = array();
@@ -169,7 +173,8 @@
* | 区切りで格納
* @return array ツリー生成用の配列
*/
- 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);
@@ -216,7 +221,8 @@
* @param string ディレクトリ
* @return bool ファイルが存在する場合 true
*/
- function sfDirChildExists($dir) {
+ function sfDirChildExists($dir)
+ {
if (file_exists($dir)) {
if (is_dir($dir)) {
$handle = opendir($dir);
@@ -242,7 +248,8 @@
* | 区切りで格納
* @return bool 前回開かれた状態の場合 true
*/
- function lfIsFileOpen($dir, $tree_status) {
+ function lfIsFileOpen($dir, $tree_status)
+ {
$arrTreeStatus = explode('|', $tree_status);
if (in_array($dir, $arrTreeStatus)) {
return true;
@@ -257,7 +264,8 @@
* @param string $file ファイルパス
* @return void
*/
- function sfDownloadFile($file) {
+ function sfDownloadFile($file)
+ {
// ファイルの場合はダウンロードさせる
Header('Content-disposition: attachment; filename='.basename($file));
Header('Content-type: application/octet-stream; name='.basename($file));
@@ -273,7 +281,8 @@
* @param integer $mode パーミッション
* @return bool ファイル作成に成功した場合 true
*/
- function sfCreateFile($file, $mode = '') {
+ function sfCreateFile($file, $mode = '')
+ {
// 行末の/を取り除く
if ($mode != '') {
$ret = @mkdir($file, $mode);
@@ -290,7 +299,8 @@
* @param string ファイルパス
* @return string ファイルの内容
*/
- function sfReadFile($filename) {
+ function sfReadFile($filename)
+ {
$str = '';
// バイナリモードでオープン
$fp = @fopen($filename, 'rb');
@@ -310,7 +320,8 @@
* @param string $value 書き込み内容
* @return boolean ファイルの書き込みに成功した場合 true
*/
- function sfWriteFile($filename, $value) {
+ function sfWriteFile($filename, $value)
+ {
if (!is_dir(dirname($filename))) {
SC_Utils_Ex::recursiveMkdir(dirname($filename), 0777);
}
@@ -331,7 +342,8 @@
* @param string $template_code テンプレートコード
* @return boolean 成功した場合 true; 失敗した場合 false
*/
- function downloadArchiveFiles($dir, $template_code) {
+ function downloadArchiveFiles($dir, $template_code)
+ {
// ダウンロードされるファイル名
$dlFileName = 'tpl_package_' . $template_code . '_' . date('YmdHis') . '.tar.gz';
@@ -369,7 +381,8 @@
* @param string $path アーカイブパス
* @return boolean Archive_Tar::extractModify()のエラー
*/
- function unpackFile($path) {
+ function unpackFile($path)
+ {
// 圧縮フラグTRUEはgzip解凍をおこなう
$tar = new Archive_Tar($path, true);
@@ -397,7 +410,8 @@
* @param boolean $del_myself $pathそのものを削除するか. true なら削除する.
* @return void
*/
- function deleteFile($path, $del_myself = true) {
+ function deleteFile($path, $del_myself = true)
+ {
$flg = false;
// 対象が存在するかを検証.
if (file_exists($path) === false) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,14 +29,16 @@
* @package Helper
* @version $Id$
*/
-class SC_Helper_HandleError {
+class SC_Helper_HandleError
+{
/**
* 処理の読み込みを行う
*
* @return void
*/
- static function load() {
+ static function load()
+ {
// E_DEPRECATED 定数 (for PHP < 5.3)
// TODO バージョン互換処理に統合したい。
if (!defined('E_DEPRECATED')) {
@@ -82,7 +84,8 @@
* @return void|boolean E_USER_ERROR が発生した場合は, エラーページへリダイレクト;
* E_WARNING, E_USER_WARNING が発生した場合、true を返す
*/
- static function handle_warning($errno, $errstr, $errfile, $errline) {
+ static function handle_warning($errno, $errstr, $errfile, $errline)
+ {
// error_reporting 設定に含まれていないエラーコードは処理しない
if (!(error_reporting() & $errno)) {
return;
@@ -125,7 +128,8 @@
* @return string|void エラーが捕捉された場合は, エラーページへリダイレクトする;
* エラーが捕捉されない場合は, 出力バッファリングの内容を返す
*/
- static function &_fatal_error_handler(&$buffer) {
+ 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);
@@ -149,7 +153,8 @@
*
* @return void
*/
- static function handle_error() {
+ static function handle_error()
+ {
// 最後のエラーを確実に捉えるため、先頭で呼び出す。
$arrError = error_get_last();
@@ -186,7 +191,8 @@
* @param string|null $errstr エラーメッセージ
* @return void
*/
- static function displaySystemError($errstr = null) {
+ static function displaySystemError($errstr = null)
+ {
ob_clean();
// 絵文字変換・除去フィルターが有効か評価する。
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_Mail {
+class SC_Helper_Mail
+{
/** メールテンプレートのパス */
var $arrMAILTPLPATH;
@@ -43,7 +44,8 @@
/**
* コンストラクタ.
*/
- function __construct() {
+ function __construct()
+ {
$masterData = new SC_DB_MasterData_Ex();
$this->arrMAILTPLPATH = $masterData->getMasterData('mtb_mail_tpl_path');
$this->arrPref = $masterData->getMasterData('mtb_pref');
@@ -54,7 +56,8 @@
*
* @param LC_Page $objPage
*/
- function setPage(LC_Page $objPage) {
+ function setPage(LC_Page $objPage)
+ {
$this->objPage = $objPage;
}
@@ -63,12 +66,14 @@
*
* @return LC_Page
*/
- function getPage() {
+ function getPage()
+ {
return $this->objPage;
}
/* DBに登録されたテンプレートメールの送信 */
- 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();
// メールテンプレート情報の取得
@@ -100,7 +105,8 @@
}
/* 受注完了メール送信 */
- 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();
@@ -212,7 +218,8 @@
}
// テンプレートを使用したメールの送信
- 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();
@@ -233,7 +240,8 @@
}
// 通常のメール送信
- function sfSendMail($to, $tmp_subject, $body) {
+ function sfSendMail($to, $tmp_subject, $body)
+ {
$arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
// メール送信処理
$objSendMail = new SC_SendMail_Ex();
@@ -247,7 +255,8 @@
}
//件名にテンプレートを用いる
- function sfMakeSubject($subject, &$objMailView) {
+ function sfMakeSubject($subject, &$objMailView)
+ {
if (empty($objMailView)) {
$objMailView = new SC_SiteView_Ex();
$objMailView->setPage($this->getPage());
@@ -266,7 +275,8 @@
}
// メール配信履歴への登録
- 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;
@@ -286,7 +296,8 @@
}
/* 会員登録があるかどうかのチェック(仮会員を含まない) */
- 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';
@@ -307,7 +318,8 @@
* @param boolean $is_mobile false(default):PCアドレスにメールを送る true:携帯アドレスにメールを送る
* @return boolean true:成功 false:失敗
*/
- function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false) {
+ function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false)
+ {
// 会員データの取得
if (SC_Utils_Ex::sfIsInt($customer_id)) {
$arrCustomerData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id);
@@ -370,7 +382,8 @@
* @return array メールテンプレート情報を格納した配列
* @todo 表示順も引数で変更できるように
*/
- function sfGetMailmagaTemplate($template_id = null) {
+ function sfGetMailmagaTemplate($template_id = null)
+ {
// 初期化
$where = '';
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -396,7 +409,8 @@
* @param integer 特定の送信履歴を取り出したい時はsend_idを指定。未指定時は全件取得
* @return array 送信履歴情報を格納した配列
*/
- function sfGetSendHistory($send_id = null) {
+ function sfGetSendHistory($send_id = null)
+ {
// 初期化
$where = '';
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -424,7 +438,8 @@
* @param integer $send_id dtb_send_history の情報
* @return void
*/
- function sfSendMailmagazine($send_id) {
+ function sfSendMailmagazine($send_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objDb = new SC_Helper_DB_Ex();
$objSite = $objDb->sfGetBasisData();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mobile.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_Mobile {
+class SC_Helper_Mobile
+{
/** 基本MimeType */
var $defaultMimeType = 'application/force-download';
@@ -80,7 +81,8 @@
*
* @return void
*/
- function lfMobileCheckCompatibility() {
+ function lfMobileCheckCompatibility()
+ {
if (!SC_MobileUserAgent_Ex::isSupported()) {
header('Location: ' . ROOT_URLPATH . 'unsupported/' . DIR_INDEX_PATH);
exit;
@@ -93,7 +95,8 @@
* @param string &$value 入力データへの参照
* @return void
*/
- function lfMobileConvertInputValue(&$value) {
+ function lfMobileConvertInputValue(&$value)
+ {
if (is_array($value)) {
foreach ($value as $key => $val) {
$this->lfMobileConvertInputValue($value[$key]);
@@ -112,7 +115,8 @@
*
* @return void
*/
- function lfMobileInitInput() {
+ function lfMobileInitInput()
+ {
array_walk($_GET, array($this, 'lfMobileConvertInputValue'));
array_walk($_POST, array($this, 'lfMobileConvertInputValue'));
array_walk($_REQUEST, array($this, 'lfMobileConvertInputValue'));
@@ -124,7 +128,8 @@
* @return string|null 取得したセッションIDを返す。
* 取得できなかった場合は null を返す。
*/
- function lfMobileGetExtSessionId() {
+ function lfMobileGetExtSessionId()
+ {
if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches = array())) {
return null;
}
@@ -151,7 +156,8 @@
* @return string|false 取得した有効なセッションIDを返す。
* 取得できなかった場合は false を返す。
*/
- function lfMobileGetSessionId() {
+ function lfMobileGetSessionId()
+ {
// パラメーターからセッションIDを取得する。
$sessionId = @$_POST[session_name()];
if (!isset($sessionId)) {
@@ -180,7 +186,8 @@
*
* @return boolean セッションデータが有効な場合は true、無効な場合は false を返す。
*/
- function lfMobileValidateSession() {
+ function lfMobileValidateSession()
+ {
// 配列 mobile が登録されているかどうかをチェックする。
if (!is_array(@$_SESSION['mobile'])) {
return false;
@@ -220,7 +227,8 @@
*
* @return void
*/
- function lfMobileInitOutput() {
+ function lfMobileInitOutput()
+ {
// 出力用のエンコーディングを Shift JIS に固定する。
mb_http_output('SJIS-win');
@@ -242,7 +250,8 @@
*
* @return void
*/
- function sfMobileInit() {
+ function sfMobileInit()
+ {
$this->lfMobileInitInput();
if (basename(dirname($_SERVER['SCRIPT_NAME'])) != 'unsupported') {
@@ -257,7 +266,8 @@
*
* @return String
*/
- function gfAddSessionId($url = null) {
+ function gfAddSessionId($url = null)
+ {
$objURL = new Net_URL($url);
$objURL->addQueryString(session_name(), session_id());
return $objURL->getURL();
@@ -269,7 +279,8 @@
* @param array $array 元となる配列
* @param array セッション ID を追加した配列
*/
- function sessionIdArray($array = array()) {
+ function sessionIdArray($array = array())
+ {
return array_merge($array, array(session_name() => session_id()));
}
@@ -278,7 +289,8 @@
*
* @return string 生成したトークンを返す。
*/
- function lfGenerateKaraMailToken() {
+ function lfGenerateKaraMailToken()
+ {
$token_chars = '0123456789abcdefghijklmnopqrstuvwxyz';
$token_chars_length = strlen($token_chars);
$token_length = 10;
@@ -299,7 +311,8 @@
* @param string $session_id セッションID (省略した場合は現在のセッションID)
* @return string|false トークンを返す。エラーが発生した場合はfalseを返す。
*/
- function gfPrepareKaraMail($next_url, $session_id = null) {
+ function gfPrepareKaraMail($next_url, $session_id = null)
+ {
if (!isset($session_id)) {
$session_id = session_id();
}
@@ -345,7 +358,8 @@
* @param string $email メールアドレス
* @return boolean 成功した場合はtrue、失敗した場合はfalseを返す。
*/
- function gfRegisterKaraMail($token, $email) {
+ function gfRegisterKaraMail($token, $email)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// GC
@@ -375,7 +389,8 @@
* @param string $token トークン
* @return string|false URLを返す。エラーが発生した場合はfalseを返す。
*/
- function gfFinishKaraMail($token) {
+ function gfFinishKaraMail($token)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrRow = $objQuery->getRow(
@@ -413,7 +428,8 @@
* @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
@@ -436,7 +452,8 @@
* @param string $address メールアドレス
* @return boolean 携帯のメールアドレスの場合はtrue、それ以外の場合はfalseを返す。
*/
- function gfIsMobileMailAddress($address) {
+ function gfIsMobileMailAddress($address)
+ {
$masterData = new SC_DB_MasterData_Ex();
$arrMobileMailDomains = $masterData->getMasterData('mtb_mobile_domain');
@@ -456,7 +473,8 @@
* @param string $filename ファイル名
* @return string MIMEタイプ
*/
- function getMimeType($filename) {
+ function getMimeType($filename)
+ {
//ファイルの拡張子からコンテンツタイプを決定する
$file_extension = strtolower(substr(strrchr($filename,'.'),1));
$mime_type = $this->defaultMimeType;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @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
@@ -46,7 +47,8 @@
* @param integer $device_type_id 端末種別ID
* @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を元にページ情報を取得
if ($preview === false) {
@@ -108,7 +110,8 @@
* @param array $arrParams 追加の検索パラメーター
* @return array ページ属性の配列
*/
- 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) {
@@ -132,7 +135,8 @@
* @param boolean $has_realpath php_path, tpl_path の絶対パスを含める場合 true
* @return array ブロック情報の配列
*/
- function getBlocs($device_type_id = DEVICE_TYPE_PC, $where = '', $arrParams = array(), $has_realpath = true) {
+ 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);
@@ -153,7 +157,8 @@
* @param boolean $has_realpath php_path, tpl_path の絶対パスを含める場合 true
* @return array 配置情報を含めたブロックの配列
*/
- 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
@@ -192,7 +197,8 @@
* @param integer $device_type_id 端末種別ID
* @return integer 削除数
*/
- 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 が空でない場合にはdeleteを実行
if ($page_id != '') {
@@ -214,7 +220,8 @@
* @param integer $device_type_id 端末種別ID
* @return void // TODO boolean にするべき?
*/
- function lfDelFile($filename, $device_type_id) {
+ function lfDelFile($filename, $device_type_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
/*
@@ -246,7 +253,8 @@
* @param integer $page_id ページID
* @return 編集可能ページの場合 true
*/
- function isEditablePage($device_type_id, $page_id) {
+ function isEditablePage($device_type_id, $page_id)
+ {
if ($page_id == 0) {
return false;
}
@@ -265,7 +273,8 @@
* @param boolean $isUser USER_REALDIR 以下のパスを返す場合 true
* @return string テンプレートのパス
*/
- 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:
@@ -302,7 +311,8 @@
* @param boolean $hasPackage パッケージのパスも含める場合 true
* @return string 端末に応じた DocumentRoot から user_data までのパス
*/
- 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;
@@ -334,7 +344,8 @@
* @param array $arrBlocs 設定するブロックの配列
* @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'];
@@ -350,7 +361,8 @@
* @param array $arrPageLayout レイアウト情報の配列
* @return integer $col_num カラム数
*/
- function getColumnNum($arrPageLayout) {
+ function getColumnNum($arrPageLayout)
+ {
// メインは確定
$col_num = 1;
// LEFT NAVI
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Payment.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -37,7 +37,8 @@
* @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
* @return array
*/
- public function get($payment_id, $has_deleted = false) {
+ public function get($payment_id, $has_deleted = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'payment_id = ?';
if (!$has_deleted) {
@@ -53,7 +54,8 @@
* @param boolean $has_deleted 削除された支払方法も含む場合 true; 初期値 false
* @return array
*/
- public function getList($has_deleted = false) {
+ public function getList($has_deleted = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'payment_id, payment_method, charge, rule_max, upper_rule, note, fix, charge_flg';
$where = '';
@@ -72,7 +74,8 @@
* @param array $sqlval
* @return void
*/
- public function save($sqlval) {
+ public function save($sqlval)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$payment_id = $sqlval['payment_id'];
@@ -99,7 +102,8 @@
* @param integer $payment_id 支払方法ID
* @return void
*/
- public function delete($payment_id) {
+ public function delete($payment_id)
+ {
$objDb = new SC_Helper_DB_Ex();
// ランク付きレコードの削除
$objDb->sfDeleteRankRecord('dtb_payment', 'payment_id', $payment_id);
@@ -111,7 +115,8 @@
* @param integer $payment_id 支払方法ID
* @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);
}
@@ -122,7 +127,8 @@
* @param integer $payment_id 支払方法ID
* @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);
}
@@ -135,7 +141,8 @@
* @param integer $payment_id 支払い方法ID
* @return boolean 決済モジュールを使用する支払い方法の場合 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);
@@ -146,7 +153,8 @@
*
* @return array
*/
- public static function getIDValueList() {
+ public static function getIDValueList()
+ {
return SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -27,7 +27,8 @@
* @package Helper
* @version $Id$
*/
-class SC_Helper_Plugin {
+class SC_Helper_Plugin
+{
// プラグインのインスタンスの配列.
var $arrPluginInstances = array();
// プラグインのアクションの配列.
@@ -43,7 +44,8 @@
*
* @return void
*/
- function load($plugin_activate_flg = true) {
+ function load($plugin_activate_flg = true)
+ {
if (!defined('CONFIG_REALFILE') || !file_exists(CONFIG_REALFILE)) return; // インストール前
if (GC_Utils_Ex::isInstallFunction()) return; // インストール中
@@ -77,7 +79,8 @@
*
* @return object SC_Helper_Pluginオブジェクト
*/
- static function getSingletonInstance($plugin_activate_flg = true) {
+ static function getSingletonInstance($plugin_activate_flg = true)
+ {
if (!isset($GLOBALS['_SC_Helper_Plugin_instance'])) {
// プラグインのローダーがDB接続を必要とするため、
// SC_Queryインスタンス生成後のみオブジェクトを生成する。
@@ -99,7 +102,8 @@
* @param array $arrArgs コールバック関数へ渡す引数
* @return void
*/
- function doAction($hook_point, $arrArgs = array()) {
+ function doAction($hook_point, $arrArgs = array())
+ {
if (is_array($arrArgs) === false) {
array(&$arrArgs);
}
@@ -153,7 +157,8 @@
* @param string $function_name 実行する関数名
* @param string $priority 実行順
*/
- function registerSuperHookPoint($objPlugin, $hook_point, $function_name, $priority) {
+ function registerSuperHookPoint($objPlugin, $hook_point, $function_name, $priority)
+ {
// スーパープラグイン関数を定義しているかを検証.
if (method_exists($objPlugin, $function_name) === true) {
// アクションの登録
@@ -167,7 +172,8 @@
* @param Object $objPlugin プラグインのインスタンス
* @param string $priority 実行順
*/
- function registerLocalHookPoint($objPlugin, $priority) {
+ function registerLocalHookPoint($objPlugin, $priority)
+ {
// ローカルプラグイン関数を定義しているかを検証.
if (method_exists($objPlugin, 'register') === true) {
// アクションの登録（プラグイン側に記述）
@@ -184,7 +190,8 @@
* @param string $priority 同一フックポイント内での実行優先度
* @return boolean 成功すればtrue
*/
- function addAction($hook_point, $function, $priority = 0) {
+ function addAction($hook_point, $function, $priority = 0)
+ {
if (!is_callable($function)) {
// TODO エラー処理; コール可能な形式ではありません
}
@@ -201,7 +208,8 @@
* @param integer $priority 同一フックポイント内での実行優先度
* @return string コールバック関数を一意に識別するID
*/
- function makeActionUniqueId($hook_point, $function, $priority) {
+ function makeActionUniqueId($hook_point, $function, $priority)
+ {
static $filter_id_count = 0;
if (is_string($function)) {
@@ -240,7 +248,8 @@
* @param array $arrBlocs プラグインのインストールディレクトリ
* @return array $arrBlocsサイトルートからメディアディレクトリへの相対パス
*/
- function getEnableBlocs($arrBlocs) {
+ function getEnableBlocs($arrBlocs)
+ {
foreach ($arrBlocs as $key => $value) {
// 有効なpluginのブロック以外.
if (!in_array($value['plugin_id'] , $this->arrPluginIds)) {
@@ -260,7 +269,8 @@
* @param string $url PHPファイルのURL
* @return void
*/
- function setHeadNavi($url) {
+ function setHeadNavi($url)
+ {
$this->arrHeadNaviBlocsByPlugin[$url] = TARGET_ID_HEAD;
}
@@ -270,7 +280,8 @@
* @param array|null $arrBlocs 配置情報を含めたブロックの配列
* @return void
*/
- function setHeadNaviBlocs(&$arrBlocs) {
+ function setHeadNaviBlocs(&$arrBlocs)
+ {
foreach ($this->arrHeadNaviBlocsByPlugin as $key => $value) {
$arrBlocs[] = array(
'target_id' =>$value,
@@ -287,7 +298,8 @@
* @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);
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author Kentaro Ohkouchi
* @version $Id$
*/
-class SC_Helper_Purchase {
+class SC_Helper_Purchase
+{
var $arrShippingKey = array(
'name01', 'name02', 'kana01', 'kana02',
@@ -59,7 +60,8 @@
* @param integer $orderStatus 受注処理を完了する際に設定する対応状況
* @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();
@@ -114,7 +116,8 @@
* @param boolean $is_delete 受注データを論理削除する場合 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) {
@@ -156,7 +159,8 @@
* @param boolean $is_delete 受注データを論理削除する場合 true
* @return string 受注一時ID
*/
- 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) {
@@ -198,7 +202,8 @@
* @param SC_CartSession $objCartSession
* @return void
*/
- function verifyChangeCart($uniqId, &$objCartSession) {
+ function verifyChangeCart($uniqId, &$objCartSession)
+ {
$cartKey = $objCartSession->getKey();
// カート内が空でないか
@@ -233,7 +238,8 @@
* @param integer $uniqId 受注一時情報ID
* @return array 受注一時情報の配列
*/
- function getOrderTemp($uniqId) {
+ function getOrderTemp($uniqId)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->getRow('*', 'dtb_order_temp', 'order_temp_id = ?', array($uniqId));
}
@@ -244,7 +250,8 @@
* @param integer $order_id 受注ID
* @return array 受注一時情報の配列
*/
- function getOrderTempByOrderId($order_id) {
+ function getOrderTempByOrderId($order_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->getRow('*', 'dtb_order_temp', 'order_id = ?', array($order_id));
}
@@ -259,7 +266,8 @@
* @param SC_Customer $objCustomer SC_Customer インスタンス
* @return void
*/
- function saveOrderTemp($uniqId, $params, &$objCustomer = NULL) {
+ function saveOrderTemp($uniqId, $params, &$objCustomer = NULL)
+ {
if (SC_Utils_Ex::isBlank($uniqId)) {
return;
}
@@ -294,7 +302,8 @@
*
* @param bool $has_shipment_item 配送商品を保有している配送先のみ返す。
*/
- function getShippingTemp($has_shipment_item = false) {
+ function getShippingTemp($has_shipment_item = false)
+ {
if ($has_shipment_item) {
$arrReturn = array();
foreach ($_SESSION['shipping'] as $key => $arrVal) {
@@ -313,7 +322,8 @@
* @param integer $shipping_id 配送先ID
* @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);
@@ -333,7 +343,8 @@
* @param integer $quantity 数量
* @return void
*/
- function setShipmentItemTemp($shipping_id, $product_class_id, $quantity) {
+ function setShipmentItemTemp($shipping_id, $product_class_id, $quantity)
+ {
// 配列が長くなるので, リファレンスを使用する
$arrItems =& $_SESSION['shipping'][$shipping_id]['shipment_item'][$product_class_id];
@@ -363,7 +374,8 @@
/**
* 配送先都道府県の配列を返す.
*/
- function getShippingPref($is_multiple) {
+ function getShippingPref($is_multiple)
+ {
$results = array();
foreach (SC_Helper_Purchase_Ex::getShippingTemp($is_multiple) as $val) {
$results[] = $val['shipping_pref'];
@@ -376,7 +388,8 @@
*
* @return boolean 複数配送指定の購入の場合 true
*/
- function isMultiple() {
+ function isMultiple()
+ {
return count(SC_Helper_Purchase_Ex::getShippingTemp(true)) >= 2;
}
@@ -388,7 +401,8 @@
* @param integer $shipping_id 配送先ID
* @return void
*/
- function saveShippingTemp($arrSrc, $shipping_id = 0) {
+ function saveShippingTemp($arrSrc, $shipping_id = 0)
+ {
// 配送商品は引き継がない
unset($arrSrc['shipment_item']);
@@ -406,7 +420,8 @@
* @param integer $shipping_id 配送先ID
* @return void
*/
- function unsetShippingTemp() {
+ function unsetShippingTemp()
+ {
SC_Helper_Purchase_Ex::unsetAllShippingTemp(true);
}
@@ -416,7 +431,8 @@
* @param bool $multiple_temp 複数お届け先の画面戻り処理用の情報も破棄するか
* @return void
*/
- static function unsetAllShippingTemp($multiple_temp = false) {
+ static function unsetAllShippingTemp($multiple_temp = false)
+ {
unset($_SESSION['shipping']);
if ($multiple_temp) {
unset($_SESSION['multiple_temp']);
@@ -429,7 +445,8 @@
* @param integer $shipping_id 配送先ID
* @return void
*/
- static function unsetOneShippingTemp($shipping_id) {
+ static function unsetOneShippingTemp($shipping_id)
+ {
unset($_SESSION['shipping'][$shipping_id]);
}
@@ -491,7 +508,8 @@
* @param string $src_prefix コピー元の接頭辞. デフォルト 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;
}
@@ -514,7 +532,8 @@
* @param string $arrSrc 元となる配列
* @return void
*/
- function extractShipping($arrSrc) {
+ function extractShipping($arrSrc)
+ {
$arrKey = array();
foreach ($this->arrShippingKey as $key) {
$arrKey[] = 'shipping_' . $key;
@@ -529,7 +548,8 @@
* @param integer $deliv_id 配送業者ID
* @return array 購入金額に応じた支払方法の配列
*/
- function getPaymentsByPrice($total, $deliv_id) {
+ function getPaymentsByPrice($total, $deliv_id)
+ {
$arrPaymentIds = SC_Helper_Delivery_Ex::getPayments($deliv_id);
if (SC_Utils_Ex::isBlank($arrPaymentIds)) {
@@ -573,7 +593,8 @@
/**
* お届け日一覧を取得する.
*/
- function getDelivDate(&$objCartSess, $productTypeId) {
+ function getDelivDate(&$objCartSess, $productTypeId)
+ {
$cartList = $objCartSess->getCartList($productTypeId);
$delivDateIds = array();
foreach ($cartList as $item) {
@@ -631,7 +652,8 @@
/**
* お届け可能日のスタート値から, お届け日の配列を取得する.
*/
- function getDateArray($start_day, $end_day) {
+ function getDateArray($start_day, $end_day)
+ {
$masterData = new SC_DB_MasterData_Ex();
$arrWDAY = $masterData->getMasterData('mtb_wday');
//お届け可能日のスタート値がセットされていれば
@@ -664,7 +686,8 @@
* @param boolean $convert_shipping_date yyyy/mm/dd(EEE) 形式の配送日付を変換する場合 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 = ?';
@@ -702,7 +725,8 @@
* @param array $arrParams 配送商品の配列
* @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 = ?';
@@ -758,7 +782,8 @@
* @param integer $cartKey 登録を行うカート情報のキー
* @param integer 受注ID
*/
- function registerOrderComplete($orderParams, &$objCartSession, $cartKey) {
+ function registerOrderComplete($orderParams, &$objCartSession, $cartKey)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 不要な変数を unset
@@ -828,7 +853,8 @@
* @param array $arrParams 受注情報の連想配列
* @return integer 受注ID
*/
- function registerOrder($order_id, $arrParams) {
+ function registerOrder($order_id, $arrParams)
+ {
$table = 'dtb_order';
$where = 'order_id = ?';
$objQuery = SC_Query_Ex::getSingletonInstance();
@@ -882,7 +908,8 @@
* @param array $arrParams 受注情報の連想配列
* @return void
*/
- function registerOrderDetail($order_id, $arrParams) {
+ function registerOrderDetail($order_id, $arrParams)
+ {
$table = 'dtb_order_detail';
$where = 'order_id = ?';
$objQuery = SC_Query_Ex::getSingletonInstance();
@@ -903,7 +930,8 @@
* @param integer $customer_id 会員ID
* @return array 受注情報の配列
*/
- 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);
@@ -921,7 +949,8 @@
* @param boolean $has_order_status 対応状況, 入金日も含める場合 true
* @return array 受注詳細の配列
*/
- 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__
@@ -978,7 +1007,8 @@
* @param array 受注詳細の配列
* @return void
*/
- function setDownloadableFlgTo(&$arrOrderDetail) {
+ function setDownloadableFlgTo(&$arrOrderDetail)
+ {
foreach ($arrOrderDetail as $key => $value) {
// 販売価格が 0 円
if ($arrOrderDetail[$key]['price'] == '0') {
@@ -1001,7 +1031,8 @@
* @param boolean $has_items 結果に配送商品も含める場合 true
* @return array 配送情報の配列
*/
- 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');
@@ -1031,7 +1062,8 @@
* @param boolean $has_detail 商品詳細も取得する場合 true
* @return array 商品規格IDをキーにした配送商品の配列
*/
- 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();
@@ -1063,7 +1095,8 @@
* @param integer $orderId 受注ID
* @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;
@@ -1082,7 +1115,8 @@
* @param array $sqlval 更新後の値をリファレンスさせるためのパラメーター
* @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));
@@ -1190,7 +1224,8 @@
* @param boolean $temp_table 更新対象は「受注_Temp」か
* @static
*/
- function sfUpdateOrderNameCol($order_id, $temp_table = false) {
+ function sfUpdateOrderNameCol($order_id, $temp_table = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
if ($temp_table) {
@@ -1228,7 +1263,8 @@
* @param integer $status 対応状況
* @return boolean 使用するか(会員テーブルから減算するか)
*/
- function isUsePoint($status) {
+ function isUsePoint($status)
+ {
if ($status == null) {
return false;
}
@@ -1248,7 +1284,8 @@
* @param integer $status 対応状況
* @return boolean 加算するか
*/
- function isAddPoint($status) {
+ function isAddPoint($status)
+ {
switch ($status) {
case ORDER_NEW: // 新規注文
case ORDER_PAY_WAIT: // 入金待ち
@@ -1284,7 +1321,8 @@
* @param SC_Customer $objCustomer SC_Customer インスタンス
* @param integer $cartKey 登録を行うカート情報のキー
*/
- function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey) {
+ function cleanupSession($orderId, &$objCartSession, &$objCustomer, $cartKey)
+ {
// カートの内容を削除する.
$objCartSession->delAllProducts($cartKey);
SC_SiteSession_Ex::unsetUniqId();
@@ -1301,7 +1339,8 @@
* @param integer $shipping_id 配送先ID
* @return void
*/
- function setShipmentItemTempForSole(&$objCartSession, $shipping_id = 0) {
+ function setShipmentItemTempForSole(&$objCartSession, $shipping_id = 0)
+ {
$objCartSess = new SC_CartSession_Ex();
$this->clearShipmentItemTemp();
@@ -1318,7 +1357,8 @@
*
* @return integer
*/
- public function getNextOrderID() {
+ public function getNextOrderID()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->nextVal('dtb_order_order_id');
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -12,7 +12,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_Session {
+class SC_Helper_Session
+{
var $objDb;
@@ -24,7 +25,8 @@
*
* 各関数をセッションハンドラに保存する
*/
- function __construct() {
+ function __construct()
+ {
$this->objDb = new SC_Helper_DB_Ex();
session_set_save_handler(array(&$this, 'sfSessOpen'),
array(&$this, 'sfSessClose'),
@@ -48,7 +50,8 @@
* @param string $session_name セッション名(使用しない)
* @return bool セッションが正常に開始された場合 true
*/
- function sfSessOpen($save_path, $session_name) {
+ function sfSessOpen($save_path, $session_name)
+ {
return true;
}
@@ -57,7 +60,8 @@
*
* @return bool セッションが正常に終了した場合 true
*/
- function sfSessClose() {
+ function sfSessClose()
+ {
return true;
}
@@ -67,7 +71,8 @@
* @param string $id セッションID
* @return string セッションデータの値
*/
- 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)) {
@@ -84,7 +89,8 @@
* @param string $sess_data セッションデータの値
* @return bool セッションの書き込みに成功した場合 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();
@@ -114,7 +120,8 @@
* @param string $id セッションID
* @return bool セッションを正常に破棄した場合 true
*/
- function sfSessDestroy($id) {
+ function sfSessDestroy($id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->delete('dtb_session', 'sess_id = ?', array($id));
return true;
@@ -127,7 +134,8 @@
*
* @param integer $maxlifetime セッションの有効期限(使用しない)
*/
- function sfSessGc($maxlifetime) {
+ function sfSessGc($maxlifetime)
+ {
// MAX_LIFETIME以上更新されていないセッションを削除する。
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = "update_date < current_timestamp + '-". MAX_LIFETIME . " secs'";
@@ -153,7 +161,8 @@
* @access protected
* @return string トランザクショントークンの文字列
*/
- function getToken() {
+ function getToken()
+ {
if (empty($_SESSION[TRANSACTION_ID_NAME])) {
$_SESSION[TRANSACTION_ID_NAME] = SC_Helper_Session_Ex::createToken();
}
@@ -166,7 +175,8 @@
* @access private
* @return string トランザクショントークン用の文字列
*/
- function createToken() {
+ function createToken()
+ {
return sha1(uniqid(rand(), true));
}
@@ -188,7 +198,8 @@
* デフォルト値は false
* @return boolean トランザクショントークンが有効な場合 true
*/
- function isValidToken($is_unset = false) {
+ function isValidToken($is_unset = false)
+ {
// token の妥当性チェック
$ret = $_REQUEST[TRANSACTION_ID_NAME] === $_SESSION[TRANSACTION_ID_NAME];
@@ -203,7 +214,8 @@
*
* @return void
*/
- function destroyToken() {
+ function destroyToken()
+ {
unset($_SESSION[TRANSACTION_ID_NAME]);
}
@@ -214,7 +226,8 @@
*
* @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'])) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Transform.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -27,7 +27,8 @@
* @package Helper
* @version $Id$
*/
-class SC_Helper_Transform {
+class SC_Helper_Transform
+{
protected $objDOM;
protected $arrSmartyTagsOrg;
protected $arrSmartyTagsSub;
@@ -48,7 +49,8 @@
* @param string $source 変形対象のテンプレート
* @return void
*/
- public function __construct($source) {
+ public function __construct($source)
+ {
$this->objDOM = new DOMDocument();
$this->objDOM->strictErrorChecking = false;
$this->snip_count = 0;
@@ -131,7 +133,8 @@
* @param string $err_msg エラーメッセージ
* @return SC_Helper_Transformオブジェクト
*/
- 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;
@@ -171,7 +174,8 @@
* @param string $err_msg エラーメッセージ
* @return SC_Helper_Transformオブジェクト
*/
- 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();
@@ -211,7 +215,8 @@
* @param int $back_num 選択状態を戻す数
* @return SC_Helper_Transformオブジェクト
*/
- public function end($back_num = 1) {
+ public function end($back_num = 1)
+ {
if ($this->search_depth >= $back_num) {
$this->search_depth -= $back_num;
} else {
@@ -228,7 +233,8 @@
* @param string $html_snip 挿入するHTMLの断片
* @return SC_Helper_Transformオブジェクト
*/
- 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);
}
@@ -242,7 +248,8 @@
* @param string $html_snip 挿入するHTMLの断片
* @return SC_Helper_Transformオブジェクト
*/
- 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);
}
@@ -256,7 +263,8 @@
* @param string $html_snip 挿入するHTMLの断片
* @return SC_Helper_Transformオブジェクト
*/
- 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);
}
@@ -270,7 +278,8 @@
* @param string $html_snip 挿入するHTMLの断片
* @return SC_Helper_Transformオブジェクト
*/
- 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);
}
@@ -284,7 +293,8 @@
* @param string $html_snip 置換後のHTMLの断片
* @return SC_Helper_Transformオブジェクト
*/
- 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);
}
@@ -297,7 +307,8 @@
*
* @return SC_Helper_Transformオブジェクト
*/
- public function removeElement() {
+ public function removeElement()
+ {
foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
$this->lfSetTransform('replaceElement', $objElement[0], '');
}
@@ -310,7 +321,8 @@
*
* @return string トランスフォーム済みHTML。まったくトランスフォームが行われなかった場合は元のHTMLを返す。。
*/
- public function getHTML() {
+ public function getHTML()
+ {
if (count($this->arrErr)) {
// エラーメッセージ組み立て
$err_msg = '';
@@ -357,7 +369,8 @@
* @param array $arrMatches マッチしたタグの情報
* @return string 代わりの文字列
*/
- 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;
@@ -374,7 +387,8 @@
* @param array $arrMatches マッチしたタグの情報
* @return string 代わりの文字列
*/
- 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;
@@ -397,7 +411,8 @@
* @param array $arrMatches マッチしたタグの情報
* @return string 代わりの文字列
*/
- protected function lfCaptureSmartyTagsInTag(array $arrMatches) {
+ protected function lfCaptureSmartyTagsInTag(array $arrMatches)
+ {
// Smartyタグ内のクォートを処理しやすいよう、いったんダミーのタグに
$html = preg_replace_callback('/<\!--{.+?\}-->/s', array($this, 'lfCaptureSmartyTags2Temptag'), $arrMatches[0]);
$html = preg_replace_callback('/\"[^"]*?\"/s', array($this, 'lfCaptureSmartyTagsInQuote'), $html);
@@ -414,7 +429,8 @@
* @param array $arrMatches マッチしたタグの情報
* @return string 代わりの文字列
*/
- 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;
@@ -431,7 +447,8 @@
* @param array $arrMatches マッチしたタグの情報
* @return string 代わりの文字列
*/
- protected function lfCaptureSmartyTagsInQuote(array $arrMatches) {
+ protected function lfCaptureSmartyTagsInQuote(array $arrMatches)
+ {
$html = preg_replace_callback(
'/###TEMP(\d{8})###/s',
array($this, 'lfCaptureSmartyTags2Value'),
@@ -449,7 +466,8 @@
* @param array $arrMatches マッチしたタグの情報
* @return string 代わりの文字列
*/
- 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;
@@ -465,7 +483,8 @@
* @param array $arrMatches マッチしたタグの情報
* @return string 代わりの文字列
*/
- 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;
@@ -479,7 +498,8 @@
* @param DOMNode $objDOMElement DOMNodeオブジェクト
* @return void
*/
- protected function lfScanChild(DOMNode $objDOMElement, $parent_selector = '') {
+ protected function lfScanChild(DOMNode $objDOMElement, $parent_selector = '')
+ {
$objNodeList = $objDOMElement->childNodes;
if (is_null($objNodeList)) return;
@@ -515,7 +535,8 @@
* @param string $parent_index セレクタ検索時の親要素の位置（子孫要素検索のため）
* @return string 正規表現文字列
*/
- protected function lfSelector2Regex($selector, $parent_index = NULL){
+ protected function lfSelector2Regex($selector, $parent_index = NULL)
+ {
// jQueryライクなセレクタを正規表現に
$selector = preg_replace('/ *> */', ' >', $selector); // 子セレクタをツリー検索用に 「A >B」の記法にする
$regex = '/';
@@ -550,7 +571,8 @@
* @param array $arrElement インデックスとDOMオブジェクトをペアとした配列
* @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 {
@@ -568,7 +590,8 @@
* @param string $html_snip HTMLコード
* @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;
@@ -634,7 +657,8 @@
* @param string $err_msg エラーメッセージ
* @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,
変更: branches/version-2_12-dev/data/class/pages/LC_Page.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/LC_Page.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @author LOCKON CO.,LTD.
* @version $Id:LC_Page.php 15532 2007-08-31 14:39:46Z nanasess $
*/
-class LC_Page {
+class LC_Page
+{
// {{{ properties
@@ -83,7 +84,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
// 開始時刻を設定する。
$this->timeStart = microtime(true);
@@ -116,14 +118,16 @@
*
* @return void
*/
- function process() {}
+ function process()
+ {}
/**
* Page のレスポンス送信.
*
* @return void
*/
- function sendResponse() {
+ function sendResponse()
+ {
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
// ローカルフックポイントを実行.
$this->doLocalHookpointAfter($objPlugin);
@@ -150,7 +154,8 @@
*
* @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}");
@@ -167,7 +172,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
// 一定時間以上かかったページの場合、ログ出力する。
// エラー画面の表示では $this->timeStart が出力されない
if (defined('PAGE_DISPLAY_TIME_LOG_MODE') && PAGE_DISPLAY_TIME_LOG_MODE == true && isset($this->timeStart)) {
@@ -186,7 +192,8 @@
* @param SC_Helper_Plugin_Ex $objPlugin
* @return void
*/
- function doLocalHookpointBefore(SC_Helper_Plugin_Ex $objPlugin) {
+ function doLocalHookpointBefore(SC_Helper_Plugin_Ex $objPlugin)
+ {
// ローカルフックポイントを実行
$parent_class_name = get_parent_class($this);
if ($parent_class_name != 'LC_Page') {
@@ -204,7 +211,8 @@
* @param SC_Helper_Plugin_Ex $objPlugin
* @return void
*/
- function doLocalHookpointAfter(SC_Helper_Plugin_Ex $objPlugin) {
+ function doLocalHookpointAfter(SC_Helper_Plugin_Ex $objPlugin)
+ {
// ローカルフックポイントを実行
$parent_class_name = get_parent_class($this);
if ($parent_class_name != 'LC_Page') {
@@ -220,7 +228,8 @@
* テンプレート取得
*
*/
- function getTemplate() {
+ function getTemplate()
+ {
return $this->template;
}
@@ -228,7 +237,8 @@
* テンプレート設定(ポップアップなどの場合)
*
*/
- function setTemplate($template) {
+ function setTemplate($template)
+ {
$this->template = $template;
}
@@ -252,7 +262,8 @@
* @return string $path の存在する http(s):// から始まる絶対パス
* @see Net_URL
*/
- function getLocation($path, $param = array(), $useSSL = 'escape') {
+ function getLocation($path, $param = array(), $useSSL = 'escape')
+ {
$rootPath = $this->getRootPath($path);
// スキーマを定義
@@ -285,7 +296,8 @@
* @param string $path 結果を取得するためのパス
* @return string EC-CUBE のWEBルート(/html/)を / としたパス
*/
- function getRootPath($path) {
+ function getRootPath($path)
+ {
// Windowsの場合は, ディレクトリの区切り文字を\から/に変換する
$path = str_replace('\\', '/', $path);
$htmlPath = str_replace('\\', '/', HTML_REALDIR);
@@ -323,7 +335,8 @@
* @return void
* @deprecated 決済モジュール互換のため
*/
- function allowClientCache() {
+ function allowClientCache()
+ {
$this->httpCacheControl('private');
}
@@ -334,7 +347,8 @@
* @param string $mode (nocache/private)
* @return void
*/
- function httpCacheControl($mode = '') {
+ function httpCacheControl($mode = '')
+ {
switch ($mode) {
case 'nocache':
header('Pragma: no-cache');
@@ -369,7 +383,8 @@
* @access protected
* @return string $_GET['mode'] 又は $_POST['mode'] の文字列
*/
- function getMode() {
+ function getMode()
+ {
$pattern = '/^[a-zA-Z0-9_]+$/';
$mode = null;
if (isset($_GET['mode']) && preg_match($pattern, $_GET['mode'])) {
@@ -395,7 +410,8 @@
* @param boolean $is_admin 管理画面でエラー表示をする場合 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) {
@@ -414,7 +430,8 @@
* @access protected
* @return void
*/
- function setTokenTo() {
+ function setTokenTo()
+ {
$this->transactionid = SC_Helper_Session_Ex::getToken();
}
@@ -423,7 +440,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
*/
- function log($mess, $log_level) {
+ function log($mess, $log_level)
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
// ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
if ($log_level === 'Debug' && DEBUG_MODE === false) {
@@ -443,7 +461,8 @@
* @param mixed $val デバックする要素
* @return void
*/
- function p($val) {
+ function p($val)
+ {
SC_Utils_Ex::sfPrintR($val);
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_Index.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Index extends LC_Page_Ex {
+class LC_Page_Index extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->tpl_title = '';
$objCustomer = new SC_Customer_Ex();
$this->isLogin = $objCustomer->isLoginSuccess(true);
@@ -72,7 +76,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_InputZip.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_InputZip extends LC_Page_Ex {
+class LC_Page_InputZip extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_message = '住所を検索しています。';
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$objView = new SC_SiteView_Ex(false);
// 入力エラーチェック
@@ -89,7 +92,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -99,7 +103,8 @@
* @param array $arrRequest リクエスト値($_GET)
* @return array $arrErr エラーメッセージ配列
*/
- function fnErrorCheck($arrRequest) {
+ function fnErrorCheck($arrRequest)
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
// パラメーター情報の初期化
@@ -126,7 +131,8 @@
* @param string $value
* @return エラーなし：true エラー：false
*/
- function lfInputNameCheck($value) {
+ function lfInputNameCheck($value)
+ {
// 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー
if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
return false;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_ResizeImage.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_ResizeImage extends LC_Page_Ex {
+class LC_Page_ResizeImage extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
$objFormParam->setParam($_GET);
@@ -89,11 +93,13 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('画像ファイル名', 'image', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
$objFormParam->addParam('画像の幅', 'width', STEXT_LEN, 'n', array('NUM_CHECK'));
$objFormParam->addParam('画像の高さ', 'height', STEXT_LEN, 'n', array('NUM_CHECK'));
@@ -104,7 +110,8 @@
*
* @return boolean 正常な形式:true 不正な形式:false
*/
- function lfCheckFileName() {
+ function lfCheckFileName()
+ {
//$pattern = '|^[0-9]+_[0-9a-z]+\.[a-z]{3}$|';
$pattern = '|\./|';
$file = trim($_GET['image']);
@@ -124,7 +131,8 @@
*
* @return void
*/
- function lfOutputImage($file, $width, $height) {
+ function lfOutputImage($file, $width, $height)
+ {
$objThumb = new gdthumb();
$objThumb->Main($file, $width, $height, '', true);
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -50,7 +50,8 @@
* :TODO: 各ページの changefreq や priority を指定できるようにする
* :TODO: filemtime 関数を使えば、静的なページの更新時間も取得できそう
*/
-class LC_Page_Sitemap extends LC_Page_Ex {
+class LC_Page_Sitemap extends LC_Page_Ex
+{
// }}}
// {{{ properties
@@ -69,7 +70,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->staticURL = array();
@@ -82,7 +84,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
// ページのデータを取得
// FIXME PCサイトのみに限定している。ある程度妥当だとは思うが、よりベターな方法はないだろうか。
$this->arrPageList = $this->getPageData('device_type_id = ?', DEVICE_TYPE_PC);
@@ -139,7 +142,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -154,7 +158,8 @@
* @see https://www.google.com/webmasters/tools/docs/ja/protocol.html#xmlTagDefinitions
* TODO Smarty に移行すべき?
*/
- 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)) {
@@ -175,7 +180,8 @@
* @param array $arrPageList すべてのページ情報の配列
* @return array TOPページの情報
*/
- function getTopPage($arrPageList) {
+ function getTopPage($arrPageList)
+ {
$arrRet = array();
foreach ($arrPageList as $arrPage) {
if ($arrPage['page_id'] == '1') {
@@ -191,7 +197,8 @@
* @param array $arrPageList すべてのページ情報の配列
* @return array 編集可能ページ
*/
- function getEditablePage($arrPageList) {
+ function getEditablePage($arrPageList)
+ {
$arrRet = array();
foreach ($arrPageList as $arrPage) {
if ($arrPage['page_id'] > 4) {
@@ -206,7 +213,8 @@
*
* @return array 検索エンジンからアクセス可能な商品一覧ページの情報
*/
- function getAllProducts() {
+ function getAllProducts()
+ {
// XXX: 商品登録の無いカテゴリは除外する方が良い気もする
$objQuery = SC_Query_Ex::getSingletonInstance();
@@ -228,7 +236,8 @@
*
* @return array 検索エンジンからアクセス可能な商品詳細ページの情報
*/
- 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);
@@ -251,7 +260,8 @@
* @param array $arrVal WHERE句の値を格納した配列
* @return array $arrPageList ブロック情報
*/
- function getPageData($where = '', $arrVal = '') {
+ function getPageData($where = '', $arrVal = '')
+ {
$objQuery = SC_Query_Ex::getSingletonInstance(); // DB操作オブジェクト
$sql = ''; // データ取得SQL生成用
$arrRet = array(); // データ取得用
@@ -301,7 +311,8 @@
* @param date $date 変換する日付
* @return void
*/
- function date2W3CDatetime($date) {
+ function date2W3CDatetime($date)
+ {
$arr = array();
// 正規表現で文字列を抽出
preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $date, $arr);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/abouts/LC_Page_Abouts.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_page_category = 'abouts';
$this->tpl_title = '当サイトについて';
@@ -54,7 +56,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->objSiteInfo->data = SC_Helper_DB_Ex::sfGetBasisData();
$this->objSiteInfo->data['pref'] =
@@ -80,7 +84,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Admin extends LC_Page_Ex {
+class LC_Page_Admin extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
$this->template = MAIN_FRAME;
//IP制限チェック
@@ -86,7 +88,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
}
/**
@@ -94,7 +97,8 @@
*
* @return void
*/
- function sendResponse() {
+ function sendResponse()
+ {
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
// ローカルフックポイントを実行
$parent_class_name = get_parent_class($this);
@@ -119,7 +123,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -128,7 +133,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
*/
- function log($mess, $log_level='Info') {
+ function log($mess, $log_level='Info')
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
// ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
if ($log_level === 'Debug' && DEBUG_MODE === false) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'home.tpl';
$this->tpl_subtitle = 'ホーム';
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// DBバージョンの取得
$this->db_version = $this->lfGetDBVersion();
@@ -111,7 +115,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -120,7 +125,8 @@
*
* @return string PHPバージョン情報
*/
- function lfGetPHPVersion() {
+ function lfGetPHPVersion()
+ {
return 'PHP ' . phpversion();
}
@@ -129,7 +135,8 @@
*
* @return mixed DBバージョン情報
*/
- function lfGetDBVersion() {
+ function lfGetDBVersion()
+ {
$dbFactory = SC_DB_DBFactory_Ex::getInstance();
return $dbFactory->sfGetDBVersion();
}
@@ -139,7 +146,8 @@
*
* @return integer 会員数
*/
- function lfGetCustomerCnt() {
+ function lfGetCustomerCnt()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'COUNT(customer_id)';
$table = 'dtb_customer';
@@ -153,7 +161,8 @@
* @param string $method 取得タイプ 件数:'COUNT' or 金額:'SUM'
* @return integer 結果数値
*/
- function lfGetOrderYesterday($method) {
+ function lfGetOrderYesterday($method)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// TODO: DBFactory使わないでも共通化できそうな気もしますが
@@ -168,7 +177,8 @@
* @param string $method 取得タイプ 件数:'COUNT' or 金額:'SUM'
* @return integer 結果数値
*/
- function lfGetOrderMonth($method) {
+ function lfGetOrderMonth($method)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$month = date('Y/m', mktime());
@@ -183,7 +193,8 @@
*
* @return integer 会員の保持ポイント合計
*/
- function lfGetTotalCustomerPoint() {
+ function lfGetTotalCustomerPoint()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'SUM(point)';
@@ -197,7 +208,8 @@
*
* @return integer 昨日のレビュー書き込み数
*/
- function lfGetReviewYesterday() {
+ function lfGetReviewYesterday()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// TODO: DBFactory使わないでも共通化できそうな気もしますが
@@ -211,7 +223,8 @@
*
* @return integer レビュー書き込み非表示数
*/
- 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';
@@ -224,7 +237,8 @@
*
* @return array 品切れ商品一覧
*/
- function lfGetSoldOut() {
+ function lfGetSoldOut()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$cols = 'product_id, name';
@@ -241,7 +255,8 @@
*
* @return array 新規受付一覧配列
*/
- function lfGetNewOrder() {
+ function lfGetNewOrder()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sql = <<< __EOS__
@@ -298,7 +313,8 @@
*
* @return array 取得した情報配列
*/
- function lfGetInfo() {
+ function lfGetInfo()
+ {
// 更新情報の取得ON/OFF確認
if (!ECCUBE_INFO) return array();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Index.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'login.tpl';
$this->httpCacheControl('nocache');
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -62,7 +65,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -71,7 +75,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -109,7 +114,8 @@
* @param array $objFormParam フォームパラメータークラス
* @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'));
}
@@ -122,7 +128,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array $arrErr エラー配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 書式チェック
$arrErr = $objFormParam->checkError();
if (SC_Utils_Ex::isBlank($arrErr)) {
@@ -143,7 +150,8 @@
* @param string $pass ログインパスワード文字列
* @return boolean ログイン情報が有効な場合 true
*/
- function lfIsLoginMember($login_id, $pass) {
+ function lfIsLoginMember($login_id, $pass)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
//パスワード、saltの取得
$cols = 'password, salt';
@@ -166,7 +174,8 @@
* @param string $login_id ログインID文字列
* @return void
*/
- function lfDoLogin($login_id) {
+ function lfDoLogin($login_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
//メンバー情報取得
$cols = 'member_id, authority, login_date, name';
@@ -189,7 +198,8 @@
* @param string $last_login 最終ログイン日時(YYYY/MM/DD HH:ii:ss形式) またはNULL
* @return string $sid 設定したセッションのセッションID
*/
- 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();
// 認証済みの設定
$objSess->SetSession('cert', CERT_STRING);
@@ -216,7 +226,8 @@
* @param string $last_login 最終ログイン日時(YYYY/MM/DD HH:ii:ss形式) またはNULL
* @return void
*/
- function lfSetLoginData($sid, $member_id, $login_id, $authority, $last_login) {
+ function lfSetLoginData($sid, $member_id, $login_id, $authority, $last_login)
+ {
// ログイン記録ログ出力
$str_log = "login: user=$login_id($member_id) auth=$authority "
. "lastlogin=$last_login sid=$sid";
@@ -239,7 +250,8 @@
* @param string $login_id ログイン失敗時に投入されたlogin_id文字列
* @return void
*/
- function lfSetIncorrectData($error_login_id) {
+ function lfSetIncorrectData($error_login_id)
+ {
GC_Utils_Ex::gfPrintLog($error_login_id . ' password incorrect.');
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Logout.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
}
@@ -59,7 +62,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->lfDoLogout();
@@ -72,7 +76,8 @@
*
* @return void
*/
- function lfDoLogout() {
+ function lfDoLogout()
+ {
$objSess = new SC_Session_Ex();
$objSess->logout();
}
@@ -82,7 +87,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/index.tpl';
$this->tpl_subno = 'index';
@@ -67,7 +69,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -77,7 +80,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -115,7 +119,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -124,7 +129,8 @@
*
* @deprecated 2.12.4
*/
- function lfUpdateData($arrData) {
+ function lfUpdateData($arrData)
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
SC_Helper_DB_Ex::registerBasisData($arrData);
}
@@ -134,12 +140,14 @@
*
* @deprecated 2.12.4
*/
- function lfInsertData($arrData) {
+ function lfInsertData($arrData)
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
SC_Helper_DB_Ex::registerBasisData($arrData);
}
- function lfInitParam(&$objFormParam, $post) {
+ function lfInitParam(&$objFormParam, $post)
+ {
$objFormParam->addParam('会社名', 'company_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
$objFormParam->addParam('会社名(フリガナ)', 'company_kana', STEXT_LEN, 'KVC', array('KANA_CHECK','MAX_LENGTH_CHECK'));
@@ -190,7 +198,8 @@
}
// 入力エラーチェック
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$arrErr = $objFormParam->checkError();
$post = $objFormParam->getHashArray();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/delivery.tpl';
$this->tpl_subno = 'delivery';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDeliv = new SC_Helper_Delivery_Ex();
$mode = $this->getMode();
@@ -114,7 +118,8 @@
* @param string $mode
* @return array
*/
- function lfCheckError($mode, &$objFormParam) {
+ function lfCheckError($mode, &$objFormParam)
+ {
$arrErr = array();
switch ($mode) {
case 'delete':
@@ -137,7 +142,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -40,7 +41,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/delivery_input.tpl';
$this->tpl_subno = 'delivery';
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($this->mode, $objFormParam);
$objFormParam->setParam($_POST);
@@ -104,12 +108,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* パラメーター情報の初期化 */
- function lfInitParam($mode, &$objFormParam) {
+ function lfInitParam($mode, &$objFormParam)
+ {
$objFormParam = new SC_FormParam_Ex();
switch ($mode) {
@@ -147,7 +153,8 @@
*
* @return $deliv_id
*/
- function lfRegistData($arrRet, $member_id) {
+ function lfRegistData($arrRet, $member_id)
+ {
$objDelivery = new SC_Helper_Delivery_Ex();
// 入力データを渡す。
@@ -196,7 +203,8 @@
}
/* 配送業者情報の取得 */
- function lfGetDelivData(&$objFormParam) {
+ function lfGetDelivData(&$objFormParam)
+ {
$objDelivery = new SC_Helper_Delivery_Ex();
$deliv_id = $objFormParam->getValue('deliv_id');
@@ -228,7 +236,8 @@
}
/* 入力内容のチェック */
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrRet = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrRet);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/holiday.tpl';
$this->tpl_subno = 'holiday';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
@@ -162,18 +166,21 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
- function lfGetHolidayDataByHolidayID($holiday_id) {
+ 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 lfGetHolidayList() {
+ function lfGetHolidayList()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'del_flg <> 1';
@@ -182,7 +189,8 @@
}
/* DBへの挿入 */
- function lfInsertClass($arrData, $member_id) {
+ function lfInsertClass($arrData, $member_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTする値を作成する。
$sqlval['title'] = $arrData['title'];
@@ -199,7 +207,8 @@
}
/* DBへの更新 */
- function lfUpdateClass($arrData) {
+ function lfUpdateClass($arrData)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['title'] = $arrData['title'];
@@ -212,7 +221,8 @@
return $ret;
}
- function lfInitParam($mode, &$objFormParam) {
+ function lfInitParam($mode, &$objFormParam)
+ {
switch ($mode) {
case 'edit':
$objFormParam->addParam('タイトル', 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -236,7 +246,8 @@
* @param string $mode
* @return array
*/
- function lfCheckError($mode, &$objFormParam) {
+ function lfCheckError($mode, &$objFormParam)
+ {
$objFormParam->convParam();
$arrErr = $objFormParam->checkError();
$post = $objFormParam->getHashArray();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/kiyaku.tpl';
$this->tpl_subno = 'kiyaku';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
@@ -151,12 +155,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* DBへの挿入 */
- function lfInsertClass($arrData, $member_id) {
+ function lfInsertClass($arrData, $member_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTする値を作成する。
$sqlval = array();
@@ -172,14 +178,16 @@
return ($ret) ? $sqlval['kiyaku_id'] : FALSE;
}
- function lfGetKiyakuDataByKiyakuID($kiyaku_id) {
+ 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() {
+ function lfGetKiyakuList()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'del_flg <> 1';
@@ -188,7 +196,8 @@
}
/* DBへの更新 */
- function lfUpdateClass($arrData, $kiyaku_id) {
+ function lfUpdateClass($arrData, $kiyaku_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
@@ -200,7 +209,8 @@
return ($ret) ? $kiyaku_id : FALSE;
}
- function lfInitParam($mode, &$objFormParam) {
+ function lfInitParam($mode, &$objFormParam)
+ {
switch ($mode) {
case 'confirm':
case 'pre_edit':
@@ -223,7 +233,8 @@
* @param string $mode
* @return array
*/
- function lfCheckError($objFormParam) {
+ function lfCheckError($objFormParam)
+ {
$arrErr = $objFormParam->checkError();
$arrForm = $objFormParam->getHashArray();
$objQuery =& SC_Query_Ex::getSingletonInstance();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/mail.tpl';
$this->tpl_mainno = 'basis';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$masterData = new SC_DB_MasterData_Ex();
@@ -119,18 +123,21 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
- function lfGetMailTemplateByTemplateID($template_id) {
+ 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) {
+ function lfRegistMailTemplate($post, $member_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$post['creator_id'] = $member_id;
@@ -147,7 +154,8 @@
}
- function lfInitParam($mode, &$objFormParam) {
+ function lfInitParam($mode, &$objFormParam)
+ {
switch ($mode) {
case 'regist':
$objFormParam->addParam('メールタイトル', 'subject', MTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/payment.tpl';
$this->tpl_mainno = 'basis';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objPayment = new SC_Helper_Payment_Ex();
@@ -113,7 +117,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -46,7 +47,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/payment_input.tpl';
$this->tpl_mainno = 'basis';
@@ -60,7 +62,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -70,7 +73,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objPayment = new SC_Helper_Payment_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -159,18 +163,21 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* ファイル情報の初期化 */
- function lfInitFile() {
+ function lfInitFile()
+ {
$this->objUpFile->addFile('ロゴ画像', 'payment_image', array('gif','jpeg','jpg','png'), IMAGE_SIZE, false, CLASS_IMAGE_WIDTH, CLASS_IMAGE_HEIGHT);
return $this->objUpFile;
}
/* パラメーター情報の初期化 */
- function lfInitParam($mode, &$objFormParam) {
+ function lfInitParam($mode, &$objFormParam)
+ {
switch ($mode) {
case 'edit':
@@ -211,7 +218,8 @@
}
/* DBへデータを登録する */
- 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['payment_id'] = $payment_id;
@@ -227,7 +235,8 @@
/* 利用条件の数値チェック */
/* 入力内容のチェック */
- function lfCheckError($post, $objFormParam, SC_Helper_Payment_Ex $objPayment) {
+ function lfCheckError($post, $objFormParam, SC_Helper_Payment_Ex $objPayment)
+ {
// DBのデータを取得
$arrPaymentData = $objPayment->get($post['payment_id']);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/point.tpl';
$this->tpl_subno = 'point';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
// パラメーター管理クラス
@@ -115,17 +119,20 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* パラメーター情報の初期化 */
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('ポイント付与率', 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('会員登録時付与ポイント', 'welcome_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
}
- function lfUpdateData($post) {
+ function lfUpdateData($post)
+ {
// 入力データを渡す。
$sqlval = $post;
$sqlval['update_date'] = 'CURRENT_TIMESTAMP';
@@ -134,7 +141,8 @@
$ret = $objQuery->update('dtb_baseinfo', $sqlval);
}
- function lfInsertData($post) {
+ function lfInsertData($post)
+ {
// 入力データを渡す。
$sqlval = $post;
$sqlval['id'] = 1;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -46,7 +47,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/seo.tpl';
$this->tpl_subno = 'seo';
@@ -66,7 +68,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -76,7 +79,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// データの取得
$this->arrPageData = $this->lfGetSeoPageData();
@@ -131,7 +135,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -141,7 +146,8 @@
* @param array $arrUpdData 更新データ
* @return integer 更新結果
*/
- function lfUpdPageData($arrUpdData = array()) {
+ function lfUpdPageData($arrUpdData = array())
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_pagelayout';
@@ -159,7 +165,8 @@
return $objQuery->update($table, $sqlval, $where, $arrWhereVal);
}
- function lfInitParam($mode, &$objFormParam) {
+ function lfInitParam($mode, &$objFormParam)
+ {
$objFormParam->addParam('デバイスID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メタタグ:Author', 'author', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -174,7 +181,8 @@
* @param array 表示データ
* @return array 表示データ
*/
- function lfSetData($arrPageData, $arrDispData) {
+ function lfSetData($arrPageData, $arrDispData)
+ {
foreach ($arrPageData as $device_key => $arrVal) {
foreach ($arrVal as $key => $val) {
@@ -195,7 +203,8 @@
* @param void
* @return array $arrRet ページデータ($arrRet[デバイスタイプID])
*/
- function lfGetSeoPageData() {
+ function lfGetSeoPageData()
+ {
$objLayout = new SC_Helper_PageLayout_Ex();
return array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/tradelaw.tpl';
$this->tpl_subno = 'tradelaw';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
@@ -116,12 +120,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* パラメーター情報の初期化 */
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('販売業者', 'law_company', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('運営責任者', 'law_manager', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('郵便番号1', 'law_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -145,14 +151,16 @@
$objFormParam->addParam('返品・交換について', 'law_term06', MLTEXT_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の実行
$ret = $objQuery->update('dtb_baseinfo', $sqlval);
}
- function lfInsertData($sqlval) {
+ function lfInsertData($sqlval)
+ {
$sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTの実行
@@ -160,7 +168,8 @@
}
/* 入力内容のチェック */
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrRet = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrRet);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -43,7 +43,8 @@
* @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の行数 */
var $tpl_line = 0;
@@ -65,7 +66,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'basis/zip_install.tpl';
$this->tpl_subno = 'zip_install';
@@ -83,7 +85,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -93,7 +96,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -164,11 +168,13 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
- function lfAutoCommitZip() {
+ function lfAutoCommitZip()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// DB更新
@@ -183,7 +189,8 @@
*
* @return void
*/
- function lfDeleteZip() {
+ function lfDeleteZip()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// DB
@@ -198,7 +205,8 @@
*
* @return void
*/
- function lfInitParam($tpl_mode, &$objFormParam) {
+ function lfInitParam($tpl_mode, &$objFormParam)
+ {
if ($tpl_mode == 'manual') {
$objFormParam->addParam('開始行', 'startRowNum', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
}
@@ -209,7 +217,8 @@
*
* @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/'; // 画像パスは admin 固定
@@ -273,7 +282,8 @@
<script type='text/javascript' language='javascript'>
<!--
// 完了画面
- function complete() {
+ function complete()
+ {
document.open('text/html','replace');
document.clear();
document.write('<p>完了しました。<br />');
@@ -290,7 +300,8 @@
<?php
}
- function openZipCsv() {
+ function openZipCsv()
+ {
$this->convertZipCsv();
$fp = fopen(ZIP_CSV_UTF8_REALFILE, 'r');
if (!$fp) {
@@ -299,7 +310,8 @@
return $fp;
}
- function convertZipCsv() {
+ function convertZipCsv()
+ {
if (file_exists(ZIP_CSV_UTF8_REALFILE)) return;
$fpr = fopen(ZIP_CSV_REALFILE, 'r');
@@ -320,12 +332,14 @@
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();
@@ -350,7 +364,8 @@
*
* @return void
*/
- function lfDownloadZipFileFromJp() {
+ function lfDownloadZipFileFromJp()
+ {
// Proxy経由を可能とする。
// TODO Proxyの設定は「data/module/HTTP/Request.php」内の「function HTTP_Request」へ記述する。いずれは、外部設定としたい。
$req = new HTTP_Request();
@@ -379,7 +394,8 @@
*
* @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 . ' をオープンできません。', E_USER_ERROR);
@@ -432,7 +448,8 @@
*
* @return string CSV の更新日時 (整形済みテキスト)
*/
- function lfGetCsvDatetime() {
+ function lfGetCsvDatetime()
+ {
return date('Y/m/d H:i:s', filemtime(ZIP_CSV_REALFILE));
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'contents/index.tpl';
$this->tpl_subno = 'index';
@@ -65,7 +67,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -75,7 +78,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -160,7 +164,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -169,7 +174,8 @@
* @param Object $objFormParam
* @return Array エラー内容
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
$objErr->doFunc(array('日付', 'year', 'month', 'day'), array('CHECK_DATE'));
@@ -180,7 +186,8 @@
* パラメーターの初期化を行う
* @param Object $objFormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('news_id', 'news_id');
$objFormParam->addParam('日付(年)', 'year', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('日付(月)', 'month', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -197,7 +204,8 @@
* @param Array $arrPost POSTデータの配列
* @param Integer $member_id 登録した管理者のID
*/
- function lfNewsInsert($arrPost,$member_id) {
+ function lfNewsInsert($arrPost,$member_id)
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
// rankの最大+1を取得する
@@ -220,7 +228,8 @@
$objQuery->insert($table, $sqlval);
}
- function lfNewsUpdate($arrPost,$member_id) {
+ function lfNewsUpdate($arrPost,$member_id)
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_news';
@@ -242,7 +251,8 @@
* @param Array $arrPost POSTのグローバル変数
* @return string 登録日を示す文字列
*/
- function getRegistDate($arrPost) {
+ function getRegistDate($arrPost)
+ {
$registDate = $arrPost['year'] .'/'. $arrPost['month'] .'/'. $arrPost['day'];
return $registDate;
}
@@ -252,7 +262,8 @@
* @param int $link_method
* @return int
*/
- function checkLinkMethod($link_method) {
+ function checkLinkMethod($link_method)
+ {
if (strlen($link_method) == 0) {
$link_method = 1;
}
@@ -263,7 +274,8 @@
* ニュース記事を取得する。
* @param Integer news_id ニュースID
*/
- function getNews($news_id = '') {
+ function getNews($news_id = '')
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$col = '*, cast(news_date as date) as cast_news_date';
$table = 'dtb_news';
@@ -283,7 +295,8 @@
* 指定されたニュースのランクの値を取得する。
* @param Integer $news_id
*/
- function getRankByNewsId($news_id) {
+ function getRankByNewsId($news_id)
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'rank';
$table = 'dtb_news';
@@ -298,7 +311,8 @@
* @param Integer $news_id
* @param Integer $rank
*/
- function computeRankForDelete($news_id,$rank) {
+ function computeRankForDelete($news_id,$rank)
+ {
SC_Helper_DB_Ex::sfDeleteRankRecord('dtb_news', 'news_id', $news_id);
}
@@ -306,7 +320,8 @@
* ニュースの日付の値をフロントでの表示形式に合わせるために分割
* @param String $news_date
*/
- function splitNewsDate($news_date) {
+ function splitNewsDate($news_date)
+ {
return explode('-', $news_date);
}
@@ -314,7 +329,8 @@
* ランクの最大値の値を返す。
* @return Intger $max ランクの最大値の値
*/
- function getRankMax() {
+ function getRankMax()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'MAX(rank) as max';
$table = 'dtb_news';
@@ -328,7 +344,8 @@
* @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];
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'contents/csv.tpl';
$this->tpl_subno = 'csv';
@@ -60,7 +62,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -70,7 +73,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -116,7 +120,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('編集種別', 'tpl_subno_csv', STEXT_LEN, 'a', array('ALNUM_CHECK', 'MAX_LENGTH_CHECK'), 'product');
$objFormParam->addParam('出力設定リスト', 'output_list', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK', 'EXIST_CHECK'));
//デフォルト値で上書き
@@ -130,7 +135,8 @@
* @param integer $csv_status_flg 読み込む対象のフラグ CSV_COLUMN_STATUS_FLG_ENABLE or ''
* @return array SwapArrayしたカラム設定
*/
- 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 !='') {
@@ -151,7 +157,8 @@
* @param integer $csv_id CSV ID
* @return array 選択済みカラム列情報
*/
- 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();
@@ -165,7 +172,8 @@
* @param integer $csv_id CSV ID
* @return array 選択済みカラム列情報
*/
- function lfGetOptions($csv_id) {
+ function lfGetOptions($csv_id)
+ {
$arrData = $this->lfGetCSVColumn($csv_id);
if (!isset($arrData['no'])) {
$arrData['no'] = array();
@@ -180,7 +188,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -190,7 +199,8 @@
* @param string $subno_csv CSV名
* @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];
@@ -208,7 +218,8 @@
* @param integer $csv_id CSV_ID
* @return boolean 成功:true
*/
- function lfSetDefaultCsvOutput($csv_id) {
+ function lfSetDefaultCsvOutput($csv_id)
+ {
$arrData = $this->lfGetCSVColumn($csv_id, '', $order = 'no');
if (!isset($arrData['no'])) {
$arrData['no'] = array();
@@ -223,7 +234,8 @@
* @param array $arrData 有効にするCSV列データ配列
* @return boolean 成功:true
*/
- function lfUpdCsvOutput($csv_id, $arrData = array()) {
+ function lfUpdCsvOutput($csv_id, $arrData = array())
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// ひとまず、全部使用しないで更新する
$table = 'dtb_csv';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'contents/csv_sql.tpl';
$this->tpl_subno = 'csv';
@@ -56,7 +58,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -66,7 +69,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
// パラメーター設定
@@ -141,7 +145,8 @@
* @param array $objFormParam フォームパラメータークラス
* @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出力対象SQL ID', 'csv_output_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'), '', false);
$objFormParam->addParam('選択テーブル', 'select_table', STEXT_LEN, 'KVa', array('GRAPH_CHECK','MAX_LENGTH_CHECK'), '', false);
@@ -155,7 +160,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckConfirmError(&$objFormParam) {
+ function lfCheckConfirmError(&$objFormParam)
+ {
// パラメーターの基本チェック
$arrErr = $objFormParam->checkError();
// 拡張エラーチェック
@@ -182,7 +188,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckPreviewError(&$objFormParam) {
+ function lfCheckPreviewError(&$objFormParam)
+ {
// パラメーターの基本チェック
$arrErr = $objFormParam->checkError();
// 拡張エラーチェック
@@ -201,7 +208,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckDeleteError(&$objFormParam) {
+ function lfCheckDeleteError(&$objFormParam)
+ {
// パラメーターの基本チェック
$arrErr = $objFormParam->checkError();
// 拡張エラーチェック
@@ -219,7 +227,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckOutputError(&$objFormParam) {
+ function lfCheckOutputError(&$objFormParam)
+ {
// パラメーターの基本チェック
$arrErr = $objFormParam->checkError();
// 拡張エラーチェック
@@ -236,7 +245,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -245,7 +255,8 @@
*
* @return array テーブル名一覧
*/
- function lfGetTableList() {
+ function lfGetTableList()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 実テーブル上のカラム設定を見に行く仕様に変更 ref #476
$arrTable = $objQuery->listTables();
@@ -269,7 +280,8 @@
* @param string $selectTable テーブル名
* @return array カラム一覧の配列
*/
- function lfGetColList($table) {
+ function lfGetColList($table)
+ {
if (SC_Utils_Ex::isBlank($table)) {
return array();
}
@@ -287,7 +299,8 @@
* @param array $arrVal 絞り込みデータ
* @return array 取得結果の配列
*/
- function lfGetSqlList($where = '' , $arrVal = array()) {
+ function lfGetSqlList($where = '' , $arrVal = array())
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_csv_sql';
$objQuery->setOrder('sql_id');
@@ -300,7 +313,8 @@
* @param string SQL文データ(頭にSELECTは入れない)
* @return string エラー内容
*/
- function lfCheckSQL($sql) {
+ function lfCheckSQL($sql)
+ {
// FIXME: 意図的に new SC_Query しています。 force_runをtrueにする必要があるので.本当はqueryの引数で制御したい。ref SC_Query
$objQuery = new SC_Query_Ex('', true);
$err = '';
@@ -318,7 +332,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return mixed 表示用パラメーター
*/
- function lfGetSqlData(&$objFormParam) {
+ function lfGetSqlData(&$objFormParam)
+ {
// 編集中データがある場合
if (!SC_Utils_Ex::isBlank($objFormParam->getValue('sql_name'))
|| !SC_Utils_Ex::isBlank($objFormParam->getValue('csv_sql'))
@@ -339,7 +354,8 @@
* @param integer $sql_id 出力するデータのSQL_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'] . ' ';
@@ -370,7 +386,8 @@
* @param array $arrSqlVal 更新データの配列
* @return integer $sql_id SQL_IDを返す
*/
- function lfUpdData($sql_id, $arrSqlVal) {
+ function lfUpdData($sql_id, $arrSqlVal)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_csv_sql';
$arrSqlVal['update_date'] = 'CURRENT_TIMESTAMP';
@@ -394,7 +411,8 @@
* @param integer $sql_id 削除するデータのSQL_ID
* @return boolean 実行結果 true：成功
*/
- function lfDelData($sql_id) {
+ function lfDelData($sql_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_csv_sql';
$where = 'sql_id = ?';
@@ -413,7 +431,8 @@
*
* @return array 不許可ワード配列
*/
- function lfGetSqlDenyList() {
+ function lfGetSqlDenyList()
+ {
$arrList = array(';'
,'CREATE\s'
,'INSERT\s'
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'contents/file_manager.tpl';
$this->tpl_mainno = 'contents';
@@ -56,7 +58,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -66,7 +69,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// フォーム操作クラス
$objFormParam = new SC_FormParam_Ex();
@@ -204,7 +208,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -214,7 +219,8 @@
* @param SC_FormParam $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
// 共通定義
$this->lfInitParamCommon($objFormParam);
}
@@ -225,7 +231,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParamModeMove(&$objFormParam) {
+ function lfInitParamModeMove(&$objFormParam)
+ {
// 共通定義
$this->lfInitParamCommon($objFormParam);
$objFormParam->addParam('選択ファイル', 'select_file', MTEXT_LEN, 'a', array());
@@ -237,7 +244,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParamModeView(&$objFormParam) {
+ function lfInitParamModeView(&$objFormParam)
+ {
// 共通定義
$this->lfInitParamCommon($objFormParam);
$objFormParam->addParam('選択ファイル', 'select_file', MTEXT_LEN, 'a', array('SELECT_CHECK'));
@@ -249,7 +257,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParamModeCreate(&$objFormParam) {
+ function lfInitParamModeCreate(&$objFormParam)
+ {
// 共通定義
$this->lfInitParamCommon($objFormParam);
$objFormParam->addParam('選択ファイル', 'select_file', MTEXT_LEN, 'a', array());
@@ -262,7 +271,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParamCommon(&$objFormParam) {
+ function lfInitParamCommon(&$objFormParam)
+ {
$objFormParam->addParam('ルートディレクトリ', 'top_dir', MTEXT_LEN, 'a', array());
$objFormParam->addParam('現在の階層ディレクトリ', 'now_dir', MTEXT_LEN, 'a', array());
$objFormParam->addParam('現在の階層ファイル', 'now_file', MTEXT_LEN, 'a', array());
@@ -276,7 +286,8 @@
* @param object $objUpFile SC_UploadFileインスタンス
* @return void
*/
- function lfInitFile(&$objUpFile) {
+ function lfInitFile(&$objUpFile)
+ {
$objUpFile->addFile('ファイル', 'upload_file', array(), FILE_SIZE, true, 0, 0, false);
}
@@ -286,7 +297,8 @@
* @param array $arrVal $_POST
* @return array $setParam テンプレートに渡す値
*/
- function createSetParam($arrVal) {
+ function createSetParam($arrVal)
+ {
$setParam = $arrVal;
// Windowsの場合は, ディレクトリの区切り文字を\から/に変換する
$setParam['top_dir'] = (strpos(PHP_OS, 'WIN') === false) ? USER_REALDIR : str_replace('\\', '/', USER_REALDIR);
@@ -304,7 +316,8 @@
* @param string $val 値
* @return void
*/
- function setDispParam($key, $val) {
+ function setDispParam($key, $val)
+ {
$this->$key = $val;
}
@@ -315,7 +328,8 @@
* @param SC_FormParam $objFormParam SC_FormParamインスタンス
* @return boolean ディレクトリ作成できたかどうか
*/
- function tryCreateDir($objFileManager, $objFormParam) {
+ function tryCreateDir($objFileManager, $objFormParam)
+ {
$create_dir_flg = false;
$create_dir = rtrim($objFormParam->getValue('now_dir'), '/');
// ファイル作成
@@ -331,7 +345,8 @@
* @param SC_FormParam $objFormParam SC_FormParamインスタンス
* @return boolean ファイル表示するかどうか
*/
- 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);
@@ -347,7 +362,8 @@
* @param SC_FormParam $objFormParam SC_FormParamインスタンス
* @return void
*/
- function setParentDir($objFormParam) {
+ function setParentDir($objFormParam)
+ {
$parent_dir = $this->lfGetParentDir($objFormParam->getValue('now_dir'));
$this->setDispParam('tpl_parent_dir', $parent_dir);
}
@@ -358,7 +374,8 @@
* @param SC_FormParam $objFormParam SC_FormParamインスタンス
* @return void
*/
- function setDispPath($objFormParam) {
+ function setDispPath($objFormParam)
+ {
$tpl_now_dir = '';
// Windows 環境で DIRECTORY_SEPARATOR が JavaScript に渡るとエスケープ文字と勘違いするので置換
$html_realdir = str_replace(DIRECTORY_SEPARATOR, '/', HTML_REALDIR);
@@ -374,7 +391,8 @@
* @param string $value エラー内容
* @return void
*/
- function setDispError($key, $value) {
+ function setDispError($key, $value)
+ {
// 既にエラーがある場合は、処理しない
if (SC_Utils_Ex::isBlank($this->arrErr[$key])) {
$this->arrErr[$key] = $value;
@@ -387,7 +405,8 @@
* @param string $tpl_onload javascript
* @return void
*/
- function setTplOnLoad($tpl_onload) {
+ function setTplOnLoad($tpl_onload)
+ {
$this->tpl_onload .= $tpl_onload;
}
@@ -398,7 +417,8 @@
* @param string $dir ディレクトリ
* @return string $select_dir 選択ディレクトリ
*/
- function lfCheckSelectDir($objFormParam, $dir) {
+ function lfCheckSelectDir($objFormParam, $dir)
+ {
$select_dir = '';
$top_dir = $objFormParam->getValue('top_dir');
// USER_REALDIR以下の場合
@@ -423,7 +443,8 @@
* @param string $dir 現在いるディレクトリ
* @return string $parent_dir 親ディレクトリ
*/
- function lfGetParentDir($dir) {
+ function lfGetParentDir($dir)
+ {
$parent_dir = '';
$dir = rtrim($dir, '/');
$arrDir = explode('/', $dir);
@@ -442,7 +463,8 @@
* @param SC_FormParam $objFormParam SC_FormParamインスタンス
* @return void
*/
- function setDispTree($objFileManager, $objFormParam) {
+ function setDispTree($objFileManager, $objFormParam)
+ {
$tpl_onload = '';
// ツリーを表示する divタグid, ツリー配列変数名, 現在ディレクトリ, 選択ツリーhidden名, ツリー状態hidden名, mode hidden名
$now_dir = $objFormParam->getValue('now_dir');
@@ -474,7 +496,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function setIsTopDir($objFormParam) {
+ function setIsTopDir($objFormParam)
+ {
// トップディレクトリか調査
$is_top_dir = false;
// 末尾の/をとる
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->getMode()) {
default:
@@ -88,7 +92,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -98,7 +103,8 @@
* @param SC_FormParam $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('ファイル名', 'file', MTEXT_LEN, 'a', array('EXIST_CHECK'));
}
@@ -108,7 +114,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return boolen $file_check_flg エラーチェックの結果
*/
- function checkErrorDispFile($objFormParam) {
+ function checkErrorDispFile($objFormParam)
+ {
$file_check_flg = false;
// FIXME パスのチェック関数が必要
@@ -126,7 +133,8 @@
*
* @return void
*/
- function execFileView($objFormParam) {
+ function execFileView($objFormParam)
+ {
$file = $objFormParam->getValue('file');
// ソースとして表示するファイルを定義(直接実行しないファイル)
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'contents/recommend.tpl';
$this->tpl_mainno = 'contents';
@@ -57,7 +59,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -67,7 +70,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
$objFormParam->setParam($_POST);
@@ -142,7 +146,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -150,7 +155,8 @@
* パラメーターの初期化を行う
* @param Object $objFormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('ランク', 'rank', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -162,7 +168,8 @@
* @param Object $objFormParam
* @return Array エラー内容
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
return $objErr->arrErr;
@@ -172,7 +179,8 @@
* 既に登録されている内容を取得する
* @return Array $arrReturnProducts データベースに登録されているおすすめ商品の配列
*/
- function getRecommendProducts() {
+ function getRecommendProducts()
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'dtb_products.name,dtb_products.main_list_image,dtb_best_products.*,dtb_products.status';
$table = 'dtb_best_products INNER JOIN dtb_products ON dtb_best_products.product_id = dtb_products.product_id';
@@ -193,7 +201,8 @@
* @param Array $arrPost POSTの値を格納した配列
* @param Integer $member_id 登録した管理者を示すID
*/
- function insertRecommendProduct($arrPost,$member_id) {
+ function insertRecommendProduct($arrPost,$member_id)
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
// 古いおすすめ商品のデータを削除する。
$this->deleteProduct($arrPost);
@@ -214,7 +223,8 @@
* データを削除する
* @param Array $arrPost POSTの値を格納した配列
*/
- function deleteProduct($arrPost) {
+ function deleteProduct($arrPost)
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_best_products';
$where = 'category_id = ? AND rank = ?';
@@ -227,7 +237,8 @@
* @param Integer $product_id 商品ID
* @return Array $arrProduct 商品のデータを格納した配列
*/
- function getProduct($product_id) {
+ function getProduct($product_id)
+ {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'product_id,main_list_image,name';
$table = 'dtb_products';
@@ -242,7 +253,8 @@
* @param Array $arrPost POSTのデータを格納した配列
* @param Array $arrItems フロントに表示される商品の情報を格納した配列
*/
- function setProducts($arrPost,$arrItems) {
+ function setProducts($arrPost,$arrItems)
+ {
$arrProduct = $this->getProduct($arrPost['product_id']);
if (count($arrProduct) > 0) {
$rank = $arrPost['rank'];
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainno = 'contents';
$this->tpl_subno = '';
@@ -54,7 +56,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -64,7 +67,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -112,7 +116,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -120,7 +125,8 @@
* パラメーターの初期化を行う
* @param Object $objFormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('商品ID', 'search_name', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
$objFormParam->addParam('商品ID', 'search_category_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK','NUM_CHECK'));
$objFormParam->addParam('商品コード', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -133,7 +139,8 @@
* @param Object $objFormParam
* @return Array エラー内容
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
return $objErr->arrErr;
@@ -145,7 +152,8 @@
* @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();
@@ -190,7 +198,8 @@
* @param array $whereAndBind
* @param SC_Product $objProduct
*/
- function getLineCount($whereAndBind,&$objProduct) {
+ function getLineCount($whereAndBind,&$objProduct)
+ {
$where = $whereAndBind['where'];
$bind = $whereAndBind['bind'];
// 検索結果対象となる商品の数を取得
@@ -205,7 +214,8 @@
* @param array $whereAndBind string whereと array bindの連想配列
* @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();
@@ -222,7 +232,8 @@
* @param array $arrProductId
* @param SC_Product $objProduct
*/
- function getProductList($arrProductId, &$objProduct) {
+ function getProductList($arrProductId, &$objProduct)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 表示順序
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'customer/index.tpl';
$this->tpl_mainno = 'customer';
@@ -85,7 +87,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -95,7 +98,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -146,7 +150,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -156,7 +161,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
$objFormParam->addParam('編集対象会員ID', 'edit_customer_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
}
@@ -167,7 +173,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
}
@@ -177,7 +184,8 @@
* @param integer $customer_id 会員ID
* @return boolean true:成功 false:失敗
*/
- function lfDoDeleteCustomer($customer_id) {
+ function lfDoDeleteCustomer($customer_id)
+ {
$arrData = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id, 'del_flg = 0');
if (SC_Utils_Ex::isBlank($arrData)) {
//対象となるデータが見つからない。
@@ -197,7 +205,8 @@
* @param integer $customer_id 会員ID
* @return boolean true:成功 false:失敗
*/
- 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) {
//対象となるデータが見つからない、または削除済み
@@ -216,7 +225,8 @@
* @param array $arrParam 検索パラメーター連想配列
* @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
*/
- function lfDoSearch($arrParam) {
+ function lfDoSearch($arrParam)
+ {
return SC_Helper_Customer_Ex::sfGetSearchData($arrParam);
}
@@ -226,7 +236,8 @@
* @param array $arrParam 検索パラメーター連想配列
* @return boolean true:成功 false:失敗
*/
- function lfDoCSV($arrParam) {
+ function lfDoCSV($arrParam)
+ {
$objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
$order = 'update_date DESC, customer_id DESC';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'customer/edit.tpl';
$this->tpl_mainno = 'customer';
@@ -73,7 +75,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -83,7 +86,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -196,7 +200,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -206,7 +211,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
// 会員項目のパラメーター取得
SC_Helper_Customer_Ex::sfCustomerEntryParam($objFormParam, true);
// 検索結果一覧画面への戻り用パラメーター
@@ -221,7 +227,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfInitSearchParam(&$objFormParam) {
+ function lfInitSearchParam(&$objFormParam)
+ {
SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
// 初回受け入れ時用
$objFormParam->addParam('編集対象会員ID', 'edit_customer_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -233,7 +240,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckErrorSearchParam(&$objFormParam) {
+ function lfCheckErrorSearchParam(&$objFormParam)
+ {
return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
}
@@ -243,7 +251,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam, true);
// メアド重複チェック(共通ルーチンは使えない)
@@ -282,7 +291,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfRegistData(&$objFormParam) {
+ function lfRegistData(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 登録用データ取得
$arrData = $objFormParam->getDbArray();
@@ -311,7 +321,8 @@
* @param array $arrParam 検索パラメーター連想配列
* @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
*/
- function lfPurchaseHistory($customer_id, $pageno = 0) {
+ function lfPurchaseHistory($customer_id, $pageno = 0)
+ {
if (SC_Utils_Ex::isBlank($customer_id)) {
return array('0', array(), NULL);
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'customer/search_customer.tpl';
$this->tpl_subtitle = '会員検索';
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -97,7 +101,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -107,7 +112,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
}
@@ -117,7 +123,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
}
@@ -127,7 +134,8 @@
* @param array $arrParam 検索パラメーター連想配列
* @return array( integer 全体件数, mixed 会員データ一覧配列, mixed SC_PageNaviオブジェクト)
*/
- function lfDoSearch($arrParam) {
+ function lfDoSearch($arrParam)
+ {
return SC_Helper_Customer_Ex::sfGetSearchData($arrParam);
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'design/index.tpl';
$this->tpl_subno = 'layout';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objLayout = new SC_Helper_PageLayout_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -147,7 +151,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -158,7 +163,8 @@
* @param integer $bloc_cnt ブロック数
* @return void
*/
- function lfInitParam(&$objFormParam, $bloc_cnt = 0) {
+ function lfInitParam(&$objFormParam, $bloc_cnt = 0)
+ {
$objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('ブロック数', 'bloc_cnt', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -180,7 +186,8 @@
* @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
* @return array レイアウト情報の配列
*/
- function getLayout($device_type_id, $page_id, &$objLayout) {
+ function getLayout($device_type_id, $page_id, &$objLayout)
+ {
$arrResults = array();
$i = 0;
@@ -211,7 +218,8 @@
* @param integer $cnt 配列番号
* @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'];
@@ -226,7 +234,8 @@
* @param array $arrToBlocs チェックを行うデータ配列
* @return bool 存在する場合 true
*/
- function existsBloc($arrBloc, $arrToBlocs) {
+ function existsBloc($arrBloc, $arrToBlocs)
+ {
foreach ($arrToBlocs as $arrToBloc) {
if ($arrBloc['bloc_id'] === $arrToBloc['bloc_id']) {
return true;
@@ -242,7 +251,8 @@
* @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
* @return string プレビューを行う tpl_mainpage ファイル名
*/
- 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;
@@ -257,7 +267,8 @@
* @param boolean $is_preview プレビュー時の場合 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');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'design/bloc.tpl';
$this->tpl_subno_edit = 'bloc';
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
@@ -149,7 +153,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -159,7 +164,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('ブロックID', 'bloc_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('ブロック名', 'bloc_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -175,7 +181,8 @@
* @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
* @return array ブロック情報の配列
*/
- function getBlocTemplate($device_type_id, $bloc_id, &$objLayout) {
+ 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'];
@@ -199,7 +206,8 @@
* @return integer|boolean 登録が成功した場合, 登録したブロックID;
* 失敗した場合 false
*/
- function doRegister(&$objFormParam, &$objLayout) {
+ function doRegister(&$objFormParam, &$objLayout)
+ {
$arrParams = $objFormParam->getHashArray();
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -256,7 +264,8 @@
* @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
* @return boolean 登録が成功した場合 true; 失敗した場合 false
*/
- function doDelete(&$objFormParam, &$objLayout) {
+ function doDelete(&$objFormParam, &$objLayout)
+ {
$arrParams = $objFormParam->getHashArray();
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -298,7 +307,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラーメッセージの配列
*/
- function lfCheckError(&$objFormParam, &$arrErr, &$objLayout) {
+ function lfCheckError(&$objFormParam, &$arrErr, &$objLayout)
+ {
$arrParams = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrParams);
$objErr->arrErr =& $arrErr;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'design/css.tpl';
$this->area_row = 30;
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objLayout = new SC_Helper_PageLayout_Ex();
@@ -141,7 +145,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -151,7 +156,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('CSSファイル名', 'css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
$objFormParam->addParam('旧CSSファイル名', 'old_css_name', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'));
@@ -171,7 +177,8 @@
* @param string $css_data 書き込みを行うデータ
* @return boolean 登録が成功した場合 true; 失敗した場合 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)
@@ -195,7 +202,8 @@
* @param string $css_path CSSファイルの絶対パス
* @return boolean 削除が成功した場合 true; 失敗した場合 false
*/
- function doDelete($css_path) {
+ function doDelete($css_path)
+ {
if (!unlink($css_path)) {
$this->arrErr['err'] = '※ CSSの削除に失敗しました<br />';
return false;
@@ -209,7 +217,8 @@
* @param array $css_dir CSSディレクトリ
* @return array ファイルリスト
*/
- function getCSSList($css_dir) {
+ function getCSSList($css_dir)
+ {
$objFileManager = new SC_Helper_FileManager_Ex();
$arrFileList = $objFileManager->sfGetFileList($css_dir);
@@ -230,7 +239,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラーメッセージの配列
*/
- function lfCheckError(&$objFormParam, &$arrErr) {
+ function lfCheckError(&$objFormParam, &$arrErr)
+ {
$arrParams = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrParams);
$objErr->arrErr =& $arrErr;
@@ -265,7 +275,8 @@
* @param integer $device_type_id 端末種別ID
* @return string CSSディレクトリ
*/
- function getCSSDir($device_type_id) {
+ function getCSSDir($device_type_id)
+ {
return SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id, true) . 'css/';
}
@@ -274,7 +285,8 @@
* @param string $str
* @return boolean
*/
- function checkPath($str) {
+ function checkPath($str)
+ {
// 含む場合はfalse
if (preg_match('|\./|', $str)) {
return false;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'design/header.tpl';
$this->header_row = 13;
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
@@ -120,7 +124,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -130,7 +135,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('端末種別ID', '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('ヘッダデータ', 'header');
@@ -143,7 +149,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラーメッセージの配列
*/
- function lfCheckError(&$objFormParam, &$arrErr) {
+ function lfCheckError(&$objFormParam, &$arrErr)
+ {
$arrParams = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrParams);
$objErr->arrErr =& $arrErr;
@@ -159,7 +166,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return integer|boolean 登録が成功した場合 true; 失敗した場合 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);
@@ -178,7 +186,8 @@
* @param string $division 'header' or 'footer'
* @return string|boolean 成功した場合, テンプレートのパス; 失敗した場合 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;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'design/main_edit.tpl';
$this->text_row = 13;
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objLayout = new SC_Helper_PageLayout_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -140,7 +144,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -152,7 +157,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('名称', 'page_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -171,7 +177,8 @@
* @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
* @return array ページデータの配列
*/
- 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);
@@ -195,7 +202,8 @@
* @return integer|boolean 登録が成功した場合, 登録したページID;
* 失敗した場合 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');
@@ -250,7 +258,8 @@
* @param SC_Helper_PageLayout $objLayout SC_Helper_PageLayout インスタンス
* @return integer ページID
*/
- function registerPage($arrParams, &$objLayout) {
+ function registerPage($arrParams, &$objLayout)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// ページIDが空の場合は新規登録
@@ -294,7 +303,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラーメッセージの配列
*/
- function lfCheckError(&$objFormParam, &$arrErr) {
+ function lfCheckError(&$objFormParam, &$arrErr)
+ {
$arrParams = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrParams);
$objErr->arrErr =& $arrErr;
@@ -343,7 +353,8 @@
* @param string $filename フォームパラメーターの filename
* @return boolean 作成に成功した場合 true
*/
- function createPHPFile($filename) {
+ function createPHPFile($filename)
+ {
$path = USER_REALDIR . $filename . '.php';
if (file_exists($path)) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @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
@@ -40,7 +41,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'design/template.tpl';
$this->tpl_subno = 'template';
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
@@ -137,7 +141,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -147,7 +152,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('端末種別ID', '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'));
}
@@ -161,7 +167,8 @@
* @param integer $device_type_id 端末種別ID
* @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';
@@ -196,7 +203,8 @@
* @param string $filepath SQLのファイルパス
* @return void
*/
- function updateBloc($filepath) {
+ function updateBloc($filepath)
+ {
$sql = file_get_contents($filepath);
if ($sql !== false) {
// 改行、タブを1スペースに変換
@@ -218,7 +226,8 @@
* @param integer $device_type_id 端末種別ID
* @return boolean 成功した場合 true; 失敗した場合 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'] = '※ デフォルトテンプレートと、選択中のテンプレートは削除出来ません<br />';
@@ -266,7 +275,8 @@
* @param integer $device_type_id 端末種別ID
* @return boolean 成功した場合 true; 失敗した場合 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)) {
@@ -296,7 +306,8 @@
* @param string $template_code テンプレートコード
* @return boolean 成功した場合 true; 失敗した場合 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) {
@@ -317,7 +328,8 @@
* @param integer $device_type_id 端末種別ID
* @return array テンプレート情報の配列
*/
- 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));
}
@@ -329,7 +341,8 @@
* @param boolean $isDefault デフォルトテンプレート名を返す場合 true
* @return string テンプレート名
*/
- 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;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'design/up_down.tpl';
$this->tpl_subno = 'up_down';
@@ -60,7 +62,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -72,7 +75,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
@@ -109,7 +113,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -119,7 +124,8 @@
* @param object $objForm SC_FormParamのインスタンス
* @return object SC_UploadFileのインスタンス
*/
- 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('テンプレートファイル', 'template_file', array(), TEMPLATE_SIZE, true, 0, 0, false);
@@ -132,7 +138,8 @@
* @param SC_FormParam $objFormParam SC_FormParamのインスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('テンプレートコード', 'template_code', STEXT_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK', 'ALNUM_CHECK'));
$objFormParam->addParam('テンプレート名', 'template_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK','MAX_LENGTH_CHECK'));
$objFormParam->addParam('端末種別ID', 'device_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -145,7 +152,8 @@
* @param object $objUpFile SC_UploadFileのインスタンス
* @return array エラー情報を格納した連想配列, エラーが無ければ(多分)nullを返す
*/
- function lfCheckError(&$objFormParam, &$objUpFile) {
+ function lfCheckError(&$objFormParam, &$objUpFile)
+ {
$arrErr = $objFormParam->checkError();
$template_code = $objFormParam->getValue('template_code');
@@ -196,7 +204,8 @@
* @param object $objUpFile SC_UploadFileのインスタンス
* @return boolean 成功した場合 true; 失敗した場合 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');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'mail/index.tpl';
$this->tpl_mainno = 'mail';
@@ -82,7 +84,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -92,7 +95,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -180,7 +184,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -190,7 +195,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfInitParamSearchCustomer(&$objFormParam) {
+ function lfInitParamSearchCustomer(&$objFormParam)
+ {
SC_Helper_Customer_Ex::sfSetSearchParam($objFormParam);
$objFormParam->addParam('配信形式', 'search_htmlmail', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
$objFormParam->addParam('配信メールアドレス種別', 'search_mail_type', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
@@ -202,7 +208,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfAddParamSelectTemplate(&$objFormParam) {
+ function lfAddParamSelectTemplate(&$objFormParam)
+ {
$objFormParam->addParam('メール形式', '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('本文', 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -215,7 +222,8 @@
* @param array $arrTemplate SC_Helper_Mail_Ex::sfGetMailmagaTemplate()の戻り値
* @return array key:template_id value:サブジェクト【配信形式】
*/
- function lfGetMailTemplateList($arrTemplate) {
+ function lfGetMailTemplateList($arrTemplate)
+ {
if (is_array($arrTemplate)) {
foreach ($arrTemplate as $line) {
$return[$line['template_id']] = '【' . $this->arrHtmlmail[$line['mail_method']] . '】' . $line['subject'];
@@ -231,7 +239,8 @@
* @param array $template_id テンプレートID
* @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 = ?';
@@ -244,7 +253,8 @@
*
* @return integer 登録した行の dtb_send_history.send_id の値
*/
- function lfRegisterData(&$objFormParam) {
+ function lfRegisterData(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
list($linemax, $arrSendCustomer, $objNavi) = SC_Helper_Customer_Ex::sfGetSearchData($objFormParam->getHashArray(), 'All');
@@ -288,7 +298,8 @@
* @param integer $send_id 配信履歴番号
* @return array
*/
- function lfGetMailQuery($send_id) {
+ function lfGetMailQuery($send_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'mail/history.tpl';
$this->tpl_mainno = 'mail';
@@ -56,7 +58,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -66,7 +69,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->getMode()) {
case 'delete':
@@ -90,7 +94,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -100,7 +105,8 @@
* @param integer $search_pageno 表示したいページ番号
* @return array( integer 全体件数, mixed メール配信データ一覧配列, mixed SC_PageNaviオブジェクト)
*/
- function lfDoSearch($search_pageno = 1) {
+ function lfDoSearch($search_pageno = 1)
+ {
// 引数の初期化
if (SC_Utils_Ex::sfIsInt($search_pageno)===false) {
@@ -139,7 +145,8 @@
* @param integer $send_id 削除したい送信履歴のID
* @return void
*/
- function lfDeleteHistory($send_id) {
+ function lfDeleteHistory($send_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->update('dtb_send_history',
array('del_flg' =>1),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @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
@@ -40,7 +41,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_subtitle = 'プレビュー';
$this->tpl_mainpage = 'mail/preview.tpl';
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objMailHelper = new SC_Helper_Mail_Ex();
@@ -93,7 +97,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'mail/template.tpl';
$this->tpl_mainno = 'mail';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objMailHelper = new SC_Helper_Mail_Ex();
@@ -92,7 +96,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -101,7 +106,8 @@
* @param integer 削除したいテンプレートのID
* @return void
*/
- function lfDeleteMailTemplate($template_id) {
+ function lfDeleteMailTemplate($template_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->update('dtb_mailmaga_template',
array('del_flg' =>1),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'mail/template_input.tpl';
$this->tpl_mainno = 'mail';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objMailHelper = new SC_Helper_Mail_Ex();
@@ -114,7 +118,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -125,7 +130,8 @@
* @param integer template_id 更新時は指定
* @return void
*/
- function lfRegistData(&$objFormParam, $template_id = null) {
+ function lfRegistData(&$objFormParam, $template_id = null)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sqlval = $objFormParam->getDbArray();
@@ -153,7 +159,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('メール形式', '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('本文', 'body', LLTEXT_LEN, 'KVCa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/index.tpl';
$this->tpl_mainno = 'order';
@@ -80,7 +82,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -90,7 +93,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
@@ -181,7 +185,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -191,7 +196,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('注文番号1', 'search_order_id1', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('注文番号2', 'search_order_id2', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('対応状況', 'search_order_status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -238,7 +244,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
@@ -276,7 +283,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function buildQuery($key, &$where, &$arrValues, &$objFormParam) {
+ function buildQuery($key, &$where, &$arrValues, &$objFormParam)
+ {
$dbFactory = SC_DB_DBFactory_Ex::getInstance();
switch ($key) {
@@ -410,7 +418,8 @@
* @param array $arrParam 削除対象の値
* @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';
@@ -428,7 +437,8 @@
* @param string $order 検索結果の並び順
* @return void
*/
- function doOutputCSV($where, $arrVal, $order) {
+ function doOutputCSV($where, $arrVal, $order)
+ {
if ($where != '') {
$where = " WHERE $where ";
}
@@ -444,7 +454,8 @@
* @param array $arrValues 検索条件のパラメーター
* @return integer 検索結果の行数
*/
- function getNumberOfLines($where, $arrValues) {
+ function getNumberOfLines($where, $arrValues)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->count('dtb_order', $where, $arrValues);
}
@@ -459,7 +470,8 @@
* @param string $order 検索結果の並び順
* @return array 受注の検索結果
*/
- 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);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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',
@@ -74,7 +75,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/disp.tpl';
$this->tpl_mainno = 'order';
@@ -99,7 +101,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -109,7 +112,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objPurchase = new SC_Helper_Purchase_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -136,7 +140,8 @@
* デストラクタ.
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -146,7 +151,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
// 検索条件のパラメータを初期化
parent::lfInitParam($objFormParam);
@@ -258,7 +264,8 @@
* @param integer $order_id 取得元の受注ID
* @return void
*/
- function setOrderToFormParam(&$objFormParam, $order_id) {
+ function setOrderToFormParam(&$objFormParam, $order_id)
+ {
$objPurchase = new SC_Helper_Purchase_Ex();
// 受注詳細を設定
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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',
@@ -89,7 +90,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/edit.tpl';
$this->tpl_mainno = 'order';
@@ -122,7 +124,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -132,7 +135,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objPurchase = new SC_Helper_Purchase_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -311,7 +315,8 @@
*
* @return void
*/
-function destroy() {
+function destroy()
+{
parent::destroy();
}
@@ -321,7 +326,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
-function lfInitParam(&$objFormParam) {
+function lfInitParam(&$objFormParam)
+{
// 検索条件のパラメーターを初期化
parent::lfInitParam($objFormParam);
@@ -442,7 +448,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
-function lfInitMultipleParam(&$objFormParam) {
+function lfInitMultipleParam(&$objFormParam)
+{
$objFormParam->addParam('商品規格ID', 'multiple_product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('商品コード', 'multiple_product_code', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
$objFormParam->addParam('商品名', 'multiple_product_name', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
@@ -459,7 +466,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
-function setMultipleItemTo(&$objFormParam) {
+function setMultipleItemTo(&$objFormParam)
+{
$arrMultipleKey = array('multiple_shipping_id',
'multiple_product_class_id',
'multiple_product_name',
@@ -536,7 +544,8 @@
* @param integer $order_id 取得元の受注ID
* @return void
*/
-function setOrderToFormParam(&$objFormParam, $order_id) {
+function setOrderToFormParam(&$objFormParam, $order_id)
+{
$objPurchase = new SC_Helper_Purchase_Ex();
// 受注詳細を設定
@@ -604,7 +613,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラーメッセージの配列
*/
-function lfCheckError(&$objFormParam) {
+function lfCheckError(&$objFormParam)
+{
$objProduct = new SC_Product_Ex();
$arrErr = $objFormParam->checkError();
@@ -690,7 +700,8 @@
*
* エラー発生時は負数を返す。
*/
- function doRegister($order_id, &$objPurchase, &$objFormParam, &$message, &$arrValuesBefore) {
+ function doRegister($order_id, &$objPurchase, &$objFormParam, &$message, &$arrValuesBefore)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrValues = $objFormParam->getDbArray();
@@ -825,7 +836,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @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');
@@ -843,7 +855,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function doDeleteProduct($delete_no, &$objFormParam) {
+ function doDeleteProduct($delete_no, &$objFormParam)
+ {
$select_shipping_id = $objFormParam->getValue('select_shipping_id');
@@ -878,7 +891,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function addShipping(&$objFormParam) {
+ function addShipping(&$objFormParam)
+ {
$objFormParam->setValue('shipping_quantity',
$objFormParam->getValue('shipping_quantity') + 1);
$arrShippingIds = $objFormParam->getValue('shipping_id');
@@ -893,7 +907,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @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);
@@ -910,7 +925,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return アンカーキーの文字列
*/
- 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) . "'";
@@ -925,7 +941,8 @@
* @param integer $add_product_class_id 追加商品規格ID
* @return void
*/
- function shipmentAddProduct(&$objFormParam, $add_product_class_id){
+ function shipmentAddProduct(&$objFormParam, $add_product_class_id)
+ {
//複数配送に商品情報追加
$select_shipping_id = $objFormParam->getValue('select_shipping_id');
@@ -968,7 +985,8 @@
* @param integer $change_no 変更対象
* @return void
*/
- function shipmentEditProduct(&$objFormParam, $edit_product_class_id, $change_no){
+ function shipmentEditProduct(&$objFormParam, $edit_product_class_id, $change_no)
+ {
$arrPreProductClassIds = $objFormParam->getValue('product_class_id');
$select_shipping_id = $objFormParam->getValue('select_shipping_id');
@@ -1022,7 +1040,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array 配送データ
*/
- function getShipmentProducts(&$objFormParam){
+ 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');
@@ -1043,7 +1062,8 @@
* @param array $no 変更対象
* @return void
*/
- function changeShipmentProducts(&$arrShipmentProducts, $arrProductInfo, $shipping_id, $no){
+ 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'];
@@ -1059,7 +1079,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function setProductsQuantity(&$objFormParam){
+ 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) {
@@ -1084,7 +1105,8 @@
* @param array $arrDeleteKeys 削除項目
* @return void
*/
- function checkDeleteProducts(&$objFormParam, $arrProductClassIds, $delete_product_class_id, $arrDeleteKeys){
+ function checkDeleteProducts(&$objFormParam, $arrProductClassIds, $delete_product_class_id, $arrDeleteKeys)
+ {
foreach ($arrProductClassIds as $relation_index => $product_class_id) {
//product_class_idの重複はないので、１つ削除したら完了
if($product_class_id == $delete_product_class_id){
@@ -1111,7 +1133,8 @@
* @param array $delete_no 削除対象
* @return void
*/
- function deleteShipment(&$objFormParam, $arrShipmentDeletKeys, $delete_shipping_id, $delete_no){
+ 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){
@@ -1136,7 +1159,8 @@
* @param array $arrAddProductInfo 追加データ
* @return array $arrAddProducts 更新データ
*/
- function checkInsertOrderProducts(&$objFormParam, $arrProductClassIds, $insert_product_class_id, $arrAddProductInfo){
+ 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'];
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/mail.tpl';
$this->tpl_mainno = 'order';
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$post = $_POST;
//一括送信用の処理
if (array_key_exists('mail_order_id',$post) and $post['mode'] == 'mail_select'){
@@ -152,7 +156,8 @@
* 指定された注文番号のメール履歴を取得する。
* @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 = ?';
@@ -165,7 +170,8 @@
* メールを送る。
* @param SC_FormParam $objFormParam
*/
- function doSend(&$objFormParam) {
+ function doSend(&$objFormParam)
+ {
$arrErr = $objFormParam->checkerror();
// メールの送信
@@ -190,7 +196,8 @@
* 確認画面を表示する為の準備
* @param SC_FormParam $objFormParam
*/
- function confirm(&$objFormParam) {
+ function confirm(&$objFormParam)
+ {
$arrErr = $objFormParam->checkerror();
// メールの送信
if (count($arrErr) == 0) {
@@ -217,7 +224,8 @@
* テンプレートの文言をフォームに入れる。
* @param SC_FormParam $objFormParam
*/
- function changeData(&$objFormParam) {
+ function changeData(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$template_id = $objFormParam->getValue('template_id');
@@ -253,7 +261,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -261,7 +270,8 @@
* パラメーター情報の初期化
* @param SC_FormParam $objFormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
// 検索条件のパラメーターを初期化
parent::lfInitParam($objFormParam);
$objFormParam->addParam('テンプレート', 'template_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/mail_view.tpl';
$this->tpl_subtitle = '受注管理メール確認';
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$send_id = $_GET['send_id'];
if (SC_Utils_Ex::sfIsInt($send_id)) {
@@ -80,7 +84,8 @@
* メールの履歴を取り出す。
* @param int $send_id
*/
- function getMailHistory($send_id) {
+ function getMailHistory($send_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'subject, mail_body';
$where = 'send_id = ?';
@@ -93,7 +98,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Multiple.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/multiple.tpl';
$this->tpl_mainno = 'order';
@@ -56,7 +58,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -66,7 +69,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->setTemplate($this->tpl_mainpage);
@@ -77,7 +81,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/pdf_input.tpl';
$this->tpl_mainno = 'order';
@@ -64,7 +66,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -74,7 +77,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objDate = new SC_Date_Ex(1901);
@@ -115,7 +119,8 @@
*
* PDF作成フォームのデフォルト値の生成
*/
- function createFromValues($order_id,$pdf_order_id) {
+ function createFromValues($order_id,$pdf_order_id)
+ {
// ここが$arrFormの初登場ということを明示するため宣言する。
$arrForm = array();
// タイトルをセット
@@ -149,7 +154,8 @@
* PDFの作成
* @param SC_FormParam $objFormParam
*/
- function createPdf(&$objFormParam) {
+ function createPdf(&$objFormParam)
+ {
$arrErr = $this->lfCheckError($objFormParam);
$arrRet = $objFormParam->getHashArray();
@@ -175,7 +181,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -183,7 +190,8 @@
* パラメーター情報の初期化
* @param SC_FormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('注文番号', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('注文番号', 'pdf_order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('発行日', 'year', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -206,7 +214,8 @@
* @var SC_FormParam
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrParams = $objFormParam->getHashArray();
$arrErr = $objFormParam->checkError();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/product_select.tpl';
$this->tpl_mainno = 'order';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -101,7 +105,8 @@
$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();';
// 規格1クラス名
$this->tpl_class_name1 = $objProduct->className1;
@@ -132,7 +137,8 @@
* @param array $arrProductId
* @param SC_Product $objProduct
*/
- function getProductList($arrProductId, &$objProduct) {
+ function getProductList($arrProductId, &$objProduct)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 表示順序
@@ -146,7 +152,8 @@
* ロード時に実行するJavascriptを生成
* @param array $arrProducts
*/
- function getFnOnload($arrProducts) {
+ function getFnOnload($arrProducts)
+ {
foreach ($arrProducts as $arrProduct) {
$js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});";
}
@@ -157,7 +164,8 @@
* 規格クラス用JavaScript生成
* @param SC_Product $objProduct
*/
- function getTplJavascript(&$objProduct) {
+ function getTplJavascript(&$objProduct)
+ {
return 'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
}
@@ -166,7 +174,8 @@
* @param array $whereAndBind string whereと array bindの連想配列
* @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();
@@ -186,7 +195,8 @@
* @param array $whereAndBind
* @param SC_Product $objProduct
*/
- function getLineCount($whereAndBind,&$objProduct) {
+ function getLineCount($whereAndBind,&$objProduct)
+ {
$where = $whereAndBind['where'];
$bind = $whereAndBind['bind'];
// 検索結果対象となる商品の数を取得
@@ -202,7 +212,8 @@
* @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();
@@ -242,7 +253,8 @@
* リクエストパラメーターnoを取ってくる。
* @param unknown_type $globalParams
*/
- function getNo($globalParams) {
+ function getNo($globalParams)
+ {
foreach ($globalParams as $params) {
if (isset($params['no']) && $params['no']!= '') {
return intval($params['no']);
@@ -255,7 +267,8 @@
* リクエストパラメーター shipping_id を取ってくる。
* @param unknown_type $globalParams
*/
- function getShippingId($globalParams) {
+ function getShippingId($globalParams)
+ {
foreach ($globalParams as $params) {
if (isset($params['shipping_id']) && $params['shipping_id']!= '') {
return intval($params['shipping_id']);
@@ -270,7 +283,8 @@
* @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;
@@ -286,7 +300,8 @@
* デストラクタ.
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -294,7 +309,8 @@
* パラメーター情報の初期化
* @param SC_FormParam $objFormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('オーダーID', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
$objFormParam->addParam('カテゴリID', 'search_category_id', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'order/status.tpl';
$this->tpl_mainno = 'order';
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
@@ -121,7 +125,8 @@
* パラメーター情報の初期化
* @param SC_FormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('注文番号', 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('変更前対応状況', 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('ページ番号', 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -135,7 +140,8 @@
* 入力内容のチェック
* @param SC_FormParam
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrRet = $objFormParam->getHashArray();
$arrErr = $objFormParam->checkError();
@@ -149,12 +155,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
// 対応状況一覧の表示
- function lfStatusDisp($status,$pageno) {
+ function lfStatusDisp($status,$pageno)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$select ='*';
@@ -189,7 +197,8 @@
/**
* 対応状況の更新
*/
- function lfStatusMove($statusId, $arrOrderId) {
+ function lfStatusMove($statusId, $arrOrderId)
+ {
$objPurchase = new SC_Helper_Purchase_Ex();
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -214,7 +223,8 @@
/**
* 受注テーブルの論理削除
*/
- function lfDelete($arrOrderId) {
+ function lfDelete($arrOrderId)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
if (!isset($arrOrderId) || !is_array($arrOrderId)) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'ownersstore/plugin.tpl';
$this->tpl_subno = 'index';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
$mode = $this->getMode();
@@ -212,7 +216,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -223,7 +228,8 @@
* @param string $mode モード
* @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') {
@@ -238,7 +244,8 @@
* @param string $key 登録するキー.
* @return void
*/
- function initUploadFile(&$objUpFile, $key) {
+ function initUploadFile(&$objUpFile, $key)
+ {
$objUpFile->addFile('プラグインファイル', $key, explode(',', PLUGIN_EXTENSION), FILE_SIZE, true, 0, 0, false);
}
@@ -249,7 +256,8 @@
* @param string $file_key ファイルキー
* @return array エラー情報を格納した連想配列.
*/
- function checkUploadFile($file_key) {
+ function checkUploadFile($file_key)
+ {
$objErr = new SC_CheckError_Ex();
// 拡張子チェック
$objErr->doFunc(array('プラグインファイル', $file_key, explode(',', PLUGIN_EXTENSION)), array('FILE_EXT_CHECK'));
@@ -267,7 +275,8 @@
* @param string $plugin_code プラグインコード
* @return boolean インストール済の場合true インストールされていない場合false
*/
- function isInstalledPlugin($plugin_code) {
+ function isInstalledPlugin($plugin_code)
+ {
$plugin = SC_Plugin_Util_Ex::getPluginByPluginCode($plugin_code);
if (!empty($plugin)) {
return true;
@@ -284,7 +293,8 @@
* @param string $file_name ファイル名
* @return string $plugin_code プラグインコード.
*/
- function getPluginCode($file_name) {
+ function getPluginCode($file_name)
+ {
// 分解
$array_ext = explode('.', $file_name);
$array_file_name = array_diff($array_ext, array('tar','gz'));
@@ -299,7 +309,8 @@
* @param string $plugin_code プラグインコード
* @return string $plugin_dir_path プラグイン保存ディレクトリのパス.
*/
- function getPluginDir($plugin_code) {
+ function getPluginDir($plugin_code)
+ {
$plugin_dir_path = PLUGIN_UPLOAD_REALDIR . $plugin_code . '/';
return $plugin_dir_path;
}
@@ -310,7 +321,8 @@
* @param string $plugin_code プラグインコード
* @return string $plugin_dir_path プラグイン保存ディレクトリのパス.
*/
- function getHtmlPluginDir($plugin_code) {
+ function getHtmlPluginDir($plugin_code)
+ {
$plugin_html_dir_path = PLUGIN_HTML_REALDIR . $plugin_code . '/';
return $plugin_html_dir_path;
}
@@ -322,7 +334,8 @@
* @param string $plugin_class プラグインクラス名
* @return string $plugin_file_path クラスファイルのパス.
*/
- 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;
}
@@ -334,7 +347,8 @@
* @param string $key キー.
* @return array エラー情報を格納した連想配列.
*/
- function installPlugin($archive_file_name, $key) {
+ function installPlugin($archive_file_name, $key)
+ {
// 一時展開ディレクトリにファイルがある場合は事前に削除.
$arrFileHash = SC_Helper_FileManager_Ex::sfGetFileList(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR);
if (count($arrFileHash) > 0) {
@@ -424,7 +438,8 @@
* @param string $plugin_id プラグインID.
* @param string $plugin_html_dir_path プラグイン毎に生成されるhtmlディレクトリのパス.
*/
- function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir_path ='') {
+ function rollBack($temp_dir, $plugin_id = '', $plugin_html_dir_path ='')
+ {
// 一時ディレクトリを削除.
SC_Helper_FileManager_Ex::deleteFile($temp_dir, false);
// DBからプラグイン情報を削除
@@ -443,7 +458,8 @@
* @param ReflectionClass $objReflection
* @return array プラグイン情報の配列
*/
- function getPluginInfo(ReflectionClass $objReflection) {
+ function getPluginInfo(ReflectionClass $objReflection)
+ {
$arrStaticProps = $objReflection->getStaticProperties();
$arrConstants = $objReflection->getConstants();
@@ -481,7 +497,8 @@
* @param string $dir_path チェックするプラグインディレクトリ
* @return array エラー情報を格納した連想配列.
*/
- function checkPluginConstants(ReflectionClass $objReflection, $dir_path) {
+ function checkPluginConstants(ReflectionClass $objReflection, $dir_path)
+ {
$arrErr = array();
// プラグイン情報を取得
$arrPluginInfo = $this->getPluginInfo($objReflection);
@@ -550,7 +567,8 @@
* @param string $upload_file_name アップロードファイル名.
* @return array エラー情報を格納した連想配列.
*/
- function updatePlugin($target_plugin, $upload_file_name) {
+ function updatePlugin($target_plugin, $upload_file_name)
+ {
// アップデート前に不要なファイルを消しておきます.
SC_Helper_FileManager_Ex::deleteFile(DOWNLOADS_TEMP_PLUGIN_UPDATE_DIR, false);
@@ -598,7 +616,8 @@
* @param string $file_key ファイルキー
* @return array エラー情報を格納した連想配列.
*/
- function unpackPluginFile($unpack_file_name, $unpack_dir_path, $file_key) {
+ function unpackPluginFile($unpack_file_name, $unpack_dir_path, $file_key)
+ {
$arrErr = array();
// 解凍ディレクトリディレクトリを作成し、一時ディレクトリからファイルを移動
$objUpFile = new SC_UploadFile_Ex(PLUGIN_TEMP_REALDIR, $unpack_dir_path);
@@ -629,7 +648,8 @@
* @param array $plugin プラグイン情報を確認した連想配列.
* @return array エラー情報を格納した連想配列.
*/
- function uninstallPlugin($plugin) {
+ function uninstallPlugin($plugin)
+ {
$arrErr = array();
// プラグインファイルを読み込みます.
$plugin_class_file_path = $this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
@@ -663,7 +683,8 @@
* @param array $plugin プラグイン情報を確認した連想配列.
* @return array $arrErr エラー情報を格納した連想配列.
*/
- function enablePlugin($plugin) {
+ function enablePlugin($plugin)
+ {
$arrErr = array();
// クラスファイルを読み込み.
$plugin_class_file_path = $this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
@@ -688,7 +709,8 @@
* @param array $plugin プラグイン情報を確認した連想配列.
* @return array $arrErr エラー情報を格納した連想配列.
*/
- function disablePlugin($plugin) {
+ function disablePlugin($plugin)
+ {
$arrErr = array();
// クラスファイルを読み込み.
$plugin_class_file_path =$this->getPluginFilePath($plugin['plugin_code'], $plugin['class_name']);
@@ -715,7 +737,8 @@
* @param int $priority 優先度
* @return integer 更新件数
*/
- function updatePriority($plugin_id, $priority) {
+ function updatePriority($plugin_id, $priority)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['priority'] = $priority;
@@ -732,7 +755,8 @@
* @param array $arrPluginInfo プラグイン情報を格納した連想配列.
* @return array エラー情報を格納した連想配列.
*/
- function registerData($arrPluginInfo) {
+ function registerData($arrPluginInfo)
+ {
// プラグイン情報をDB登録.
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -804,7 +828,8 @@
* @param string $key エラー情報のキー.
* @return array $arrErr エラー情報を格納した連想配列.
*/
- function requirePluginFile($file_path, $key) {
+ function requirePluginFile($file_path, $key)
+ {
$arrErr = array();
if (file_exists($file_path)) {
require_once $file_path;
@@ -823,7 +848,8 @@
* @return array $arrErr エラー情報を格納した連想配列.
*
*/
- 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);
@@ -842,7 +868,8 @@
* @param string $path アーカイブパス
* @return boolean Archive_Tar::extractModify()のエラー
*/
- function unpackPluginArchive($path) {
+ function unpackPluginArchive($path)
+ {
// 圧縮フラグTRUEはgzip解凍をおこなう
$tar = new Archive_Tar($path, true);
@@ -868,7 +895,8 @@
* @param int $enable_flg 有効フラグ
* @return integer 更新件数
*/
- function updatePluginEnable($plugin_id, $enable_flg) {
+ function updatePluginEnable($plugin_id, $enable_flg)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['enable'] = $enable_flg;
@@ -886,7 +914,8 @@
* @param string $plugin_code プラグインコード.
* @return array $arrErr エラー情報を格納した連想配列.
*/
- function deletePlugin($plugin_id, $plugin_code) {
+ function deletePlugin($plugin_id, $plugin_code)
+ {
$arrErr = array();
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -913,7 +942,8 @@
* @param string $file_name ファイル名.
* @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) {
@@ -932,7 +962,8 @@
* @param string $file_path 判定するファイルパス
* @return boolean
*/
- function checkContainsFile($tar_obj, $file_path) {
+ function checkContainsFile($tar_obj, $file_path)
+ {
// ファイル一覧を取得
$arrayFile = $tar_obj->listContent();
foreach ($arrayFile as $value) {
@@ -947,7 +978,8 @@
* @param string $dir_path 作成するディレクトリのパス
* @return void
*/
- function makeDir($dir_path) {
+ function makeDir($dir_path)
+ {
// ディレクトリ作成
if (!file_exists($dir_path)) {
mkdir($dir_path);
@@ -960,7 +992,8 @@
* @param int $plugin_id プラグインID
* @return string $conflict_alert_message メッセージ
*/
- function checkConflictPlugin($plugin_id) {
+ function checkConflictPlugin($plugin_id)
+ {
// フックポイントを取得します.
$hookPoints = $this->getHookPoint($plugin_id);
@@ -995,7 +1028,8 @@
* @param array $arrErr エラー情報を格納した連想配列.
* @return boolean.
*/
- function isError($error) {
+ function isError($error)
+ {
if (is_array($error) && count($error) > 0) {
return true;
}
@@ -1008,7 +1042,8 @@
* @param string $plugin_id プラグインID
* @return array フックポイントの連想配列.
*/
- function getHookPoint($plugin_id) {
+ function getHookPoint($plugin_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_plugin_hookpoint';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'ownersstore/log.tpl';
@@ -56,7 +58,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -66,7 +69,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->getMode()) {
case 'detail':
$objForm = $this->initParam();
@@ -90,11 +94,13 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
- function getLogs() {
+ function getLogs()
+ {
$sql =<<<END
SELECT
*
@@ -113,14 +119,16 @@
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
*
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Module.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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';
// }}}
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'ownersstore/module.tpl';
@@ -57,7 +59,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -67,7 +70,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// nothing.
}
@@ -76,7 +80,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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のインスタンス */
var $objForm;
@@ -50,7 +51,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'ownersstore/settings.tpl';
@@ -66,7 +68,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -76,7 +79,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->getMode()) {
// 入力内容をDBへ登録する
case 'register':
@@ -93,7 +97,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -104,7 +109,8 @@
* @param void
* @return void
*/
- function execRegisterMode() {
+ function execRegisterMode()
+ {
// パラメーターオブジェクトの初期化
$this->initRegisterMode();
// POSTされたパラメーターの検証
@@ -133,7 +139,8 @@
* @param void
* @return void
*/
- function initRegisterMode() {
+ function initRegisterMode()
+ {
// 前後の空白を削除
if (isset($_POST['public_key'])) {
$_POST['public_key'] = trim($_POST['public_key']);
@@ -152,7 +159,8 @@
* @param void
* @return array エラー情報を格納した連想配列
*/
- function validateRegistermode() {
+ function validateRegistermode()
+ {
return $this->objForm->checkError();
}
@@ -163,7 +171,8 @@
* @param void
* @return void
*/
- function execDefaultMode() {
+ function execDefaultMode()
+ {
$this->arrForm = $this->getOwnersStoreSettings();
}
@@ -173,7 +182,8 @@
* @param array $arrSettingsData オーナーズストア設定の連想配列
* @return void
*/
- function registerOwnersStoreSettings($arrSettingsData) {
+ function registerOwnersStoreSettings($arrSettingsData)
+ {
$table = 'dtb_ownersstore_settings';
$objQuery =& SC_Query_Ex::getSingletonInstance();
$exists = $objQuery->exists($table);
@@ -191,7 +201,8 @@
* @param void
* @return array
*/
- function getOwnersStoreSettings() {
+ function getOwnersStoreSettings()
+ {
$table = 'dtb_ownersstore_settings';
$colmuns = '*';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/index.tpl';
$this->tpl_mainno = 'products';
@@ -77,7 +79,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -87,7 +90,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -186,7 +190,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -196,7 +201,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
// POSTされる値
$objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -227,7 +233,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
@@ -237,7 +244,8 @@
}
// カテゴリIDをキー、カテゴリ名を値にする配列を返す。
- function lfGetIDName($arrCatKey, $arrCatVal) {
+ function lfGetIDName($arrCatKey, $arrCatVal)
+ {
$max = count($arrCatKey);
for ($cnt = 0; $cnt < $max; $cnt++) {
$key = isset($arrCatKey[$cnt]) ? $arrCatKey[$cnt] : '';
@@ -254,7 +262,8 @@
* @param array $arrParam 削除対象の値
* @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';
@@ -281,7 +290,8 @@
* @param SC_FormParam $objDb SC_Helper_DB_Ex インスタンス
* @return void
*/
- function buildQuery($key, &$where, &$arrValues, &$objFormParam, &$objDb) {
+ function buildQuery($key, &$where, &$arrValues, &$objFormParam, &$objDb)
+ {
$dbFactory = SC_DB_DBFactory_Ex::getInstance();
switch ($key) {
// 商品ID
@@ -366,7 +376,8 @@
* @param array $arrValues 検索条件のパラメーター
* @return integer 検索結果の行数
*/
- function getNumberOfLines($where, $arrValues) {
+ function getNumberOfLines($where, $arrValues)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->count('dtb_products', $where, $arrValues);
}
@@ -382,7 +393,8 @@
* @param SC_Product $objProduct SC_Product インスタンス
* @return array 商品の検索結果
*/
- function findProducts($where, $arrValues, $limit, $offset, $order, &$objProduct) {
+ function findProducts($where, $arrValues, $limit, $offset, $order, &$objProduct)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 読み込む列とテーブルの指定
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_maintitle = '商品管理';
$this->tpl_subtitle = 'カテゴリ登録';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -200,7 +204,8 @@
* @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();
@@ -230,7 +235,8 @@
* @param SC_FormParam $objFormParam
* @return void
*/
- function doPreEdit(&$objFormParam) {
+ function doPreEdit(&$objFormParam)
+ {
$category_id = $objFormParam->getValue('category_id');
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -256,7 +262,8 @@
* @param SC_FormParam $objFormParam
* @return void
*/
- function doEdit(&$objFormParam) {
+ function doEdit(&$objFormParam)
+ {
$category_id = $objFormParam->getValue('category_id');
// 追加か
@@ -292,7 +299,8 @@
* @param boolean $add 追加か
* @return void
*/
- function checkError(&$objFormParam, $add) {
+ function checkError(&$objFormParam, $add)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 入力項目チェック
@@ -347,7 +355,8 @@
* @param SC_FormParam $objFormParam
* @return void
*/
- function doUp(&$objFormParam) {
+ function doUp(&$objFormParam)
+ {
$category_id = $objFormParam->getValue('category_id');
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -374,7 +383,8 @@
* @param SC_FormParam $objFormParam
* @return void
*/
- function doDown(&$objFormParam) {
+ function doDown(&$objFormParam)
+ {
$category_id = $objFormParam->getValue('category_id');
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -401,7 +411,8 @@
* @param SC_FormParam $objFormParam
* @return void
*/
- function initParam(&$objFormParam) {
+ function initParam(&$objFormParam)
+ {
$objFormParam->addParam('親カテゴリID', 'parent_category_id', null, null, array());
$objFormParam->addParam('カテゴリID', 'category_id', null, null, array());
$objFormParam->addParam('カテゴリ名', 'category_name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -417,7 +428,8 @@
* @param int $parent_category_id 親カテゴリID
* @return array カテゴリの配列
*/
- function findCategoiesByParentCategoryId($parent_category_id) {
+ function findCategoiesByParentCategoryId($parent_category_id)
+ {
if (!$parent_category_id) {
$parent_category_id = 0;
}
@@ -434,7 +446,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function updateCategory($category_id, $arrCategory) {
+ function updateCategory($category_id, $arrCategory)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrCategory['update_date'] = 'CURRENT_TIMESTAMP';
@@ -451,7 +464,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function registerCategory($arrCategory) {
+ function registerCategory($arrCategory)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$parent_category_id = $arrCategory['parent_category_id'];
@@ -497,7 +511,8 @@
* @param integer 親カテゴリID
* @param 超えている場合 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;
@@ -508,12 +523,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
// 並びが1つ下のIDを取得する。
- function lfGetDownRankID($objQuery, $table, $pid_name, $id_name, $id) {
+ function lfGetDownRankID($objQuery, $table, $pid_name, $id_name, $id)
+ {
// 親IDを取得する。
$col = "$pid_name";
$where = "$id_name = ?";
@@ -534,7 +551,8 @@
}
// 並びが1つ上のIDを取得する。
- function lfGetUpRankID($objQuery, $table, $pid_name, $id_name, $id) {
+ function lfGetUpRankID($objQuery, $table, $pid_name, $id_name, $id)
+ {
// 親IDを取得する。
$col = "$pid_name";
$where = "$id_name = ?";
@@ -554,14 +572,16 @@
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();
// 子ID一覧を取得
$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();
// 子ID一覧を取得
$arrRet = $objDb->sfGetChildrenArray($table, $pid_name, $id_name, $id);
@@ -573,7 +593,8 @@
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();
// 子ID一覧を取得
$arrRet = $objDb->sfGetChildrenArray($table, $pid_name, $id_name, $id);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/class.tpl';
$this->tpl_subno = 'class';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
@@ -138,7 +142,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -148,7 +153,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('規格名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
$objFormParam->addParam('規格ID', 'class_id', INT_LEN, 'n', array('NUM_CHECK'));
}
@@ -158,7 +164,8 @@
*
* @return array 規格情報
*/
- function lfGetClass() {
+ function lfGetClass()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'del_flg <> 1';
@@ -173,7 +180,8 @@
* @param integer $class_id 規格ID
* @return string 規格名
*/
- 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));
@@ -186,7 +194,8 @@
* @param array $arrForm フォームパラメータークラス
* @return integer 更新件数
*/
- function lfInsertClass($arrForm) {
+ function lfInsertClass($arrForm)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTする値を作成する。
$sqlval['name'] = $arrForm['name'];
@@ -206,7 +215,8 @@
* @param array $arrForm フォームパラメータークラス
* @return integer 更新件数
*/
- function lfUpdateClass($arrForm) {
+ function lfUpdateClass($arrForm)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['name'] = $arrForm['name'];
@@ -224,7 +234,8 @@
* @param SC_Helper_DB $objDb SC_Helper_DBのインスタンス
* @return integer 削除件数
*/
- function lfDeleteClass($class_id) {
+ function lfDeleteClass($class_id)
+ {
$objDb = new SC_Helper_DB_Ex();
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -240,7 +251,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrForm = $objFormParam->getHashArray();
// パラメーターの基本チェック
@@ -266,7 +278,8 @@
* @param string $arrForm フォームの入力値
* @return boolean 新規商品追加の場合 true
*/
- function lfCheckInsert($arrForm) {
+ function lfCheckInsert($arrForm)
+ {
//class_id のあるなしで新規商品かどうかを判定
if (empty($arrForm['class_id'])) {
return true;
@@ -280,7 +293,8 @@
* @param integer $class_id 規格ID
* @return void
*/
- function lfUpRank($class_id) {
+ function lfUpRank($class_id)
+ {
$objDb = new SC_Helper_DB_Ex();
$objDb->sfRankUp('dtb_class', 'class_id', $class_id);
}
@@ -290,7 +304,8 @@
* @param integer $class_id 規格ID
* @return void
*/
- function lfDownRank($class_id) {
+ function lfDownRank($class_id)
+ {
$objDb = new SC_Helper_DB_Ex();
$objDb->sfRankDown('dtb_class', 'class_id', $class_id);
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/classcategory.tpl';
$this->tpl_subno = 'class';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
@@ -141,7 +145,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -151,7 +156,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('規格ID', 'class_id', INT_LEN, 'n', array('NUM_CHECK'));
$objFormParam->addParam('規格分類名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK' ,'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
$objFormParam->addParam('規格分類ID', 'classcategory_id', INT_LEN, 'n', array('NUM_CHECK'));
@@ -163,7 +169,8 @@
* @param integer $class_id 規格ID
* @return array 規格分類情報
*/
- function lfGetClassCat($class_id) {
+ function lfGetClassCat($class_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'del_flg <> 1 AND class_id = ?';
@@ -178,7 +185,8 @@
* @param integer $class_id 規格ID
* @return string 規格名
*/
- function lfGetClassName($class_id) {
+ function lfGetClassName($class_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'class_id = ?';
@@ -192,7 +200,8 @@
* @param integer $classcategory_id 規格分類ID
* @return string 規格分類名
*/
- 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));
@@ -205,7 +214,8 @@
* @param array $arrForm フォームパラメータークラス
* @return integer 更新件数
*/
- function lfInsertClass($arrForm) {
+ function lfInsertClass($arrForm)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
// 親規格IDの存在チェック
@@ -233,7 +243,8 @@
* @param array $arrForm フォームパラメータークラス
* @return integer 更新件数
*/
- function lfUpdateClass($arrForm) {
+ function lfUpdateClass($arrForm)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['name'] = $arrForm['name'];
@@ -250,7 +261,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return array エラー配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrForm = $objFormParam->getHashArray();
// パラメーターの基本チェック
@@ -276,7 +288,8 @@
* @param integer $classcategory_id 規格分類ID
* @return boolean 新規商品追加の場合 true
*/
- function lfCheckInsert($classcategory_id) {
+ function lfCheckInsert($classcategory_id)
+ {
//classcategory_id のあるなしで新規規格分類化かどうかを判定
if (empty($classcategory_id)) {
return true;
@@ -292,7 +305,8 @@
* @param integer $classcategory_id 規格分類ID
* @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);
@@ -304,7 +318,8 @@
* @param integer $classcategory_id 規格分類ID
* @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);
@@ -316,7 +331,8 @@
* @param integer $classcategory_id 規格分類ID
* @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);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/maker.tpl';
$this->tpl_subno = 'maker';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
@@ -149,7 +153,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -159,7 +164,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('メーカーID', 'maker_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メーカー名', 'name', SMTEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
}
@@ -169,7 +175,8 @@
*
* @return array $arrMaker メーカー情報
*/
- function lfDisp() {
+ function lfDisp()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 削除されていないメーカー情報を表示する
@@ -186,7 +193,8 @@
* @param array $arrForm メーカー情報
* @return void
*/
- function lfInsert(&$arrForm) {
+ function lfInsert(&$arrForm)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTする値を作成する
@@ -207,7 +215,8 @@
* @param array $arrForm メーカー情報
* @return void
*/
- function lfUpdate(&$arrForm) {
+ function lfUpdate(&$arrForm)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEする値を作成する
@@ -225,7 +234,8 @@
* @param integer $maker_id メーカーID
* @return void
*/
- function lfDelete($maker_id) {
+ function lfDelete($maker_id)
+ {
$objDb = new SC_Helper_DB_Ex();
$objDb->sfDeleteRankRecord('dtb_maker', 'maker_id', $maker_id, '', true);
}
@@ -237,7 +247,8 @@
* @param string $mode up か down のモードを示す文字列
* @return void
*/
- function lfRankChange($maker_id, $mode) {
+ function lfRankChange($maker_id, $mode)
+ {
$objDb = new SC_Helper_DB_Ex();
switch ($mode) {
@@ -261,7 +272,8 @@
* @param integer $maker_id メーカーID
* @return array $arrForm メーカー名を追加
*/
- function lfPreEdit(&$arrForm, $maker_id) {
+ function lfPreEdit(&$arrForm, $maker_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 編集項目を取得する
@@ -279,7 +291,8 @@
* @param array $arrForm メーカー情報
* @return array $objErr->arrErr エラー内容
*/
- function lfCheckError(&$arrForm, &$objFormParam) {
+ function lfCheckError(&$arrForm, &$objFormParam)
+ {
$arrErr = $objFormParam->checkError();
if (!empty($arrErr)) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/product.tpl';
$this->tpl_mainno = 'products';
@@ -64,7 +66,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -74,7 +77,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
@@ -293,7 +297,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -305,7 +310,8 @@
* @param array $arrPost $_POSTデータ
* @return void
*/
- function lfInitFormParam_PreEdit(&$objFormParam, $arrPost) {
+ function lfInitFormParam_PreEdit(&$objFormParam, $arrPost)
+ {
$objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->setParam($arrPost);
$objFormParam->convParam();
@@ -318,7 +324,8 @@
* @param array $arrPost $_POSTデータ
* @return void
*/
- function lfInitFormParam(&$objFormParam, $arrPost) {
+ function lfInitFormParam(&$objFormParam, $arrPost)
+ {
$objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('商品名', 'name', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('商品カテゴリ', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -386,7 +393,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitFormParam_UploadImage(&$objFormParam) {
+ function lfInitFormParam_UploadImage(&$objFormParam)
+ {
$objFormParam->addParam('image_key', 'image_key', '', '', array());
}
@@ -397,7 +405,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return void
*/
- function lfInitFormParam_UploadDown(&$objFormParam) {
+ function lfInitFormParam_UploadDown(&$objFormParam)
+ {
$objFormParam->addParam('down_key', 'down_key', '', '', array());
}
@@ -408,7 +417,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @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'));
}
@@ -420,7 +430,8 @@
* @param object $objUpFile SC_UploadFileインスタンス
* @return void
*/
- function lfInitFile(&$objUpFile) {
+ function lfInitFile(&$objUpFile)
+ {
$objUpFile->addFile('一覧-メイン画像', 'main_list_image', array('jpg', 'gif', 'png'),IMAGE_SIZE, false, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
$objUpFile->addFile('詳細-メイン画像', 'main_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT);
$objUpFile->addFile('詳細-メイン拡大画像', 'main_large_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, LARGE_IMAGE_WIDTH, LARGE_IMAGE_HEIGHT);
@@ -437,7 +448,8 @@
* @param object $objDownFile SC_UploadFileインスタンス
* @return void
*/
- function lfInitDownFile(&$objDownFile) {
+ function lfInitDownFile(&$objDownFile)
+ {
$objDownFile->addFile('ダウンロード販売用ファイル', 'down_file', explode(',', DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0);
}
@@ -450,7 +462,8 @@
* @param array $arrForm フォーム入力パラメーター配列
* @return array エラー情報を格納した連想配列
*/
- function lfCheckError_Edit(&$objFormParam, &$objUpFile, &$objDownFile, $arrForm) {
+ function lfCheckError_Edit(&$objFormParam, &$objUpFile, &$objDownFile, $arrForm)
+ {
$objErr = new SC_CheckError_Ex($arrForm);
$arrErr = array();
@@ -492,7 +505,8 @@
* @param array $arrErr エラーメッセージの配列
* @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];
@@ -518,7 +532,8 @@
* @param array $arrPost $_POSTデータ
* @return array 検索パラメーター配列
*/
- function lfGetSearchParam($arrPost) {
+ function lfGetSearchParam($arrPost)
+ {
$arrSearchParam = array();
$objFormParam = new SC_FormParam_Ex();
@@ -538,7 +553,8 @@
* @param integer $product_id 商品ID
* @return array フォームパラメーター配列
*/
- function lfGetFormParam_PreEdit(&$objUpFile, &$objDownFile, $product_id) {
+ function lfGetFormParam_PreEdit(&$objUpFile, &$objDownFile, $product_id)
+ {
$arrForm = array();
// DBから商品データ取得
@@ -558,7 +574,8 @@
* @param object $objFormParam SC_FormParamインスタンス
* @return array フォームパラメーター配列
*/
- 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']);
@@ -575,7 +592,8 @@
* @param array $arrForm フォーム入力パラメーター配列
* @return array 表示用フォームパラメーター配列
*/
- function lfSetViewParam_InputPage(&$objUpFile, &$objDownFile, &$arrForm) {
+ function lfSetViewParam_InputPage(&$objUpFile, &$objDownFile, &$arrForm)
+ {
// カテゴリマスターデータ取得
$objDb = new SC_Helper_DB_Ex();
list($this->arrCatVal, $this->arrCatOut) = $objDb->sfGetLevelCatList(false);
@@ -617,7 +635,8 @@
* @param array $arrForm フォーム入力パラメーター配列
* @return array 表示用フォームパラメーター配列
*/
- function lfSetViewParam_ConfirmPage(&$objUpFile, &$objDownFile, &$arrForm) {
+ function lfSetViewParam_ConfirmPage(&$objUpFile, &$objDownFile, &$arrForm)
+ {
// カテゴリ表示用
$arrForm['arrCategoryId'] = $arrForm['category_id'];
// hidden に渡す値は serialize する
@@ -637,7 +656,8 @@
* @param string $image_key 画像ファイルキー
* @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':
@@ -662,7 +682,8 @@
* @param object $objUpFile SC_UploadFileインスタンス
* @return void
*/
- function lfCopyProductImageFiles(&$objUpFile) {
+ function lfCopyProductImageFiles(&$objUpFile)
+ {
$arrKey = $objUpFile->keyname;
$arrSaveFile = $objUpFile->save_file;
@@ -680,7 +701,8 @@
* @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 = '';
@@ -718,7 +740,8 @@
* @param string $image_key 画像ファイルキー
* @return void
*/
- function lfDeleteTempFile(&$objUpFile, $image_key) {
+ function lfDeleteTempFile(&$objUpFile, $image_key)
+ {
// TODO: SC_UploadFile::deleteFileの画像削除条件見直し要
$arrTempFile = $objUpFile->temp_file;
$arrKeyName = $objUpFile->keyname;
@@ -751,7 +774,8 @@
* @param integer $product_id 商品ID
* @return void
*/
- function lfSaveUploadFiles(&$objUpFile, &$objDownFile, $product_id) {
+ function lfSaveUploadFiles(&$objUpFile, &$objDownFile, $product_id)
+ {
// TODO: SC_UploadFile::moveTempFileの画像削除条件見直し要
$objImage = new SC_Image_Ex($objUpFile->temp_dir);
$arrKeyName = $objUpFile->keyname;
@@ -785,7 +809,8 @@
* @param string $image_file_name 画像ファイル名
* @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;
@@ -818,7 +843,8 @@
* @param integer $product_id 商品ID
* @return array 商品データ配列
*/
- function lfGetProductData_FromDB($product_id) {
+ function lfGetProductData_FromDB($product_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrProduct = array();
@@ -881,7 +907,8 @@
* @param integer $product_id 商品ID
* @return array 関連商品データ配列
*/
- function lfGetRecommendProductsData_FromDB($product_id) {
+ function lfGetRecommendProductsData_FromDB($product_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrRecommendProducts = array();
@@ -908,7 +935,8 @@
* @param string $arrForm フォーム入力パラメーター配列
* @return array 関連商品データ配列
*/
- function lfGetRecommendProducts(&$arrForm) {
+ function lfGetRecommendProducts(&$arrForm)
+ {
$arrRecommend = array();
for ($i = 1; $i <= RECOMMEND_PRODUCT_MAX; $i++) {
@@ -935,7 +963,8 @@
* @param void
* @return array カテゴリマスターデータ配列
*/
- function lfGetCategoryList_Edit() {
+ function lfGetCategoryList_Edit()
+ {
$objDb = new SC_Helper_DB_Ex();
$arrCategoryList = array();
@@ -954,7 +983,8 @@
* @param string $anchor_hash アンカー用ハッシュ文字列(省略可)
* @return string ページonload用JavaScript
*/
- function lfSetOnloadJavaScript_InputPage($anchor_hash = '') {
+ function lfSetOnloadJavaScript_InputPage($anchor_hash = '')
+ {
return "fnCheckStockLimit('" . DISABLED_RGB . "'); fnMoveSelect('category_id_unselect', 'category_id');" . $anchor_hash;
}
@@ -966,7 +996,8 @@
* @param array $arrList フォーム入力パラメーター配列
* @return integer 登録商品ID
*/
- function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList) {
+ function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objDb = new SC_Helper_DB_Ex();
@@ -1114,7 +1145,8 @@
* @param array $arrList
* @return void
*/
- function lfInsertDummyProductClass($arrList) {
+ function lfInsertDummyProductClass($arrList)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objDb = new SC_Helper_DB_Ex();
@@ -1147,7 +1179,8 @@
* @param array $arrList
* @return void
*/
- function lfUpdateProductClass($arrList) {
+ function lfUpdateProductClass($arrList)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sqlval = array();
@@ -1166,7 +1199,8 @@
* @param integer $product_id 登録する商品ID
* @return void
*/
- function lfInsertRecommendProducts(&$objQuery, $arrList, $product_id) {
+ function lfInsertRecommendProducts(&$objQuery, $arrList, $product_id)
+ {
// 一旦関連商品をすべて削除する
$objQuery->delete('dtb_recommend_products', 'product_id = ?', array($product_id));
$sqlval['product_id'] = $product_id;
@@ -1198,7 +1232,8 @@
* @param object $objQuery SC_Queryインスタンス
* @return boolean エラーフラグ
*/
- function lfCopyProductClass($arrList, &$objQuery) {
+ function lfCopyProductClass($arrList, &$objQuery)
+ {
// 複製元のdtb_products_classを取得（規格なしのため、1件のみの取得）
$col = '*';
$table = 'dtb_products_class';
@@ -1248,7 +1283,8 @@
* @param string $to_key
* @return string
*/
- function lfGetAddSuffix($to_key) {
+ function lfGetAddSuffix($to_key)
+ {
if ( IMAGE_RENAME === true) return;
// 自動生成される画像名
@@ -1275,7 +1311,8 @@
* @param array $arrSubProductData サブ情報配列
* @return boolean true: サブ情報あり, false: サブ情報なし
*/
- function hasSubProductData($arrSubProductData) {
+ function hasSubProductData($arrSubProductData)
+ {
$has_subproduct_data = false;
for ($i = 1; $i <= PRODUCTSUB_MAX; $i++) {
@@ -1301,7 +1338,8 @@
* @param string $anchor_key フォーム入力パラメーターで受け取ったアンカーキー
* @return <type>
*/
- function getAnchorHash($anchor_key) {
+ function getAnchorHash($anchor_key)
+ {
if ($anchor_key != '') {
return "location.hash='#" . htmlspecialchars($anchor_key) . "'";
} else {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/product_class.tpl';
$this->tpl_mainno = 'products';
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// 商品マスターの検索条件パラメーターを初期化
$objFormParam = new SC_FormParam_Ex();
@@ -164,7 +168,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -174,7 +179,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function initParam(&$objFormParam) {
+ function initParam(&$objFormParam)
+ {
// 商品マスター検索パラメーター引き継ぎ
$objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('カテゴリID', 'category_id', STEXT_LEN, 'n', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -224,7 +230,8 @@
* @param array $arrList 入力フォームの内容
* @param integer $product_id 登録を行う商品ID
*/
- function registerProductClass($arrList, $product_id, $total) {
+ function registerProductClass($arrList, $product_id, $total)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objDb = new SC_Helper_DB_Ex();
@@ -307,7 +314,8 @@
*
* @return array エラーの配列
*/
- function lfCheckSelectClass() {
+ function lfCheckSelectClass()
+ {
$objErr = new SC_CheckError_Ex();
$objErr->doFunc(array('規格1', 'class_id1'), array('EXIST_CHECK'));
$objErr->doFunc(array('規格', 'class_id1', 'select_class_id2'), array('TOP_EXIST_CHECK'));
@@ -321,7 +329,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラー結果の配列
*/
- function lfCheckProductsClass(&$objFormParam) {
+ function lfCheckProductsClass(&$objFormParam)
+ {
$arrValues = $objFormParam->getHashArray();
$arrErr = $objFormParam->checkError();
$total = $objFormParam->getValue('total');
@@ -394,7 +403,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @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');
@@ -430,7 +440,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function initDispParam(&$objFormParam) {
+ function initDispParam(&$objFormParam)
+ {
// 登録チェックボックス初期化(すべてチェックを外す)
$objFormParam->setValue('check', '');
@@ -448,7 +459,8 @@
* @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);
@@ -525,7 +537,8 @@
* @param $product_id
* @return void
*/
- function doDelete($product_id) {
+ function doDelete($product_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -562,7 +575,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function doFileUpload(&$objFormParam) {
+ function doFileUpload(&$objFormParam)
+ {
$index = $objFormParam->getValue('upload_index');
$arrDownRealFiles = $objFormParam->getValue('down_realfilename');
@@ -624,7 +638,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @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');
@@ -639,7 +654,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @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)) {
@@ -656,7 +672,8 @@
* @param integer $class_id2 規格ID2
* @return array 規格と規格分類の配列
*/
- function getAllClassCategory($class_id1, $class_id2 = null) {
+ function getAllClassCategory($class_id1, $class_id2 = null)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = <<< __EOF__
@@ -696,7 +713,8 @@
* @param integer $product_id 商品ID
* @return string 商品名の文字列
*/
- function getProductName($product_id) {
+ function getProductName($product_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
return $objQuery->get('name', 'dtb_products', 'product_id = ?', array($product_id));
}
@@ -707,7 +725,8 @@
* @access private
* @return array 規格分類の登録された, すべての規格
*/
- function getAllClass() {
+ function getAllClass()
+ {
$arrClass = SC_Helper_DB_Ex::sfGetIDValueList('dtb_class', 'class_id', 'name');
// 規格分類が登録されていない規格は表示しないようにする。
@@ -732,7 +751,8 @@
* @param integer $product_id 商品ID
* @return array 商品規格の配列
*/
- 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';
@@ -750,7 +770,8 @@
* @param integer $size 作成する配列のサイズ
* @return void
*/
- function fillCheckboxesValue($key, $size) {
+ function fillCheckboxesValue($key, $size)
+ {
if (empty($_POST[$key])) {
$_POST[$key] = array_pad(array(), $size, '');
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/product_rank.tpl';
$this->tpl_mainno = 'products';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objDb = new SC_Helper_DB_Ex();
@@ -112,12 +116,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* 商品読み込み */
- function lfGetProduct($category_id) {
+ function lfGetProduct($category_id)
+ {
// FIXME SC_Product クラスを使用した実装
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'alldtl.product_id, name, main_list_image, product_code_min, product_code_max, status';
@@ -150,7 +156,8 @@
/*
* 商品の数値指定での並び替え実行
*/
- function lfRenumber($parent_category_id) {
+ function lfRenumber($parent_category_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sql = <<< __EOS__
@@ -175,17 +182,20 @@
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)) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/product_select.tpl';
$this->tpl_mainno = 'products';
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
@@ -97,7 +101,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -107,14 +112,16 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('カテゴリ', 'search_category_id', STEXT_LEN, 'n');
$objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa');
$objFormParam->addParam('商品コード', 'search_product_code', STEXT_LEN, 'KVa');
}
/* 商品検索結果取得 */
- function lfGetProducts(&$objDb) {
+ function lfGetProducts(&$objDb)
+ {
$where = 'del_flg = 0';
$arrWhereVal = array();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/review.tpl';
$this->tpl_mainno = 'products';
@@ -75,7 +77,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -85,7 +88,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -134,7 +138,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -144,7 +149,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrRet = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrRet);
@@ -174,7 +180,8 @@
* @param integer $review_id 商品レビューのID
* @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));
@@ -186,7 +193,8 @@
* @param array $arrForm フォームデータ
* @return array hidden情報
*/
- function lfSetHidden($arrForm) {
+ function lfSetHidden($arrForm)
+ {
$arrHidden = array();
foreach ($arrForm AS $key=>$val) {
if (preg_match('/^search_/', $key)) {
@@ -212,7 +220,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('投稿者名', 'search_reviewer_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
$objFormParam->addParam('投稿者URL', 'search_reviewer_url', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
$objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVas', array('MAX_LENGTH_CHECK'),'',false);
@@ -237,7 +246,8 @@
* @param array $arrWhereVal WHERE文の判定値
* @return void
*/
- function lfDoOutputCsv($where, $arrWhereVal) {
+ function lfDoOutputCsv($where, $arrWhereVal)
+ {
$objCSV = new SC_Helper_CSV_Ex();
if ($where != '') {
$where = 'WHERE ' . $where;
@@ -251,7 +261,8 @@
* @param array $arrForm フォームデータ
* @return array WHERE文、判定値
*/
- function lfGetWhere($arrForm) {
+ function lfGetWhere($arrForm)
+ {
//削除されていない商品を検索
$where = 'A.del_flg = 0 AND B.del_flg = 0';
$arrWhereVal = array();
@@ -343,7 +354,8 @@
* @param array $arrWhereVal WHERE文の判定値
* @return array レビュー一覧
*/
- function lfGetReview($arrForm, $where, $arrWhereVal) {
+ function lfGetReview($arrForm, $where, $arrWhereVal)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// ページ送りの処理
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/review_edit.tpl';
$this->tpl_mainno = 'products';
@@ -61,7 +63,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -71,7 +74,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター情報の初期化
$objFormParam = new SC_FormParam_Ex();
@@ -108,7 +112,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -118,7 +123,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
// 検索条件のパラメーターを初期化
parent::lfInitParam($objFormParam);
$objFormParam->addParam('レビューID', 'review_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -141,7 +147,8 @@
* @param integer $review_id レビューID
* @return array レビュー情報
*/
- 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';
@@ -161,7 +168,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @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';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
*
* FIXME 同一商品IDで商品規格違いを登録できない。(更新は可能)
*/
-class LC_Page_Admin_Products_UploadCSV extends LC_Page_Admin_Ex {
+class LC_Page_Admin_Products_UploadCSV extends LC_Page_Admin_Ex
+{
// }}}
// {{{ functions
@@ -59,7 +60,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/upload_csv.tpl';
$this->tpl_mainno = 'products';
@@ -85,7 +87,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -95,7 +98,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->objDb = new SC_Helper_DB_Ex();
@@ -143,7 +147,8 @@
* @param stirng $message メッセージ
* @return void
*/
- function addRowResult($line_count, $message) {
+ function addRowResult($line_count, $message)
+ {
$this->arrRowResult[] = $line_count . '行目：' . $message;
}
@@ -154,7 +159,8 @@
* @param stirng $message メッセージ
* @return void
*/
- function addRowErr($line_count, $message) {
+ function addRowErr($line_count, $message)
+ {
$this->arrRowErr[] = $line_count . '行目：' . $message;
}
@@ -166,7 +172,8 @@
* @param $objQuery 保存を行うためのクエリ(指定がない場合、テストのみを行う)
* @return boolean errFlag. 読み込みに失敗した場合true
*/
- function lfReadCSVFile(&$objFormParam, &$fp, $objQuery = null) {
+ function lfReadCSVFile(&$objFormParam, &$fp, $objQuery = null)
+ {
$dry_run = ($objQuery===null) ? true : false;
// 登録対象の列数
$col_max_count = $objFormParam->getCount();
@@ -234,7 +241,8 @@
*
* @return void
*/
- function doUploadCsv(&$objFormParam, &$objUpFile) {
+ function doUploadCsv(&$objFormParam, &$objUpFile)
+ {
// ファイルアップロードのチェック
$this->arrErr['csv_file'] = $objUpFile->makeTempFile('csv_file');
if (strlen($this->arrErr['csv_file']) >= 1) {
@@ -295,7 +303,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -304,7 +313,8 @@
*
* @return void
*/
- function lfInitFile(&$objUpFile) {
+ function lfInitFile(&$objUpFile)
+ {
$objUpFile->addFile('CSVファイル', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false);
}
@@ -314,7 +324,8 @@
* @param array CSV構造設定配列
* @return void
*/
- function lfInitParam(&$objFormParam, &$arrCSVFrame) {
+ function lfInitParam(&$objFormParam, &$arrCSVFrame)
+ {
// 固有の初期値調整
$arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame);
// CSV項目毎の処理
@@ -359,7 +370,8 @@
*
* @return void
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrRet = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrRet);
@@ -380,7 +392,8 @@
*
* @return void
*/
- function lfInitTableInfo() {
+ function lfInitTableInfo()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$this->arrProductColumn = $objQuery->listTableFields('dtb_products');
$this->arrProductClassColumn = $objQuery->listTableFields('dtb_products_class');
@@ -395,7 +408,8 @@
* @param string|integer $line 処理中の行数
* @return void
*/
- function lfRegistProduct($objQuery, $line = '', &$objFormParam) {
+ function lfRegistProduct($objQuery, $line = '', &$objFormParam)
+ {
$objProduct = new SC_Product_Ex();
// 登録データ対象取得
$arrList = $objFormParam->getHashArray();
@@ -465,7 +479,8 @@
* @param integer $product_class_id 商品規格ID
* @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テーブルの中で古いカラム名(右辺)が設定されている。sfArrayIntersectKeysでフィルタされてしまうので、名称を変更する必要がある
@@ -516,7 +531,8 @@
* @param integer $product_id 商品ID
* @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;
@@ -544,7 +560,8 @@
* @param array $arrCSVFrame CSV構造配列
* @return array $arrCSVFrame CSV構造配列
*/
- function lfSetParamDefaultValue(&$arrCSVFrame) {
+ function lfSetParamDefaultValue(&$arrCSVFrame)
+ {
foreach ($arrCSVFrame as $key => $val) {
switch ($val['col']) {
case 'status':
@@ -574,7 +591,8 @@
* @param array $sqlval 商品登録情報配列
* @return $sqlval 登録情報配列
*/
- function lfSetProductDefaultData(&$sqlval) {
+ function lfSetProductDefaultData(&$sqlval)
+ {
//新規登録時のみ設定する項目
if ($sqlval['product_id'] == '') {
if ($sqlval['status'] == '') {
@@ -598,7 +616,8 @@
* @param boolean $upload_flg 更新フラグ(更新の場合true)
* @return $sqlval 登録情報配列
*/
- function lfSetProductClassDefaultData(&$sqlval, $upload_flg) {
+ function lfSetProductClassDefaultData(&$sqlval, $upload_flg)
+ {
//新規登録時のみ設定する項目
if ($sqlval['product_class_id'] == '') {
if ($sqlval['point_rate'] == '') {
@@ -649,7 +668,8 @@
* @param array エラー配列
* @return array エラー配列
*/
- function lfCheckErrorDetail($item, $arrErr) {
+ function lfCheckErrorDetail($item, $arrErr)
+ {
// 規格IDの存在チェック
// FIXME 規格分類ID自体のが有効かを主眼においたチェックをすべきと感じる。
if (!$this->lfIsDbRecord('dtb_products_class', 'product_class_id', $item)) {
@@ -775,7 +795,8 @@
* @param string $line_no 行番号
* @return string $time DB保存用の時間文字列
*/
- function lfGetDbFormatTimeWithLine($line_no = '') {
+ function lfGetDbFormatTimeWithLine($line_no = '')
+ {
$time = date('Y-m-d H:i:s');
// 秒以下を生成
if ($line_no != '') {
@@ -794,7 +815,8 @@
* @param string $delimiter 分割文字
* @return boolean true:有効なデータがある false:有効ではない
*/
- function lfIsArrayRecordMulti($arr, $keyname, $item, $delimiter = ',') {
+ function lfIsArrayRecordMulti($arr, $keyname, $item, $delimiter = ',')
+ {
if (array_search($keyname, $this->arrFormKeyList) === FALSE) {
return true;
}
@@ -825,7 +847,8 @@
* @param string $delimiter 分割文字
* @return boolean true:有効なデータがある false:有効ではない
*/
- function lfIsDbRecordMulti($table, $tblkey, $keyname, $item, $delimiter = ',') {
+ function lfIsDbRecordMulti($table, $tblkey, $keyname, $item, $delimiter = ',')
+ {
if (array_search($keyname, $this->arrFormKeyList) === FALSE) {
return true;
}
@@ -856,7 +879,8 @@
* @param array $item 入力データ配列
* @return boolean true:有効なデータがある false:有効ではない
*/
- function lfIsDbRecord($table, $keyname, $item) {
+ function lfIsDbRecord($table, $keyname, $item)
+ {
if (array_search($keyname, $this->arrFormKeyList) !== FALSE //入力対象である
&& $item[$keyname] != '' // 空ではない
&& !$this->objDb->sfIsRecord($table, $keyname, (array)$item[$keyname]) //DBに存在するか
@@ -874,7 +898,8 @@
* @param array $item 入力データ配列
* @return boolean true:有効なデータがある false:有効ではない
*/
- function lfIsArrayRecord($arr, $keyname, $item) {
+ function lfIsArrayRecord($arr, $keyname, $item)
+ {
if (array_search($keyname, $this->arrFormKeyList) !== FALSE //入力対象である
&& $item[$keyname] != '' // 空ではない
&& !array_key_exists($item[$keyname], $arr) //配列に存在するか
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
/** エラー情報 **/
@@ -65,7 +66,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'products/upload_csv_category.tpl';
$this->tpl_mainno = 'products';
@@ -84,7 +86,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -94,7 +97,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// CSV管理ヘルパー
$objCSV = new SC_Helper_CSV_Ex();
@@ -140,7 +144,8 @@
* @param stirng $message メッセージ
* @return void
*/
- function addRowResult($line_count, $message) {
+ function addRowResult($line_count, $message)
+ {
$this->arrRowResult[] = $line_count . '行目：' . $message;
}
@@ -151,7 +156,8 @@
* @param stirng $message メッセージ
* @return void
*/
- function addRowErr($line_count, $message) {
+ function addRowErr($line_count, $message)
+ {
$this->arrRowErr[] = $line_count . '行目：' . $message;
}
@@ -163,7 +169,8 @@
* @param SC_Helper_DB $objDb
* @return void
*/
- function doUploadCsv(&$objFormParam, &$objUpFile) {
+ function doUploadCsv(&$objFormParam, &$objUpFile)
+ {
// ファイルアップロードのチェック
$objUpFile->makeTempFile('csv_file');
$arrErr = $objUpFile->checkExists();
@@ -261,7 +268,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -270,7 +278,8 @@
*
* @return void
*/
- function lfInitFile(&$objUpFile) {
+ function lfInitFile(&$objUpFile)
+ {
$objUpFile->addFile('CSVファイル', 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false);
}
@@ -280,7 +289,8 @@
* @param array CSV構造設定配列
* @return void
*/
- function lfInitParam(&$objFormParam, &$arrCSVFrame) {
+ function lfInitParam(&$objFormParam, &$arrCSVFrame)
+ {
// 固有の初期値調整
$arrCSVFrame = $this->lfSetParamDefaultValue($arrCSVFrame);
// CSV項目毎の処理
@@ -325,7 +335,8 @@
*
* @return void
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrRet = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrRet);
@@ -346,7 +357,8 @@
*
* @return void
*/
- function lfInitTableInfo() {
+ function lfInitTableInfo()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$this->arrRegistColumn = $objQuery->listTableFields('dtb_category');
}
@@ -360,7 +372,8 @@
* @param string|integer $line 処理中の行数
* @return integer カテゴリID
*/
- function lfRegistCategory($objQuery, $line, &$objFormParam) {
+ function lfRegistCategory($objQuery, $line, &$objFormParam)
+ {
// 登録データ対象取得
$arrList = $objFormParam->getHashArray();
// 登録時間を生成(DBのCURRENT_TIMESTAMPだとcommitした際、すべて同一の時間になってしまう)
@@ -406,7 +419,8 @@
* @param array $arrCSVFrame CSV構造配列
* @return array $arrCSVFrame CSV構造配列
*/
- function lfSetParamDefaultValue(&$arrCSVFrame) {
+ function lfSetParamDefaultValue(&$arrCSVFrame)
+ {
foreach ($arrCSVFrame as $key => $val) {
switch ($val['col']) {
case 'parent_category_id':
@@ -428,7 +442,8 @@
* @param array $sqlval 商品登録情報配列
* @return $sqlval 登録情報配列
*/
- function lfSetCategoryDefaultData(&$sqlval) {
+ function lfSetCategoryDefaultData(&$sqlval)
+ {
if ($sqlval['del_flg'] == '') {
$sqlval['del_flg'] = '0'; //有効
}
@@ -448,7 +463,8 @@
* @param array エラー配列
* @return array エラー配列
*/
- function lfCheckErrorDetail($item, $arrErr) {
+ function lfCheckErrorDetail($item, $arrErr)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
/*
// カテゴリIDの存在チェック
@@ -516,7 +532,8 @@
* @param integer 指定カテゴリID
* @return integer カテゴリID
*/
- 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;
@@ -571,7 +588,8 @@
* @param string $line_no 行番号
* @return string $time DB保存用の時間文字列
*/
- function lfGetDbFormatTimeWithLine($line_no = '') {
+ function lfGetDbFormatTimeWithLine($line_no = '')
+ {
$time = date('Y-m-d H:i:s');
// 秒以下を生成
if ($line_no != '') {
@@ -589,7 +607,8 @@
* @param array $item 入力データ配列
* @return boolean true:有効なデータがある false:有効ではない
*/
- function lfIsDbRecord($table, $keyname, $item) {
+ function lfIsDbRecord($table, $keyname, $item)
+ {
if (array_search($keyname, $this->arrFormKeyList) !== FALSE //入力対象である
&& $item[$keyname] != '' // 空ではない
&& !SC_Helper_DB_EX::sfIsRecord($table, $keyname, (array)$item[$keyname]) //DBに存在するか
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->list_data = ''; // テーブルデータ取得用
@@ -64,7 +66,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -74,7 +77,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// ADMIN_ID以外の管理者件数を取得
$linemax = $this->getMemberCount('del_flg <> 1 AND member_id <> ' . ADMIN_ID);
@@ -101,7 +105,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -112,7 +117,8 @@
* @param string $where WHERE句
* @return integer 件数
*/
- function getMemberCount($where) {
+ function getMemberCount($where)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_member';
return $objQuery->count($table, $where);
@@ -125,7 +131,8 @@
* @param integer $startno 開始行番号
* @return array 管理者データの連想配列
*/
- 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 <> ?';
@@ -143,7 +150,8 @@
* @param integer $pageno ページの番号（$_GETから入ってきた値）
* @return integer $clean_pageno チェック後のページの番号
*/
- function lfCheckPageNo($pageno) {
+ function lfCheckPageNo($pageno)
+ {
$clean_pageno = '';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/adminarea.tpl';
$this->tpl_subno = 'adminarea';
@@ -56,7 +58,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -66,7 +69,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
if (strpos(HTTPS_URL,'https://') !== FALSE) {
$this->tpl_enable_ssl = TRUE;
@@ -118,7 +122,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -129,7 +134,8 @@
* @param array $arrParams $_POST値
* @return void
*/
- function initParam(&$objFormParam, &$arrParams) {
+ function initParam(&$objFormParam, &$arrParams)
+ {
$objFormParam->addParam('ディレクトリ名', 'admin_dir', ID_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
$objFormParam->addParam('SSL制限', 'admin_force_ssl', 1, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -146,7 +152,8 @@
* @param array $arrErr エラーがあった項目用配列
* @return void
*/
- function lfCheckAdminArea(&$arrForm, &$arrErr) {
+ function lfCheckAdminArea(&$arrForm, &$arrErr)
+ {
$admin_dir = trim($arrForm['admin_dir']) . '/';
$installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES);
@@ -165,7 +172,8 @@
}
//管理機能ディレクトリのリネームと CONFIG_REALFILE の変更
- function lfUpdateAdminData(&$arrForm) {
+ function lfUpdateAdminData(&$arrForm)
+ {
$admin_dir = trim($arrForm['admin_dir']) . '/';
$admin_force_ssl = 'false';
if ($arrForm['admin_force_ssl'] == 1) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
+{
/** リストア中にエラーが発生したか */
var $tpl_restore_err = false;
@@ -50,7 +51,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/bkup.tpl';
$this->tpl_mainno = 'system';
@@ -67,7 +69,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -77,7 +80,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex;
@@ -219,7 +223,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -230,7 +235,8 @@
* @param array $arrParams $_POST値
* @return void
*/
- function initParam(&$objFormParam, &$arrParams) {
+ function initParam(&$objFormParam, &$arrParams)
+ {
$objFormParam->addParam('バックアップ名', 'bkup_name', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB', 'FILE_NAME_CHECK_BY_NOUPLOAD'));
$objFormParam->addParam('バックアップメモ', 'bkup_memo', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -247,7 +253,8 @@
* @param string $mode
* @return $arrErr
*/
- function lfCheckError(&$arrForm, $mode) {
+ function lfCheckError(&$arrForm, $mode)
+ {
switch ($mode) {
case 'bkup':
@@ -283,7 +290,8 @@
* @param string $bkup_name
* @return boolean|int 結果。true:成功 int:失敗 FIXME 本来は int ではなく、エラーメッセージを戻すべき
*/
- function lfCreateBkupData($bkup_name, $work_dir) {
+ function lfCreateBkupData($bkup_name, $work_dir)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$csv_autoinc = '';
$arrData = array();
@@ -365,7 +373,8 @@
* @param mixed $data 出力データ
* @return boolean true (true:固定 false:中断)
*/
- function cbOutputCSV($data) {
+ function cbOutputCSV($data)
+ {
$line = '';
if ($this->first_line) {
// カラム名
@@ -386,7 +395,8 @@
* @return string シーケンス一覧の文字列
* @return string $ret
*/
- function lfGetAutoIncrement() {
+ function lfGetAutoIncrement()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrSequences = $objQuery->listSequences();
@@ -407,7 +417,8 @@
}
// バックアップテーブルにデータを更新する
- function lfUpdBkupData($data) {
+ function lfUpdBkupData($data)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrVal = array();
@@ -421,7 +432,8 @@
/**
* バックアップの一覧を取得する
*/
- function lfGetBkupData($sql_option = '', $filter_bkup_name = '') {
+ function lfGetBkupData($sql_option = '', $filter_bkup_name = '')
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// テーブルから取得
@@ -473,7 +485,8 @@
* @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;
@@ -525,7 +538,8 @@
* @param string $mode
* @return void
*/
- function lfExeInsertSQL(&$objQuery, $dir, $mode) {
+ function lfExeInsertSQL(&$objQuery, $dir, $mode)
+ {
$tbl_flg = false;
$col_flg = false;
@@ -594,7 +608,8 @@
/**
* シーケンス生成器を復元する
*/
- function restoreSequence(&$objQuery, $csv) {
+ function restoreSequence(&$objQuery, $csv)
+ {
// csvファイルからデータの取得
$arrCsvData = file($csv);
@@ -613,7 +628,8 @@
}
// 選択したバックアップをDBから削除
- function lfDeleteBackUp(&$arrForm, $bkup_dir, $bkup_ext) {
+ function lfDeleteBackUp(&$arrForm, $bkup_dir, $bkup_ext)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex;
@@ -92,7 +96,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -103,7 +108,8 @@
* @param array $arrParams $_GET値
* @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'));
@@ -117,7 +123,8 @@
* @param integer $id 削除対象のmember_id
* @return void
*/
- function deleteMember($id) {
+ function deleteMember($id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -134,7 +141,8 @@
* @param integer $id 削除対象のmember_id
* @return void|UPDATE の結果フラグ
*/
- function renumberRank(&$objQuery, $id) {
+ function renumberRank(&$objQuery, $id)
+ {
// ランクの取得
$where1 = 'member_id = ?';
@@ -154,7 +162,8 @@
* @param integer $id 削除対象のmember_id
* @return void|UPDATE の結果フラグ
*/
- function deleteRecode(&$objQuery, $id) {
+ function deleteRecode(&$objQuery, $id)
+ {
// Updateする値を作成する.
$sqlVal = array();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/editdb.tpl';
$this->tpl_subno = 'editdb';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
@@ -93,7 +97,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -104,7 +109,8 @@
* @param array $arrParams $_POST値
* @return void
*/
- function initForm(&$objFormParam, &$arrParams) {
+ function initForm(&$objFormParam, &$arrParams)
+ {
$objFormParam->addParam('モード', 'mode', INT_LEN, 'n', array('ALPHA_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('テーブル名', 'table_name');
@@ -115,7 +121,8 @@
}
- function lfDoChange(&$objFormParam) {
+ function lfDoChange(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrTarget = $this->lfGetTargetData($objFormParam);
$message = '';
@@ -140,7 +147,8 @@
return $message;
}
- function lfGetTargetData(&$objFormParam) {
+ function lfGetTargetData(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrIndexFlag = $objFormParam->getValue('indexflag');
$arrIndexFlagNew = $objFormParam->getValue('indexflag_new');
@@ -183,7 +191,8 @@
*
* @return void
*/
- function lfGetIndexList() {
+ function lfGetIndexList()
+ {
// データベースからインデックス設定一覧を取得する
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->setOrder('table_name, column_name');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/input.tpl';
@@ -60,7 +62,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -70,7 +73,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
// ページ送りの処理 $_REQUEST['pageno']が信頼しうる値かどうかチェックする。
@@ -181,7 +185,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -193,7 +198,8 @@
* @param string $mode editの時は指定
* @return void
*/
- function initForm(&$objFormParam, &$arrParams, $mode = '') {
+ function initForm(&$objFormParam, &$arrParams, $mode = '')
+ {
$objFormParam->addParam('メンバーID', 'member_id', INT_LEN, 'n', array('NUM_CHECK'));
$objFormParam->addParam('名前', 'name', STEXT_LEN, 'KV', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('所属', 'department', STEXT_LEN, 'KV', array('MAX_LENGTH_CHECK'));
@@ -221,7 +227,8 @@
* @param void
* @return array エラー情報の連想配列
*/
- function validateData(&$objFormParam, &$arrParams, $mode) {
+ function validateData(&$objFormParam, &$arrParams, $mode)
+ {
$arrErr = $objFormParam->checkError();
if (isset($arrErr) && count($arrErr) > 0) return $arrErr;
@@ -269,7 +276,8 @@
* @param integer $id メンバーID
* @return array 管理者データの連想配列, 無い場合は空の配列を返す
*/
- function getMemberData($id) {
+ function getMemberData($id)
+ {
$table = 'dtb_member';
$columns = 'name,department,login_id,authority, work';
$where = 'member_id = ?';
@@ -285,7 +293,8 @@
* @param string $val 検索したい値
* @return boolean 登録済みならtrue, 未登録ならfalse
*/
- function memberDataExists($where, $val) {
+ function memberDataExists($where, $val)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_member';
@@ -301,7 +310,8 @@
* @param integer $pageno ページの番号
* @return integer $clean_pageno チェック後のページの番号
*/
- function lfCheckPageNo($pageno) {
+ function lfCheckPageNo($pageno)
+ {
$clean_pageno = '';
@@ -324,7 +334,8 @@
* @param array 管理者データの連想配列
* @return void
*/
- function insertMemberData($arrMemberData) {
+ function insertMemberData($arrMemberData)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTする値を作成する.
@@ -354,7 +365,8 @@
* @param array 管理者データの連想配列
* @return void
*/
- function updateMemberData($member_id, $arrMemberData) {
+ function updateMemberData($member_id, $arrMemberData)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// Updateする値を作成する.
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author Seasoft 塚田将久
* @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();
@@ -40,7 +41,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/log.tpl';
$this->tpl_subno = 'log';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex;
@@ -93,7 +97,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -102,7 +107,8 @@
*
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('ファイル', 'log', null, '', array());
$objFormParam->addParam('行数', 'line_max', INT_LEN, '', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), 50);
}
@@ -112,7 +118,8 @@
*
* @return array $arrLogs 取得したログ
*/
- function getEccubeLog($log_path_base) {
+ function getEccubeLog($log_path_base)
+ {
$index = 0;
$arrLogs = array();
@@ -159,7 +166,8 @@
*
* セキュリティ面をカバーする役割もある。
*/
- function getLogPath($log_name) {
+ function getLogPath($log_name)
+ {
if (strlen($log_name) === 0) {
return LOG_REALFILE;
}
@@ -175,7 +183,8 @@
* TODO mtb_constants から動的生成したい。
* @return void
*/
- function loadLogList() {
+ function loadLogList()
+ {
$this->arrLogList[''] = '標準ログファイル';
$this->arrLogList['CUSTOMER'] = '会員ログイン ログファイル';
$this->arrLogList['ADMIN'] = '管理機能ログファイル';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/masterdata.tpl';
$this->tpl_subno = 'masterdata';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->arrMasterDataName = $this->getMasterDataNames(array('mtb_pref', 'mtb_zip', 'mtb_constants'));
$masterData = new SC_DB_MasterData_Ex();
@@ -103,7 +107,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -115,7 +120,8 @@
* @param array $arrMasterDataName マスターデータテーブル名のリスト
* @return string $master_data_name 選択しているマスターデータのテーブル名
*/
- function checkMasterDataName(&$arrParams, &$arrMasterDataName) {
+ function checkMasterDataName(&$arrParams, &$arrMasterDataName)
+ {
if (in_array($arrParams['master_data_name'], $arrMasterDataName)) {
$master_data_name = $arrParams['master_data_name'];
@@ -133,7 +139,8 @@
* @param array $ignores 取得しないマスターデータ名の配列
* @return array マスターデータ名の配列
*/
- function getMasterDataNames($ignores = array()) {
+ function getMasterDataNames($ignores = array())
+ {
$dbFactory = SC_DB_DBFactory_Ex::getInstance();
$arrMasterDataName = $dbFactory->findTableNames('mtb_');
@@ -157,7 +164,8 @@
* @access private
* @return void|string エラーが発生した場合はエラーメッセージを返す.
*/
- function checkUniqueID(&$arrParams) {
+ function checkUniqueID(&$arrParams)
+ {
$arrId = $arrParams['id'];
for ($i = 0; $i < count($arrId); $i++) {
@@ -183,7 +191,8 @@
* @param string $master_data_name 登録対象のマスターデータのテーブル名
* @return void
*/
- function registMasterData($arrParams, &$masterData, $master_data_name) {
+ function registMasterData($arrParams, &$masterData, $master_data_name)
+ {
$arrTmp = array();
foreach ($arrParams['id'] as $key => $val) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -52,7 +53,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/parameter.tpl';
$this->tpl_subno = 'parameter';
@@ -66,7 +68,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -76,7 +79,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$masterData = new SC_DB_MasterData_Ex();
@@ -118,7 +122,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -130,7 +135,8 @@
* @access private
* @return void
*/
- function update(&$arrKeys, &$arrForm) {
+ function update(&$arrKeys, &$arrForm)
+ {
$data = array();
$masterData = new SC_DB_MasterData_Ex();
foreach ($arrKeys as $key) {
@@ -151,7 +157,8 @@
* @param array $arrForm $_POST 値
* @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],
@@ -167,7 +174,8 @@
* @access private
* @return array パラメーターのキーの配列
*/
- function getParamKeys(&$masterData) {
+ function getParamKeys(&$masterData)
+ {
$keys = array();
$i = 0;
foreach ($masterData->getDBMasterData('mtb_constants') as $key => $val) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -40,7 +41,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -49,7 +51,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -59,7 +62,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// チェック後のデータを格納
$arrClean = array();
@@ -107,12 +111,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
// ランキングを上げる。
- function lfRunkUp($id) {
+ function lfRunkUp($id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 自身のランクを取得する。
@@ -142,7 +148,8 @@
}
// ランキングを下げる。
- function lfRunkDown($id) {
+ function lfRunkDown($id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 自身のランクを取得する。
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_System.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'system/system.tpl';
$this->tpl_subno = 'system';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
@@ -91,7 +95,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -102,7 +107,8 @@
* @param array $arrParams $_GET値
* @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);
}
@@ -112,7 +118,8 @@
*
* @return array システム情報
*/
- function getSystemInfo() {
+ function getSystemInfo()
+ {
$objDB = SC_DB_DBFactory_Ex::getInstance();
$arrSystemInfo = array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @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
@@ -40,7 +41,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
// GDライブラリのインストール判定
$this->install_GD = function_exists('gd_info') ? true : false;
@@ -90,7 +92,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -100,7 +103,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
if (isset($_GET['draw_image']) && $_GET['draw_image'] != '') {
define('DRAW_IMAGE' , true);
@@ -169,12 +173,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* デフォルト値の取得 */
- function lfGetDateDefault() {
+ function lfGetDateDefault()
+ {
$year = date('Y');
$month = date('m');
$day = date('d');
@@ -201,7 +207,8 @@
}
/* パラメーター情報の初期化 */
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
// デフォルト値の取得
$arrList = $this->lfGetDateDefault();
@@ -224,7 +231,8 @@
}
/* 入力内容のチェック */
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objFormParam->convParam();
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
@@ -250,7 +258,8 @@
}
/* サブナビを移動しても日付が残るようにセッションに入力期間を記録する */
- function lfSaveDateSession($session, $arrForm) {
+ function lfSaveDateSession($session, $arrForm)
+ {
// session の初期化をする
if (!isset($session['total'])) {
@@ -265,7 +274,8 @@
}
/* 日付の初期値 */
- 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');
@@ -274,7 +284,8 @@
}
/* フォームで入力された日付を適切な形にする */
- function lfSetStartEndDate(&$objFormParam) {
+ function lfSetStartEndDate(&$objFormParam)
+ {
$arrRet = $objFormParam->getHashArray();
// 月度集計
@@ -293,7 +304,8 @@
}
/* 折れ線グラフの作成 */
- function lfGetGraphLine($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate, $xincline) {
+ function lfGetGraphLine($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate, $xincline)
+ {
$ret_path = '';
@@ -351,7 +363,8 @@
}
// 円グラフの作成
- function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = '') {
+ function lfGetGraphPie($arrResults, $keyname, $type, $title = '', $sdate = '', $edate = '')
+ {
$ret_path = '';
// 結果が0行以上ある場合のみグラフを生成する。
@@ -395,7 +408,8 @@
}
// 棒グラフの作成
- function lfGetGraphBar($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate) {
+ function lfGetGraphBar($arrResults, $keyname, $type, $xtitle, $ytitle, $sdate, $edate)
+ {
$ret_path = '';
// 結果が0行以上ある場合のみグラフを生成する。
@@ -441,7 +455,8 @@
}
// グラフ用のPNGファイル名
- 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']);
@@ -452,7 +467,8 @@
}
// 会員、非会員集計のWHERE分の作成
- function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id') {
+ function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id')
+ {
$where = '';
// 取得日付の指定
if ($sdate != '') {
@@ -495,7 +511,8 @@
}
/** 会員別集計 **/
- 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);
@@ -536,7 +553,8 @@
}
/** 商品別集計 **/
- 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);
@@ -573,7 +591,8 @@
}
/** 職業別集計 **/
- 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);
@@ -609,7 +628,8 @@
}
/** 年代別集計 **/
- function lfGetOrderAge($type, $sdate, $edate) {
+ function lfGetOrderAge($type, $sdate, $edate)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
@@ -647,7 +667,8 @@
/** 期間別集計 **/
// todo あいだの日付埋める
- function lfGetOrderTerm($type, $sdate, $edate) {
+ function lfGetOrderTerm($type, $sdate, $edate)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
list($where, $arrWhereVal) = $this->lfGetWhereMember('create_date', $sdate, $edate);
@@ -703,7 +724,8 @@
/*
* 期間中の日付を埋める
*/
- function lfAddBlankLine($arrResults, $type, $st, $ed) {
+ function lfAddBlankLine($arrResults, $type, $st, $ed)
+ {
$arrDateList = $this->lfDateTimeArray($type, $st, $ed);
@@ -729,7 +751,8 @@
* 日付の配列を作成する
*
*/
- function lfDateTimeArray($type, $st, $ed) {
+ function lfDateTimeArray($type, $st, $ed)
+ {
switch ($type) {
case 'month':
$format = 'm';
@@ -770,7 +793,8 @@
/*
* 合計を付与する
*/
- function lfAddTotalLine($arrResults) {
+ function lfAddTotalLine($arrResults)
+ {
// 検索結果が0でない場合
if (count($arrResults) > 0) {
@@ -789,7 +813,8 @@
}
// 必要なカラムのみ抽出する(CSVデータで取得する)
- function lfGetDataColCSV($arrData, $arrDataCol) {
+ function lfGetDataColCSV($arrData, $arrDataCol)
+ {
$max = count($arrData);
$csv_data = '';
for ($i = 0; $i < $max; $i++) {
@@ -805,7 +830,8 @@
return $csv_data;
}
- function lfGetCSVColum($page) {
+ function lfGetCSVColum($page)
+ {
switch ($page) {
// 商品別集計
case 'products':
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Api extends LC_Page_Ex {
+class LC_Page_Api extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
// $this->sendResponse();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$arrParam = $_REQUEST;
list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -74,7 +78,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Json.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
// $this->sendResponse();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$arrParam = $_REQUEST;
list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -74,7 +78,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Php.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
// $this->sendResponse();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$arrParam = $_REQUEST;
list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -74,7 +78,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/api/LC_Page_Api_Xml.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
// $this->sendResponse();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$arrParam = $_REQUEST;
list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
@@ -74,7 +78,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Cart extends LC_Page_Ex {
+class LC_Page_Cart extends LC_Page_Ex
+{
// {{{ properties
@@ -52,7 +53,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = '現在のカゴの中';
$masterData = new SC_DB_MasterData_Ex();
@@ -65,7 +67,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -76,7 +79,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
@@ -190,7 +194,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -199,7 +204,8 @@
*
* @return object
*/
- function lfInitParam($arrRequest) {
+ function lfInitParam($arrRequest)
+ {
$objFormParam = new SC_FormParam_Ex();
$objFormParam->addParam('カートキー', 'cartKey', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
$objFormParam->addParam('カートナンバー', 'cart_no', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -219,7 +225,8 @@
*
* @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();
@@ -235,7 +242,8 @@
*
* @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'];
@@ -259,7 +267,8 @@
*
* @return void
*/
- function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey) {
+ function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey)
+ {
// 正常に登録されたことを記録しておく
$objSiteSess->setRegistFlag();
$pre_uniqid = $objSiteSess->getUniqId();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Contact extends LC_Page_Ex {
+class LC_Page_Contact extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
$this->tpl_title = 'お問い合わせ';
@@ -65,7 +67,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -76,7 +79,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -139,7 +143,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -152,7 +157,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'KVa', array('EXIST_CHECK','SPTAB_CHECK','MAX_LENGTH_CHECK'));
@@ -177,7 +183,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array 入力チェック結果の配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力データを渡す。
$arrForm = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrForm);
@@ -191,7 +198,8 @@
*
* @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'];
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact_Complete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'お問い合わせ(完了ページ)';
$this->tpl_mainno = 'contact';
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// do nothing...
@@ -75,7 +79,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -42,7 +43,8 @@
* Page を初期化する.
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
$this->arrPref = $masterData->getMasterData('mtb_pref');
@@ -63,7 +65,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -73,7 +76,8 @@
* Page のプロセス
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
@@ -166,7 +170,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -178,7 +183,8 @@
* @access private
* @return uniqid
*/
- function lfRegistCustomerData($sqlval) {
+ function lfRegistCustomerData($sqlval)
+ {
SC_Helper_Customer_Ex::sfEditCustomerData($sqlval);
return $sqlval['secret_key'];
}
@@ -194,7 +200,8 @@
* @access private
* @return $arrResults
*/
- function lfMakeSqlVal(&$objFormParam) {
+ function lfMakeSqlVal(&$objFormParam)
+ {
$arrForm = $objFormParam->getHashArray();
$arrResults = $objFormParam->getDbArray();
@@ -229,7 +236,8 @@
* @access private
* @return void
*/
- function lfSendMail($uniqid, $arrForm) {
+ function lfSendMail($uniqid, $arrForm)
+ {
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
$objMailText = new SC_SiteView_Ex();
@@ -284,7 +292,8 @@
* @param string $referer $_SERVER['HTTP_REFERER'] のデータ
* @return boolean kiyaku.php からの妥当な遷移であれば true
*/
- function lfCheckReferer(&$post, $referer) {
+ function lfCheckReferer(&$post, $referer)
+ {
if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE
&& empty($post)
@@ -300,7 +309,8 @@
* @param array $arrRequest リクエスト値($_GET)
* @return array $arrErr エラーメッセージ配列
*/
- function lfCheckError($arrRequest) {
+ function lfCheckError($arrRequest)
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
// パラメーター情報の初期化
@@ -329,7 +339,8 @@
* @param string $value
* @return エラーなし：true エラー：false
*/
- function lfInputNameCheck($value) {
+ function lfInputNameCheck($value)
+ {
// 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー
if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
return false;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Complete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->httpCacheControl('nocache');
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// カートが空かどうかを確認する。
$objCartSess = new SC_CartSession_Ex();
@@ -91,7 +95,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_EmailMobile.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
$objFormParam = new SC_FormParam_Ex();
@@ -94,7 +98,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -104,7 +109,8 @@
* @access public
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('メールアドレス', 'email_mobile', null, 'a',
array('NO_SPTAB', 'EXIST_CHECK', 'CHANGE_LOWER', 'EMAIL_CHAR_CHECK', 'EMAIL_CHECK', 'MOBILE_EMAIL_CHECK'));
}
@@ -117,7 +123,8 @@
* @access private
* @return array エラー情報の配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objFormParam->convParam();
$objErr = new SC_CheckError_Ex();
$objErr->arrErr = $objFormParam->checkError();
@@ -139,7 +146,8 @@
* @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),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'ご利用規約';
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$arrKiyaku = $this->lfGetKiyakuData();
$this->max = count($arrKiyaku);
@@ -82,7 +86,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -95,7 +100,8 @@
* @access public
* @return string 規約の内容をテキストエリアで表示するように整形したデータ
*/
- 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;
@@ -111,7 +117,8 @@
* @access private
* @return array $arrKiyaku 規約の配列
*/
- function lfGetKiyakuData() {
+ function lfGetKiyakuData()
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
@@ -129,7 +136,8 @@
* @access private
* @return int
*/
- function lfSetOffset($offset) {
+ function lfSetOffset($offset)
+ {
return is_numeric($offset) === true ? intval($offset) : 1;
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -60,7 +61,8 @@
* ここでは, parent::init() を行わない.
* @return void
*/
- function init() {
+ function init()
+ {
$this->tpl_mainpage = 'error.tpl';
$this->tpl_title = 'エラー';
// ディスプレイクラス生成
@@ -79,7 +81,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -90,7 +93,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->type) {
case PRODUCT_NOT_FOUND:
@@ -176,14 +180,16 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/**
* エラーページではトランザクショントークンの自動検証は行わない
*/
- function doValidToken() {
+ function doValidToken()
+ {
// queit.
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -44,7 +45,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
$this->template = LOGIN_FRAME;
$this->tpl_mainpage = 'login_error.tpl';
$this->tpl_title = 'ログインエラー';
@@ -64,7 +66,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -74,7 +77,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->type) {
case LOGIN_ERROR:
@@ -102,14 +106,16 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/**
* エラーページではトランザクショントークンの自動検証は行わない
*/
- function doValidToken() {
+ function doValidToken()
+ {
// queit.
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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;
@@ -51,7 +52,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'システムエラー';
}
@@ -61,7 +63,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -71,7 +74,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->tpl_error = 'システムエラーが発生しました。<br />大変お手数ですが、サイト管理者までご連絡ください。';
@@ -93,7 +97,8 @@
*
* @return void
*/
- function sendResponse() {
+ function sendResponse()
+ {
$this->adminPage = GC_Utils_Ex::isAdminFunction();
if ($this->adminPage) {
@@ -112,20 +117,23 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/**
* トランザクショントークンに関して処理しないようにオーバーライド
*/
- function doValidToken() {
+ function doValidToken()
+ {
}
/**
* トランザクショントークンに関して処理しないようにオーバーライド
*/
- function setTokenTo() {
+ function setTokenTo()
+ {
}
/**
@@ -133,7 +141,8 @@
*
* @return string
*/
- function sfGetErrMsg() {
+ function sfGetErrMsg()
+ {
$errmsg = '';
$errmsg .= $this->lfGetErrMsgHead();
$errmsg .= "\n";
@@ -165,7 +174,8 @@
*
* @return string
*/
- function lfGetErrMsgHead() {
+ function lfGetErrMsgHead()
+ {
$errmsg = '';
$errmsg .= GC_Utils_Ex::getUrl() . "\n";
$errmsg .= "\n";
@@ -181,7 +191,8 @@
*
* @return void
*/
- function addDebugMsg($debugMsg) {
+ function addDebugMsg($debugMsg)
+ {
$this->arrDebugMsg[] = rtrim($debugMsg, "\n");
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Forgot extends LC_Page_Ex {
+class LC_Page_Forgot extends LC_Page_Ex
+{
// {{{ properties
@@ -55,7 +56,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'パスワードを忘れた方';
$this->tpl_mainpage = 'forgot/index.tpl';
@@ -74,7 +76,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -85,7 +88,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
@@ -146,7 +150,8 @@
* @param array $arrReminder リマインダー質問リスト
* @return string エラー文字列 問題が無ければNULL
*/
- function lfCheckForgotMail(&$arrForm, &$arrReminder) {
+ function lfCheckForgotMail(&$arrForm, &$arrReminder)
+ {
$errmsg = NULL;
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = '(email Like ? OR email_mobile Like ?) AND name01 Like ? AND name02 Like ? AND del_flg = 0';
@@ -174,7 +179,8 @@
* @param array $device_type デバイスタイプ
* @return void
*/
- function lfInitMailCheckParam(&$objFormParam, $device_type) {
+ function lfInitMailCheckParam(&$objFormParam, $device_type)
+ {
$objFormParam->addParam('お名前(姓)', 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(名)', 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
if ($device_type === DEVICE_TYPE_MOBILE) {
@@ -192,7 +198,8 @@
* @param array $arrReminder リマインダー質問リスト
* @return string エラー文字列 問題が無ければNULL
*/
- function lfCheckForgotSecret(&$arrForm, &$arrReminder) {
+ function lfCheckForgotSecret(&$arrForm, &$arrReminder)
+ {
$errmsg = '';
$objQuery =& SC_Query_Ex::getSingletonInstance();
$cols = 'customer_id, reminder, reminder_answer, salt';
@@ -252,7 +259,8 @@
* @param array $device_type デバイスタイプ
* @return void
*/
- function lfInitSecretCheckParam(&$objFormParam, $device_type) {
+ function lfInitSecretCheckParam(&$objFormParam, $device_type)
+ {
// メールチェックと同等のチェックを再度行う
$this->lfInitMailCheckParam($objFormParam, $device_type);
// 秘密の質問チェックの追加
@@ -266,7 +274,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -281,7 +290,8 @@
*
* FIXME: メールテンプレート編集の方に足すのが望ましい
*/
- function lfSendMail(&$CONF, $email, $customer_name, $new_password) {
+ function lfSendMail(&$CONF, $email, $customer_name, $new_password)
+ {
// パスワード変更お知らせメール送信
$objMailText = new SC_SiteView_Ex(false);
$objMailText->setPage($this);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// 会員管理クラス
$objCustomer = new SC_Customer_Ex();
@@ -208,7 +212,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -218,7 +223,8 @@
* @param SC_FormParam $objFormParam パラメーター管理クラス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('メールアドレス', 'login_email', MTEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -234,7 +240,8 @@
* @return string JSON 形式のエラーメッセージ
* @see LC_PageError
*/
- function lfGetErrorMessage($error) {
+ function lfGetErrorMessage($error)
+ {
switch ($error) {
case TEMP_LOGIN_ERROR:
$msg = "メールアドレスもしくはパスワードが正しくありません。\n本登録がお済みでない場合は、仮登録メールに記載されているURLより本登録を行ってください。";
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,14 +31,16 @@
* @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 を初期化する.
*
* @return void
*/
- function init() {
+ function init()
+ {
// 開始時刻を設定する。
$this->timeStart = microtime(true);
@@ -63,7 +65,8 @@
* @param string $bloc_file ブロックファイル名
* @return void
*/
- function setTplMainpage($bloc_file) {
+ function setTplMainpage($bloc_file)
+ {
if (SC_Utils_Ex::isAbsoluteRealPath($bloc_file)) {
$this->tpl_mainpage = $bloc_file;
} else {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// 休日取得取得
$this->arrHoliday = $this->lfGetHoliday();
@@ -78,7 +82,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -88,7 +93,8 @@
* @param integer $disp_month 表示する月数
* @return array カレンダー情報の配列を返す
*/
- function lfGetCalendar($disp_month = 1) {
+ function lfGetCalendar($disp_month = 1)
+ {
$arrCalendar = array();
$today = date('Y/m/d');
@@ -123,7 +129,8 @@
*
* @return array $arrHoliday 休日情報の配列を返す
*/
- function lfGetHoliday() {
+ function lfGetHoliday()
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
$objQuery->setOrder('rank DESC');
@@ -140,7 +147,8 @@
*
* @return array $arrRegularHoliday 定休日情報の配列を返す
*/
- function lfGetRegularHoliday() {
+ function lfGetRegularHoliday()
+ {
$arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
$arrRegularHoliday = explode('|', $arrInfo['regular_holiday_ids']);
return $arrRegularHoliday;
@@ -154,7 +162,8 @@
* @param integer $day 日
* @return boolean 休日の場合trueを返す
*/
- function lfCheckHoliday($year, $month, $day) {
+ function lfCheckHoliday($year, $month, $day)
+ {
if (!empty($this->arrHoliday[$month])) {
if (in_array($day, $this->arrHoliday[$month])) {
return true;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
$this->arrProductType = $masterData->getMasterData('mtb_product_type'); //商品種類を取得
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCart = new SC_CartSession_Ex();
$this->isMultiple = $objCart->isMultiple();
@@ -78,7 +82,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -88,7 +93,8 @@
* @param SC_CartSession $objCart カートセッション管理クラス
* @return array カートデータ配列
*/
- function lfGetCartData(&$objCart) {
+ function lfGetCartData(&$objCart)
+ {
$arrCartKeys = $objCart->getKeys();
foreach ($arrCartKeys as $cart_key) {
// 購入金額合計
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// モバイル判定
switch (SC_Display_Ex::detectDevice()) {
@@ -84,7 +88,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -94,7 +99,8 @@
* @param array $arrRequest リクエスト配列
* @return array $arrCategoryId 選択中のカテゴリID
*/
- function lfGetSelectedCategoryId($arrRequest) {
+ function lfGetSelectedCategoryId($arrRequest)
+ {
// 商品ID取得
$product_id = '';
if (isset($arrRequest['product_id']) && $arrRequest['product_id'] != '' && is_numeric($arrRequest['product_id'])) {
@@ -121,7 +127,8 @@
* @param boolean $count_check 登録商品数をチェックする場合はtrue
* @return array $arrRet カテゴリツリーの配列を返す
*/
- function lfGetCatTree($arrParentCategoryId, $count_check = false) {
+ function lfGetCatTree($arrParentCategoryId, $count_check = false)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objDb = new SC_Helper_DB_Ex();
$col = '*';
@@ -170,7 +177,8 @@
* @param boolean $count_check 登録商品数をチェックする場合はtrue
* @return array $arrMainCat メインカテゴリの配列を返す
*/
- 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';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_login = false;
$this->tpl_disable_logout = false;
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
// クッキー管理クラス
@@ -99,7 +103,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -108,7 +113,8 @@
*
* @return boolean
*/
- function lfCheckDisableLogout() {
+ function lfCheckDisableLogout()
+ {
$masterData = new SC_DB_MasterData_Ex();
$arrDisableLogout = $masterData->getMasterData('mtb_disable_logout');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
parent::action();
}
@@ -69,7 +73,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
parent::action();
}
@@ -69,7 +73,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
parent::action();
}
@@ -69,7 +73,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
$this->arrProductType = $masterData->getMasterData('mtb_product_type'); //商品種類を取得
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
parent::action();
//ヘッダーナビのカート情報を取得
@@ -78,7 +82,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -90,7 +95,8 @@
* @param Array $cartKeys 商品種類配列
* @return array $arrCartList カートデータ配列
*/
- function lfGetCartData($objCart, $arrInfo, $cartKeys) {
+ function lfGetCartData($objCart, $arrInfo, $cartKeys)
+ {
$cartList = array();
foreach ($cartKeys as $key) {
// カート集計処理
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
switch ($this->getMode()) {
@@ -107,7 +111,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -117,7 +122,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return void
*/
- function lfInitNewsParam(&$objFormParam) {
+ function lfInitNewsParam(&$objFormParam)
+ {
$objFormParam->addParam('現在ページ', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
$objFormParam->addParam('表示件数', 'disp_number', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
$objFormParam->addParam('新着ID', 'news_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
@@ -128,7 +134,8 @@
*
* @return array $arrNewsList 新着情報の配列を返す
*/
- function lfGetNews(&$objQuery) {
+ function lfGetNews(&$objQuery)
+ {
$objQuery->setOrder('rank DESC ');
$arrNewsList = $objQuery->select('* , cast(news_date as date) as news_date_disp', 'dtb_news' ,'del_flg = 0');
@@ -154,7 +161,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return String $json 新着情報のJSONを返す
*/
- function lfGetNewsForJson(&$objFormParam) {
+ function lfGetNewsForJson(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrData = $objFormParam->getHashArray();
@@ -183,7 +191,8 @@
* @param array $objFormParam フォームパラメータークラス
* @return String $json 新着情報1件分のJSONを返す
*/
- function lfGetNewsDetailForJson(&$objFormParam) {
+ function lfGetNewsDetailForJson(&$objFormParam)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
$arrData = $objFormParam->getHashArray();
@@ -200,7 +209,8 @@
*
* @return Integer $count 新着情報の件数を返す
*/
- function lfGetNewsCount() {
+ function lfGetNewsCount()
+ {
$count = 0;
@@ -216,7 +226,8 @@
* @param array $arrErr エラーメッセージの配列
* @return string JSON 形式のエラーメッセージ
*/
- function lfGetErrors($arrErr) {
+ function lfGetErrors($arrErr)
+ {
$messages = '';
foreach ($arrErr as $val) {
$messages .= $val . "\n";
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// 基本情報を渡す
$objSiteInfo = SC_Helper_DB_Ex::sfGetBasisData();
@@ -77,7 +81,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -86,7 +91,8 @@
*
* @return array $arrBestProducts 検索結果配列
*/
- function lfGetRanking() {
+ function lfGetRanking()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objProduct = new SC_Product_Ex();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
$this->sendResponse();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// 商品ID取得
$product_id = $this -> lfGetProductId();
@@ -85,7 +89,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -94,7 +99,8 @@
*
* @return string $product_id 商品ID
*/
- function lfGetProductId() {
+ function lfGetProductId()
+ {
$product_id = '';
if (isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id'])) {
$product_id = $_GET['product_id'];
@@ -107,7 +113,8 @@
*
* @return string $category_id カテゴリID
*/
- function lfGetCategoryId() {
+ function lfGetCategoryId()
+ {
$category_id = '';
if (isset($_GET['category_id']) && $_GET['category_id'] != '' && is_numeric($_GET['category_id'])) {
$category_id = $_GET['category_id'];
@@ -120,7 +127,8 @@
*
* @return string $maker_id メーカーID
*/
- function lfGetMakerId() {
+ function lfGetMakerId()
+ {
$maker_id = '';
if (isset($_GET['maker_id']) && $_GET['maker_id'] != '' && is_numeric($_GET['maker_id'])) {
$maker_id = $_GET['maker_id'];
@@ -133,7 +141,8 @@
*
* @return array $arrCategoryId 選択中のカテゴリID
*/
- function lfGetSelectedCategoryId($product_id, $category_id) {
+ function lfGetSelectedCategoryId($product_id, $category_id)
+ {
// 選択中のカテゴリIDを判定する
$objDb = new SC_Helper_DB_Ex();
$arrCategoryId = $objDb->sfGetCategoryId($product_id, $category_id);
@@ -145,7 +154,8 @@
*
* @return array $arrMakerId 選択中のメーカーID
*/
- function lfGetSelectedMakerId($product_id, $maker_id) {
+ function lfGetSelectedMakerId($product_id, $maker_id)
+ {
// 選択中のメーカーIDを判定する
$objDb = new SC_Helper_DB_Ex();
$arrMakerId = $objDb->sfGetMakerId($product_id, $maker_id);
@@ -157,7 +167,8 @@
*
* @return array $arrCategoryList カテゴリ検索用選択リスト
*/
- function lfGetCategoryList() {
+ function lfGetCategoryList()
+ {
$objDb = new SC_Helper_DB_Ex();
// カテゴリ検索用選択リスト
$arrCategoryList = $objDb->sfGetCategoryList('', true, ' ');
@@ -176,7 +187,8 @@
*
* @return array $arrMakerList メーカー検索用選択リスト
*/
- function lfGetMakerList() {
+ function lfGetMakerList()
+ {
$objDb = new SC_Helper_DB_Ex();
// メーカー検索用選択リスト
$arrMakerList = $objDb->sfGetMakerList('', true);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Guide extends LC_Page_Ex {
+class LC_Page_Guide extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -71,7 +75,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_About.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
$this->arrPref = $masterData->getMasterData('mtb_pref');
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -73,7 +77,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Charge.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -71,7 +75,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->lfGetKiyaku(intval($_GET['page']), $this);
@@ -73,7 +77,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -84,7 +89,8 @@
* @param object &$objPage ページオブジェクト
* @return void
*/
- function lfGetKiyaku($index, &$objPage) {
+ 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');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -71,7 +75,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/guide/LC_Page_Guide_Usage.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -71,7 +75,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_AbstractMypage.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_AbstractMypage extends LC_Page_Ex {
+class LC_Page_AbstractMypage extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
// mypage 共通
$this->tpl_title = 'MYページ';
@@ -54,7 +56,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
// ログインチェック
@@ -102,7 +105,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -46,7 +47,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mypageno = 'index';
if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_MOBILE) {
@@ -65,7 +67,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -74,7 +77,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getvalue('customer_id');
@@ -112,7 +116,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -124,7 +129,8 @@
* @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';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_subtitle = '会員登録内容変更(入力ページ)';
$this->tpl_mypageno = 'change';
@@ -66,7 +68,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -74,7 +77,8 @@
* Page のプロセス
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
@@ -165,7 +169,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -177,7 +182,8 @@
* @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']);
@@ -191,7 +197,8 @@
* @param array $arrRequest リクエスト値($_GET)
* @return array $arrErr エラーメッセージ配列
*/
- function lfCheckError($arrRequest) {
+ function lfCheckError($arrRequest)
+ {
// パラメーター管理クラス
$objFormParam = new SC_FormParam_Ex();
// パラメーター情報の初期化
@@ -220,7 +227,8 @@
* @param string $value
* @return エラーなし：true エラー：false
*/
- function lfInputNameCheck($value) {
+ function lfInputNameCheck($value)
+ {
// 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー
if (strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
return false;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_subtitle = '会員登録内容変更(完了ページ)';
$this->tpl_mypageno = 'change';
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -71,7 +75,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_subtitle = 'お届け先追加・変更';
$this->tpl_mypageno = 'delivery';
@@ -55,7 +57,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -64,7 +67,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
@@ -124,7 +128,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -133,7 +138,8 @@
*
* @return SC_FormParam
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('お届け先ID', 'other_deliv_id', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('現在ページ', 'pageno', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'), '', false);
}
@@ -145,7 +151,8 @@
* @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']];
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'お届け先の追加・変更';
$masterData = new SC_DB_MasterData_Ex();
@@ -57,7 +59,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
$objAddress = new SC_Helper_Address_Ex();
@@ -161,12 +165,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* 登録実行 */
- function lfRegistData($objAddress, $objFormParam, $customer_id) {
+ function lfRegistData($objAddress, $objFormParam, $customer_id)
+ {
$arrRet = $objFormParam->getHashArray();
$sqlval = $objFormParam->getDbArray();
@@ -176,7 +182,8 @@
$objAddress->registAddress($sqlval);
}
- function lfRegistDataNonMember($objFormParam) {
+ function lfRegistDataNonMember($objFormParam)
+ {
$arrRegistColumn = $objFormParam->getDbArray();
foreach ($arrRegistColumn as $key => $val) {
$arrRegist['shipping_' . $key ] = $val;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @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
@@ -55,7 +56,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->allowClientCache();
}
@@ -65,7 +67,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
ob_end_clean();
parent::process();
$this->action();
@@ -77,7 +80,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// ログインチェック
$objCustomer = new SC_Customer_Ex();
@@ -104,7 +108,8 @@
* todo たいした処理でないのに異常に処理が重い
* @return void
*/
- function sendResponse() {
+ function sendResponse()
+ {
// TODO sendResponseをオーバーライドしている為、afterフックポイントが実行されない.直接実行する.(#1790)
$objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
$objPlugin->doAction('LC_Page_Mypage_DownLoad_action_after', array($this));
@@ -164,7 +169,8 @@
* @param integer $product_class_id 商品規格ID
* @return array 商品情報の配列
*/
- 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,
@@ -193,7 +199,8 @@
}
/* パラメーター情報の初期化 */
- 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'));
@@ -201,7 +208,8 @@
}
/* 入力内容のチェック */
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
return $objErr->arrErr;
@@ -213,7 +221,8 @@
* @param string $realpath ダウンロードファイルパス
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfMobileHeader($realpath,$sdown_filename) {
+ function lfMobileHeader($realpath,$sdown_filename)
+ {
$objHelperMobile = new SC_Helper_Mobile_Ex();
//ファイルの拡張子からコンテンツタイプを取得する
$mime_type = $objHelperMobile->getMIMEType($realpath);
@@ -230,7 +239,8 @@
* @param string $realpath ダウンロードファイルパス
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfMobileAuDownload($realpath,$sdown_filename) {
+ function lfMobileAuDownload($realpath,$sdown_filename)
+ {
//モバイル用ヘッダー出力
$this->lfMobileHeader($realpath,$sdown_filename);
//ファイルサイズを取得する
@@ -261,7 +271,8 @@
* @param string $realpath ダウンロードファイルパス
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfMobileDownload($realpath,$sdown_filename) {
+ function lfMobileDownload($realpath,$sdown_filename)
+ {
//モバイル用ヘッダー出力
$this->lfMobileHeader($realpath,$sdown_filename);
//ファイルサイズを取得する
@@ -319,7 +330,8 @@
* @param string $realpath ダウンロードファイルパス
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfDownload($realpath,$sdown_filename) {
+ function lfDownload($realpath,$sdown_filename)
+ {
// 拡張子を取得
$extension = pathinfo($realpath, PATHINFO_EXTENSION);
$contentType = $this->defaultContentType;
@@ -360,7 +372,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -46,7 +47,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_subtitle = 'お気に入り一覧';
$this->tpl_mypageno = 'favorite';
@@ -57,7 +59,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -66,7 +69,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
@@ -110,7 +114,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -122,7 +127,8 @@
* @access private
* @return array お気に入り商品一覧
*/
- function lfGetFavoriteProduct($customer_id, &$objPage) {
+ function lfGetFavoriteProduct($customer_id, &$objPage)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
$objProduct = new SC_Product_Ex();
@@ -171,7 +177,8 @@
}
/* 仕方がない処理。。 */
- function lfMakeWhere($tablename, $arrProductId) {
+ function lfMakeWhere($tablename, $arrProductId)
+ {
// 取得した表示すべきIDだけを指定して情報を取得。
$where = '';
@@ -185,7 +192,8 @@
}
// お気に入り商品削除
- 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));
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mypageno = 'index';
$this->tpl_subtitle = '購入履歴詳細';
@@ -59,7 +61,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -68,7 +71,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
$objDb = new SC_Helper_DB_Ex();
@@ -120,7 +124,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -130,7 +135,8 @@
* @param integer $order_id 注文番号
* @return array 受注メール送信履歴の内容
*/
- function lfGetMailHistory($order_id) {
+ function lfGetMailHistory($order_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'send_date, subject, template_id, send_id';
$where = 'order_id = ?';
@@ -146,7 +152,8 @@
* @param $arrWDAY array 曜日データの配列
* @return array お届け先情報
*/
- function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY) {
+ function lfGetShippingDate(&$objPurchase, $order_id, $arrWDAY)
+ {
$arrShipping = $objPurchase->getShippings($order_id);
foreach ($arrShipping as $shipping_index => $shippingData) {
@@ -168,7 +175,8 @@
* @param $arrOrderDetail 購入履歴の配列
* @return array 画像をセットした購入履歴の配列
*/
- function setMainListImage($arrOrderDetails) {
+ function setMainListImage($arrOrderDetails)
+ {
$i = 0;
foreach ($arrOrderDetails as $arrOrderDetail) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -185,7 +193,8 @@
* @param $arrOrderDetail 購入履歴の配列
* @return array MIMETYPE、ファイル名をセットした購入履歴の配列
*/
- function lfSetMimetype($arrOrderDetails) {
+ function lfSetMimetype($arrOrderDetails)
+ {
$objHelperMobile = new SC_Helper_Mobile_Ex();
$i = 0;
foreach ($arrOrderDetails as $arrOrderDetail) {
@@ -206,7 +215,8 @@
* @param integer $order_id 注文番号
* @param $arrOrderDetail 購入履歴の配列
*/
- function lfSetAU($arrOrderDetails) {
+ function lfSetAU($arrOrderDetails)
+ {
$this->isAU = false;
// モバイル端末かつ、キャリアがAUの場合に処理を行う
if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE && SC_MobileUserAgent::getCarrier() == 'ezweb') {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->httpCacheControl('nocache');
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
SC_Response_Ex::sendRedirect(DIR_INDEX_PATH);
@@ -71,7 +75,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->httpCacheControl('nocache');
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCustomer = new SC_Customer_Ex();
if (!SC_Utils_Ex::sfIsInt($_GET['send_id'])) {
@@ -100,7 +104,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -112,7 +117,8 @@
* @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 = ?';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -59,7 +62,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
//受注詳細データの取得
$arrOrderDetail = $this->lfGetOrderDetail($_POST['order_id']);
@@ -80,12 +84,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
// 受注詳細データの取得
- function lfGetOrderDetail($order_id) {
+ function lfGetOrderDetail($order_id)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
$objCustomer = new SC_Customer_Ex();
@@ -103,7 +109,8 @@
}
// 商品をカートに追加
- function lfAddCartProducts($arrOrderDetail) {
+ function lfAddCartProducts($arrOrderDetail)
+ {
$objCartSess = new SC_CartSession_Ex();
foreach ($arrOrderDetail as $order_row) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_subtitle = '退会手続き(入力ページ)';
$this->tpl_mypageno = 'refusal';
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->getMode()) {
case 'confirm':
@@ -88,7 +92,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -98,7 +103,8 @@
* @access private
* @return void
*/
- function lfDeleteCustomer($customer_id) {
+ function lfDeleteCustomer($customer_id)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
$sqlval['del_flg'] = 1;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'MYページ';
@@ -60,7 +62,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -71,7 +74,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -81,7 +85,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/order/LC_Page_Order.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Order extends LC_Page_Ex {
+class LC_Page_Order extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_page_category = 'order';
$this->tpl_title = '特定商取引に関する法律に基づく表記';
@@ -54,7 +56,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objDb = new SC_Helper_DB_Ex();
$this->arrOrder = $objDb->sfGetBasisData();
@@ -78,7 +82,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/preview/LC_Page_Preview.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Preview extends LC_Page_Ex {
+class LC_Page_Preview extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$objView = new SC_SiteView_Ex();
@@ -77,7 +80,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_CategoryList.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -60,7 +63,8 @@
* Page のAction
* @return void
*/
- function action() {
+ function action()
+ {
// カテゴリIDの正当性チェック
$this->lfCheckCategoryId();
@@ -80,12 +84,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* カテゴリIDの正当性チェック */
- 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;
}
@@ -101,7 +107,8 @@
* @param object &$objPage ページオブジェクト
* @return void
*/
- function lfGetCategories($category_id, $count_check = false, &$objPage) {
+ function lfGetCategories($category_id, $count_check = false, &$objPage)
+ {
// カテゴリの正しいIDを取得する。
$category_id = $this->lfCheckCategoryId($category_id);
if ($category_id == 0) {
@@ -155,7 +162,8 @@
*
* @return object
*/
- function lfInitParam($arrRequest) {
+ function lfInitParam($arrRequest)
+ {
$objFormParam = new SC_FormParam_Ex();
$objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('NUM_CHECK','MAX_LENGTH_CHECK'));
// 値の取得
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -34,7 +34,8 @@
* @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
+{
/** 商品ステータス */
var $arrSTATUS;
@@ -65,7 +66,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
$this->arrSTATUS = $masterData->getMasterData('mtb_status');
@@ -79,7 +81,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -90,7 +93,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
// 会員クラス
$objCustomer = new SC_Customer_Ex();
@@ -135,7 +139,8 @@
}
$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();';
// モバイル用 規格選択セレクトボックスの作成
@@ -236,12 +241,14 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/* プロダクトIDの正当性チェック */
- function lfCheckProductId($admin_mode,$product_id) {
+ function lfCheckProductId($admin_mode,$product_id)
+ {
// 管理機能からの確認の場合は、非公開の商品も表示する。
if (isset($admin_mode) && $admin_mode == 'on') {
SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
@@ -262,7 +269,8 @@
}
/* ファイル情報の初期化 */
- function lfInitFile($objUpFile) {
+ function lfInitFile($objUpFile)
+ {
$objUpFile->addFile('詳細-メイン画像', 'main_image', array('jpg'), IMAGE_SIZE);
for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) {
$objUpFile->addFile("詳細-サブ画像$cnt", "sub_image$cnt", array('jpg'), IMAGE_SIZE);
@@ -271,7 +279,8 @@
}
/* 規格選択セレクトボックスの作成 */
- function lfMakeSelect() {
+ function lfMakeSelect()
+ {
return 'fnSetClassCategories('
. 'document.form1, '
. SC_Utils_Ex::jsonEncode($this->objFormParam->getValue('classcategory_id2'))
@@ -279,7 +288,8 @@
}
/* 規格選択セレクトボックスの作成(モバイル) */
- function lfMakeSelectMobile(&$objPage, $product_id,$request_classcategory_id1) {
+ function lfMakeSelectMobile(&$objPage, $product_id,$request_classcategory_id1)
+ {
$classcat_find1 = false;
$classcat_find2 = false;
@@ -342,7 +352,8 @@
}
/* パラメーター情報の初期化 */
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('規格1', 'classcategory_id1', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('規格2', 'classcategory_id2', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -359,13 +370,15 @@
}
/* 商品規格情報の取得 */
- function lfGetProductsClass($product_id) {
+ function lfGetProductsClass($product_id)
+ {
$objProduct = new SC_Product_Ex();
return $objProduct->getProductsClassFullByProductId($product_id);
}
/* 登録済み関連商品の読み込み */
- function lfPreGetRecommendProducts($product_id) {
+ function lfPreGetRecommendProducts($product_id)
+ {
$objProduct = new SC_Product_Ex();
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -389,7 +402,8 @@
}
/* 入力内容のチェック */
- 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':
@@ -421,7 +435,8 @@
}
//商品ごとのレビュー情報を取得する
- function lfGetReviewData($id) {
+ function lfGetReviewData($id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
//商品ごとのレビュー情報を取得する
$col = 'create_date, reviewer_url, reviewer_name, recommend_level, title, comment';
@@ -438,7 +453,8 @@
* ファイルの情報をセットする
* @return $subImageFlag
*/
- function lfSetFile($objUpFile,$arrProduct,&$arrFile) {
+ function lfSetFile($objUpFile,$arrProduct,&$arrFile)
+ {
// DBからのデータを引き継ぐ
$objUpFile->setDBFileList($arrProduct);
// ファイル表示用配列を渡す
@@ -458,7 +474,8 @@
* お気に入り商品登録
* @return void
*/
- function lfRegistFavoriteProduct($favorite_product_id,$customer_id) {
+ function lfRegistFavoriteProduct($favorite_product_id,$customer_id)
+ {
// ログイン中のユーザが商品をお気に入りにいれる処理
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);
@@ -488,7 +505,8 @@
*
* @return void
*/
- function doCart() {
+ function doCart()
+ {
$this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,
$this->tpl_classcat_find1,
$this->tpl_classcat_find2);
@@ -510,7 +528,8 @@
* @param type $objCustomer
* @return void
*/
- function doAddFavorite(&$objCustomer) {
+ function doAddFavorite(&$objCustomer)
+ {
// ログイン中のユーザが商品をお気に入りにいれる処理
if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0) {
$this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam);
@@ -532,7 +551,8 @@
* @param type $objCustomer
* @return void
*/
- function doAddFavoriteSphone($objCustomer) {
+ function doAddFavoriteSphone($objCustomer)
+ {
// ログイン中のユーザが商品をお気に入りにいれる処理(スマートフォン用)
if ($objCustomer->isLoginSuccess() === true && $this->objFormParam->getValue('favorite_product_id') > 0) {
$this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam);
@@ -556,7 +576,8 @@
*
* @return void
*/
- function doDefault() {
+ function doDefault()
+ {
// カート「戻るボタン」用に保持
$netURL = new Net_URL();
$_SESSION['cart_referer_url'] = $netURL->getURL();
@@ -566,7 +587,8 @@
*
* @return void
*/
- function doMobileSelect() {
+ function doMobileSelect()
+ {
// 規格1が設定されている場合
if ($this->tpl_classcat_find1) {
// templateの変更
@@ -582,7 +604,8 @@
*
* @return type
*/
- function doMobileSelect2() {
+ function doMobileSelect2()
+ {
$this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,$this->tpl_classcat_find1,$this->tpl_classcat_find2);
// 規格1が設定されていて、エラーを検出した場合
@@ -607,7 +630,8 @@
*
* @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);
@@ -649,7 +673,8 @@
*
* @return void
*/
- function doMobileCart() {
+ function doMobileCart()
+ {
// この段階でエラーが出る場合は、数量の入力エラーのはず
if (count($this->arrErr)) {
// 数量の入力を行う
@@ -661,7 +686,8 @@
*
* @return void
*/
- function doMobileDefault() {
+ function doMobileDefault()
+ {
$this->tpl_mainpage = 'products/detail.tpl';
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -67,7 +68,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
@@ -82,7 +84,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -93,7 +96,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objProduct = new SC_Product_Ex();
@@ -150,7 +154,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -159,7 +164,8 @@
*
* @return integer カテゴリID
*/
- function lfGetCategoryId($category_id) {
+ function lfGetCategoryId($category_id)
+ {
// 指定なしの場合、0 を返す
if (empty($category_id)) return 0;
@@ -183,7 +189,8 @@
}
/* 商品一覧の表示 */
- function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct) {
+ function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct)
+ {
$arrOrderVal = array();
@@ -241,7 +248,8 @@
}
/* 入力内容のチェック */
- function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2) {
+ function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2)
+ {
// 入力データを渡す。
$objErr = new SC_CheckError_Ex($arrForm);
@@ -265,7 +273,8 @@
*
* @return void
*/
- function lfGetDisplayNum($display_number) {
+ function lfGetDisplayNum($display_number)
+ {
// 表示件数
return (SC_Utils_Ex::sfIsInt($display_number))
? $display_number
@@ -277,7 +286,8 @@
*
* @return str
*/
- function lfGetPageTitle($mode, $category_id = 0) {
+ function lfGetPageTitle($mode, $category_id = 0)
+ {
if ($mode == 'search') {
return '検索結果';
} elseif ($category_id == 0) {
@@ -293,7 +303,8 @@
*
* @return array
*/
- function lfGetSearchConditionDisp($arrSearchData) {
+ function lfGetSearchConditionDisp($arrSearchData)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrSearch = array('category' => '指定なし', 'maker' => '指定なし', 'name' => '指定なし');
// カテゴリ検索条件
@@ -318,7 +329,8 @@
*
* @return int
*/
- function lfGetProductAllNum($searchCondition) {
+ function lfGetProductAllNum($searchCondition)
+ {
// 検索結果対象となる商品の数を取得
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->setWhere($searchCondition['where_for_count']);
@@ -331,7 +343,8 @@
*
* @return array
*/
- function lfGetSearchCondition($arrSearchData) {
+ function lfGetSearchCondition($arrSearchData)
+ {
$searchCondition = array(
'where' => '',
'arrval' => array(),
@@ -390,7 +403,8 @@
*
* @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) {
@@ -411,7 +425,8 @@
*
* @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']);
@@ -425,7 +440,8 @@
* @param Array $arrStatusImage スタータス画像配列
* @return Array $arrProducts 商品一覧情報
*/
- function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage) {
+ function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage)
+ {
foreach ($arrProducts['productStatus'] as $product_id => $arrValues) {
for ($i = 0; $i < count($arrValues); $i++) {
@@ -447,7 +463,8 @@
*
* @return void
*/
- function doJson() {
+ function doJson()
+ {
$this->arrProducts = $this->setStatusDataTo($this->arrProducts, $this->arrSTATUS, $this->arrSTATUS_IMAGE);
SC_Product_Ex::setPriceTaxTo($this->arrProducts);
@@ -465,7 +482,8 @@
* @param type $objProduct
* @return void
*/
- function doDefault(&$objProduct) {
+ function doDefault(&$objProduct)
+ {
//商品一覧の表示処理
$strnavi = $this->objNavi->strnavi;
// 表示文字列
@@ -526,7 +544,8 @@
$_SESSION['cart_referer_url'] = $netURL->getURL();
}
- $this->tpl_javascript .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
+ $this->tpl_javascript .= 'function fnOnLoad()
+ {' . $js_fnOnLoad . '}';
$this->tpl_onload .= 'fnOnLoad(); ';
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -52,7 +53,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
@@ -66,7 +68,8 @@
/**
* Page のプロセス.
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -77,7 +80,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objFormParam = new SC_FormParam_Ex();
$this->lfInitParam($objFormParam);
@@ -136,7 +140,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -146,7 +151,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('レビューID', 'review_id', INT_LEN, 'aKV');
$objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('NUM_CHECK','EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('投稿者名', 'reviewer_name', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -163,7 +169,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラーメッセージの配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$arrErr = $objFormParam->checkError();
$arrForm = $objFormParam->getHashArray();
@@ -191,14 +198,16 @@
* @param integer $product_id 商品ID
* @return string $product_name 商品名
*/
- 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));
}
//登録実行
- function lfRegistRecommendData(&$objFormParam) {
+ function lfRegistRecommendData(&$objFormParam)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrRegist = $objFormParam->getDbArray();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->setTemplate('products/review_complete.tpl');
@@ -73,7 +77,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Search.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -61,7 +64,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -71,7 +75,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Regist extends LC_Page_Ex {
+class LC_Page_Regist extends LC_Page_Ex
+{
// {{{ properties
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
switch ($this->getMode()) {
case 'regist':
@@ -91,7 +95,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -102,7 +107,8 @@
* @access private
* @return string $arrRegist['secret_key'] 本登録ID
*/
- function lfRegistData($array) {
+ function lfRegistData($array)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
$arrRegist['secret_key'] = SC_Helper_Customer_Ex::sfGetUniqSecretKey(); //本登録ID発行
$arrRegist['status'] = 2;
@@ -122,7 +128,8 @@
* @access private
* @return array エラーの配列
*/
- function lfCheckError($array) {
+ function lfCheckError($array)
+ {
$objErr = new SC_CheckError_Ex($array);
if (preg_match("/^[[:alnum:]]+$/", $array['id'])) {
@@ -144,7 +151,8 @@
* @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();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist_Complete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = '会員登録(完了ページ)';
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
@@ -72,7 +76,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_RSS extends LC_Page_Ex {
+class LC_Page_RSS extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'rss/index.tpl';
$this->encode = 'UTF-8';
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
$objView = new SC_SiteView_Ex(false);
@@ -89,7 +92,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -99,7 +103,8 @@
* @param SC_Query $objQuery DB操作クラス
* @return array $arrNews 取得結果を配列で返す
*/
- function lfGetNews(&$objQuery) {
+ function lfGetNews(&$objQuery)
+ {
$col = '';
$col .= 'news_id '; // 新着情報ID
$col .= ',news_title '; // 新着情報タイトル
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_mainpage = 'rss/products.tpl';
$this->encode = 'UTF-8';
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$this->action();
}
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objView = new SC_SiteView_Ex();
@@ -123,7 +127,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -134,7 +139,8 @@
* @param str $product_id 商品ID
* @return array $arrProduct 商品情報の配列を返す
*/
- function lfGetProductsDetailData($mode, $product_id) {
+ function lfGetProductsDetailData($mode, $product_id)
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
//商品詳細を取得
if ($mode == 'all') {
@@ -185,7 +191,8 @@
*
* @return array $arrProduct 商品情報の配列を返す
*/
- function lfGetProductsListData() {
+ function lfGetProductsListData()
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
//商品一覧を取得
$arrProduct = $objQuery->getAll('SELECT product_id, name AS product_name FROM dtb_products');
@@ -197,7 +204,8 @@
*
* @return array $arrProduct 商品情報の配列を返す
*/
- function lfGetProductsAllData() {
+ function lfGetProductsAllData()
+ {
$objQuery = SC_Query_Ex::getSingletonInstance();
//商品情報を取得
$arrProduct = $this->lfGetProductsAllclass($objQuery);
@@ -242,7 +250,8 @@
* @param integer $product_id 商品ID
* @return array $arrProduct 取得結果を配列で返す
*/
- function lfGetProductsDetail(&$objQuery, $product_id = 'all') {
+ function lfGetProductsDetail(&$objQuery, $product_id = 'all')
+ {
$objProduct = new SC_Product_Ex();
// --- 商品詳細の取得
@@ -283,7 +292,8 @@
* @param SC_Query $objQuery DB操作クラス
* @return array $arrProduct 取得結果を配列で返す
*/
- function lfGetProductsAllclass(&$objQuery) {
+ function lfGetProductsAllclass(&$objQuery)
+ {
// --- 商品一覧の取得
$objQuery->setWhere('del_flg = 0 AND status = 1');
$objQuery->setOrder('product_id');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Shopping extends LC_Page_Ex {
+class LC_Page_Shopping extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'ログイン';
$masterData = new SC_DB_MasterData_Ex();
@@ -63,7 +65,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -74,7 +77,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
@@ -271,7 +275,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -281,7 +286,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -326,7 +332,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitLoginFormParam(&$objFormParam) {
+ function lfInitLoginFormParam(&$objFormParam)
+ {
$objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('メールアドレス', 'login_email', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -346,7 +353,8 @@
* @param SC_SiteSession $objSiteSess SC_SiteSession インスタンス
* @return string 遷移先のパス
*/
- 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);
@@ -370,7 +378,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @param boolean $isMultiple 複数配送の場合 true
*/
- function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false) {
+ function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false)
+ {
$arrParams = $objFormParam->getHashArray();
// 注文者をお届け先とする配列を取得
@@ -413,7 +422,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラー情報の配
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
// 入力値の変換
$objFormParam->convParam();
$objFormParam->toLower('order_mail');
@@ -462,7 +472,8 @@
* @param integer $uniqid 購入一時情報のユニークID
* @return void
*/
- function setFormParams(&$objFormParam, &$objPurchase, $uniqid) {
+ function setFormParams(&$objFormParam, &$objPurchase, $uniqid)
+ {
$arrOrderTemp = $objPurchase->getOrderTemp($uniqid);
if (SC_Utils_Ex::isBlank($arrOrderTemp)) {
$arrOrderTemp = array(
@@ -500,7 +511,8 @@
* @return string JSON 形式のエラーメッセージ
* @see LC_PageError
*/
- function lfGetErrorMessage($error) {
+ function lfGetErrorMessage($error)
+ {
switch ($error) {
case TEMP_LOGIN_ERROR:
$msg = "メールアドレスもしくはパスワードが正しくありません。\n本登録がお済みでない場合は、仮登録メールに記載されているURLより本登録を行ってください。";
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'ご注文完了';
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -62,7 +65,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
unset($_SESSION['order_id']);
@@ -75,14 +79,16 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
/**
* 決済モジュールから遷移する場合があるため, トークンチェックしない.
*/
- function doValidToken() {
+ function doValidToken()
+ {
// nothing.
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'ご入力内容のご確認';
$masterData = new SC_DB_MasterData_Ex();
@@ -58,7 +60,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -69,7 +72,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
@@ -180,7 +184,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$masterData = new SC_DB_MasterData_Ex();
$this->arrPref = $masterData->getMasterData('mtb_pref');
@@ -54,7 +56,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -65,7 +68,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
@@ -190,7 +194,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -200,7 +205,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('その他のお届け先ID', 'other_deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お届け先チェック', 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK'));
}
@@ -218,7 +224,8 @@
* @param SC_Customer $objCustomer SC_Customer インスタンス
* @return boolean お届け先チェックの値が妥当な場合 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();
// 会員登録住所がチェックされている場合
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -34,7 +34,8 @@
* @author Kentaro Ohkouchi
* @version $Id$
*/
-class LC_Page_Shopping_LoadPaymentModule extends LC_Page_Ex {
+class LC_Page_Shopping_LoadPaymentModule extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -44,7 +45,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
$order_id = $this->getOrderId();
if ($order_id === false) {
@@ -75,7 +78,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -89,7 +93,8 @@
* @return string|boolean 成功した場合は決済モジュールのパス;
* 失敗した場合 false
*/
- function getModulePath($order_id) {
+ function getModulePath($order_id)
+ {
$objPurchase = new SC_Helper_Purchase_Ex();
$objPayment = new SC_Helper_Payment_Ex();
@@ -118,7 +123,8 @@
* @return integer|boolean 受注IDの取得に成功した場合は受注IDを返す;
* 失敗した場合は, false を返す.
*/
- function getOrderId() {
+ function getOrderId()
+ {
if (isset($_SESSION['order_id'])
&& !SC_Utils_Ex::isBlank($_SESSION['order_id'])
&& SC_Utils_Ex::sfIsInt($_SESSION['order_id'])) {
@@ -142,7 +148,8 @@
/**
* 決済モジュールから遷移する場合があるため, トークンチェックしない.
*/
- function doValidToken() {
+ function doValidToken()
+ {
// nothing.
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = 'お届け先の複数指定';
$this->httpCacheControl('nocache');
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -63,7 +66,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
@@ -120,7 +124,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -130,7 +135,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return void
*/
- function lfInitParam(&$objFormParam) {
+ function lfInitParam(&$objFormParam)
+ {
$objFormParam->addParam('商品規格ID', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('商品名', 'name');
$objFormParam->addParam('規格1', 'class_name1');
@@ -153,7 +159,8 @@
* @param SC_CartSession $objCartSess SC_CartSession インスタンス
* @return void
*/
- function setParamToSplitItems(&$objFormParam, &$objCartSess) {
+ function setParamToSplitItems(&$objFormParam, &$objCartSess)
+ {
$cartLists =& $objCartSess->getCartList($objCartSess->getKey());
$arrItems = array();
$index = 0;
@@ -184,7 +191,8 @@
* @param integer $uniqid 受注一時テーブルのユニークID
* @return array 配送住所のプルダウン用連想配列
*/
- function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress, $uniqid) {
+ function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress, $uniqid)
+ {
$masterData = new SC_DB_MasterData_Ex();
$arrPref = $masterData->getMasterData('mtb_pref');
@@ -235,7 +243,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @return array エラー情報の配列
*/
- function lfCheckError(&$objFormParam) {
+ function lfCheckError(&$objFormParam)
+ {
$objCartSess = new SC_CartSession_Ex();
$objFormParam->convParam();
@@ -297,7 +306,8 @@
* @param SC_CartSession $objCartSess SC_CartSession インスタンス
* @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) {
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -49,7 +50,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_onload = 'fnCheckInputPoint();';
$this->tpl_title = 'お支払方法・お届け時間等の指定';
@@ -62,7 +64,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -73,7 +76,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
@@ -247,7 +251,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
@@ -259,7 +264,8 @@
* @param boolean $deliv_only deliv_id チェックのみの場合 true
* @param array $arrShipping 配送先情報の配列
*/
- 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();
@@ -273,7 +279,8 @@
* @param array $arrShipping 配送先情報の配列
* @return void
*/
- function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping) {
+ function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping)
+ {
$objFormParam->addParam('配送業者', 'deliv_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('ポイント', 'use_point', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK', 'ZERO_START'));
$objFormParam->addParam('その他お問い合わせ', 'message', LTEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -302,7 +309,8 @@
* @param integer $max_point 会員の保持ポイント
* @return array 入力チェック結果の配列
*/
- function lfCheckError(&$objFormParam, $subtotal, $max_point) {
+ function lfCheckError(&$objFormParam, $subtotal, $max_point)
+ {
$objPurchase = new SC_Helper_Purchase_Ex();
// 入力データを渡す。
$arrForm = $objFormParam->getHashArray();
@@ -342,7 +350,8 @@
* @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @param array $arrDelivTime 配送時間の配列
*/
- function saveShippings(&$objFormParam, $arrDelivTime) {
+ function saveShippings(&$objFormParam, $arrDelivTime)
+ {
$deliv_id = $objFormParam->getValue('deliv_id');
/* TODO
@@ -368,7 +377,8 @@
* @param array $arrPayment お支払い方法の配列
* @return void
*/
- function lfRegistData($uniqid, $arrForm, &$objPurchase, $arrPayment) {
+ function lfRegistData($uniqid, $arrForm, &$objPurchase, $arrPayment)
+ {
$arrForm['order_temp_id'] = $uniqid;
$arrForm['update_date'] = 'CURRENT_TIMESTAMP';
@@ -400,7 +410,8 @@
* @param integer $deliv_id 配送業者ID
* @return array 支払い方法, お届け時間を格納した配列
*/
- 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());
@@ -415,7 +426,8 @@
* @param array $arrPayment 支払い方法の配列
* @return boolean 支払い方法の画像がある場合 true
*/
- function hasPaymentImage($arrPayment) {
+ function hasPaymentImage($arrPayment)
+ {
foreach ($arrPayment as $val) {
if (!SC_Utils_Ex::isBlank($val['payment_image'])) {
return true;
@@ -430,7 +442,8 @@
* @param array $arrDeliv 配送業者の配列
* @return boolean 配送業者が1社のみの場合 true
*/
- function isSingleDeliv($arrDeliv) {
+ function isSingleDeliv($arrDeliv)
+ {
if (count($arrDeliv) == 1) {
return true;
} else {
@@ -445,7 +458,8 @@
* @param string $mode フォームパラメーター 'mode' の文字列
* @return string モバイル用テンプレートのパス
*/
- function getMobileMainpage($is_single_deliv = true, $mode) {
+ function getMobileMainpage($is_single_deliv = true, $mode)
+ {
switch ($mode) {
case 'select_deliv':
return 'shopping/payment.tpl';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/unsupported/LC_Page_Unsupported.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_Unsupported extends LC_Page_Ex {
+class LC_Page_Unsupported extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
$this->tpl_title = '未対応デバイス';
}
@@ -51,13 +53,15 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
}
- function action() {
+ function action()
+ {
}
@@ -67,7 +71,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -11,8 +11,10 @@
* @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');
@@ -33,7 +35,8 @@
* @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));
@@ -54,7 +57,8 @@
* @param array $arrParams 追加パラメーター.連想配列で渡す.
* @return string|object レスポンスボディ|エラー時にはPEAR::Errorオブジェクトを返す.
*/
- 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');
@@ -75,7 +79,8 @@
}
}
- function isLoggedInAdminPage() {
+ function isLoggedInAdminPage()
+ {
$objSess = new SC_Session_Ex();
if ($objSess->isSuccess() === SUCCESS) {
@@ -89,11 +94,13 @@
*
* @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'])
@@ -104,7 +111,8 @@
/**
* オーナーズストアからの POST のため, トークンチェックしない.
*/
- function doValidToken() {
+ function doValidToken()
+ {
// nothing.
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process($mode) {
+ function process($mode)
+ {
$objLog = new LC_Upgrade_Helper_Log;
$objLog->start($mode);
@@ -244,11 +247,13 @@
*
* @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')
@@ -261,7 +266,8 @@
*
* @param object $objRet
*/
- function updateMdlTable($objRet) {
+ function updateMdlTable($objRet)
+ {
$table = 'dtb_module';
$where = 'module_id = ?';
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -294,7 +300,8 @@
* @param array #arrCookies Cookie配列
* @return
*/
- function notifyDownload($mode, $arrCookies) {
+ function notifyDownload($mode, $arrCookies)
+ {
$arrPOSTParams = array(
'eccube_url' => HTTP_URL
);
@@ -307,7 +314,8 @@
*
* @return boolean
*/
- function isValidAccess($mode) {
+ function isValidAccess($mode)
+ {
$objLog = new LC_Upgrade_Helper_Log;
switch ($mode) {
// モジュールダウンロード
@@ -357,7 +365,8 @@
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'),
@@ -379,7 +388,8 @@
* 他の変数・関数とかぶらないよう、
* LC_Update_Updater::execute()で処理を実行する.
*/
- function fileExecute($productCode) {
+ function fileExecute($productCode)
+ {
$file = DATA_REALDIR . 'downloads/update/' . $productCode . '_update.php';
if (file_exists($file)) {
@include_once $file;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process($mode) {
+ function process($mode)
+ {
$objLog = new LC_Upgrade_Helper_Log;
$objJson = new LC_Upgrade_Helper_Json;
@@ -156,7 +159,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @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
@@ -41,14 +42,16 @@
*
* @return void
*/
- function init() {}
+ function init()
+ {}
/**
* Page のプロセス.
*
* @return void
*/
- function process($mode) {
+ function process($mode)
+ {
$objLog = new LC_Upgrade_Helper_LOG;
$objJson = new LC_Upgrade_Helper_Json;
@@ -77,5 +80,6 @@
*
* @return void
*/
- function destroy() {}
+ function destroy()
+ {}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -3,7 +3,8 @@
* Enter description here...
*
*/
-class LC_Upgrade_Helper_Json extends Services_JSON {
+class LC_Upgrade_Helper_Json extends Services_JSON
+{
/** */
var $arrData = array(
'status' => null,
@@ -17,7 +18,8 @@
*
* @return SC_Upgrade_Helper_Json
*/
- function __construct() {
+ function __construct()
+ {
parent::Services_JSON();
}
@@ -25,11 +27,13 @@
* 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;
}
@@ -42,7 +46,8 @@
* @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');
@@ -58,7 +63,8 @@
*
* @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;
@@ -68,7 +74,8 @@
* Enter description here...
*
*/
- function display() {
+ function display()
+ {
header('Content-Type: text/javascript; charset=UTF-8');
echo $this->encode($this->arrData);
}
@@ -84,7 +91,8 @@
* @return StdClass
* @see SC_Utils_Ex::jsonDecode
*/
- function decode($str) {
+ function decode($str)
+ {
return SC_Utils_Ex::jsonDecode($str);
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -25,13 +25,15 @@
* オーナーズストア管理用ログクラス
*
*/
-class LC_Upgrade_Helper_Log {
+class LC_Upgrade_Helper_Log
+{
/**
* 開始メッセージを出力
*
* @param string $mode
*/
- function start($mode) {
+ function start($mode)
+ {
$message = "##### $mode start #####";
$this->log($message);
}
@@ -40,7 +42,8 @@
*
* @param string $mode
*/
- function end() {
+ function end()
+ {
$message = '##### end #####';
$this->log($message);
}
@@ -49,7 +52,8 @@
*
* @param string $message
*/
- function log($message) {
+ function log($message)
+ {
GC_Utils_Ex::gfPrintLog($message, OSTORE_LOG_REALFILE);
}
/**
@@ -58,7 +62,8 @@
* @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);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Base.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @author LOCKON CO.,LTD.
* @version $Id: $
*/
-abstract class SC_Plugin_Base {
+abstract class SC_Plugin_Base
+{
protected $arrSelfInfo;
@@ -40,7 +41,8 @@
* @param array $arrSelfInfo 自身のプラグイン情報
* @return void
*/
- function __construct(array $arrSelfInfo) {
+ function __construct(array $arrSelfInfo)
+ {
$this->arrSelfInfo = $arrSelfInfo;
}
/**
@@ -89,7 +91,8 @@
* @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) {
@@ -107,7 +110,8 @@
*
* @return array $arrSelfInfo 自身のプラグイン情報
*/
- function getPluginInfo() {
+ function getPluginInfo()
+ {
return $this->arrSelfInfo;
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Util.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -22,12 +22,14 @@
*/
// プラグインのユーティリティクラス.
-class SC_Plugin_Util {
+class SC_Plugin_Util
+{
/**
* 稼働中のプラグインを取得する。
*/
- function getEnablePlugin() {
+ function getEnablePlugin()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = '*';
$table = 'dtb_plugin';
@@ -54,7 +56,8 @@
*
* @return array $arrRet インストールされているプラグイン.
*/
- function getAllPlugin() {
+ function getAllPlugin()
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = '*';
$table = 'dtb_plugin';
@@ -73,7 +76,8 @@
* @param int $plugin_id プラグインID.
* @return array プラグインの基本情報.
*/
- function getPluginByPluginId($plugin_id) {
+ function getPluginByPluginId($plugin_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = '*';
$table = 'dtb_plugin';
@@ -89,7 +93,8 @@
* @param string $plugin_code プラグインコード.
* @return array プラグインの基本情報.
*/
- function getPluginByPluginCode($plugin_code) {
+ function getPluginByPluginCode($plugin_code)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = '*';
$table = 'dtb_plugin';
@@ -104,7 +109,8 @@
* @param string $plugin_id プラグインID.
* @return array プラグインの基本情報.
*/
- function deletePluginByPluginId($plugin_id) {
+ function deletePluginByPluginId($plugin_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'plugin_id = ?';
$objQuery->delete('dtb_plugin', $where, array($plugin_id));
@@ -116,7 +122,8 @@
*
* @return array $arrPluginDirectory
*/
- function getPluginDirectory() {
+ function getPluginDirectory()
+ {
$arrPluginDirectory = array();
if (is_dir(PLUGIN_UPLOAD_REALDIR)) {
if ($dh = opendir(PLUGIN_UPLOAD_REALDIR)) {
@@ -135,7 +142,8 @@
* @param integer $plugin_id
* @return array フックポイントの一覧
*/
- function getPluginHookPoint($plugin_id) {
+ function getPluginHookPoint($plugin_id)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$cols = '*';
$from = 'dtb_plugin_hookpoint';
@@ -149,7 +157,8 @@
* @param string $key エラー情報を格納するキー
* @return array $arrErr エラー情報を格納した連想配列.
*/
- function checkExtension($key) {
+ function checkExtension($key)
+ {
// プラグイン利用に必須のモジュール
// 'EC-CUBEバージョン' => array('モジュール名')
$arrRequireExtension = array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseCookie.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_SessionFactory_UseCookie extends SC_SessionFactory_Ex {
+class SC_SessionFactory_UseCookie extends SC_SessionFactory_Ex
+{
// }}}
// {{{ functions
@@ -44,7 +45,8 @@
* ・同じドメイン間で共有
* FIXME セッションキーのキーが PHP デフォルトのため、上位ディレクトリーで定義があると、その値で動作すると考えられる。
**/
- function initSession() {
+ function initSession()
+ {
ini_set('session.cache_limiter', 'none');
// (session.auto_start などで)セッションが開始されていた場合に備えて閉じる。(FIXME: 保存する必要はない。破棄で良い。)
session_write_close();
@@ -60,7 +62,8 @@
*
* @return boolean 常に true を返す
*/
- function useCookie() {
+ function useCookie()
+ {
return true;
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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;
@@ -44,7 +45,8 @@
*
* @param string $state
*/
- function setState($state = 'pc') {
+ function setState($state = 'pc')
+ {
switch ($state) {
case 'mobile':
$this->state = new LC_UseRequest_State_Mobile;
@@ -62,7 +64,8 @@
*
* @return boolean 常にfalseを返す
*/
- function useCookie() {
+ function useCookie()
+ {
return false;
}
@@ -73,7 +76,8 @@
* @return string|null 取得したセッションIDを返す。
* 取得できなかった場合は null を返す。
*/
- function getExtSessionId() {
+ function getExtSessionId()
+ {
if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
return null;
}
@@ -103,7 +107,8 @@
* @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
@@ -126,7 +131,8 @@
*
* @return boolean セッションデータが有効な場合は true、無効な場合は false を返す。
*/
- function validateSession() {
+ function validateSession()
+ {
/**
* PCサイトでは
* ・セッションデータが適切に設定されているか
@@ -150,7 +156,8 @@
* @return string|false 取得した有効なセッションIDを返す。
* 取得できなかった場合は false を返す。
*/
- function getSessionId() {
+ function getSessionId()
+ {
// パラメーターからセッションIDを取得する。
$sessionId = @$_POST[session_name()];
if (!isset($sessionId)) {
@@ -184,7 +191,8 @@
*
* @return void
*/
- function initSession() {
+ function initSession()
+ {
// セッションIDの受け渡しにクッキーを使用しない。
ini_set('session.use_cookies', '0');
ini_set('session.use_trans_sid', '1');
@@ -232,7 +240,8 @@
* セッションデータ管理クラスの基底クラス
*
*/
-class LC_UseRequest_State {
+class LC_UseRequest_State
+{
/** 名前空間(pc/mobile) */
var $namespace = '';
/** 有効期間 */
@@ -245,14 +254,16 @@
*
* @return string
*/
- function getNameSpace() { return $this->namespace; }
+ function getNameSpace()
+ { return $this->namespace; }
/**
* 有効期間を取得する
*
* @return integer
*/
- function getLifeTime() { return $this->lifetime; }
+ function getLifeTime()
+ { return $this->lifetime; }
/**
* セッションデータが設定されているかを判定する.
@@ -261,7 +272,8 @@
*
* @return boolean
*/
- function validateNameSpace() {
+ function validateNameSpace()
+ {
$namespace = $this->getNameSpace();
if (isset($_SESSION[$namespace]) && is_array($_SESSION[$namespace])) {
return true;
@@ -277,7 +289,8 @@
* @param string $key
* @return mixed|null
*/
- function getValue($key) {
+ function getValue($key)
+ {
$namespace = $this->getNameSpace();
return isset($_SESSION[$namespace][$key])
? $_SESSION[$namespace][$key]
@@ -291,7 +304,8 @@
* @param string $key
* @param mixed $value
*/
- function setValue($key, $value) {
+ function setValue($key, $value)
+ {
$namespace = $this->getNameSpace();
$_SESSION[$namespace][$key] = $value;
}
@@ -301,7 +315,8 @@
*
* @return integer
*/
- function getExpire() {
+ function getExpire()
+ {
return $this->getValue('expires');
}
@@ -309,7 +324,8 @@
* 有効期限を設定する.
*
*/
- function updateExpire() {
+ function updateExpire()
+ {
$lifetime = $this->getLifeTime();
$this->setValue('expires', time() + $lifetime);
}
@@ -319,7 +335,8 @@
*
* @return boolean
*/
- function validateExpire() {
+ function validateExpire()
+ {
$expire = $this->getExpire();
if (intval($expire) > time()) {
return true;
@@ -334,7 +351,8 @@
*
* @return string
*/
- function getIp() {
+ function getIp()
+ {
return $this->getValue('ip');
}
@@ -342,7 +360,8 @@
* IPアドレスを設定する.
*
*/
- function updateIp() {
+ function updateIp()
+ {
$this->setValue('ip', $_SERVER['REMOTE_ADDR']);
}
@@ -352,7 +371,8 @@
*
* @return boolean
*/
- function validateIp() {
+ function validateIp()
+ {
$ip = $this->getIp();
if (!empty($_SERVER['REMOTE_ADDR']) && $ip === $_SERVER['REMOTE_ADDR']) {
@@ -369,7 +389,8 @@
*
* @return string
*/
- function getModel() {
+ function getModel()
+ {
return $this->getValue('model');
}
@@ -378,7 +399,8 @@
*
* @return boolean
*/
- function validateSessionData() {
+ function validateSessionData()
+ {
foreach ($this->validate as $method) {
$method = 'validate' . $method;
if (!$this->$method()) {
@@ -392,14 +414,16 @@
* セッションデータを初期化する.
*
*/
- function inisializeSessionData() {}
+ function inisializeSessionData()
+ {}
}
/**
* PCサイト用のセッションデータ管理クラス
*
*/
-class LC_UseRequest_State_PC extends LC_UseRequest_State {
+class LC_UseRequest_State_PC extends LC_UseRequest_State
+{
/**
* コンストラクタ
@@ -412,7 +436,8 @@
*
* @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');
@@ -422,7 +447,8 @@
* セッションにUserAgentを設定する.
*
*/
- function updateModel() {
+ function updateModel()
+ {
$this->setValue('model', $_SERVER['HTTP_USER_AGENT']);
}
@@ -431,7 +457,8 @@
*
* @return boolean
*/
- function validateModel() {
+ function validateModel()
+ {
$ua = $this->getModel();
if (!empty($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] === $ua) {
return true;
@@ -446,7 +473,8 @@
* セッションデータを初期化する.
*
*/
- function inisializeSessionData() {
+ function inisializeSessionData()
+ {
$_SESSION = array();
$this->updateModel();
$this->updateIp();
@@ -458,7 +486,8 @@
* モバイルサイト用のセッションデータ管理クラス
*
*/
-class LC_UseRequest_State_Mobile extends LC_UseRequest_State {
+class LC_UseRequest_State_Mobile extends LC_UseRequest_State
+{
/**
* コンストラクタ
@@ -472,7 +501,8 @@
*
* @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');
@@ -482,7 +512,8 @@
* 携帯の機種名を設定する
*
*/
- function updateModel() {
+ function updateModel()
+ {
$this->setValue('model', SC_MobileUserAgent_Ex::getModel());
}
@@ -491,7 +522,8 @@
*
* @return boolean
*/
- function validateModel() {
+ function validateModel()
+ {
$modelInSession = $this->getModel();
$model = SC_MobileUserAgent_Ex::getModel();
if (!empty($model) && $model === $modelInSession) {
@@ -505,7 +537,8 @@
*
* @return string
*/
- function getPhoneId() {
+ function getPhoneId()
+ {
return $this->getValue('phone_id');
}
@@ -513,7 +546,8 @@
* 携帯のIDを登録する.
*
*/
- function updatePhoneId() {
+ function updatePhoneId()
+ {
$this->setValue('phone_id', SC_MobileUserAgent_Ex::getId());
}
@@ -521,7 +555,8 @@
* セッションデータを初期化する.
*
*/
- function inisializeSessionData() {
+ function inisializeSessionData()
+ {
$_SESSION = array();
$this->updateModel();
$this->updateIp();
変更: branches/version-2_12-dev/data/class/util/GC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/GC_Utils.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/util/GC_Utils.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class GC_Utils {
+class GC_Utils
+{
/**
* ログファイルに変数の詳細を出力
@@ -38,7 +39,8 @@
* @param mixed $obj
* @return void
*/
- function gfDebugLog($obj) {
+ function gfDebugLog($obj)
+ {
if (USE_VERBOSE_LOG === true) {
$msg = "DEBUG\n"
. print_r($obj, true);
@@ -52,7 +54,8 @@
* @param int $forLogInfo ログ出力用に利用するかどうか(1:ログ出力用に利用する)
* @return string 呼び出し元クラス、関数名、行数の文字列表現
*/
- function gfGetCallerInfo($forLogInfo = true) {
+ function gfGetCallerInfo($forLogInfo = true)
+ {
// バックトレースを取得する
$traces = debug_backtrace(false);
$bklv = 1;
@@ -73,7 +76,8 @@
*
* エラーハンドリングに関わる情報を切り捨てる。
*/
- function getDebugBacktrace($arrBacktrace = null) {
+ function getDebugBacktrace($arrBacktrace = null)
+ {
if (is_null($arrBacktrace)) {
$arrBacktrace = debug_backtrace(false);
}
@@ -118,7 +122,8 @@
*
* @deprecated 2.12.0
*/
- function gfGetLogStr($mess, $log_level = 'Info') {
+ function gfGetLogStr($mess, $log_level = 'Info')
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
// メッセージの前に、ログ出力元関数名とログ出力関数呼び出し部分の行数を付与
$mess = GC_Utils::gfGetCallerInfo(true) . $mess;
@@ -136,7 +141,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
*/
- function gfAdminLog($mess, $log_level = 'Info') {
+ function gfAdminLog($mess, $log_level = 'Info')
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
// ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
if ($log_level === 'Debug' && DEBUG_MODE === false) {
@@ -152,7 +158,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::gfPrintLog を使用すること
*/
- function gfFrontLog($mess, $log_level = 'Info') {
+ function gfFrontLog($mess, $log_level = 'Info')
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
// ログレベル=Debugの場合は、DEBUG_MODEがtrueの場合のみログ出力する
if ($log_level === 'Debug' && DEBUG_MODE === false) {
@@ -171,7 +178,8 @@
* @param string $path
* @param bool $verbose 冗長な出力を行うか
*/
- function gfPrintLog($msg, $path = '', $verbose = USE_VERBOSE_LOG) {
+ function gfPrintLog($msg, $path = '', $verbose = USE_VERBOSE_LOG)
+ {
// 日付の取得
$today = date('Y/m/d H:i:s');
// 出力パスの作成
@@ -207,7 +215,8 @@
* @param string $path ファイルパス
* @return void
*/
- function gfLogRotation($max_log, $max_size, $path) {
+ function gfLogRotation($max_log, $max_size, $path)
+ {
// ファイルが存在しない場合、終了
if (!file_exists($path)) return;
@@ -244,7 +253,8 @@
* [依存] なし
* [注釈] -
*----------------------------------------------------------------------*/
- function gfMakePassword($pwLength) {
+ function gfMakePassword($pwLength)
+ {
// 乱数表のシードを決定
srand((double)microtime() * 54234853);
@@ -270,7 +280,8 @@
* [注釈] -
*----------------------------------------------------------------------------------------------------------------------*/
- function gfMailHeaderAddr($str) {
+ function gfMailHeaderAddr($str)
+ {
$addrs = explode(',', $str); //アドレスを配列に入れる
$mailaddrs = array();
foreach ($addrs as $addr) {
@@ -292,7 +303,8 @@
* @param array $arrBacktrace バックトレース
* @return string テキストで表現したバックトレース
*/
- function toStringBacktrace($arrBacktrace) {
+ function toStringBacktrace($arrBacktrace)
+ {
$string = '';
foreach (array_reverse($arrBacktrace) as $backtrace) {
@@ -315,7 +327,8 @@
* @param integer $error_type エラー型
* @return string|integer エラー定数名
*/
- function getErrorTypeName($error_type) {
+ function getErrorTypeName($error_type)
+ {
$arrDefinedConstants = get_defined_constants(true);
// PHP の歴史対応
@@ -346,7 +359,8 @@
*
* @return string 現在のURL
*/
- function getUrl() {
+ function getUrl()
+ {
$url = '';
if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
@@ -368,7 +382,8 @@
*
* @return bool 管理機能か
*/
- function isAdminFunction() {
+ function isAdminFunction()
+ {
return defined('ADMIN_FUNCTION') && ADMIN_FUNCTION === true;
}
@@ -377,7 +392,8 @@
*
* @return bool フロント機能か
*/
- function isFrontFunction() {
+ function isFrontFunction()
+ {
return defined('FRONT_FUNCTION') && FRONT_FUNCTION === true;
}
@@ -386,7 +402,8 @@
*
* @return bool インストール機能か
*/
- function isInstallFunction() {
+ function isInstallFunction()
+ {
return defined('INSTALL_FUNCTION') && INSTALL_FUNCTION === true;
}
@@ -397,7 +414,8 @@
*
* @return string XML宣言の文字列
*/
- 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";
変更: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,10 +32,12 @@
* @author LOCKON CO.,LTD.
* @version $Id:SC_Utils.php 15532 2007-08-31 14:39:46Z nanasess $
*/
-class SC_Utils {
+class SC_Utils
+{
// インストール初期処理
- function sfInitInstall() {
+ function sfInitInstall()
+ {
// インストール済みが定義されていない。
if (!defined('ECCUBE_INSTALL')) {
$phpself = $_SERVER['SCRIPT_NAME'];
@@ -63,7 +65,8 @@
* @param string $path 検索対象のパス
* @return string インストーラの URL
*/
- function searchInstallerPath($path) {
+ function searchInstallerPath($path)
+ {
$installer = 'install/' . DIR_INDEX_PATH;
if (SC_Utils_Ex::sfIsHTTPS()) {
@@ -100,7 +103,8 @@
* @param string $url http(s):// から始まる URL
* @return string $url を絶対パスに変換した URL
*/
- function getRealURL($url) {
+ function getRealURL($url)
+ {
$parse = parse_url($url);
$tmp = explode('/', $parse['path']);
$results = array();
@@ -119,7 +123,8 @@
}
// 装飾付きエラーメッセージの表示
- function sfErrorHeader($mess, $print = false) {
+ function sfErrorHeader($mess, $print = false)
+ {
global $GLOBAL_ERR;
$GLOBAL_ERR.= '<div id="errorHeader">';
$GLOBAL_ERR.= $mess;
@@ -130,7 +135,8 @@
}
/* エラーページの表示 */
- function sfDispError($type) {
+ function sfDispError($type)
+ {
require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_DispError_Ex.php';
@@ -143,7 +149,8 @@
}
/* サイトエラーページの表示 */
- 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';
@@ -164,13 +171,15 @@
*
* @deprecated 2.12.0 trigger_error($debugMsg, E_USER_ERROR) を使用すること
*/
- function sfDispException($debugMsg = null) {
+ function sfDispException($debugMsg = null)
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
trigger_error($debugMsg, E_USER_ERROR);
}
/* 認証の可否判定 */
- function sfIsSuccess($objSess, $disp_error = true) {
+ function sfIsSuccess($objSess, $disp_error = true)
+ {
$ret = $objSess->IsSuccess();
if ($ret != SUCCESS) {
if ($disp_error) {
@@ -205,7 +214,8 @@
* @param string $passlen 変換する文字列
* @return string アスタリスクへ変換した文字列
*/
- function sfPassLen($passlen) {
+ function sfPassLen($passlen)
+ {
$ret = '';
for ($i=0;$i<$passlen;true) {
$ret.='*';
@@ -219,7 +229,8 @@
*
* @return bool
*/
- function sfIsHTTPS() {
+ function sfIsHTTPS()
+ {
// HTTPS時には$_SERVER['HTTPS']には空でない値が入る
// $_SERVER['HTTPS'] != 'off' はIIS用
if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
@@ -235,7 +246,8 @@
* @param obj SC_Session, SC_SiteSession
* @return bool
*/
- function sfIsValidTransition($objSess) {
+ function sfIsValidTransition($objSess)
+ {
// 前画面からPOSTされるuniqidが正しいものかどうかをチェック
$uniqid = $objSess->getUniqId();
if (!empty($_POST['uniqid']) && ($_POST['uniqid'] === $uniqid)) {
@@ -246,7 +258,8 @@
}
/* DB用日付文字列取得 */
- function sfGetTimestamp($year, $month, $day, $last = false) {
+ function sfGetTimestamp($year, $month, $day, $last = false)
+ {
if ($year != '' && $month != '' && $day != '') {
if ($last) {
$time = '23:59:59';
@@ -269,7 +282,8 @@
* @return bool
*/
//
- function sfIsInt($value) {
+ function sfIsInt($value)
+ {
if (strlen($value) >= 1 && strlen($value) <= INT_LEN && is_numeric($value)) {
return true;
}
@@ -282,13 +296,15 @@
* @param string $value 検査対象
* @return boolean 0で埋められている
*/
- 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';
@@ -305,7 +321,8 @@
}
/* 1階層上のディレクトリ名を取得する */
- function sfUpDirName() {
+ function sfUpDirName()
+ {
$path = $_SERVER['SCRIPT_NAME'];
$arrVal = explode('/', $path);
$cnt = count($arrVal);
@@ -316,7 +333,8 @@
/**
* @deprecated
*/
- function sfMergeCBValue($keyname, $max) {
+ function sfMergeCBValue($keyname, $max)
+ {
$conv = '';
$cnt = 1;
for ($cnt = 1; $cnt <= $max; $cnt++) {
@@ -333,7 +351,8 @@
/**
* @deprecated
*/
- function sfMergeCheckBoxes($array, $max) {
+ function sfMergeCheckBoxes($array, $max)
+ {
$ret = '';
$arrTmp = array();
if (is_array($array)) {
@@ -355,7 +374,8 @@
/**
* @deprecated
*/
- function sfMergeParamCheckBoxes($array) {
+ function sfMergeParamCheckBoxes($array)
+ {
$ret = '';
if (is_array($array)) {
foreach ($array as $val) {
@@ -375,7 +395,8 @@
/**
* @deprecated
*/
- function sfSearchCheckBoxes($array) {
+ function sfSearchCheckBoxes($array)
+ {
$max = max($array);
$ret = '';
for ($i = 1; $i <= $max; $i++) {
@@ -391,7 +412,8 @@
/**
* @deprecated
*/
- function sfSplitCheckBoxes($val) {
+ function sfSplitCheckBoxes($val)
+ {
$arrRet = array();
$len = strlen($val);
for ($i = 0; $i < $len; $i++) {
@@ -406,7 +428,8 @@
/**
* @deprecated
*/
- function sfMergeCBSearchValue($keyname, $max) {
+ function sfMergeCBSearchValue($keyname, $max)
+ {
$conv = '';
$cnt = 1;
for ($cnt = 1; $cnt <= $max; $cnt++) {
@@ -423,7 +446,8 @@
/**
* @deprecated
*/
- function sfSplitCBValue($val, $keyname = '') {
+ function sfSplitCBValue($val, $keyname = '')
+ {
$arr = array();
$len = strlen($val);
$no = 1;
@@ -439,7 +463,8 @@
}
// キーと値をセットした配列を取得
- function sfArrKeyValue($arrList, $keyname, $valname, $len_max = '', $keysize = '') {
+ function sfArrKeyValue($arrList, $keyname, $valname, $len_max = '', $keysize = '')
+ {
$arrRet = array();
$max = count($arrList);
@@ -464,7 +489,8 @@
}
// キーと値をセットした配列を取得(値が複数の場合)
- function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = '') {
+ function sfArrKeyValues($arrList, $keyname, $valname, $len_max = '', $keysize = '', $connect = '')
+ {
$max = count($arrList);
@@ -491,7 +517,8 @@
}
// 配列の値をカンマ区切りで返す。
- function sfGetCommaList($array, $space=true, $arrPop = array()) {
+ function sfGetCommaList($array, $space=true, $arrPop = array())
+ {
if (count($array) > 0) {
$line = '';
foreach ($array as $val) {
@@ -516,7 +543,8 @@
}
/* 配列の要素をCSVフォーマットで出力する。*/
- function sfGetCSVList($array) {
+ function sfGetCSVList($array)
+ {
$line = '';
if (count($array) > 0) {
foreach ($array as $val) {
@@ -539,7 +567,8 @@
/* ２．終了年月日 (YYYY/MM/DD 235959)
/* ３．エラー (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)
+ {
// 期間指定
$error = 0;
@@ -562,12 +591,14 @@
}
// エラー箇所の背景色を変更するためのfunction SC_Viewで読み込む
- function sfSetErrorStyle() {
+ function sfSetErrorStyle()
+ {
return 'style="background-color:'.ERR_COLOR.'"';
}
// 一致した値のキー名を取得
- function sfSearchKey($array, $word, $default) {
+ function sfSearchKey($array, $word, $default)
+ {
foreach ($array as $key => $val) {
if ($val == $word) {
return $key;
@@ -576,28 +607,32 @@
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("^[ \n\r]*", '', $str);
$ret = mb_ereg_replace("[ \n\r]*$", '', $ret);
return $ret;
@@ -614,7 +649,8 @@
* @param integer $tax_rule 端数処理
* @return integer 税金額
*/
- function sfTax($price, $tax, $tax_rule) {
+ function sfTax($price, $tax, $tax_rule)
+ {
$real_tax = $tax / 100;
$ret = $price * $real_tax;
switch ($tax_rule) {
@@ -649,12 +685,14 @@
* @param integer $tax_rule 端数処理
* @return integer 税金付与した金額
*/
- function sfCalcIncTax($price, $tax, $tax_rule) {
+ function sfCalcIncTax($price, $tax, $tax_rule)
+ {
return $price + SC_Utils_Ex::sfTax($price, $tax, $tax_rule);
}
// 桁数を指定して四捨五入
- function sfRound($value, $pow = 0) {
+ function sfRound($value, $pow = 0)
+ {
$adjust = pow(10 ,$pow-1);
// 整数且つ0出なければ桁数指定を行う
@@ -676,7 +714,8 @@
* @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) {
@@ -701,7 +740,8 @@
}
/* 規格分類の件数取得 */
- 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 ';
@@ -721,7 +761,8 @@
* @param int $classcategory_id2 デフォルト値0
* @return int
*/
- function sfGetProductClassId($product_id, $classcategory_id1=0, $classcategory_id2=0) {
+ function sfGetProductClassId($product_id, $classcategory_id1=0, $classcategory_id2=0)
+ {
$where = 'product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?';
if (!$classcategory_id1) { //NULLが入ってきた場合への対策
$classcategory_id1 = 0;
@@ -735,13 +776,15 @@
}
/* 文末の「/」をなくす */
- function sfTrimURL($url) {
+ function sfTrimURL($url)
+ {
$ret = rtrim($url, '/');
return $ret;
}
/* DBから取り出した日付の文字列を調整する。*/
- 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) {
@@ -757,7 +800,8 @@
}
/* 配列をキー名ごとの配列に変更する */
- function sfSwapArray($array, $isColumnName = true) {
+ function sfSwapArray($array, $isColumnName = true)
+ {
$arrRet = array();
foreach ($array as $key1 => $arr1) {
if (!is_array($arr1)) continue 1;
@@ -782,7 +826,8 @@
* @param array 必須キーの配列
* @return array 連想配列の値のみの配列
*/
- function getHash2Array($hash, $requires = array()) {
+ function getHash2Array($hash, $requires = array())
+ {
$array = array();
$i = 0;
foreach ($hash as $key => $val) {
@@ -800,7 +845,8 @@
}
/* かけ算をする（Smarty用) */
- function sfMultiply($num1, $num2) {
+ function sfMultiply($num1, $num2)
+ {
return $num1 * $num2;
}
@@ -814,7 +860,8 @@
* @param integer $point_rate
* @return integer 加算ポイント
*/
- function sfGetAddPoint($totalpoint, $use_point, $point_rate) {
+ function sfGetAddPoint($totalpoint, $use_point, $point_rate)
+ {
// 購入商品の合計ポイントから利用したポイントのポイント換算価値を引く方式
$add_point = $totalpoint - intval($use_point * ($point_rate / 100));
@@ -825,7 +872,8 @@
}
/* 一意かつ予測されにくいID */
- function sfGetUniqRandomId($head = '') {
+ function sfGetUniqRandomId($head = '')
+ {
// 予測されないようにランダム文字列を付与する。
$random = GC_Utils_Ex::gfMakePassword(8);
// 同一ホスト内で一意なIDを生成
@@ -834,7 +882,8 @@
}
// 二回以上繰り返されているスラッシュ[/]を一つに変換する。
- function sfRmDupSlash($istr) {
+ function sfRmDupSlash($istr)
+ {
if (preg_match('|^http://|', $istr)) {
$str = substr($istr, 7);
$head = 'http://';
@@ -866,7 +915,8 @@
* @param string $out_dir 変換後のファイルを出力するディレクトリを表す文字列
* @return string 変換後のテキストファイルのパス
*/
- function sfEncodeFile($filepath, $enc_type, $out_dir) {
+ function sfEncodeFile($filepath, $enc_type, $out_dir)
+ {
$ifp = fopen($filepath, 'r');
// 正常にファイルオープンした場合
@@ -894,7 +944,8 @@
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);
@@ -942,7 +993,8 @@
}
// 年、月、締め日から、先月の締め日+1、今月の締め日を求める。
- function sfTermMonth($year, $month, $close_day) {
+ function sfTermMonth($year, $month, $close_day)
+ {
$end_year = $year;
$end_month = $month;
@@ -984,7 +1036,8 @@
}
// 再帰的に多段配列を検索して一次元配列(Hidden引渡し用配列)に変換する。
- 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 != '') {
@@ -1003,7 +1056,8 @@
}
// DB取得日時をタイムに変換
- function sfDBDatetoTime($db_date) {
+ function sfDBDatetoTime($db_date)
+ {
$date = preg_replace("|\..*$|",'',$db_date);
$time = strtotime($date);
return $time;
@@ -1014,12 +1068,14 @@
*
* XXX この関数を使っている箇所は、ほぼ設計誤りと思われる。変数にフェッチするか、出力時のエンコーディングで対応すべきと見受ける。
*/
- function sfMbConvertEncoding($str, $encode = CHAR_CODE) {
+ function sfMbConvertEncoding($str, $encode = CHAR_CODE)
+ {
return mb_convert_encoding($str, $encode);
}
// 2つの配列を用いて連想配列を作成する
- function sfArrCombine($arrKeys, $arrValues) {
+ function sfArrCombine($arrKeys, $arrValues)
+ {
if (count($arrKeys) <= 0 and count($arrValues) <= 0) return array();
@@ -1037,7 +1093,8 @@
}
/* 階層構造のテーブルから与えられたIDの兄弟を取得する */
- function sfGetBrothersArray($arrData, $pid_name, $id_name, $arrPID) {
+ function sfGetBrothersArray($arrData, $pid_name, $id_name, $arrPID)
+ {
$max = count($arrData);
$arrBrothers = array();
@@ -1060,7 +1117,8 @@
}
/* 階層構造のテーブルから与えられたIDの直属の子を取得する */
- function sfGetUnderChildrenArray($arrData, $pid_name, $id_name, $parent) {
+ function sfGetUnderChildrenArray($arrData, $pid_name, $id_name, $parent)
+ {
$max = count($arrData);
$arrChildren = array();
@@ -1077,7 +1135,8 @@
* SQLシングルクォート対応
* @deprecated SC_Query::quote() を使用すること
*/
- function sfQuoteSmart($in) {
+ function sfQuoteSmart($in)
+ {
if (is_int($in) || is_double($in)) {
return $in;
@@ -1091,7 +1150,8 @@
}
// ディレクトリを再帰的に生成する
- function sfMakeDir($path) {
+ function sfMakeDir($path)
+ {
static $count = 0;
$count++; // 無限ループ回避
$dir = dirname($path);
@@ -1118,7 +1178,8 @@
}
// ディレクトリ以下のファイルを再帰的にコピー
- function sfCopyDir($src, $des, $mess = '', $override = false) {
+ function sfCopyDir($src, $des, $mess = '', $override = false)
+ {
if (!is_dir($src)) {
return false;
}
@@ -1175,7 +1236,8 @@
* @param boolean|string $output 半角スペース256文字+改行を出力するか。または、送信する文字列を指定。
* @return void
*/
- function sfFlush($output = false, $sleep = 0) {
+ function sfFlush($output = false, $sleep = 0)
+ {
// 出力をバッファリングしない(==日本語自動変換もしない)
while (@ob_end_flush());
@@ -1197,7 +1259,8 @@
}
// @versionの記載があるファイルからバージョンを取得する。
- function sfGetFileVersion($path) {
+ function sfGetFileVersion($path)
+ {
if (file_exists($path)) {
$src_fp = fopen($path, 'rb');
if ($src_fp) {
@@ -1222,7 +1285,8 @@
* @return array 変換後の配列
* @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);
@@ -1238,7 +1302,8 @@
* @param array $defineIndexes チェックする添字
* @return array 添字を定義した配列
*/
- function arrayDefineIndexes($array, $defineIndexes) {
+ function arrayDefineIndexes($array, $defineIndexes)
+ {
foreach ($defineIndexes as $key) {
if (!isset($array[$key])) $array[$key] = '';
}
@@ -1254,7 +1319,8 @@
* @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];
@@ -1267,7 +1333,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::printXMLDeclaration を使用すること
*/
- function printXMLDeclaration() {
+ function printXMLDeclaration()
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
GC_Utils_Ex::printXMLDeclaration();
}
@@ -1277,7 +1344,8 @@
*
* @return string
*/
- function getTableTag($array) {
+ function getTableTag($array)
+ {
$html = '<table>';
$html.= '<tr>';
foreach ($array[0] as $key => $val) {
@@ -1303,7 +1371,8 @@
* @param string &$filename ファイル名
* @return string
*/
- function sfNoImageMainList($filename = '') {
+ function sfNoImageMainList($filename = '')
+ {
if (strlen($filename) == 0 || substr($filename, -1, 1) == '/') {
$filename .= 'noimage_main_list.jpg';
}
@@ -1316,7 +1385,8 @@
* @param string &$filename ファイル名
* @return string
*/
- function sfNoImageMain($filename = '') {
+ function sfNoImageMain($filename = '')
+ {
if (strlen($filename) == 0 || substr($filename, -1, 1) == '/') {
$filename .= 'noimage_main.png';
}
@@ -1324,7 +1394,8 @@
}
/* デバッグ用 ------------------------------------------------------------------------------------------------*/
- function sfPrintR($obj) {
+ function sfPrintR($obj)
+ {
echo '<div style="font-size: 12px;color: #00FF00;">' . "\n";
echo '<strong>**デバッグ中**</strong><br />' . "\n";
echo '<pre>' . "\n";
@@ -1339,7 +1410,8 @@
* @param integer $length 文字数
* @return string ランダムな文字列
*/
- function sfGetRandomString($length = 1) {
+ function sfGetRandomString($length = 1)
+ {
return Text_Password::create($length);
}
@@ -1348,7 +1420,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::getUrl を使用すること
*/
- function sfGetUrl() {
+ function sfGetUrl()
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
return GC_Utils_Ex::getUrl();
}
@@ -1358,7 +1431,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::toStringBacktrace を使用すること
*/
- function sfBacktraceToString($arrBacktrace) {
+ function sfBacktraceToString($arrBacktrace)
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
return GC_Utils_Ex::toStringBacktrace($arrBacktrace);
}
@@ -1368,7 +1442,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::isAdminFunction を使用すること
*/
- function sfIsAdminFunction() {
+ function sfIsAdminFunction()
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
return GC_Utils_Ex::isAdminFunction();
}
@@ -1378,7 +1453,8 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::isFrontFunction を使用すること
*/
- function sfIsFrontFunction() {
+ function sfIsFrontFunction()
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
return GC_Utils_Ex::isFrontFunction();
}
@@ -1388,13 +1464,15 @@
*
* @deprecated 2.12.0 GC_Utils_Ex::isInstallFunction を使用すること
*/
- function sfIsInstallFunction() {
+ function sfIsInstallFunction()
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
return GC_Utils_Ex::isInstallFunction();
}
// 郵便番号から住所の取得
- function sfGetAddress($zipcode) {
+ function sfGetAddress($zipcode)
+ {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -1440,7 +1518,8 @@
*
* @deprecated 2.12.0 microtime(true) を使用する。
*/
- function sfMicrotimeFloat() {
+ function sfMicrotimeFloat()
+ {
trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
return microtime(true);
}
@@ -1466,7 +1545,8 @@
* @param boolean $greedy '貧欲'にチェックを行う場合 true
* @return boolean $val が空白と判断された場合 true
*/
- function isBlank($val, $greedy = true) {
+ function isBlank($val, $greedy = true)
+ {
if (is_array($val)) {
if ($greedy) {
if (empty($val)) {
@@ -1508,7 +1588,8 @@
* @param string $url
* @return boolean
*/
- function sfIsInternalDomain($url) {
+ function sfIsInternalDomain($url)
+ {
$netURL = new Net_URL(HTTP_URL);
$host = $netURL->host;
if (!$host) return false;
@@ -1524,7 +1605,8 @@
* @param string $salt salt
* @return string ハッシュ暗号化された文字列
*/
- function sfGetHashString($str, $salt) {
+ function sfGetHashString($str, $salt)
+ {
$res = '';
if ($salt == '') {
$salt = AUTH_MAGIC;
@@ -1545,7 +1627,8 @@
* @param string $salt salt
* @return boolean 一致判定
*/
- function sfIsMatchHashPassword($pass, $hashpass, $salt) {
+ function sfIsMatchHashPassword($pass, $hashpass, $salt)
+ {
$res = false;
if ($hashpass != '') {
if (AUTH_TYPE == 'PLAIN') {
@@ -1576,7 +1659,8 @@
* @param string $search_page_max 表示件数の選択値
* @return integer 1ページあたりの最大表示件数
*/
- 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 {
@@ -1597,7 +1681,8 @@
* @see json_encode()
* @see Services_JSON::encode()
*/
- function jsonEncode($value) {
+ function jsonEncode($value)
+ {
if (function_exists('json_encode')) {
return json_encode($value);
} else {
@@ -1619,7 +1704,8 @@
* @see json_decode()
* @see Services_JSON::decode()
*/
- function jsonDecode($json) {
+ function jsonDecode($json)
+ {
if (function_exists('json_decode')) {
return json_decode($json);
} else {
@@ -1638,7 +1724,8 @@
* @param string チェック対象のパス
* @return boolean 絶対パスの場合 true
*/
- function isAbsoluteRealPath($realpath) {
+ function isAbsoluteRealPath($realpath)
+ {
if (strpos(PHP_OS, 'WIN') === false) {
return substr($realpath, 0, 1) == '/';
} else {
@@ -1656,7 +1743,8 @@
* @return boolean 作成に成功した場合 true; 失敗した場合 false
* @see http://jp.php.net/mkdir
*/
- function recursiveMkdir($pathname, $mode = 0777) {
+ function recursiveMkdir($pathname, $mode = 0777)
+ {
/*
* SC_Utils_Ex への再帰は無限ループやメモリリークの懸念
* 自クラスへ再帰する.
@@ -1665,7 +1753,8 @@
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;
}
@@ -1678,7 +1767,8 @@
* @param integer $seconds 最大実行時間を延長する秒数。
* @return boolean 成功=true, 失敗=false
*/
- function extendTimeOut($seconds = null) {
+ function extendTimeOut($seconds = null)
+ {
$safe_mode = (boolean)ini_get('safe_mode');
if ($safe_mode) return false;
@@ -1700,7 +1790,8 @@
* コンパイルファイルを削除します.
* @return void
*/
- function clearCompliedTemplate() {
+ function clearCompliedTemplate()
+ {
// コンパイルファイルの削除処理
SC_Helper_FileManager_Ex::deleteFile(COMPILE_REALDIR, false);
SC_Helper_FileManager_Ex::deleteFile(COMPILE_ADMIN_REALDIR, false);
@@ -1714,7 +1805,8 @@
* @param string $destDir コピー先ディレクトリのパス
* @return void
*/
- function copyDirectory($source_path, $dest_path) {
+ function copyDirectory($source_path, $dest_path)
+ {
$handle=opendir($source_path);
while ($filename = readdir($handle)) {
@@ -1740,7 +1832,8 @@
* @param string $separator 区切り文字
* @return string
*/
- function repeatStrWithSeparator($input, $multiplier, $separator = ',') {
+ function repeatStrWithSeparator($input, $multiplier, $separator = ',')
+ {
return implode($separator, array_fill(0, $multiplier, $input));
}
@@ -1751,7 +1844,8 @@
* @param string $str 文字列
* @return string RFC3986エンコード文字列
*/
- function encodeRFC3986($str) {
+ function encodeRFC3986($str)
+ {
return str_replace('%7E', '~', rawurlencode($str));
}
@@ -1762,7 +1856,8 @@
* @param string $charlist 削除する文字を指定
* @return string 変更後の文字列
*/
- 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);
}
@@ -1774,7 +1869,8 @@
* @param string $charlist 削除する文字を指定
* @return string 変更後の文字列
*/
- static function ltrim($str, $charlist = null) {
+ static function ltrim($str, $charlist = null)
+ {
$re = SC_Utils_Ex::getTrimPregPattern($charlist);
return preg_replace('/^' . $re . '/us', '', $str);
}
@@ -1786,7 +1882,8 @@
* @param string $charlist 削除する文字を指定
* @return string 変更後の文字列
*/
- static function rtrim($str, $charlist = null) {
+ static function rtrim($str, $charlist = null)
+ {
$re = SC_Utils_Ex::getTrimPregPattern($charlist);
return preg_replace('/' . $re . '$/us', '', $str);
}
@@ -1797,7 +1894,8 @@
* @param string $charlist 削除する文字を指定
* @return string パターン
*/
- static function getTrimPregPattern($charlist = null) {
+ static function getTrimPregPattern($charlist = null)
+ {
if (is_null($charlist)) {
return '\s+';
} else {
@@ -1811,7 +1909,8 @@
* @param int $data
* @return string
*/
- function getUnitDataSize($data){
+ function getUnitDataSize($data)
+ {
if($data < 1000){
$return = $data . "KB";
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_AdminView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_AdminView.php';
-class SC_AdminView_Ex extends SC_AdminView {
+class SC_AdminView_Ex extends SC_AdminView
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Batch_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Batch.php';
-class SC_Batch_Ex extends SC_Batch {
+class SC_Batch_Ex extends SC_Batch
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_CartSession_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_CartSession.php';
-class SC_CartSession_Ex extends SC_CartSession {
+class SC_CartSession_Ex extends SC_CartSession
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_CheckError_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_CheckError.php';
-class SC_CheckError_Ex extends SC_CheckError {
+class SC_CheckError_Ex extends SC_CheckError
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_ClassAutoloader_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_ClassAutoloader.php';
-class SC_ClassAutoloader_Ex extends SC_ClassAutoloader {
+class SC_ClassAutoloader_Ex extends SC_ClassAutoloader
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Cookie_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Cookie.php';
-class SC_Cookie_Ex extends SC_Cookie {
+class SC_Cookie_Ex extends SC_Cookie
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_CustomerList_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_CustomerList.php';
-class SC_CustomerList_Ex extends SC_CustomerList {
+class SC_CustomerList_Ex extends SC_CustomerList
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Customer_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Customer.php';
-class SC_Customer_Ex extends SC_Customer {
+class SC_Customer_Ex extends SC_Customer
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Date_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Date.php';
-class SC_Date_Ex extends SC_Date {
+class SC_Date_Ex extends SC_Date
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Display_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -2,5 +2,6 @@
require_once CLASS_REALDIR . 'SC_Display.php';
-class SC_Display_Ex extends SC_Display{
+class SC_Display_Ex extends SC_Display
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_FormParam_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_FormParam.php';
-class SC_FormParam_Ex extends SC_FormParam {
+class SC_FormParam_Ex extends SC_FormParam
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Fpdf_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Fpdf.php';
-class SC_Fpdf_Ex extends SC_Fpdf {
+class SC_Fpdf_Ex extends SC_Fpdf
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Image_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Image.php';
-class SC_Image_Ex extends SC_Image {
+class SC_Image_Ex extends SC_Image
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Initial_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,5 +32,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Initial_Ex extends SC_Initial {
+class SC_Initial_Ex extends SC_Initial
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_InstallView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_InstallView.php';
-class SC_InstallView_Ex extends SC_InstallView {
+class SC_InstallView_Ex extends SC_InstallView
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileEmoji_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_MobileEmoji.php';
-class SC_MobileEmoji_Ex extends SC_MobileEmoji {
+class SC_MobileEmoji_Ex extends SC_MobileEmoji
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileImage_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_MobileImage.php';
-class SC_MobileImage_Ex extends SC_MobileImage {
+class SC_MobileImage_Ex extends SC_MobileImage
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileUserAgent_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_MobileUserAgent.php';
-class SC_MobileUserAgent_Ex extends SC_MobileUserAgent {
+class SC_MobileUserAgent_Ex extends SC_MobileUserAgent
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_MobileView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_MobileView.php';
-class SC_MobileView_Ex extends SC_MobileView {
+class SC_MobileView_Ex extends SC_MobileView
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_PageNavi_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_PageNavi.php';
-class SC_PageNavi_Ex extends SC_PageNavi {
+class SC_PageNavi_Ex extends SC_PageNavi
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Product_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Product.php';
-class SC_Product_Ex extends SC_Product {
+class SC_Product_Ex extends SC_Product
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Query_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Query.php';
-class SC_Query_Ex extends SC_Query {
+class SC_Query_Ex extends SC_Query
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Response_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -2,5 +2,6 @@
require_once CLASS_REALDIR . 'SC_Response.php';
-class SC_Response_Ex extends SC_Response{
+class SC_Response_Ex extends SC_Response
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_SelectSql_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_SelectSql.php';
-class SC_SelectSql_Ex extends SC_SelectSql {
+class SC_SelectSql_Ex extends SC_SelectSql
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_SendMail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_SendMail_Ex extends SC_SendMail {
+class SC_SendMail_Ex extends SC_SendMail
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_SessionFactory_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_SessionFactory.php';
-class SC_SessionFactory_Ex extends SC_SessionFactory {
+class SC_SessionFactory_Ex extends SC_SessionFactory
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_Session_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_Session.php';
-class SC_Session_Ex extends SC_Session {
+class SC_Session_Ex extends SC_Session
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_SiteSession_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_SiteSession.php';
-class SC_SiteSession_Ex extends SC_SiteSession {
+class SC_SiteSession_Ex extends SC_SiteSession
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_SiteView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_SiteView.php';
-class SC_SiteView_Ex extends SC_SiteView {
+class SC_SiteView_Ex extends SC_SiteView
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_SmartphoneUserAgent_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_SmartphoneUserAgent.php';
-class SC_SmartphoneUserAgent_Ex extends SC_SmartphoneUserAgent {
+class SC_SmartphoneUserAgent_Ex extends SC_SmartphoneUserAgent
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_SmartphoneView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_SmartphoneView.php';
-class SC_SmartphoneView_Ex extends SC_SmartphoneView {
+class SC_SmartphoneView_Ex extends SC_SmartphoneView
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_UploadFile_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_UploadFile.php';
-class SC_UploadFile_Ex extends SC_UploadFile {
+class SC_UploadFile_Ex extends SC_UploadFile
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/SC_View_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'SC_View.php';
-class SC_View_Ex extends SC_View {
+class SC_View_Ex extends SC_View
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Abstract_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Operation_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/SC_Api_Utils_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/AddrFromZip.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/AddrFromZip.php';
-class API_AddrFromZip_Ex extends API_AddrFromZip {
+class API_AddrFromZip_Ex extends API_AddrFromZip
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/BrowseNodeLookup.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/BrowseNodeLookup.php';
-class API_BrowseNodeLookup_Ex extends API_BrowseNodeLookup {
+class API_BrowseNodeLookup_Ex extends API_BrowseNodeLookup
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartAdd_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/CartAdd.php';
-class API_CartAdd_Ex extends API_CartAdd {
+class API_CartAdd_Ex extends API_CartAdd
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartClear.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/CartClear.php';
-class API_CartClear_Ex extends API_CartClear {
+class API_CartClear_Ex extends API_CartClear
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartCreate.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/CartCreate.php';
-class API_CartCreate_Ex extends API_CartCreate {
+class API_CartCreate_Ex extends API_CartCreate
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartGet.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/CartGet.php';
-class API_CartGet_Ex extends API_CartGet {
+class API_CartGet_Ex extends API_CartGet
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/CartModify.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/CartModify.php';
-class API_CartModify_Ex extends API_CartModify {
+class API_CartModify_Ex extends API_CartModify
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/Default_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/Default.php';
-class API_Default_Ex extends API_Default {
+class API_Default_Ex extends API_Default
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/GetVersion_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/GetVersion.php';
-class API_GetVersion_Ex extends API_GetVersion {
+class API_GetVersion_Ex extends API_GetVersion
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemLookup.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/ItemLookup.php';
-class API_ItemLookup_Ex extends API_ItemLookup {
+class API_ItemLookup_Ex extends API_ItemLookup
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/api_extends/operations/ItemSearch.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,6 +30,7 @@
*/
require_once CLASS_REALDIR . 'api/operations/ItemSearch.php';
-class API_ItemSearch_Ex extends API_ItemSearch {
+class API_ItemSearch_Ex extends API_ItemSearch
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/batch_extends/SC_Batch_Update_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -44,7 +45,8 @@
* @param string $db_type 任意のインスタンスを返したい場合は DB_TYPE 文字列を指定
* @return mixed DBFactory インスタンス
*/
- function getInstance($db_type = DB_TYPE) {
+ function getInstance($db_type = DB_TYPE)
+ {
switch ($db_type) {
case 'mysql':
return new SC_DB_DBFactory_MYSQL_Ex();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/db_extends/SC_DB_MasterData_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_DB_MasterData_Ex extends SC_DB_MasterData {
+class SC_DB_MasterData_Ex extends SC_DB_MasterData
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_MYSQL_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/db_extends/dbfactory/SC_DB_DBFactory_PGSQL_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Bar_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Base_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Line_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/graph_extends/SC_Graph_Pie_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_CSV_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_DB_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_DB_Ex extends SC_Helper_DB {
+class SC_Helper_DB_Ex extends SC_Helper_DB
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FPDI_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,5 +30,6 @@
* @package Helper
* @version $Id:$
*/
-class SC_Helper_FPDI_Ex extends SC_Helper_FPDI {
+class SC_Helper_FPDI_Ex extends SC_Helper_FPDI
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_FileManager_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_HandleError_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -29,5 +29,6 @@
* @package Page
* @version $Id$
*/
-class SC_Helper_HandleError_Ex extends SC_Helper_HandleError {
+class SC_Helper_HandleError_Ex extends SC_Helper_HandleError
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Mobile_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_Mobile_Ex extends SC_Helper_Mobile {
+class SC_Helper_Mobile_Ex extends SC_Helper_Mobile
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_PageLayout_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_PageLayout_Ex extends SC_Helper_PageLayout {
+class SC_Helper_PageLayout_Ex extends SC_Helper_PageLayout
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_Plugin_Ex extends SC_Helper_Plugin {
+class SC_Helper_Plugin_Ex extends SC_Helper_Plugin
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Purchase_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author Kentaro Ohkouchi
* @version $Id$
*/
-class SC_Helper_Purchase_Ex extends SC_Helper_Purchase {
+class SC_Helper_Purchase_Ex extends SC_Helper_Purchase
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Session_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/helper_extends/SC_Helper_Transform_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_Transform_Ex extends SC_Helper_Transform {
+class SC_Helper_Transform_Ex extends SC_Helper_Transform
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
require_once CLASS_REALDIR . 'pages/LC_Page.php';
-class LC_Page_Ex extends LC_Page {
+class LC_Page_Ex extends LC_Page
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Index_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_InputZip_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Redirect_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_ResizeImage_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/LC_Page_Sitemap_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/abouts/LC_Page_Abouts_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Home_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Index_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Login_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/LC_Page_Admin_Logout_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_DeliveryInput_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Delivery_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Holiday_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Kiyaku_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Mail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_PaymentInput_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Payment_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Point_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Seo_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tradelaw_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -51,7 +53,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -60,7 +63,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_ZipInstall_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CSV_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_CsvSql_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileManager_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_FileView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_RecommendSearch_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/contents/LC_Page_Admin_Contents_Recommend_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Edit_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -44,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -53,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -62,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Bloc_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_CSS_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Header_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_MainEdit_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_Template_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/design/LC_Page_Admin_Design_UpDown_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_History_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Preview_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_TemplateInput_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/mail/LC_Page_Admin_Mail_Template_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Disp_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Edit_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_MailView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Mail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Multiple_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Pdf_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_ProductSelect_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/order/LC_Page_Admin_Order_Status_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Log_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Module_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Category_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ClassCategory_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Class_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Maker_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductClass_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductRank_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ProductSelect_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Product_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_ReviewEdit_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_Review_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSV_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_AdminArea_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Bkup_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Delete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Editdb_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Input_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Log_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @author Seasoft 塚田将久
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Masterdata_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Parameter_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_Rank_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/system/LC_Page_Admin_System_System_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/total/LC_Page_Admin_Total_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Json_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Php_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/api/LC_Page_Api_Xml_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/cart/LC_Page_Cart_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Complete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/contact/LC_Page_Contact_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Complete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/entry/LC_Page_Entry_New_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_DispError_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/error/LC_Page_Error_SystemError_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -34,7 +34,8 @@
* @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
@@ -44,7 +45,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -53,7 +55,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -62,7 +65,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/forgot/LC_Page_Forgot_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_About_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Order_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/guide/LC_Page_Guide_Usage_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_ChangeComplete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Change_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DeliveryAddr_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Delivery_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_DownLoad_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Favorite_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_HistoryDetail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Login_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_MailView_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Order_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_RefusalComplete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/mypage/LC_Page_Mypage_Refusal_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/order/LC_Page_Order_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/preview/LC_Page_Preview_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_CategoryList_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Detail_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_List_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_ReviewComplete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Review_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/products/LC_Page_Products_Search_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Complete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/regist/LC_Page_Regist_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/rss/LC_Page_Rss_Products_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Complete_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Confirm_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_DelivAddr_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Deliv_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/page_extends/unsupported/LC_Page_Unsupported_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/plugin_extends/SC_Plugin_Util_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseCookie_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/sessionfactory_extends/SC_SessionFactory_UseRequest_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -23,5 +23,6 @@
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
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/util_extends/GC_Utils_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class GC_Utils_Ex extends GC_Utils {
+class GC_Utils_Ex extends GC_Utils
+{
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/class_extends/util_extends/SC_Utils_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,5 +33,6 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Utils_Ex extends SC_Utils {
+class SC_Utils_Ex extends SC_Utils
+{
}
変更: branches/version-2_12-dev/data/include/image_converter.inc
===================================================================
--- branches/version-2_12-dev/data/include/image_converter.inc 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/include/image_converter.inc 2013-02-18 10:09:54 UTC (rev 22567)
@@ -2,7 +2,8 @@
/**
* 画像ファイルの変換を行う
*/
-class ImageConverter {
+class ImageConverter
+{
var $outputImageDir; // 変換後の画像の保存先
var $outputImageType; // 変換後の画像の形式
var $outputImageWidth; // 変換後の画像の横幅
@@ -10,7 +11,8 @@
var $outputImageFileSize; // 変換後の画像のファイルサイズ
// コンストラクタ
- function ImageConverter() {
+ function ImageConverter()
+ {
$this->outputImageDir = realpath(realpath(dirname(__FILE__)));
$this->outputImageType = 'jpg';
$this->outputImageWidth = 320;
@@ -19,7 +21,8 @@
}
// 変換実行
- function execute($inputImagePath) {
+ function execute($inputImagePath)
+ {
// 前処理
$filestat = @stat($inputImagePath);
$imagesize = getimagesize($inputImagePath);
@@ -160,22 +163,50 @@
}
// 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()
+ {
}
/**
@@ -185,7 +216,8 @@
* @param resource $image imagecreatetruecolor() のような画像作成関数が返す画像リソース。
* @return array 色情報
*/
- function getTransparentColor($image) {
+ function getTransparentColor($image)
+ {
$max_x = imagesx($image) - 1;
$max_y = imagesy($image) - 1;
for ($x = 0; $x <= $max_x; $x++) {
変更: branches/version-2_12-dev/data/smarty_extends/block.marquee.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/block.marquee.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/block.marquee.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -7,7 +7,8 @@
* @param string $value 入力
* @return string 出力
*/
-function smarty_block_marquee($params, $content, &$smarty, &$repeat) {
+function smarty_block_marquee($params, $content, &$smarty, &$repeat)
+{
// {/marquee}の場合のみ出力する。
if ($repeat || !isset($content)) {
return null;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/function.from_to.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,7 +30,8 @@
* @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;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -38,7 +38,8 @@
* @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';
@@ -126,7 +127,8 @@
}
}
-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="'
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -38,7 +38,8 @@
* @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';
@@ -128,7 +129,8 @@
}
-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="'
変更: branches/version-2_12-dev/data/smarty_extends/modifier.h.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/modifier.h.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.h.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -18,6 +18,7 @@
* @param string $string
* @return string
*/
-function smarty_modifier_h($string) {
+function smarty_modifier_h($string)
+{
return htmlspecialchars($string, ENT_QUOTES);
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.nl2br_html.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -18,7 +18,8 @@
* @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); // 最終行のキー
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.numeric_emoji.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -8,7 +8,8 @@
* @param string $value 入力
* @return string 出力
*/
-function smarty_modifier_numeric_emoji($value) {
+function smarty_modifier_numeric_emoji($value)
+{
// 数字絵文字 (0〜9) の絵文字番号
static $numeric_emoji_index = array('134', '125', '126', '127', '128', '129', '130', '131', '132', '133');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.script_escape.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,7 +5,8 @@
* @param string $value 入力
* @return string $value マッチした場合は変換後の文字列、しない場合は入力された文字列をそのまま返す。
*/
-function smarty_modifier_script_escape($value) {
+function smarty_modifier_script_escape($value)
+{
if (is_array($value)) return $value;
変更: branches/version-2_12-dev/data/smarty_extends/modifier.u.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/modifier.u.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/data/smarty_extends/modifier.u.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -18,6 +18,7 @@
* @param string $string
* @return string
*/
-function smarty_modifier_u($string) {
+function smarty_modifier_u($string)
+{
return htmlspecialchars(rawurlencode($string), ENT_QUOTES);
}
変更: branches/version-2_12-dev/html/install/index.php
===================================================================
--- branches/version-2_12-dev/html/install/index.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/html/install/index.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -274,7 +274,8 @@
$objView->display('install_frame.tpl');
//-----------------------------------------------------------------------------------------------------------------------------------
// ようこそ画面の表示
-function lfDispWelcome($objPage) {
+function lfDispWelcome($objPage)
+{
global $objWebParam;
global $objDBParam;
// hiddenに入力値を保持
@@ -289,7 +290,8 @@
}
// 使用許諾契約書の表示
-function lfDispAgreement($objPage) {
+function lfDispAgreement($objPage)
+{
global $objWebParam;
global $objDBParam;
// hiddenに入力値を保持
@@ -304,7 +306,8 @@
}
// STEP0画面の表示(チェック)
-function lfDispStep0($objPage) {
+function lfDispStep0($objPage)
+{
global $objWebParam;
global $objDBParam;
// hiddenに入力値を保持
@@ -448,7 +451,8 @@
}
// STEP0_1画面の表示(ファイルのコピー)
-function lfDispStep0_1($objPage) {
+function lfDispStep0_1($objPage)
+{
global $objWebParam;
global $objDBParam;
@@ -465,13 +469,15 @@
return $objPage;
}
-function lfGetFileMode($path) {
+function lfGetFileMode($path)
+{
$mode = substr(sprintf('%o', fileperms($path)), -3);
return $mode;
}
// STEP1画面の表示
-function lfDispStep1($objPage) {
+function lfDispStep1($objPage)
+{
global $objDBParam;
// hiddenに入力値を保持
$objPage->arrHidden = $objDBParam->getHashArray();
@@ -483,7 +489,8 @@
}
// STEP2画面の表示
-function lfDispStep2($objPage) {
+function lfDispStep2($objPage)
+{
global $objWebParam;
global $objDBParam;
// hiddenに入力値を保持
@@ -496,7 +503,8 @@
}
// STEP3画面の表示
-function lfDispStep3($objPage) {
+function lfDispStep3($objPage)
+{
global $objWebParam;
global $objDBParam;
// hiddenに入力値を保持
@@ -511,7 +519,8 @@
}
// STEP4画面の表示
-function lfDispStep4($objPage) {
+function lfDispStep4($objPage)
+{
global $objWebParam;
global $objDBParam;
global $objDb;
@@ -544,7 +553,8 @@
}
// 完了画面の表示
-function lfDispComplete($objPage) {
+function lfDispComplete($objPage)
+{
global $objWebParam;
global $objDBParam;
// hiddenに入力値を保持
@@ -616,7 +626,8 @@
}
// WEBパラメーター情報の初期化
-function lfInitWebParam($objWebParam) {
+function lfInitWebParam($objWebParam)
+{
global $objDb;
if (defined('HTTP_URL')) {
@@ -703,7 +714,8 @@
}
// DBパラメーター情報の初期化
-function lfInitDBParam($objDBParam) {
+function lfInitDBParam($objDBParam)
+{
if (defined('DB_SERVER')) {
$db_server = DB_SERVER;
@@ -746,7 +758,8 @@
}
// 入力内容のチェック
-function lfCheckWebError($objWebParam) {
+function lfCheckWebError($objWebParam)
+{
// 入力データを渡す。
$arrRet = $objWebParam->getHashArray();
$objErr = new SC_CheckError($arrRet);
@@ -780,7 +793,8 @@
}
// 入力内容のチェック
-function lfCheckDBError($objDBParam) {
+function lfCheckDBError($objDBParam)
+{
global $objPage;
// 入力データを渡す。
@@ -811,7 +825,8 @@
}
// SQL文の実行
-function lfExecuteSQL($filepath, $arrDsn, $disp_err = true) {
+function lfExecuteSQL($filepath, $arrDsn, $disp_err = true)
+{
$arrErr = array();
if (!file_exists($filepath)) {
@@ -868,7 +883,8 @@
* @param array $arrDsn データソース名の配列
* @return array エラーが発生した場合はエラーメッセージの配列
*/
-function lfDropSequence($arrSequences, $arrDsn) {
+function lfDropSequence($arrSequences, $arrDsn)
+{
$arrErr = array();
// Debugモード指定
@@ -907,7 +923,8 @@
* @param array $arrDsn データソース名の配列
* @return array エラーが発生した場合はエラーメッセージの配列
*/
-function lfCreateSequence($arrSequences, $arrDsn) {
+function lfCreateSequence($arrSequences, $arrDsn)
+{
$arrErr = array();
// Debugモード指定
@@ -946,7 +963,8 @@
}
// 設定ファイルの作成
-function lfMakeConfigFile() {
+function lfMakeConfigFile()
+{
global $objWebParam;
global $objDBParam;
@@ -1040,7 +1058,8 @@
* @see http://www.php.net/glob
*/
$alldirs = array();
-function listdirs($dir) {
+function listdirs($dir)
+{
global $alldirs;
$alldirs[] = $dir;
$dirs = glob($dir . '/*');
@@ -1055,7 +1074,8 @@
/**
* 保持したスタティック変数をクリアする。
*/
-function initdirs() {
+function initdirs()
+{
global $alldirs;
$alldirs = array();
}
@@ -1065,7 +1085,8 @@
*
* @return array シーケンスを使用するテーブル名とカラム名の配列
*/
-function getSequences() {
+function getSequences()
+{
return array(
array('dtb_best_products', 'best_id'),
array('dtb_bloc', 'bloc_id'),
@@ -1106,7 +1127,8 @@
*
* @param string 設定する管理機能のディレクトリ名
*/
-function renameAdminDir($adminDir) {
+function renameAdminDir($adminDir)
+{
$oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR);
if ($adminDir === $oldAdminDir) {
return true;
@@ -1120,7 +1142,8 @@
return true;
}
-function getArrayDsn(SC_FormParam $objDBParam) {
+function getArrayDsn(SC_FormParam $objDBParam)
+{
$arrRet = $objDBParam->getHashArray();
if (!defined('DB_TYPE')) {
変更: branches/version-2_12-dev/html/test/upgrade/index.php
===================================================================
--- branches/version-2_12-dev/html/test/upgrade/index.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/html/test/upgrade/index.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -72,7 +72,8 @@
*
* @return string
*/
-function getMode() {
+function getMode()
+{
if (isset($_GET['mode'])) {
return $_GET['mode'];
} elseif (isset($_POST['mode'])) {
@@ -85,7 +86,8 @@
* モジュールリスト一覧をjson出力する
*
*/
-function displayProductsList() {
+function displayProductsList()
+{
$arrRet = array(
'status' => 'SUCCESS',
'data' => $GLOBALS['productsList']
@@ -102,7 +104,8 @@
*
* @param array $arrProductsList
*/
-function updateModuleTable($arrProductsList) {
+function updateModuleTable($arrProductsList)
+{
$table = 'dtb_module';
$where = 'module_id = ?';
$objQuery =& SC_Query_Ex::getSingletonInstance();
変更: branches/version-2_12-dev/html/upgrade/index.php
===================================================================
--- branches/version-2_12-dev/html/upgrade/index.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/html/upgrade/index.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -42,7 +42,8 @@
$objPage->process($mode);
-function lfPageFactory($mode) {
+function lfPageFactory($mode)
+{
$prefix = 'LC_Page_Upgrade_';
$file = CLASS_REALDIR . "pages/upgrade/${prefix}";
$class = $prefix;
変更: branches/version-2_12-dev/html/user_data/__default.php
===================================================================
--- branches/version-2_12-dev/html/user_data/__default.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/html/user_data/__default.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -9,14 +9,16 @@
*
* @package Page
*/
-class LC_Page_User extends LC_Page_Ex {
+class LC_Page_User extends LC_Page_Ex
+{
/**
* Page を初期化する.
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -25,7 +27,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
$this->action();
$this->sendResponse();
@@ -36,7 +39,8 @@
*
* @return void
*/
- function action() {
+ function action()
+ {
}
/**
@@ -44,7 +48,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: branches/version-2_12-dev/templates/mobile_class.php
===================================================================
--- branches/version-2_12-dev/templates/mobile_class.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/templates/mobile_class.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -4,7 +4,8 @@
*
* @return void
*/
- function mobileInit() {
+ function mobileInit()
+ {
$this->init();
}
@@ -13,7 +14,8 @@
*
* @return void
*/
- function mobileProcess() {
+ function mobileProcess()
+ {
}
/*
* Local variables:
変更: branches/version-2_12-dev/templates/page_class.php
===================================================================
--- branches/version-2_12-dev/templates/page_class.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/templates/page_class.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class LC_Page_XXX extends LC_Page_Ex {
+class LC_Page_XXX extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
}
/**
@@ -58,7 +61,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: branches/version-2_12-dev/templates/page_class_extends.php
===================================================================
--- branches/version-2_12-dev/templates/page_class_extends.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/templates/page_class_extends.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,7 +33,8 @@
* @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
@@ -43,7 +44,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -52,7 +54,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -61,7 +64,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
変更: branches/version-2_12-dev/templates/templates.xml
===================================================================
--- branches/version-2_12-dev/templates/templates.xml 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/templates/templates.xml 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author LOCKON CO.,LTD.
* @version $$Id$$
*/
-class LC_Page_XXX extends LC_Page_Ex {
+class LC_Page_XXX extends LC_Page_Ex
+{
// }}}
// {{{ functions
@@ -41,7 +42,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -50,7 +52,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
}
/**
@@ -58,7 +61,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
@@ -98,7 +102,8 @@
* @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
@@ -108,7 +113,8 @@
*
* @return void
*/
- function init() {
+ function init()
+ {
parent::init();
}
@@ -117,7 +123,8 @@
*
* @return void
*/
- function process() {
+ function process()
+ {
parent::process();
}
@@ -126,7 +133,8 @@
*
* @return void
*/
- function destroy() {
+ function destroy()
+ {
parent::destroy();
}
}
@@ -165,4 +173,4 @@
$$objPage->init();
$$objPage->process();
register_shutdown_function(array($$objPage, "destroy"));
-?></template></templates>
\ No newline at end of file
+?></template></templates>
変更: branches/version-2_12-dev/test/TestSuite.php
===================================================================
--- branches/version-2_12-dev/test/TestSuite.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/TestSuite.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -35,8 +35,10 @@
* @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());
変更: branches/version-2_12-dev/test/api_test.php
===================================================================
--- branches/version-2_12-dev/test/api_test.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/api_test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -81,9 +81,11 @@
<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{
@@ -93,7 +95,8 @@
return str;
}
-function makeSignature() {
+function makeSignature()
+{
$('#mode').val("signature");
$('#form').submit();
}
@@ -179,7 +182,8 @@
var str = var_dump(data);
$('#dump').text(str);
}
- var recverror = function (result, textstatus, errorThrown) {
+ var recverror = function (result, textstatus, errorThrown)
+ {
$('#res').text(textstatus);
}
$.ajax({
変更: branches/version-2_12-dev/test/class/SC_DbConn_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/SC_DbConn_Test.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/SC_DbConn_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,7 +31,8 @@
* @author Kentaro Ohkouchi
* @version $Id$
*/
-class SC_DbConn_Test extends PHPUnit_Framework_TestCase {
+class SC_DbConn_Test extends PHPUnit_Framework_TestCase
+{
/** SC_DbConn インスタンス */
var $objDbConn;
@@ -39,24 +40,28 @@
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);
}
/**
* インスタンスを取得するテストケース.
*/
- function testGetInstance() {
+ function testGetInstance()
+ {
$this->expected = true;
$this->actual = is_object($this->objDbConn);
@@ -66,7 +71,8 @@
/**
* SC_DbConn:query() を使用して, CREATE TABLE を実行するテストケース.
*/
- function testCreateTable() {
+ function testCreateTable()
+ {
$result = $this->createTestTable();
$this->expected = false;
@@ -78,7 +84,8 @@
/**
* SC_DbConn::getAll() のテストケース.
*/
- function testGetAll() {
+ function testGetAll()
+ {
$this->createTestTable();
$result = $this->setTestData(1, '2', 'f');
@@ -95,7 +102,8 @@
* SC_DbConn::getAll() のテストケース(エラー).
*/
/*
- function testGetAllIsError() {
+ function testGetAllIsError()
+ {
// SC_DbConn::getAll() は接続エラーが発生すると 0 を返す
$failur_dsn = "pgsql://user:pass@127.0.0.1:/xxxxx";
@@ -110,7 +118,8 @@
/**
* SC_DbConn::getOne() のテストケース.
*/
- function testGetOne() {
+ function testGetOne()
+ {
$this->createTestTable();
$this->setTestData(1, '2', 'f');
$this->setTestData(1, '2', 'f');
@@ -126,7 +135,8 @@
* SC_DbConn::getOne() のテストケース(エラー).
*/
/*
- function testGetOneIsError() {
+ function testGetOneIsError()
+ {
$this->createTestTable();
$this->setTestData(1, '2', 'f');
$this->setTestData(1, '2', 'f');
@@ -142,7 +152,8 @@
/**
* SC_DbConn::getRow() のテストケース.
*/
- function testGetRow() {
+ function testGetRow()
+ {
$this->createTestTable();
$this->setTestData(1, '1', 'f');
$this->setTestData(2, '2', 'f');
@@ -156,7 +167,8 @@
/**
* SC_DbConn::getCol() のテストケース.
*/
- function testGetCol() {
+ function testGetCol()
+ {
$this->createTestTable();
$this->setTestData(1, '1', 'f');
$this->setTestData(2, '2', 'f');
@@ -173,7 +185,8 @@
* SC_DbConn::autoExecute() で INSERT を実行するテストケース.
*/
/*
- function testAutoExecuteOfInsert() {
+ function testAutoExecuteOfInsert()
+ {
$this->createTestTable();
$result = $this->setTestData(1, '2', 'f');
@@ -191,7 +204,8 @@
* SC_DbConn::autoExecute() で UPDATE を実行するテストケース.
*/
/*
- function testAutoExecuteOfUpdate() {
+ function testAutoExecuteOfUpdate()
+ {
$this->createTestTable();
$this->setTestData(1, '2', 'f');
@@ -213,7 +227,8 @@
/**
* SC_DbConn::query() で INSERT を実行するテストケース.
*/
- function testQuery1() {
+ function testQuery1()
+ {
$this->createTestTable();
$sql = "INSERT INTO test_table VALUES (?, ?, ?, ?)";
$data = array('1', '1', '1', 'f');
@@ -233,7 +248,8 @@
/**
* SC_DbConn::query() で UPDATE を実行するテストケース.
*/
- function testQuery2() {
+ function testQuery2()
+ {
$this->createTestTable();
$this->setTestData(1, '2', 'f');
@@ -256,22 +272,26 @@
/**
* SC_DbConn::prepare() は未使用
*/
- function testPrepare() {
+ function testPrepare()
+ {
}
/**
* SC_DbConn::execute() は未使用
*/
- function testExecute() {
+ function testExecute()
+ {
}
/**
* SC_DbConn::reset() は未使用
*/
- function testReset() {
+ function testReset()
+ {
}
- function createTestTable() {
+ function createTestTable()
+ {
$sql = "CREATE TABLE test_table ("
. "id SERIAL PRIMARY KEY,"
. "column1 numeric(9),"
@@ -281,7 +301,8 @@
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);
変更: branches/version-2_12-dev/test/class/SC_Query_Test.php
===================================================================
--- branches/version-2_12-dev/test/class/SC_Query_Test.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/SC_Query_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @author Kentaro Ohkouchi
* @version $Id$
*/
-class SC_Query_Test extends PHPUnit_Framework_TestCase {
+class SC_Query_Test extends PHPUnit_Framework_TestCase
+{
/** SC_Query インスタンス */
var $objQuery;
@@ -40,26 +41,30 @@
var $expected;
var $actual;
- function setUp() {
+ function setUp()
+ {
$this->objQuery = new SC_Query();
$this->objQuery->begin();
}
- function tearDown() {
+ function tearDown()
+ {
// MySQL では CREATE TABLE がロールバックされないので DROP TABLE を行う
$this->dropTestTable();
$this->objQuery->rollback();
$this->objQuery = null;
}
- function verify() {
+ function verify()
+ {
$this->assertEquals($this->expected, $this->actual);
}
/**
* インスタンスを取得するテストケース.
*/
- function testGetInstance() {
+ function testGetInstance()
+ {
$this->expected = true;
$this->actual = is_object($this->objQuery);
@@ -69,7 +74,8 @@
/**
* SC_Query::query() を使用して, CREATE TABLE を実行するテストケース.
*/
- function testCreateTable() {
+ function testCreateTable()
+ {
$result = $this->createTestTable();
$this->expected = false;
@@ -81,7 +87,8 @@
/**
* SC_Query::getAll() のテストケース.
*/
- function testGetAll() {
+ function testGetAll()
+ {
$result = $this->createTestTable();
$result = $this->setTestData(1, '2', 'f');
@@ -97,7 +104,8 @@
/**
* SC_Query::select() のテストケース.
*/
- function testSelect() {
+ function testSelect()
+ {
$this->createTestTable();
$result = $this->setTestData(1, '2', 'f');
@@ -117,7 +125,8 @@
/**
* SC_Query::getOne() のテストケース.
*/
- function testGetOne() {
+ function testGetOne()
+ {
$this->createTestTable();
$this->setTestData(1, '2', 'f');
$this->setTestData(1, '2', 'f');
@@ -132,7 +141,8 @@
/**
* SC_Query::getRow() のテストケース.
*/
- function testGetRow() {
+ function testGetRow()
+ {
$this->createTestTable();
$this->setTestData(1, '1', 'f');
$this->setTestData(2, '2', 'f');
@@ -146,7 +156,8 @@
/**
* SC_Query::getCol() のテストケース.
*/
- function testGetCol() {
+ function testGetCol()
+ {
$this->createTestTable();
$this->setTestData(1, '1', 'f');
$this->setTestData(2, '2', 'f');
@@ -162,7 +173,8 @@
/**
* SC_Query::query() で INSERT を実行するテストケース.
*/
- function testQuery1() {
+ function testQuery1()
+ {
$this->createTestTable();
$sql = "INSERT INTO test_table VALUES (?, ?, ?, ?)";
$data = array('1', '1', '1', 'f');
@@ -179,7 +191,8 @@
$this->verify();
}
- function testInsert() {
+ function testInsert()
+ {
$this->createTestTable();
$this->objQuery->insert('test_table',
@@ -201,7 +214,8 @@
/**
* SC_Query::query() で UPDATE を実行するテストケース.
*/
- function testQuery2() {
+ function testQuery2()
+ {
$this->createTestTable();
$this->setTestData(1, '2', 'f');
@@ -220,7 +234,8 @@
$this->verify();
}
- function testUpdate() {
+ function testUpdate()
+ {
$this->createTestTable();
$this->setTestData(1, '2', 'f');
@@ -240,28 +255,33 @@
$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),"
@@ -271,7 +291,8 @@
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");
@@ -279,7 +300,8 @@
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);
変更: branches/version-2_12-dev/test/class/db/DB_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/db/DB_AllTests.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/db/DB_AllTests.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -34,9 +34,11 @@
* @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');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/db/SC_DB_DBFactory_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,13 +32,15 @@
* @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) {
@@ -54,14 +56,16 @@
}
*/
- 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');
@@ -86,7 +90,8 @@
/**
* 昨日の売上高・売上件数を算出する SQL のテスト.
*/
- function testGetOrderYesterdaySql() {
+ function testGetOrderYesterdaySql()
+ {
switch (DB_TYPE) {
case 'pgsql':
@@ -115,7 +120,8 @@
/**
* 当月の売上高・売上件数を算出する SQL のテスト.
*/
- function testGetOrderMonthSql() {
+ function testGetOrderMonthSql()
+ {
switch (DB_TYPE) {
case 'pgsql':
$expected = "SELECT COUNT(total) FROM dtb_order "
@@ -145,7 +151,8 @@
/**
* 昨日のレビュー書き込み件数を算出する SQL のテスト.
*/
- function testGetReviewYesterdaySql() {
+ function testGetReviewYesterdaySql()
+ {
switch (DB_TYPE) {
case 'pgsql':
$expected = "SELECT COUNT(*) FROM dtb_review AS A "
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/db/SC_DB_MasterData_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -40,7 +41,8 @@
/**
* SC_DB_MasterData::getMasterData() のテストケース
*/
- function testGetMasterData() {
+ function testGetMasterData()
+ {
$columns = array('id', 'name', 'rank');
$masterData = new SC_DB_MasterData_Ex();
$actual = $masterData->getMasterData('mtb_pref', $columns);
@@ -60,7 +62,8 @@
/**
* SC_DB_MasterData::updateMasterData() のテストケース
*/
- function testUpdateMasterData() {
+ function testUpdateMasterData()
+ {
$columns = array('id', 'name', 'rank');
$masterData = new SC_DB_MasterData_Ex();
@@ -85,7 +88,8 @@
/**
* SC_DB_MasterData::createCache() のテストケース.
*/
- function testCreateCache() {
+ function testCreateCache()
+ {
$masterData = new SC_DB_MasterData_Ex();
$masterData->clearCache('mtb_constants');
$masterData->createCache('mtb_constants', array(), true, array('id', 'remarks'));
変更: branches/version-2_12-dev/test/class/helper/Helper_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/helper/Helper_AllTests.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/helper/Helper_AllTests.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -35,9 +35,11 @@
* @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');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Address_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -56,7 +56,8 @@
$this->objQuery->rollback();
}
- function testRegistAddress() {
+ function testRegistAddress()
+ {
// ダミーの住所を登録
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
@@ -83,7 +84,8 @@
/**
* @depends testSave
*/
- function testGetAddress() {
+ function testGetAddress()
+ {
// testSave のテストが通っていること前提
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
@@ -105,7 +107,8 @@
/**
* @depends testSave
*/
- function testGetList() {
+ function testGetList()
+ {
// testSave のテストが通っていること前提
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
@@ -131,7 +134,8 @@
/**
* @depends testSave
*/
- function testDeleteAddress() {
+ function testDeleteAddress()
+ {
// testSave のテストが通っていること前提
$sqlval = $this->dummy;
$sqlval['customer_id'] = $this->customer_id;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_DB_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,12 +32,14 @@
* @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() のテストケース.
*/
- function testSfColumnExists() {
+ function testSfColumnExists()
+ {
$objDb = new SC_Helper_DB_Ex();
$this->assertEquals(true, $objDb->sfColumnExists('mtb_zip', 'zipcode'));
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Purchase_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @author LOCKON CO.,LTD.
* @version $Id$
*/
-class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase {
+class SC_Helper_Purchase_Test extends PHPUnit_Framework_TestCase
+{
/**
* @var SC_Helper_Purchase
*/
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/helper/SC_Helper_Session_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,12 +32,14 @@
* @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() のテストケース.
*/
- function testGetToken() {
+ function testGetToken()
+ {
$objSession = new SC_Helper_Session_Ex();
$token = $objSession->getToken();
@@ -50,7 +52,8 @@
/**
* isValidToken() のテストケース.
*/
- function testIsValidToken() {
+ function testIsValidToken()
+ {
$objSession = new SC_Helper_Session_Ex();
$token = $objSession->getToken();
@@ -64,7 +67,8 @@
/**
* isValidToken() のテストケース(POST).
*/
- function testIsValidTokenWithPost() {
+ function testIsValidTokenWithPost()
+ {
$objSession = new SC_Helper_Session_Ex();
$token = $objSession->getToken();
@@ -79,7 +83,8 @@
/**
* isValidToken() のテストケース(GET).
*/
- function testIsValidTokenWithGET() {
+ function testIsValidTokenWithGET()
+ {
$objSession = new SC_Helper_Session_Ex();
$token = $objSession->getToken();
@@ -96,7 +101,8 @@
*
* 値が渡されてない場合
*/
- function testIsValidTokenNotParam() {
+ function testIsValidTokenNotParam()
+ {
$objSession = new SC_Helper_Session_Ex();
$token = $objSession->getToken();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,9 +32,11 @@
* @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();
@@ -43,13 +45,15 @@
$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);
@@ -61,11 +65,13 @@
$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',
@@ -103,7 +109,8 @@
$this->verify();
}
- function testGetProductName() {
+ function testGetProductName()
+ {
$product_id = 10000000;
$this->expected = "テスト商品";
$this->setProduct($product_id, $this->expected);
@@ -113,7 +120,8 @@
$this->verify();
}
- function testGetProductsClass() {
+ function testGetProductsClass()
+ {
$product_id = 10000000;
$product_class_id = 10000;
$this->setProductsClass($product_id, $product_class_id);
@@ -140,7 +148,8 @@
$this->verify();
}
- function testGetAllClass() {
+ function testGetAllClass()
+ {
$this->clearClass();
$this->setClass(1000, "大きさ", 1, array('S', 'M', 'L', 'LL'));
$this->setClass(2, "色", 2, array("赤", "青", "黄", "緑"));
@@ -153,7 +162,8 @@
$this->verify();
}
- function testGetAllClassCategory規格1のみ() {
+ function testGetAllClassCategory規格1のみ()
+ {
$this->clearClass();
$this->setClass(1000, "大きさ", 1, array('S', 'M', 'L', 'LL'));
$this->setClass(2, "色", 2, array("赤", "青", "黄", "緑"));
@@ -181,7 +191,8 @@
$this->verify();
}
- function testGetAllClassCategory規格1と3() {
+ function testGetAllClassCategory規格1と3()
+ {
$this->clearClass();
$this->setClass(1000, "大きさ", 1, array('S', 'M', 'L', 'LL'));
$this->setClass(2, "色", 2, array("赤", "青", "黄", "緑"));
@@ -293,7 +304,8 @@
$this->verify();
}
- function testGetProductsClassAndClasscategory() {
+ function testGetProductsClassAndClasscategory()
+ {
$product_id = 10000;
$product_class_id = 1000;
$class_combination_id = 200;
@@ -330,11 +342,13 @@
$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;
@@ -342,7 +356,8 @@
$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;
@@ -364,7 +379,8 @@
$this->objQuery->insert('dtb_class_combination', $val);
}
- function clearClass() {
+ function clearClass()
+ {
$this->objQuery->delete('dtb_class');
$this->objQuery->delete('dtb_classcategory');
}
@@ -377,7 +393,8 @@
* @param integer $rank 規格の表示順
* @param array $classcategory 規格分類名の配列
*/
- 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;
@@ -396,13 +413,16 @@
}
}
-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.
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/page/LC_Page_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -46,7 +47,8 @@
* LC_Page::sendRedirect() のテストケース(エラー).
*/
/*
- function testSendRedirect() {
+ function testSendRedirect()
+ {
$objPage = new LC_Page();
$result = $objPage->sendRedirect(HTTP_URL);
@@ -57,7 +59,8 @@
* LC_Page::sendRedirect() のテストケース(エラー).
*/
/*
- function testSendRedirectIsFailed() {
+ function testSendRedirectIsFailed()
+ {
$objPage = new LC_Page();
$result = $objPage->sendRedirect("http://www.example.org");
@@ -68,7 +71,8 @@
/**
* LC_Page::getToken() のテストケース.
*/
- function testGetToken() {
+ function testGetToken()
+ {
$objPage = new LC_Page();
$objPage->setTokenTo();
@@ -84,7 +88,8 @@
/**
* LC_Page::getLocation() のテストケース.
*/
- function testGetLocation() {
+ function testGetLocation()
+ {
$objPage = new LC_Page();
$_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
$url = $objPage->getLocation("/abouts/index.php");
@@ -98,7 +103,8 @@
*
* 絶対パス
*/
- function testGetLocationWithFullPath() {
+ function testGetLocationWithFullPath()
+ {
$objPage = new LC_Page();
$_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
$url = $objPage->getLocation(ROOT_URLPATH . 'abouts/index.php');
@@ -112,7 +118,8 @@
*
* QueryString 付与
*/
- function testGetLocationWithQueryString() {
+ function testGetLocationWithQueryString()
+ {
$objPage = new LC_Page();
$_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
@@ -128,7 +135,8 @@
*
* HTTPS_URL 使用
*/
- function testGetLocationUseSSL() {
+ function testGetLocationUseSSL()
+ {
$objPage = new LC_Page();
$_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
@@ -144,7 +152,8 @@
*
* DocumentRoot 指定
*/
- function testGetLocationWithDocumentRoot() {
+ function testGetLocationWithDocumentRoot()
+ {
$objPage = new LC_Page();
$documentRoot = realpath(dirname(__FILE__) . "/../../../html");
変更: branches/version-2_12-dev/test/class/page/Page_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/page/Page_AllTests.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/page/Page_AllTests.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,9 +32,11 @@
* @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;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,20 +32,24 @@
* @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;
@@ -56,7 +60,8 @@
$this->verify();
}
- function testGetOrderIdByPOST() {
+ function testGetOrderIdByPOST()
+ {
$_GET['order_id'] = 1;
$_POST['order_id'] = 1;
@@ -66,7 +71,8 @@
$this->verify();
}
- function testGetOrderIdByGET() {
+ function testGetOrderIdByGET()
+ {
$_GET['order_id'] = 2;
$this->expected = $_GET['order_id'];
@@ -75,11 +81,13 @@
$this->verify();
}
- function testGetOrderIdIsNull() {
+ function testGetOrderIdIsNull()
+ {
$this->assertFalse($this->objPage->getOrderId());
}
- function testGetModulePath() {
+ function testGetModulePath()
+ {
$order_id = 10000;
$payment_id = 10000;
$module_path = __FILE__;
@@ -91,7 +99,8 @@
$this->verify();
}
- function testGetModulePathIsFailure() {
+ function testGetModulePathIsFailure()
+ {
$order_id = 10000;
$payment_id = 10000;
$module_path = 'aaa';
@@ -103,11 +112,13 @@
}
- 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,
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/util/SC_Utils_Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,7 +32,8 @@
* @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
@@ -42,7 +43,8 @@
*
* 変換無し
*/
- function testGetRealURL_変換無し() {
+ function testGetRealURL_変換無し()
+ {
$url = "http://www.example.jp/admin/index.php";
$expected = "http://www.example.jp:/admin/index.php";
@@ -51,7 +53,8 @@
$this->assertEquals($expected, $actual);
}
- function testGetRealURL_変換有() {
+ function testGetRealURL_変換有()
+ {
$url = "http://www.example.jp/admin/../index.php";
$expected = "http://www.example.jp:/index.php";
@@ -60,7 +63,8 @@
$this->assertEquals($expected, $actual);
}
- function testGetRealURL_空のディレクトリ() {
+ function testGetRealURL_空のディレクトリ()
+ {
$url = "http://www.example.jp/admin/..///index.php";
$expected = "http://www.example.jp:/index.php";
@@ -69,7 +73,8 @@
$this->assertEquals($expected, $actual);
}
- function testGetRealURL_Dotのディレクトリ() {
+ function testGetRealURL_Dotのディレクトリ()
+ {
$url = "http://www.example.jp/admin/././../index.php";
$expected = "http://www.example.jp:/index.php";
@@ -78,7 +83,8 @@
$this->assertEquals($expected, $actual);
}
- function testIsBlank() {
+ function testIsBlank()
+ {
$val = "";
$this->assertTrue(SC_Utils::isBlank($val));
@@ -121,7 +127,8 @@
$this->assertTrue(SC_Utils::isBlank($emptyArray));
}
- function testIsAbsoluteRealPath() {
+ function testIsAbsoluteRealPath()
+ {
// for *NIX
if (strpos(PHP_OS, 'WIN') === false) {
$unix_absolute = '/usr/local';
@@ -147,7 +154,8 @@
$this->assertFalse(SC_Utils::isAbsoluteRealPath($empty));
}
- function testRecursiveMkdir() {
+ function testRecursiveMkdir()
+ {
$tmp_dir = sys_get_temp_dir();
$dir = '/foo/bar';
$results = false;
変更: branches/version-2_12-dev/test/class/util/Util_AllTests.php
===================================================================
--- branches/version-2_12-dev/test/class/util/Util_AllTests.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/class/util/Util_AllTests.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,9 +32,11 @@
* @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;
変更: branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php
===================================================================
--- branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -87,7 +87,8 @@
/**
* EC-CUBE のテスト用会員データを生成する
*/
-class CreateEcCubeCustomerData {
+class CreateEcCubeCustomerData
+{
/** SC_Query インスタンス */
var $objQuery;
@@ -95,7 +96,8 @@
/**
* コンストラクタ.
*/
- function CreateEcCubeCustomerData() {
+ function CreateEcCubeCustomerData()
+ {
$this->objQuery = new SC_Query();
}
@@ -104,7 +106,8 @@
*
* @return void
*/
- function createCustomers() {
+ function createCustomers()
+ {
lfPrintLog("createCustomers START.(" . CUSTOMERS_VOLUME . " data)");
for ($i = 0; $i < CUSTOMERS_VOLUME; $i++) {
lfPrintLog("----------");
@@ -158,7 +161,8 @@
}
/** テスト用スクリプトのログ出力関数 */
-function lfPrintLog($mess) {
+function lfPrintLog($mess)
+{
$path = DATA_REALDIR . "logs/" . basename(__FILE__, '.php') . ".log";
GC_Utils::gfPrintLog($mess, $path);
}
変更: branches/version-2_12-dev/test/createEcCubeData-v25.php
===================================================================
--- branches/version-2_12-dev/test/createEcCubeData-v25.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/test/createEcCubeData-v25.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -86,7 +86,8 @@
/**
* EC-CUBE のデータを生成する
*/
-class CreateEcCubeData {
+class CreateEcCubeData
+{
/** SC_Query インスタンス */
var $objQuery;
@@ -112,7 +113,8 @@
/**
* コンストラクタ.
*/
- function CreateEcCubeData() {
+ function CreateEcCubeData()
+ {
$this->objQuery = new SC_Query();
// コマンドライン引数 --delete
@@ -136,7 +138,8 @@
* |- 小カテゴリ
* @return void
*/
- function createCategories() {
+ function createCategories()
+ {
print("カテゴリを生成しています...\n");
@@ -210,7 +213,8 @@
*
* @return void
*/
- function createClassData() {
+ function createClassData()
+ {
// 規格データ生成
print("規格データを生成しています...\n");
@@ -249,7 +253,8 @@
*
* @return void
*/
- function relateClass() {
+ function relateClass()
+ {
print("商品と規格の関連づけを行います...\n");
@@ -268,7 +273,8 @@
*
* @return void
*/
- function createProducts() {
+ function createProducts()
+ {
print("商品を生成しています...\n");
@@ -307,7 +313,8 @@
* @param $class_name string 規格名
* @return void
*/
- function createClass($class_name) {
+ function createClass($class_name)
+ {
$sqlval = array();
$arrRaw = array();
// class_idを取得
@@ -335,7 +342,8 @@
* @param $classcategory_name string 規格名
* @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');
@@ -374,7 +382,8 @@
* @param integer $product_id 商品ID
* @return void
*/
- function createProductsClass($product_id) {
+ function createProductsClass($product_id)
+ {
printf("商品ID %d の商品規格を生成しています...\n", $product_id);
@@ -418,7 +427,8 @@
*
* @return void
*/
- function relateProductsCategories() {
+ function relateProductsCategories()
+ {
print("商品とカテゴリの関連づけを行います...\n");
@@ -437,7 +447,8 @@
* @param array $arrCategory_id カテゴリID の配列
* @return void
*/
- function createProductsCategories($arrCategory_id, $category_name) {
+ function createProductsCategories($arrCategory_id, $category_name)
+ {
$count = 0;
printf("%s の商品カテゴリを生成しています...\n", $category_name);
@@ -667,7 +678,8 @@
/**
* 総カテゴリ数を計算し、dtb_categoryに代入するrankに使う
*/
- 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;
}
変更: branches/version-2_12-dev/tests/class/Common_TestCase.php
===================================================================
--- branches/version-2_12-dev/tests/class/Common_TestCase.php 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/Common_TestCase.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -13,7 +13,8 @@
* SC_Queryのテスト以外は基本的にこのクラスを継承して作成してください。
*
*/
-class Common_TestCase extends PHPUnit_Framework_TestCase {
+class Common_TestCase extends PHPUnit_Framework_TestCase
+{
/** SC_Query インスタンス */
protected $objQuery;
@@ -23,12 +24,14 @@
/** 実際の値 */
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;
}
@@ -37,7 +40,8 @@
* 各テストfunctionの末尾で呼び出し、期待値と実際の値の比較を行います。
* 呼び出す前に、$expectedに期待値を、$actualに実際の値を導入してください。
*/
- protected function verify($message = null) {
+ protected function verify($message = null)
+ {
$this->assertEquals($this->expected, $this->actual, $message);
}
@@ -49,7 +53,8 @@
* actionExit()呼び出しを書き換えてexit()させない例です。
*/
/**
- public function testExit() {
+ public function testExit()
+ {
$resp = new SC_Response_Ex();
$resp->actionExit();
@@ -63,7 +68,8 @@
* 端末種別をテストケースから自由に設定する例です。
*/
/**
- public function testDeviceType() {
+ public function testDeviceType()
+ {
$this->expected = array(DEVICE_TYPE_MOBILE, DEVICE_TYPE_SMARTPHONE);
$this->actual = array();
@@ -81,7 +87,8 @@
* ログイン状態をテストケースから自由に切り替える例です。
*/
/**
- public function testLoginState() {
+ public function testLoginState()
+ {
$this->expected = array(FALSE, TRUE);
$this->actual = array();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_AccessorTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,34 +24,40 @@
$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の値を取得する() {
+ public function testGetStartYear_startYearの値を取得する()
+ {
$this->expected = '2010';
$this->actual = $this->objDate->getStartYear();
$this->verify("StartYear");
}
- public function testGetEndYear_endYearの値を取得する() {
+ public function testGetEndYear_endYearの値を取得する()
+ {
$this->expected = '2014';
$this->actual = $this->objDate->getEndYear();
$this->verify("EndYear");
}
- public function testsetMonth_monthの値を設定する() {
+ public function testsetMonth_monthの値を設定する()
+ {
$this->expected = '9';
$this->objDate->setMonth('9');
$this->actual = $this->objDate->month;
@@ -59,7 +65,8 @@
$this->verify("Month");
}
- public function testsetDay_dayの値を設定する() {
+ public function testsetDay_dayの値を設定する()
+ {
$this->expected = '28';
$this->objDate->setDay('28');
$this->actual = $this->objDate->day;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getDayTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,48 +24,56 @@
$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_要素の数が31の配列を返す() {
+ public function testGetDay_要素の数が31の配列を返す()
+ {
$this->expected = 31;
$this->actual = count($this->objDate->getDay());
$this->verify("配列の長さ");
}
- public function testGetDay_要素の最低値が1の配列を返す() {
+ public function testGetDay_要素の最低値が1の配列を返す()
+ {
$this->expected = 1;
$this->actual = min($this->objDate->getDay());
$this->verify("配列の最低値");
}
- public function testGetDay_要素の最大値が31の配列を返す() {
+ public function testGetDay_要素の最大値が31の配列を返す()
+ {
$this->expected = 31;
$this->actual = max($this->objDate->getDay());
$this->verify("配列の最大値");
}
- public function testGetDay_TRUEを与えた場合要素の数が32の配列を返す() {
+ public function testGetDay_TRUEを与えた場合要素の数が32の配列を返す()
+ {
$this->expected = 32;
$this->actual = count($this->objDate->getDay(true));
$this->verify("デフォルトを設定した配列の長さ");
}
- public function testGetDay_TRUEを与えた場合ーー含まれるの配列を返す() {
+ public function testGetDay_TRUEを与えた場合ーー含まれるの配列を返す()
+ {
$result = in_array('--', $this->objDate->getDay(true));
$this->assertTrue($result, "デフォルトの値");
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getHourTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,34 +24,40 @@
$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の配列を返す() {
+ public function testGetHour_24の配列を返す()
+ {
$this->expected = 24;
$this->actual = count($this->objDate->getHour());
$this->verify("配列の長さ");
}
- public function testGetHour_要素の最低値が0の配列を返す() {
+ public function testGetHour_要素の最低値が0の配列を返す()
+ {
$this->expected = 0;
$this->actual = min($this->objDate->getHour());
$this->verify("配列の最低値");
}
- public function testGetHour_要素の最大値が23の配列を返す() {
+ public function testGetHour_要素の最大値が23の配列を返す()
+ {
$this->expected = 23;
$this->actual = max($this->objDate->getHour());
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesIntervalTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,20 +24,24 @@
$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_要素が00と30の配列を返す() {
+ public function testGetMinutesInterval_要素が00と30の配列を返す()
+ {
$this->expected = array('00'=>'00', '30'=>'30');
$this->actual = $this->objDate->getMinutesInterval();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMinutesTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,34 +24,40 @@
$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_要素の数が60の配列を返す() {
+ public function testGetMinutes_要素の数が60の配列を返す()
+ {
$this->expected = 60;
$this->actual = count($this->objDate->getMinutes());
$this->verify("配列の長さ");
}
- public function testGetMinutes_要素の最低値が0の配列を返す() {
+ public function testGetMinutes_要素の最低値が0の配列を返す()
+ {
$this->expected = 0;
$this->actual = min($this->objDate->getMinutes());
$this->verify("配列の最低値");
}
- public function testGetMinutes_要素の最大値が59の配列を返す() {
+ public function testGetMinutes_要素の最大値が59の配列を返す()
+ {
$this->expected = 59;
$this->actual = max($this->objDate->getMinutes());
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getMonthTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,48 +24,56 @@
$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_要素の数が12の配列を返す() {
+ public function testGetMonth_要素の数が12の配列を返す()
+ {
$this->expected = 12;
$this->actual = count($this->objDate->getMonth());
$this->verify("配列の長さ");
}
- public function testGetMonth_要素の最低値が1の配列を返す() {
+ public function testGetMonth_要素の最低値が1の配列を返す()
+ {
$this->expected = 1;
$this->actual = min($this->objDate->getMonth());
$this->verify("配列の最低値");
}
- public function testGetMonth_要素の最大値が12の配列を返す() {
+ public function testGetMonth_要素の最大値が12の配列を返す()
+ {
$this->expected = 12;
$this->actual = max($this->objDate->getMonth());
$this->verify("配列の最大値");
}
- public function testGetMonth_TRUEを与えた場合要素の数が13の配列を返す() {
+ public function testGetMonth_TRUEを与えた場合要素の数が13の配列を返す()
+ {
$this->expected = 13;
$this->actual = count($this->objDate->getMonth(true));
$this->verify("デフォルトを設定した配列の長さ");
}
- public function testGetMonth_TRUEを与えた場合ーー含まれるの配列を返す() {
+ public function testGetMonth_TRUEを与えた場合ーー含まれるの配列を返す()
+ {
$result = in_array('--', $this->objDate->getMonth(true));
$this->assertTrue($result, "デフォルトの値");
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getYearTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,41 +24,48 @@
$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_要素の数が4の配列を返す() {
+ public function testGetYear_要素の数が4の配列を返す()
+ {
$this->expected = 4;
$this->actual = count($this->objDate->getYear());
$this->verify("配列の長さ");
}
- public function testGetYear_最小値が今年の配列を返す() {
+ public function testGetYear_最小値が今年の配列を返す()
+ {
$this->expected = DATE('Y');
$this->actual = min($this->objDate->getYear());
$this->verify("最小値；今年");
}
- public function testGetYear_最低値が引数の年の配列を返す() {
+ public function testGetYear_最低値が引数の年の配列を返す()
+ {
$this->expected = '2007';
$this->actual = min($this->objDate->getYear('2007'));
$this->verify("引数が最低値");
}
- public function testGetYear_最低値がメンバー変数の年の配列を返す() {
+ public function testGetYear_最低値がメンバー変数の年の配列を返す()
+ {
$this->expected = '2004';
$this->objDate->setStartYear('2004');
$this->actual = min($this->objDate->getYear());
@@ -66,14 +73,16 @@
$this->verify("メンバー変数が最低値");
}
- public function testGetYear_最大値が3年後の配列を返す() {
+ public function testGetYear_最大値が3年後の配列を返す()
+ {
$this->expected = DATE('Y')+3;
$this->actual = max($this->objDate->getYear());
$this->verify("最大値；3年後");
}
- public function testGetYear_最大値がメンバ変数の配列を返す() {
+ public function testGetYear_最大値がメンバ変数の配列を返す()
+ {
$this->expected = '2020';
$this->objDate->setEndYear('2020');
$this->actual = max($this->objDate->getYear());
@@ -81,12 +90,14 @@
$this->verify("メンバー変数が最大値");
}
- public function testGetYear_デフォルト値が含まれる配列を返す() {
+ public function testGetYear_デフォルト値が含まれる配列を返す()
+ {
$result = in_array('----', $this->objDate->getYear(DATE('Y'), TRUE));
$this->assertTrue($result, "デフォルト値");
}
- public function testGetYear_デフォルト値の引数に年を指定した配列を返す() {
+ public function testGetYear_デフォルト値の引数に年を指定した配列を返す()
+ {
$year = date('Y');
$this->expected = array( $year => $year, $year+1 => $year+1
, '----' => '----'
@@ -95,7 +106,8 @@
$this->assertSame($this->expected, $this->actual, "デフォルト値");
}
- public function testGetYear_引数に指定したキーがデフォルト値となる配列を返す() {
+ public function testGetYear_引数に指定したキーがデフォルト値となる配列を返す()
+ {
$this->expected = 'default';
$return = $this->objDate->getYear(DATE('Y'), TRUE, 'default');
$this->actual = array_search('----', $return);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroMonthTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,27 +24,32 @@
$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_要素の数が12の配列を返す() {
+ public function testGetZeroMonth_要素の数が12の配列を返す()
+ {
$this->expected = 12;
$this->actual = count($this->objDate->getZeroMonth());
$this->verify("配列の長さ");
}
- public function testGetZeroMonth_0をつけた月の配列を返す() {
+ public function testGetZeroMonth_0をつけた月の配列を返す()
+ {
$this->expected = array('01'=>'01','02'=>'02','03'=>'03'
,'04'=>'04','05'=>'05','06'=>'06'
,'07'=>'07','08'=>'08','09'=>'09'
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Date/SC_Date_getZeroYearTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,39 +24,46 @@
$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_要素の数が4の配列を返す() {
+ public function testGetZeroYear_要素の数が4の配列を返す()
+ {
$this->expected = 4;
$this->actual = count($this->objDate->getZeroYear());
$this->verify("配列の長さ");
}
- public function testGetZeroYear_最小値が2桁表記の今年の配列を返す() {
+ public function testGetZeroYear_最小値が2桁表記の今年の配列を返す()
+ {
$this->expected = DATE('y');
$this->actual = min($this->objDate->getZeroYear());
$this->verify("最小値；今年");
}
- public function testGetZeroYear_最低値が引数の年の2桁表記の配列を返す() {
+ public function testGetZeroYear_最低値が引数の年の2桁表記の配列を返す()
+ {
$this->expected = '07';
$this->actual = min($this->objDate->getZeroYear('2007'));
$this->verify("引数が最低値");
}
- public function testGetZeroYear_最低値がメンバー変数の年の2桁表記の配列を返す() {
+ public function testGetZeroYear_最低値がメンバー変数の年の2桁表記の配列を返す()
+ {
$this->expected = '04';
$this->objDate->setStartYear('2004');
$this->actual = min($this->objDate->getZeroYear());
@@ -64,14 +71,16 @@
$this->verify("メンバー変数が最低値");
}
- public function testGetZeroYear_最大値が3年後の2桁表記の配列を返す() {
+ public function testGetZeroYear_最大値が3年後の2桁表記の配列を返す()
+ {
$this->expected = DATE('y')+3;
$this->actual = max($this->objDate->getZeroYear());
$this->verify("最大値；3年後");
}
- public function testGetZeroYear_最大値がメンバ変数の2桁表記の配列を返す() {
+ public function testGetZeroYear_最大値がメンバ変数の2桁表記の配列を返す()
+ {
$this->expected = '20';
$this->objDate->setEndYear('2020');
$this->actual = max($this->objDate->getZeroYear());
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_TestBase.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,19 +5,23 @@
/**
*
*/
-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に商品クラス情報を設定します.
*/
- protected function setUpProductClass() {
+ protected function setUpProductClass()
+ {
$product_class = array(
array(
'update_date' => 'CURRENT_TIMESTAMP',
@@ -58,7 +62,8 @@
);
$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();
@@ -68,7 +73,8 @@
/**
* DBに製品カテゴリ情報を登録します.
*/
- protected function setUpClassCategory() {
+ protected function setUpClassCategory()
+ {
$class_category = array(
array(
'update_date' => 'CURRENT_TIMESTAMP',
@@ -95,7 +101,8 @@
/**
* DBに製品情報を登録します.
*/
- protected function setUpProducts() {
+ protected function setUpProducts()
+ {
$products = array(
array(
'update_date' => 'CURRENT_TIMESTAMP',
@@ -155,7 +162,8 @@
/**
* DBに商品ステータス情報を登録します.
*/
- protected function setUpProductStatus() {
+ protected function setUpProductStatus()
+ {
$class_category = array(
array(
'update_date' => 'CURRENT_TIMESTAMP',
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductCountTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_すべての商品数を返す() {
+ public function testFindProductCount_すべての商品数を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -30,7 +34,8 @@
$this->verify('商品数');
}
- public function testFindProductCount_検索条件に一致する商品数を返す() {
+ public function testFindProductCount_検索条件に一致する商品数を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_findProductIdsOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品ID降順() {
+ public function testFindProductIdsOrder_商品ID降順()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -32,7 +36,8 @@
$this->verify('商品ID降順');
}
- public function testFindProductIdsOrder_商品名昇順() {
+ public function testFindProductIdsOrder_商品名昇順()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -46,7 +51,8 @@
$this->verify('商品ID昇順');
}
- public function testFindProductIdsOrder_arrOrderDataの設定による並び順() {
+ public function testFindProductIdsOrder_arrOrderDataの設定による並び順()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品数無限の場合販売制限なし() {
+ public function testGetBuyLimit_商品数無限の場合販売制限なし()
+ {
$product = array('stock_unlimited' => '1'
,'sale_limit' => null
@@ -29,7 +33,8 @@
$this->verify('販売制限なし');
}
- public function testGetBuyLimit_商品販売数制限数を返す() {
+ public function testGetBuyLimit_商品販売数制限数を返す()
+ {
$product = array('stock_unlimited' => '1'
,'sale_limit' => 3
@@ -40,7 +45,8 @@
$this->verify('販売数制限');
}
- public function testGetBuyLimit_商品在庫数を制限として返す() {
+ public function testGetBuyLimit_商品在庫数を制限として返す()
+ {
$product = array('stock_unlimited' => null
,'sale_limit' => null
@@ -51,7 +57,8 @@
$this->verify('在庫数制限');
}
- public function testGetBuyLimit_販売制限数大なり在庫数なら在庫数を返す() {
+ public function testGetBuyLimit_販売制限数大なり在庫数なら在庫数を返す()
+ {
$product = array('stock_unlimited' => null
,'sale_limit' => 5
@@ -62,7 +69,8 @@
$this->verify('販売数＞在庫数制限');
}
- public function testGetBuyLimit_販売制限数少なり在庫数なら販売制限数() {
+ public function testGetBuyLimit_販売制限数少なり在庫数なら販売制限数()
+ {
$product = array('stock_unlimited' => null
,'sale_limit' => 5
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品規格IDの商品情報と規格情報を返す() {
+ public function testGetDetailAndProductsClass_商品規格IDの商品情報と規格情報を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品IDの詳細情報を返す() {
+ public function testGetDetail_商品IDの詳細情報を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品ID指定がない場合は空配列() {
+ public function testGetListByProductIds_商品ID指定がない場合は空配列()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -30,7 +34,8 @@
$this->verify('商品ID指定なし');
}
- public function testGetListByProductIds_指定の商品IDで情報を取得する() {
+ public function testGetListByProductIds_指定の商品IDで情報を取得する()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductStatusTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品IDなしは空の配列を返す() {
+ public function testGetProductStatus_商品IDなしは空の配列を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -32,7 +36,8 @@
$this->verify('空の配列');
}
- public function testGetProductStatus_指定した商品IDの商品ステータスを返す() {
+ public function testGetProductStatus_指定した商品IDの商品ステータスを返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品IDなしは空配列を返す() {
+ public function testGetProductsClassByProductIds_商品IDなしは空配列を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -32,7 +36,8 @@
$this->verify('商品ID指定なし');
}
- public function testGetProductsClassByProductIds_指定の商品IDの情報を返す() {
+ public function testGetProductsClassByProductIds_指定の商品IDの情報を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -72,7 +77,8 @@
$this->verify('商品ID指定');
}
- public function testGetProductsClassByProductIds_削除商品含む商品情報を返す() {
+ public function testGetProductsClassByProductIds_削除商品含む商品情報を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_クエリに該当する商品情報を返す() {
+ public function testGetProductsClassByQuery_クエリに該当する商品情報を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getProductsClassTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品規格IDから規格情報を返す() {
+ public function testGetProductsClass_商品規格IDから規格情報を返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_listsTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_商品一覧取得() {
+ public function testlists_商品一覧取得()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_reduceStockTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_減少数０はFalse() {
+ public function testReduceStock_減少数０はFalse()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -31,7 +35,8 @@
$this->verify('減少数０');
}
- public function testReduceStock_減少数1はTrue() {
+ public function testReduceStock_減少数1はTrue()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -44,7 +49,8 @@
$this->verify('減少数1');
}
- public function testReduceStock_在庫数をマイナスにする数はFalse() {
+ public function testReduceStock_在庫数をマイナスにする数はFalse()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
@@ -58,7 +64,8 @@
}
- public function testReduceStock_在庫数無限の場合はTrue() {
+ public function testReduceStock_在庫数無限の場合はTrue()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductStatusTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,20 +5,24 @@
/**
*
*/
-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_登録した商品ステータスを返す() {
+ public function testSetProductStatus_登録した商品ステータスを返す()
+ {
$this->setUpProductClass();
$this->setUpProducts();
$this->setUpClassCategory();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_Product/SC_Product_setProductsOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -5,19 +5,23 @@
/**
*
*/
-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_デフォルト引数() {
+ public function testSetProductsOrder_デフォルト引数()
+ {
$this->objProducts->setProductsOrder('name');
$this->actual = $this->objProducts->arrOrderData;
@@ -26,7 +30,8 @@
$this->verify('デフォルト引数');
}
- public function testSetProductsOrder_引数指定() {
+ public function testSetProductsOrder_引数指定()
+ {
$this->objProducts->setProductsOrder('name', 'dtb_products_class', 'DESC');
$this->actual = $this->objProducts->arrOrderData;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_checkUniqIdTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,27 +24,32 @@
$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値がない場合_True() {
+ public function testCheckUniqId_POST値がない場合_True()
+ {
$_POST = null;
$this->expected = true;
$this->actual = $this->objSiteSession->checkUniqId();
$this->verify('ポスト値空');
}
- public function testCheckUniqId_POSTとセッションのUniqIDが一致する場合_True() {
+ public function testCheckUniqId_POSTとセッションのUniqIDが一致する場合_True()
+ {
$_POST['uniqid'] = '1234567890';
$_SESSION['site']['uniqid'] = '1234567890';
@@ -53,7 +58,8 @@
$this->verify('ユニークID一致');
}
- public function testCheckUniqId_POSTとセッションのUniqIDが一致しない場合_False() {
+ public function testCheckUniqId_POSTとセッションのUniqIDが一致しない場合_False()
+ {
$_POST['uniqid'] = '0987654321';
$_SESSION['site']['uniqid'] = '1234567890';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getUniqIdTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,27 +24,32 @@
$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_設定済みのユニークなID取得する() {
+ public function testGetUniqId_設定済みのユニークなID取得する()
+ {
$_SESSION['site']['uniqid'] = '0987654321';
$this->expected = '0987654321';
$this->actual = $this->objSiteSession->getUniqId();
$this->verify('ユニークID');
}
- public function testGetUniqId_新たにユニークなID取得する() {
+ public function testGetUniqId_新たにユニークなID取得する()
+ {
$_SESSION['site']['uniqid'] = '';
$this->expected = '1234567890';
$this->actual = $this->objSiteSession->getUniqId();
@@ -52,8 +57,10 @@
}
}
-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
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_getValueTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,20 +24,24 @@
$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_セッションの値を取得する() {
+ public function testSetNowPage_セッションの値を取得する()
+ {
$this->expected = $_SERVER['SCRIPT_NAME'];
$this->actual = $this->objSiteSession->getValue('now_page');
$this->verify("セッション値");
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_isPrepageTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,40 +24,47 @@
$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が空の場合_false() {
+ public function testIsPrepage_sessionが空の場合_false()
+ {
$this->expected = false;
$this->actual = $this->objSiteSession->isPrepage();
$this->verify("ページ判定");
}
- public function testIsPrepage_prepageとnowpageが違う場合_false() {
+ public function testIsPrepage_prepageとnowpageが違う場合_false()
+ {
$this->expected = false;
$_SESSION['site']['pre_page'] = 'test.php';
$this->actual = $this->objSiteSession->isPrepage();
$this->verify("ページ判定");
}
- public function testIsPrepage_prepageとnowpageが同じの場合_true() {
+ public function testIsPrepage_prepageとnowpageが同じの場合_true()
+ {
$this->expected = true;
$_SESSION['site']['pre_page'] = $_SERVER['SCRIPT_NAME'];
$this->actual = $this->objSiteSession->isPrepage();
$this->verify("ページ判定");
}
- public function testIsPrepage_pre_regist_successがtrueの場合_true() {
+ public function testIsPrepage_pre_regist_successがtrueの場合_true()
+ {
$this->expected = true;
$_SESSION['site']['pre_page'] = 'test.php';
$_SESSION['site']['pre_regist_success'] = true;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setNowPageTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,20 +24,24 @@
$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にパスを設定する() {
+ public function testSetNowPage_now_pageにパスを設定する()
+ {
$this->expected = 'test.php';
$this->objSiteSession->setNowPage('test.php');
$this->actual = $_SESSION['site']['now_page'];
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setRegistFlagTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,20 +24,24 @@
$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がセットされる() {
+ public function testSetRegistFlag_TRUEがセットされる()
+ {
$this->objSiteSession->setRegistFlag();
$this->assertTrue($_SESSION['site']['regist_success'],'登録成功フラグ');
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_setUniqIdTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,20 +24,24 @@
$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_ユニークなID設定する() {
+ public function testSetUniqId_ユニークなID設定する()
+ {
$this->objSiteSession->setUniqId();
$this->assertNotEmpty($_SESSION['site']['uniqid'], 'ユニークID');
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/SC_SiteSession/SC_SiteSession_unsetUniqIdTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -24,20 +24,24 @@
$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を解除する() {
+ public function testUnsetUniqId_uniqIDを解除する()
+ {
$_SESSION['site']['uniqid'] = '1234567890';
$this->objSiteSession->unsetUniqId();
$this->assertEmpty($_SESSION['site']['uniqid'], '空のユニークID');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,13 +30,16 @@
* @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();
}
@@ -44,7 +47,8 @@
/**
* セッションに配送情報を設定します。
*/
- protected function setUpShipping($shipping) {
+ protected function setUpShipping($shipping)
+ {
if (!$shipping) {
$shipping = $this->getSingleShipping();
}
@@ -52,7 +56,8 @@
$_SESSION['shipping'] = $shipping;
}
- protected function getSingleShipping() {
+ protected function getSingleShipping()
+ {
return array(
'00001' => array(
'shipment_id' => '00001',
@@ -61,7 +66,8 @@
);
}
- protected function getMultipleShipping() {
+ protected function getMultipleShipping()
+ {
return array(
'00001' => array(
'shipment_id' => '00001',
@@ -81,7 +87,8 @@
/**
* DBに配送情報を設定します。
*/
- protected function setUpShippingOnDb() {
+ protected function setUpShippingOnDb()
+ {
$shippings = array(
array(
'update_date' => '2000-01-01 00:00:00',
@@ -115,7 +122,8 @@
/**
* DBに配送商品情報を設定します。
*/
- protected function setUpShipmentItem() {
+ protected function setUpShipmentItem()
+ {
$shipping_items = array(
array(
'shipping_id' => '1',
@@ -143,7 +151,8 @@
/**
* DBに商品クラス情報を設定します.
*/
- protected function setUpProductClass() {
+ protected function setUpProductClass()
+ {
$product_class = array(
array(
'update_date' => '2000-01-01 00:00:00',
@@ -172,7 +181,8 @@
);
$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();
@@ -182,7 +192,8 @@
/**
* DBに製品カテゴリ情報を登録します.
*/
- protected function setUpClassCategory() {
+ protected function setUpClassCategory()
+ {
$class_category = array(
array(
'update_date' => '2000-01-01 00:00:00',
@@ -209,7 +220,8 @@
/**
* DBに製品情報を登録します.
*/
- protected function setUpProducts() {
+ protected function setUpProducts()
+ {
$products = array(
array(
'update_date' => '2000-01-01 00:00:00',
@@ -238,7 +250,8 @@
/**
* DBに支払方法の情報を登録します.
*/
- protected function setUpPaymentOptions() {
+ protected function setUpPaymentOptions()
+ {
$payment_options = array(
array(
'deliv_id' => '2001',
@@ -291,7 +304,8 @@
/**
* DBに配送業者の情報を登録します.
*/
- protected function setUpDeliv() {
+ protected function setUpDeliv()
+ {
$deliv = array(
array( // 削除フラグON
'deliv_id' => '2001',
@@ -337,7 +351,8 @@
/**
* DBにお届け時間の情報を登録します.
*/
- protected function setUpDelivTime() {
+ protected function setUpDelivTime()
+ {
$deliv_time = array(
array(
'deliv_id' => '1002',
@@ -365,7 +380,8 @@
/**
* DBに支払方法の情報を登録します.
*/
- protected function setUpPayment() {
+ protected function setUpPayment()
+ {
$payment = array(
array(
'update_date' => '2000-01-01 00:00:00',
@@ -432,7 +448,8 @@
/**
* DBに受注情報を設定します.
*/
- protected function setUpOrder() {
+ protected function setUpOrder()
+ {
$order = array(
array(
'update_date' => '2000-01-01 00:00:00',
@@ -467,7 +484,8 @@
/**
* DBに受注一時情報を設定します.
*/
- protected function setUpOrderTemp() {
+ protected function setUpOrderTemp()
+ {
$order = array(
array(
'update_date' => '2000-01-01 00:00:00',
@@ -495,7 +513,8 @@
/**
* DBに受注詳細を設定します.
*/
- protected function setUpOrderDetail() {
+ protected function setUpOrderDetail()
+ {
$order_detail = array(
array(
'order_detail_id' => '1001',
@@ -545,7 +564,8 @@
/**
* DBに顧客情報を設定します。
*/
- protected function setUpCustomer() {
+ protected function setUpCustomer()
+ {
$customer = array(
array(
'customer_id' => '1001',
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,22 +30,26 @@
* @author Hiroko Tamagawa
* @version $Id$
*/
-class SC_Helper_Purchase_cancelOrderTest extends SC_Helper_Purchase_TestBase {
+class SC_Helper_Purchase_cancelOrderTest extends SC_Helper_Purchase_TestBase
+{
private $helper;
- protected function setUp() {
+ protected function setUp()
+ {
parent::setUp();
$this->setUpProductClass();
$this->helper = new SC_Helper_Purchase_cancelOrderMock();
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testCancelOrder_デフォルトの引数で呼び出した場合_製品クラスのデータが更新される(){
+ public function testCancelOrder_デフォルトの引数で呼び出した場合_製品クラスのデータが更新される()
+ {
$order_id = '1001';
$this->objQuery->begin();
@@ -78,7 +82,8 @@
// 実際にトランザクションを開始したかどうかはテストできないが、
// 問題なく処理が完了することのみ確認
- public function testCancelOrder_トランザクションが開始していない場合_内部で開始する(){
+ public function testCancelOrder_トランザクションが開始していない場合_内部で開始する()
+ {
$order_id = '1001';
$this->helper->cancelOrder($order_id, ORDER_NEW);
@@ -109,7 +114,8 @@
$this->verify();
}
- public function testCancelOrder_削除フラグが立っている場合_DB更新時に削除フラグが立てられる(){
+ public function testCancelOrder_削除フラグが立っている場合_DB更新時に削除フラグが立てられる()
+ {
$order_id = '1001';
$this->objQuery->begin();
@@ -146,16 +152,19 @@
}
-class SC_Helper_Purchase_cancelOrderMock extends SC_Helper_Purchase {
+class SC_Helper_Purchase_cancelOrderMock extends SC_Helper_Purchase
+{
- function registerOrder($order_id, $params) {
+ function registerOrder($order_id, $params)
+ {
$_SESSION['testResult']['registerOrder'] = array(
'order_id' => $order_id,
'params' => $params
);
}
- function getOrderDetail($order_id) {
+ function getOrderDetail($order_id)
+ {
$_SESSION['testResult']['getOrderDetail'] = array(
'order_id' => $order_id
);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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__カートとセッションの配送情報が削除される() {
+ public function testCleanupSession__カートとセッションの配送情報が削除される()
+ {
// 引数の準備
$helper = new SC_Helper_Purchase();
$cartSession = new SC_CartSession();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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_配送先ID未指定の場合_全ての配送商品がクリアされる() {
+ public function testClearShipmentItem_配送先ID未指定の場合_全ての配送商品がクリアされる()
+ {
$this->setUpShipping($this->getMultipleShipping());
$helper = new SC_Helper_Purchase();
@@ -56,7 +60,8 @@
$this->verify('配送商品');
}
- public function testClearShipmentItem_配送先ID指定の場合_指定したIDの配送商品がクリアされる() {
+ public function testClearShipmentItem_配送先ID指定の場合_指定したIDの配送商品がクリアされる()
+ {
$this->setUpShipping($this->getMultipleShipping());
$helper = new SC_Helper_Purchase();
@@ -70,7 +75,8 @@
$this->verify('配送商品');
}
- public function testClearShipmentItem_存在しないIDを指定した場合_何も変更されない() {
+ public function testClearShipmentItem_存在しないIDを指定した場合_何も変更されない()
+ {
$this->setUpShipping($this->getMultipleShipping());
$helper = new SC_Helper_Purchase();
@@ -84,7 +90,8 @@
$this->verify('配送商品');
}
- public function testClearShipmentItem_商品情報が配列でない場合_何も変更されない() {
+ public function testClearShipmentItem_商品情報が配列でない場合_何も変更されない()
+ {
$this->setUpShipping($this->getMultipleShipping());
// 内容を配列でないように変更
$_SESSION['shipping']['00001'] = 'temp';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,11 +31,13 @@
* @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'
@@ -53,13 +55,15 @@
$this->helper = new SC_Helper_Purchase_completeOrderMock();
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
// 適切なfunctionが呼ばれていることのみ確認
- public function testCompleteOrder_顧客IDが指定されている場合_購入日が更新される() {
+ public function testCompleteOrder_顧客IDが指定されている場合_購入日が更新される()
+ {
$_SESSION['customer']['customer_id'] = '1002'; // 顧客ID
$this->helper->completeOrder(ORDER_DELIV);
@@ -96,7 +100,8 @@
$this->assertNotNull($last_buy_date, '最終購入日');
}
- public function testCompleteOrder_顧客IDが指定されていない場合_特にエラーなく修了できる() {
+ public function testCompleteOrder_顧客IDが指定されていない場合_特にエラーなく修了できる()
+ {
$this->helper->completeOrder(); // デフォルトのステータス(NEW)
$this->expected = array(
@@ -134,18 +139,22 @@
}
-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'],
@@ -154,7 +163,8 @@
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,
@@ -162,13 +172,15 @@
);
}
- 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
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,12 +31,14 @@
* @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');
@@ -63,12 +65,14 @@
$this->customer_array = array('customer_id' => '1001', 'email' => 'test ＠ example.com');
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testCopyFromCustomer_ログインしていない場合_何もしない() {
+ public function testCopyFromCustomer_ログインしていない場合_何もしない()
+ {
$dest = array();
User_Utils::setLoginState(FALSE, $this->customer_array, $this->objQuery);
@@ -80,7 +84,8 @@
$this->verify();
}
- public function testCopyFromCustomer_モバイルの場合_モバイルのメールアドレスを設定する() {
+ public function testCopyFromCustomer_モバイルの場合_モバイルのメールアドレスを設定する()
+ {
$dest = array();
User_Utils::setLoginState(TRUE, $this->customer_array, $this->objQuery);
User_Utils::setDeviceType(DEVICE_TYPE_MOBILE);
@@ -116,7 +121,8 @@
$this->verify();
}
- public function testCopyFromCustomer_モバイルかつモバイルのメールアドレスがない場合_通常のメールアドレスを設定する() {
+ public function testCopyFromCustomer_モバイルかつモバイルのメールアドレスがない場合_通常のメールアドレスを設定する()
+ {
$dest = array();
$prefix = 'order';
// キーを絞る
@@ -137,7 +143,8 @@
$this->verify();
}
- public function testCopyFromCustomer_モバイルでない場合_通常のメールアドレスをそのまま設定する() {
+ public function testCopyFromCustomer_モバイルでない場合_通常のメールアドレスをそのまま設定する()
+ {
$dest = array();
$prefix = 'prefix';
// キーを絞る
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_すべてデフォルト設定にした場合_デフォルトの接頭辞・キーでコピーされる() {
+ public function testCopyFromOrder_すべてデフォルト設定にした場合_デフォルトの接頭辞・キーでコピーされる()
+ {
$dest = array();
$src = array(
'order_name01' => '姓',
@@ -89,7 +93,8 @@
$this->verify();
}
- public function testCopyFromOrder_接頭辞・キーを設定した場合_指定の値でコピーされる() {
+ public function testCopyFromOrder_接頭辞・キーを設定した場合_指定の値でコピーされる()
+ {
$dest = array();
$src = array(
'input_name01' => '姓',
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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__予め指定されたキーだけが抽出される() {
+ public function testExtractShipping__予め指定されたキーだけが抽出される()
+ {
$helper = new SC_Helper_Purchase();
$helper->arrShippingKey = array('id', 'name', 'code');
$arrSrc = array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,22 +31,26 @@
* @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_存在しない受注IDを指定した場合_結果が空になる() {
+ public function testGetOrderDetail_存在しない受注IDを指定した場合_結果が空になる()
+ {
$order_id = '9999';
$this->expected = array();
@@ -55,7 +59,8 @@
$this->verify();
}
- public function testGetOrderDetail_存在する受注IDを指定した場合_対応する受注詳細情報が取得できる() {
+ public function testGetOrderDetail_存在する受注IDを指定した場合_対応する受注詳細情報が取得できる()
+ {
$order_id = '1001';
$this->expected = array(
@@ -101,7 +106,8 @@
$this->verify();
}
- public function testGetOrderDetail_ステータス取得フラグがOFFのの場合_ステータス以外の情報が取得できる() {
+ public function testGetOrderDetail_ステータス取得フラグがOFFのの場合_ステータス以外の情報が取得できる()
+ {
$order_id = '1001';
$this->expected = array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,20 +31,24 @@
* @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_存在しない受注IDを指定した場合_結果が空になる() {
+ public function testGetOrderTemp_存在しない受注IDを指定した場合_結果が空になる()
+ {
$order_id = '9999';
$this->expected = null;
@@ -53,7 +57,8 @@
$this->verify();
}
- public function testGetOrderTemp_存在する受注IDを指定した場合_対応する結果が取得できる() {
+ public function testGetOrderTemp_存在する受注IDを指定した場合_対応する結果が取得できる()
+ {
$order_temp_id = '1002';
$this->expected = array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,20 +31,24 @@
* @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_存在しない受注IDを指定した場合_結果が空になる() {
+ public function testGetOrder_存在しない受注IDを指定した場合_結果が空になる()
+ {
$order_id = '9999';
$this->expected = null;
@@ -53,7 +57,8 @@
$this->verify();
}
- public function testGetOrder_存在しない顧客IDを指定した場合_結果が空になる() {
+ public function testGetOrder_存在しない顧客IDを指定した場合_結果が空になる()
+ {
$order_id = '1002';
$customer_id = '9999';
@@ -63,7 +68,8 @@
$this->verify();
}
- public function testGetOrder_顧客IDを指定しなかった場合_受注IDに対応する結果が取得できる() {
+ public function testGetOrder_顧客IDを指定しなかった場合_受注IDに対応する結果が取得できる()
+ {
$order_id = '1002';
$this->expected = array(
@@ -77,7 +83,8 @@
$this->verify();
}
- public function testGetOrder_存在する顧客IDを指定した場合_対応する結果が取得できる() {
+ public function testGetOrder_存在する顧客IDを指定した場合_対応する結果が取得できる()
+ {
$order_id = '1002';
$customer_id = '1002';
変更: 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 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,21 +31,25 @@
* @author Hiroko Tamagawa
* @version $Id$
*/
-class SC_Helper_Purchase_getPaymentsByPriceTest extends SC_Helper_Purchase_TestBase {
+class SC_Helper_Purchase_getPaymentsByPriceTest extends SC_Helper_Purchase_TestBase
+{
- protected function setUp() {
+ protected function setUp()
+ {
parent::setUp();
$this->setUpPayment();
$this->setUpPaymentOptions();
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testGetPaymentsByPrice_購入金額がすべての上限を上回る場合_上限の設定がないものだけ取得できる() {
+ public function testGetPaymentsByPrice_購入金額がすべての上限を上回る場合_上限の設定がないものだけ取得できる()
+ {
$deliv_id = '1003';
$total = 21001;
$helper = new SC_Helper_Purchase();
@@ -70,7 +74,8 @@
$this->verify();
}
- public function testGetPaymentsByPrice_購入金額が一部の上限を上回る場合_上限に引っかからないものだけ取得できる() {
+ public function testGetPaymentsByPrice_購入金額が一部の上限を上回る場合_上限に引っかからないものだけ取得できる()
+ {
$deliv_id = '1003';
$total = 20500;
$helper = new SC_Helper_Purchase();
@@ -83,7 +88,8 @@
$this->verify();
}
- public function testGetPaymentsByPrice_購入金額が一部の下限を下回る場合_下限に引っかからないものだけ取得できる() {
+ public function testGetPaymentsByPrice_購入金額が一部の下限を下回る場合_下限に引っかからないものだけ取得できる()
+ {
$deliv_id = '1003';
$total = 11000;
$helper = new SC_Helper_Purchase();
@@ -96,7 +102,8 @@
$this->verify();
}
- public function testGetPaymentsByPrice_購入金額がすべての下限を下回る場合_下限の設定がないものだけ取得できる() {
+ public function testGetPaymentsByPrice_購入金額がすべての下限を下回る場合_下限の設定がないものだけ取得できる()
+ {
$deliv_id = '1003';
$total = 9999;
$helper = new SC_Helper_Purchase();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_存在しない受注IDを指定した場合_結果が空になる() {
+ public function testGetShipmentItems_存在しない受注IDを指定した場合_結果が空になる()
+ {
$order_id = '100'; // 存在しないID
$shipping_id = '1';
@@ -53,7 +57,8 @@
$this->verify('配送情報');
}
- public function testGetShipmentItems_存在しない配送先IDを指定した場合_結果が空になる() {
+ public function testGetShipmentItems_存在しない配送先IDを指定した場合_結果が空になる()
+ {
$order_id = '1';
$shipping_id = '100'; // 存在しないID
@@ -63,7 +68,8 @@
$this->verify('配送情報');
}
- public function testGetShipmentItems_存在する受注IDと配送先IDを指定した場合_結果が取得できる() {
+ public function testGetShipmentItems_存在する受注IDと配送先IDを指定した場合_結果が取得できる()
+ {
$order_id = '1';
$shipping_id = '1';
@@ -96,7 +102,8 @@
$this->verify('配送情報');
}
- public function testGetShipmentItems_詳細フラグをOFFにした場合_結果に詳細情報が含まれない() {
+ public function testGetShipmentItems_詳細フラグをOFFにした場合_結果に詳細情報が含まれない()
+ {
$order_id = '1';
$shipping_id = '1';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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 要確認：引数の名前がおかしい（is_multipleではないはず）
- public function testGetShippingPref_保有フラグがOFFの場合_全配送情報を取得する() {
+ public function testGetShippingPref_保有フラグがOFFの場合_全配送情報を取得する()
+ {
$this->setUpShipping($this->getMultipleShipping());
$this->expected = array('東京都', '沖縄県', '埼玉県');
@@ -52,7 +56,8 @@
$this->verify('配送先の都道府県');
}
- public function testGetShippingPref_保有フラグがONの場合_商品のある配送情報のみ取得する() {
+ public function testGetShippingPref_保有フラグがONの場合_商品のある配送情報のみ取得する()
+ {
$this->setUpShipping($this->getMultipleShipping());
$this->expected = array('東京都', '沖縄県');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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_保有フラグがOFFの場合_セッション情報を取得する() {
+ public function testGetShippingTemp_保有フラグがOFFの場合_セッション情報を取得する()
+ {
$this->setUpShipping($this->getMultipleShipping());
$this->expected = $this->getMultipleShipping();
@@ -51,7 +55,8 @@
$this->verify('配送情報');
}
- public function testGetShippingTemp_保有フラグがONの場合_商品のある情報のみ取得する() {
+ public function testGetShippingTemp_保有フラグがONの場合_商品のある情報のみ取得する()
+ {
$this->setUpShipping($this->getMultipleShipping());
$this->expected = array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,21 +31,25 @@
* @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_存在しない受注IDを指定した場合_結果が空になる() {
+ public function testGetShippings_存在しない受注IDを指定した場合_結果が空になる()
+ {
$order_id = '100'; // 存在しないID
$this->expected = array();
@@ -55,7 +59,8 @@
$this->verify('配送情報');
}
- public function testGetShippings_存在する受注IDを指定した場合_結果が取得できる() {
+ public function testGetShippings_存在する受注IDを指定した場合_結果が取得できる()
+ {
$order_id = '1';
$this->expected['count'] = 1;
@@ -77,7 +82,8 @@
$this->verify('配送情報');
}
- public function testGetShippings_商品取得フラグをOFFにした場合_結果に商品情報が含まれない() {
+ public function testGetShippings_商品取得フラグをOFFにした場合_結果に商品情報が含まれない()
+ {
$order_id = '1';
$this->expected['count'] = 1;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,60 +31,70 @@
* @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_新規注文の場合_FALSEが返る() {
+ public function testIsAddPoint_新規注文の場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isAddPoint(ORDER_NEW);
$this->verify('ポイント加算するかどうか');
}
- public function testIsAddPoint_入金待ちの場合_FALSEが返る() {
+ public function testIsAddPoint_入金待ちの場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PAY_WAIT);
$this->verify('ポイント加算するかどうか');
}
- public function testIsAddPoint_入金済みの場合_FALSEが返る() {
+ public function testIsAddPoint_入金済みの場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PRE_END);
$this->verify('ポイント加算するかどうか');
}
- public function testIsAddPoint_キャンセルの場合_FALSEが返る() {
+ public function testIsAddPoint_キャンセルの場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isAddPoint(ORDER_CANCEL);
$this->verify('ポイント加算するかどうか');
}
- public function testIsAddPoint_取り寄せ中の場合_FALSEが返る() {
+ public function testIsAddPoint_取り寄せ中の場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isAddPoint(ORDER_BACK_ORDER);
$this->verify('ポイント加算するかどうか');
}
- public function testIsAddPoint_発送済みの場合_TRUEが返る() {
+ public function testIsAddPoint_発送済みの場合_TRUEが返る()
+ {
$this->expected = TRUE;
$this->actual = SC_Helper_Purchase::isAddPoint(ORDER_DELIV);
$this->verify('ポイント加算するかどうか');
}
- public function testIsAddPoint_その他の場合_FALSEが返る() {
+ public function testIsAddPoint_その他の場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isAddPoint(ORDER_PENDING);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,25 +31,30 @@
* @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_ステータスがnullの場合_FALSEが返る() {
+ public function testIsUsePoint_ステータスがnullの場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isUsePoint(null);
$this->verify('ポイントを使用するかどうか');
}
- public function testIsUsePoint_ステータスがキャンセルの場合_FALSEが返る() {
+ public function testIsUsePoint_ステータスがキャンセルの場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Helper_Purchase::isUsePoint(ORDER_CANCEL);
@@ -57,7 +62,8 @@
}
// TODO 要確認：本当にキャンセルのとき以外はすべてTRUEで良いのか、現在の使われ方の都合か
- public function testIsUsePoint_ステータスがキャンセル以外の場合_TRUEが返る() {
+ public function testIsUsePoint_ステータスがキャンセル以外の場合_TRUEが返る()
+ {
$this->expected = TRUE;
$this->actual = SC_Helper_Purchase::isUsePoint(ORDER_NEW);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,21 +32,25 @@
* @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_不要な変数が含まれている場合_登録前に除外される() {
+ public function testRegisterOrderComplete_不要な変数が含まれている場合_登録前に除外される()
+ {
// 引数の準備
$orderParams = array(
'order_id' => '1001',
@@ -93,7 +97,8 @@
$this->verify();
}
- public function testRegisterOrderComplete_ステータスの指定がない場合_新規受付扱いとなる() {
+ public function testRegisterOrderComplete_ステータスの指定がない場合_新規受付扱いとなる()
+ {
// 引数の準備
$orderParams = array(
'order_id' => '1001',
@@ -123,9 +128,11 @@
}
-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'],
@@ -133,20 +140,24 @@
);
}
- 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
+{
// カートの内容を取得
- function getCartList($cartKey) {
+ function getCartList($cartKey)
+ {
return array(
array(
'productsClass' => array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,19 +30,23 @@
* @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_該当の受注が存在する場合_削除後に新しい情報が登録される() {
+ public function testRegisterOrderDetail_該当の受注が存在する場合_削除後に新しい情報が登録される()
+ {
$params = array(
array(
'order_id' => '1001',
@@ -75,7 +79,8 @@
$this->verify();
}
- public function testRegisterOrderDetail_該当の受注が存在しない場合_新しい情報が追加登録される() {
+ public function testRegisterOrderDetail_該当の受注が存在しない場合_新しい情報が追加登録される()
+ {
$params = array(
array(
'order_id' => '1003',
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,22 +31,26 @@
* @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_既に受注IDが存在する場合_情報が更新される() {
+ public function testRegisterOrder_既に受注IDが存在する場合_情報が更新される()
+ {
$order_id = '1001';
$arrParams = array(
'status' => '1',
@@ -88,7 +92,8 @@
$this->verify();
}
- public function testRegisterOrder_存在しない受注IDを指定した場合_新規に登録される() {
+ public function testRegisterOrder_存在しない受注IDを指定した場合_新規に登録される()
+ {
$order_id = '1003';
$arrParams = array(
'customer_id' => '1003',
@@ -131,7 +136,8 @@
$this->verify();
}
- public function testRegisterOrder_受注IDが未指定の場合_新たにIDが発行される() {
+ public function testRegisterOrder_受注IDが未指定の場合_新たにIDが発行される()
+ {
$order_id = '';
$arrParams = array( // 顧客IDも未指定
'status' => '2',
@@ -181,8 +187,10 @@
}
-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,
@@ -191,7 +199,8 @@
);
}
- function sfUpdateOrderNameCol($order_id) {
+ function sfUpdateOrderNameCol($order_id)
+ {
$_SESSION['testResult']['sfUpdateOrderNameCol'] = $order_id;
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_製品クラスIDが入っていない場合_登録を行わない() {
+ public function testRegisterShipmentItem_製品クラスIDが入っていない場合_登録を行わない()
+ {
// 引数の設定
$order_id = '1';
$shipping_id = '1';
@@ -74,7 +78,8 @@
$this->verify('登録された配送商品情報');
}
- public function testRegisterShipmentItem_製品名等が指定されている場合_指定された値で登録を行う() {
+ public function testRegisterShipmentItem_製品名等が指定されている場合_指定された値で登録を行う()
+ {
// 引数の設定
$order_id = '1';
$shipping_id = '1';
@@ -114,7 +119,8 @@
$this->verify('登録された配送商品情報');
}
- public function testRegisterShipmentItem_製品名等が指定されていない場合_DBからマスタ情報を取得して登録を行う() {
+ public function testRegisterShipmentItem_製品名等が指定されていない場合_DBからマスタ情報を取得して登録を行う()
+ {
// 引数の設定
$order_id = '1';
$shipping_id = '1';
@@ -157,7 +163,8 @@
}
- public function testRegisterShipmentItem_DBに存在しないカラムを指定した場合_エラーなく登録できる() {
+ public function testRegisterShipmentItem_DBに存在しないカラムを指定した場合_エラーなく登録できる()
+ {
// 引数の設定
$order_id = '1';
$shipping_id = '1';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_元々存在しない受注IDの場合_新規にデータが作られる() {
+ public function testRegisterShipping_元々存在しない受注IDの場合_新規にデータが作られる()
+ {
$order_id = '10';
$arrParams = array(
'20' =>
@@ -80,7 +84,8 @@
$this->assertNotNull($this->result[0]['update_date']);
}
- public function testRegisterShipping_元々存在する受注IDの場合_既存のデータが置き換えられる() {
+ public function testRegisterShipping_元々存在する受注IDの場合_既存のデータが置き換えられる()
+ {
$order_id = '2';
$arrParams = array(
'30' =>
@@ -117,7 +122,8 @@
$this->assertNotNull($this->result[0]['update_date']);
}
- public function testRegisterShipping_配送日付が空の場合_エラーが起きず変換処理がスキップされる() {
+ public function testRegisterShipping_配送日付が空の場合_エラーが起きず変換処理がスキップされる()
+ {
$order_id = '2';
$arrParams = array(
'30' =>
@@ -154,7 +160,8 @@
$this->assertNotNull($this->result[0]['update_date']);
}
- public function testRegisterShipping_非会員購入の場合_配送IDが設定される() {
+ public function testRegisterShipping_非会員購入の場合_配送IDが設定される()
+ {
$order_id = '2';
$arrParams = array(
'30' =>
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -30,22 +30,26 @@
* @author Hiroko Tamagawa
* @version $Id$
*/
-class SC_Helper_Purchase_rollbackOrderTest extends SC_Helper_Purchase_TestBase {
+class SC_Helper_Purchase_rollbackOrderTest extends SC_Helper_Purchase_TestBase
+{
private $helper;
- protected function setUp() {
+ protected function setUp()
+ {
parent::setUp();
$this->helper = new SC_Helper_Purchase_rollbackOrderMock();
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testRollbackOrder_デフォルトの引数で呼び出した場合_カートの状態をロールバックして元に戻る(){
+ public function testRollbackOrder_デフォルトの引数で呼び出した場合_カートの状態をロールバックして元に戻る()
+ {
$this->objQuery->begin();
$order_id = '1001';
@@ -83,7 +87,8 @@
* 実際にトランザクションを開始したかどうかはテストできないが、
* 問題なく処理が完了することのみ確認
*/
- public function testRollbackOrder_トランザクションが開始していない場合_内部で開始する() {
+ public function testRollbackOrder_トランザクションが開始していない場合_内部で開始する()
+ {
$order_id = '1001';
$uniqid = $this->helper->rollbackOrder($order_id, ORDER_DELIV, true);
@@ -119,10 +124,12 @@
}
-class SC_Helper_Purchase_rollbackOrderMock extends SC_Helper_Purchase {
+class SC_Helper_Purchase_rollbackOrderMock extends SC_Helper_Purchase
+{
public $testResult = array();
- function cancelOrder($order_id, $orderStatus, $is_delete) {
+ function cancelOrder($order_id, $orderStatus, $is_delete)
+ {
$this->testResult['cancelOrder'] = array(
'order_id' => $order_id,
'orderStatus' => $orderStatus,
@@ -130,7 +137,8 @@
);
}
- function getOrderTempByOrderId($order_id) {
+ function getOrderTempByOrderId($order_id)
+ {
$this->testResult['getOrderTempByOrderId'] = array(
'order_id' => $order_id
);
@@ -139,14 +147,16 @@
);
}
- function saveOrderTemp($uniqid, $arrOrderTemp, $objCustomer) {
+ function saveOrderTemp($uniqid, $arrOrderTemp, $objCustomer)
+ {
$this->testResult['saveOrderTemp'] = array(
'uniqid' => $uniqid,
'arrOrderTemp' => $arrOrderTemp
);
}
- function verifyChangeCart($uniqid, $objCartSession) {
+ function verifyChangeCart($uniqid, $objCartSession)
+ {
$this->testResult['verifyChangeCart'] = array(
'uniqid' => $uniqid
);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,21 +31,25 @@
* @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_受注一時情報IDが空の場合_何もしない(){
+ public function testSaveOrderTemp_受注一時情報IDが空の場合_何もしない()
+ {
$this->helper->saveOrderTemp(null,
array(
'customer_id' => '1003',
@@ -60,7 +64,8 @@
$this->verify('件数が変わっていない');
}
- public function testSaveOrderTemp_既存の情報がない場合_情報が新規登録される(){
+ public function testSaveOrderTemp_既存の情報がない場合_情報が新規登録される()
+ {
$this->helper->saveOrderTemp('1003',
array(
'customer_id' => '1003',
@@ -85,7 +90,8 @@
$this->verify('件数が一件増える');
}
- public function testSaveOrderTemp_既存の情報がある場合_情報が更新される(){
+ public function testSaveOrderTemp_既存の情報がある場合_情報が更新される()
+ {
$this->helper->saveOrderTemp('1002',
array(
'customer_id' => '2002',
@@ -110,7 +116,8 @@
$this->verify('件数が変わらず更新される');
}
- public function testSaveOrderTemp_注文者情報がある場合_情報がコピーされる(){
+ public function testSaveOrderTemp_注文者情報がある場合_情報がコピーされる()
+ {
$this->helper->saveOrderTemp('1003',
array(
'order_temp_id' => '1003',
@@ -134,8 +141,10 @@
}
-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');
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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_元々存在しない配送先IDの場合_新規に配列が作られる() {
+ public function testSaveShippingTemp_元々存在しない配送先IDの場合_新規に配列が作られる()
+ {
$this->setUpShipping($this->getMultipleShipping());
SC_Helper_Purchase::saveShippingTemp(
@@ -63,7 +67,8 @@
$this->verify('登録した配送情報');
}
- public function testSaveShippingTemp_元々存在する配送先IDの場合_情報がマージされる() {
+ public function testSaveShippingTemp_元々存在する配送先IDの場合_情報がマージされる()
+ {
$this->setUpShipping($this->getMultipleShipping());
SC_Helper_Purchase::saveShippingTemp(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_販売価格が0円の場合_フラグがONになる() {
+ public function testSetDownloadableFlgTo_販売価格が0円の場合_フラグがONになる()
+ {
$input = array(
'1001' => array('price' => 0)
);
@@ -55,7 +59,8 @@
$this->verify('ダウンロード可能フラグ設定結果');
}
- public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日ありの場合_フラグがONになる() {
+ public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日ありの場合_フラグがONになる()
+ {
$input = array(
'1001' => array('price' => 1000, 'effective' => '1', 'payment_date' => '2012-12-12')
);
@@ -67,7 +72,8 @@
$this->verify('ダウンロード可能フラグ設定結果');
}
- public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日なしの場合_フラグがOFFになる() {
+ public function testSetDownloadableFlgTo_ダウンロード期限内かつ入金日なしの場合_フラグがOFFになる()
+ {
$input = array(
'1001' => array('price' => 1000, 'effective' => '1', 'payment_date' => null)
);
@@ -79,7 +85,8 @@
$this->verify('ダウンロード可能フラグ設定結果');
}
- public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日ありの場合_フラグがOFFになる() {
+ public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日ありの場合_フラグがOFFになる()
+ {
$input = array(
'1001' => array('price' => 1000, 'effective' => '0', 'payment_date' => '2012-12-12')
);
@@ -91,7 +98,8 @@
$this->verify('ダウンロード可能フラグ設定結果');
}
- public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日なしの場合_フラグがOFFになる() {
+ public function testSetDownloadableFlgTo_ダウンロード期限外かつ入金日なしの場合_フラグがOFFになる()
+ {
$input = array(
'1001' => array('price' => 1000, 'effective' => '0', 'payment_date' => null)
);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,20 +31,24 @@
* @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__いったん配送情報がクリアされたあと改めて指定のものが設定される() {
+ public function testSetShipmentItemTempForSole__いったん配送情報がクリアされたあと改めて指定のものが設定される()
+ {
$helper = new SC_Helper_Purchase_setShipmentItemTempForSoleMock();
$cartSession = new SC_CartSession_setShipmentItemTempForSoleMock();
$shipping_id = '1001';
@@ -67,19 +71,24 @@
}
-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'),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,10 +31,12 @@
* @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();
@@ -45,12 +47,14 @@
$this->helper = new SC_Helper_Purchase();
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testSetShipmentItemTemp_製品情報が既に存在する場合_存在する情報が価格に反映される() {
+ public function testSetShipmentItemTemp_製品情報が既に存在する場合_存在する情報が価格に反映される()
+ {
$this->helper->setShipmentItemTemp('1001', '1001', 10);
$this->expected = array(
@@ -66,7 +70,8 @@
$this->verify();
}
- public function testSetShipmentItemTemp_製品情報が存在しない場合_DBから取得した値が反映される() {
+ public function testSetShipmentItemTemp_製品情報が存在しない場合_DBから取得した値が反映される()
+ {
$this->helper->setShipmentItemTemp('1001', '1002', 10);
$this->expected = array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,10 +31,12 @@
* @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();
@@ -46,12 +48,14 @@
$this->helper = new SC_Helper_Purchase();
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testSfUpdateOrderNameCol_TEMPフラグがOFFの場合_受注テーブルと発送テーブルが更新される() {
+ public function testSfUpdateOrderNameCol_TEMPフラグがOFFの場合_受注テーブルと発送テーブルが更新される()
+ {
$order_id = '1002';
$this->helper->sfUpdateOrderNameCol($order_id);
@@ -72,7 +76,8 @@
$this->verify();
}
- public function testSfUpdateOrderNameCol_TEMPフラグがONの場合_一時テーブルが更新される() {
+ public function testSfUpdateOrderNameCol_TEMPフラグがONの場合_一時テーブルが更新される()
+ {
$order_id = '1002';
$this->helper->sfUpdateOrderNameCol($order_id, true);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,24 +31,28 @@
* @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();
}
/////////////////////////////////////////
// オプションの引数：対応状況、使用ポイント、加算ポイント
- public function testSfUpdateOrderStatus_オプションの引数が未指定の場合_DBの値が引き継がれる() {
+ public function testSfUpdateOrderStatus_オプションの引数が未指定の場合_DBの値が引き継がれる()
+ {
$order_id = '1001';
$old_update_date = $this->objQuery->get('update_date', 'dtb_order', 'order_id = ?', array($order_id));
@@ -80,14 +84,16 @@
// TODO 定数を変更できないためテスト不可
/**
- public function testSfUpdateOrderStatus_ポイント使用しない設定の場合_ポイントに関する処理が行われない() {
+ public function testSfUpdateOrderStatus_ポイント使用しない設定の場合_ポイントに関する処理が行われない()
+ {
$this->verify();
}
*/
- public function testSfUpdateOrderStatus_対応状況が発送済みに変更された場合_発送日が更新される() {
+ public function testSfUpdateOrderStatus_対応状況が発送済みに変更された場合_発送日が更新される()
+ {
$order_id = '1001';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -123,7 +129,8 @@
$this->assertUpdate($new_dates, $old_dates, 'payment_date', '入金日', false);
}
- public function testSfUpdateOrderStatus_対応状況が入金済みに変更された場合_入金日が更新される() {
+ public function testSfUpdateOrderStatus_対応状況が入金済みに変更された場合_入金日が更新される()
+ {
$order_id = '1002';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -154,7 +161,8 @@
$this->assertUpdate($new_dates, $old_dates, 'payment_date', '入金日');
}
- public function testSfUpdateOrderStatus_変更前の対応状況が利用対象の場合_変更前の使用ポイントを戻す() {
+ public function testSfUpdateOrderStatus_変更前の対応状況が利用対象の場合_変更前の使用ポイントを戻す()
+ {
$order_id = '1002';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -182,7 +190,8 @@
$this->verify();
}
- public function testSfUpdateOrderStatus_変更後の対応状況が利用対象の場合_変更後の使用ポイントを引く() {
+ public function testSfUpdateOrderStatus_変更後の対応状況が利用対象の場合_変更後の使用ポイントを引く()
+ {
$order_id = '1001';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -209,7 +218,8 @@
$this->verify();
}
- public function testSfUpdateOrderStatus_変更前の対応状況が加算対象の場合_変更前の加算ポイントを戻す() {
+ public function testSfUpdateOrderStatus_変更前の対応状況が加算対象の場合_変更前の加算ポイントを戻す()
+ {
$order_id = '1002';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -237,7 +247,8 @@
$this->verify();
}
- public function testSfUpdateOrderStatus_変更後の対応状況が加算対象の場合_変更後の加算ポイントを足す() {
+ public function testSfUpdateOrderStatus_変更後の対応状況が加算対象の場合_変更後の加算ポイントを足す()
+ {
$order_id = '1001';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -264,7 +275,8 @@
$this->verify();
}
- public function testSfUpdateOrderStatus_加算ポイントがプラスの場合_会員テーブルが更新される() {
+ public function testSfUpdateOrderStatus_加算ポイントがプラスの場合_会員テーブルが更新される()
+ {
$order_id = '1001';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -293,7 +305,8 @@
$this->verify();
}
- public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りている場合_会員テーブルが更新される() {
+ public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りている場合_会員テーブルが更新される()
+ {
$order_id = '1001';
$old_dates = $this->objQuery->select(
'update_date, commit_date, payment_date',
@@ -324,13 +337,15 @@
// TODO ロールバックされる場合はexitするためテスト不可.
/**
- public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りていない場合_会員テーブルがロールバックされエラーとなる() {
+ public function testSfUpdateOrderStatus_加算ポイントが負でポイントが足りていない場合_会員テーブルがロールバックされエラーとなる()
+ {
}
*/
//////////////////////////////////////////
- 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';
@@ -344,19 +359,22 @@
}
}
-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);
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,9 +31,11 @@
* @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();
// 空にするだけなので適当な値を設定
@@ -41,12 +43,14 @@
$_SESSION['multiple_temp'] = 'temp02';
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testUnsetAllShippingTemp_複数配送も破棄するフラグがOFFの場合_情報の一部が破棄される() {
+ public function testUnsetAllShippingTemp_複数配送も破棄するフラグがOFFの場合_情報の一部が破棄される()
+ {
SC_Helper_Purchase::unsetAllShippingTemp();
$this->expected = array('shipping'=>TRUE, 'multiple_temp'=>FALSE);
@@ -56,7 +60,8 @@
$this->verify('セッション情報が空かどうか');
}
- public function testUnsetAllShippingTemp_複数配送も破棄するフラグがONの場合_全ての情報が破棄される() {
+ public function testUnsetAllShippingTemp_複数配送も破棄するフラグがONの場合_全ての情報が破棄される()
+ {
SC_Helper_Purchase::unsetAllShippingTemp(TRUE);
$this->expected = array('shipping'=>TRUE, 'multiple_temp'=>TRUE);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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__指定したIDの配送情報のみが破棄される() {
+ public function testUnsetOneShippingTemp__指定したIDの配送情報のみが破棄される()
+ {
$this->setUpShipping($this->getMultipleShipping());
SC_Helper_Purchase::unsetOneShippingTemp('00002');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,9 +31,11 @@
* @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();
// 空にするだけなので適当な値を設定
@@ -41,12 +43,14 @@
$_SESSION['multiple_temp'] = 'temp02';
}
- protected function tearDown() {
+ protected function tearDown()
+ {
parent::tearDown();
}
/////////////////////////////////////////
- public function testUnsetShippingTemp__配送情報がすべて破棄される() {
+ public function testUnsetShippingTemp__配送情報がすべて破棄される()
+ {
SC_Helper_Purchase::unsetShippingTemp(TRUE);
$this->expected = array('shipping'=>TRUE, 'multiple_temp'=>TRUE);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -3,7 +3,8 @@
/**
* テスト用にSC_Displayクラスを変更してユーザエージェントを自在に設定できるようにしたクラスです。
*/
-class SC_Display_Ex extends SC_Display {
+class SC_Display_Ex extends SC_Display
+{
/** テスト用に設定した端末種別 */
static $dummyDevice = DEVICE_TYPE_PC;
@@ -14,7 +15,8 @@
* @param $reset boolean
* @return integer 端末種別ID
*/
- public static function detectDevice($reset = FALSE) {
+ public static function detectDevice($reset = FALSE)
+ {
return self::$dummyDevice;
}
@@ -24,7 +26,8 @@
* @static
* @param $deviceType 端末種別ID
*/
- public static function setDummyDevice($deviceType) {
+ public static function setDummyDevice($deviceType)
+ {
self::$dummyDevice = $deviceType;
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -3,7 +3,8 @@
/**
* テスト用にexitしないSC_Responseクラスです。
*/
-class SC_Response_Ex extends SC_Response {
+class SC_Response_Ex extends SC_Response
+{
/** exitしたかどうかを保持するフラグ */
var $exited = FALSE;
@@ -13,7 +14,8 @@
/**
* SC_Response::actionExit()をラップし、PHPをexitさせないようにします。
*/
- function actionExit() {
+ function actionExit()
+ {
$this->exited = TRUE;
}
@@ -21,7 +23,8 @@
* SC_Response::sendRedirect()をラップし、PHPをexitさせないようにします。
* また、リダイレクト先のパスを取得できるようにします。
*/
- function sendRedirect($location, $arrQueryString = array(), $inheritQuerySring = false, $useSsl = null) {
+ function sendRedirect($location, $arrQueryString = array(), $inheritQuerySring = false, $useSsl = null)
+ {
$this->exited = TRUE;
$this->redirectPath = $location;
}
@@ -29,14 +32,16 @@
/**
* actionExit()が呼ばれたかどうかを取得します。
*/
- public function isExited() {
+ public function isExited()
+ {
return $this->exited;
}
/**
* sendRedirect()で指定されたパスを取得します。
*/
- public function getRedirectPath() {
+ public function getRedirectPath()
+ {
return $this->redirectPath;
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/test/util/Test_Utils.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -28,7 +28,8 @@
* @author Hiroko Tamagawa
* @version $Id$
*/
-class Test_Utils {
+class Test_Utils
+{
/**
* 連想配列から指定されたキーだけを抜き出したものを返します.
@@ -39,7 +40,8 @@
* @param map_keys 出力結果に入れたいキーを配列で指定します
* @return 指定したキーのみを持つ連想配列
*/
- 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];
@@ -57,7 +59,8 @@
* @param key 抽出対象のキー
* @return 指定のキーだけを抜き出した配列
*/
- 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];
@@ -74,7 +77,8 @@
* @param orig_array 追加先の配列
* @param new_array 追加要素を持つ配列
*/
- 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;
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/test/util/User_Utils.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -4,7 +4,8 @@
* ユーザの状態をテストに合わせて変化させるユーティリティクラスです。
*
*/
-class User_Utils {
+class User_Utils
+{
/**
* 端末種別を設定します。
@@ -12,7 +13,8 @@
* @static
* @param deviceType 端末種別ID
*/
- public static function setDeviceType($deviceType) {
+ public static function setDeviceType($deviceType)
+ {
SC_Display_Ex::setDummyDevice($deviceType);
}
@@ -22,7 +24,8 @@
* @static
* @param isLogin true:ログインしている、false:ログインしていない
*/
- 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;
@@ -38,7 +41,8 @@
/**
* ユーザ情報を外部から設定しなかった場合のデフォルト値を取得します。
*/
- private static function getDefaultCustomer() {
+ private static function getDefaultCustomer()
+ {
$arrValue['customer_id'] = '999999998';
$arrValue['name01'] = '苗字';
$arrValue['name02'] = '名前';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_チェック対象のキーがすべて存在する場合_配列に変化がない() {
+ public function testArrayDefineIndexes_チェック対象のキーがすべて存在する場合_配列に変化がない()
+ {
$input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
$defineIndexes = array('banana', 'orange');
@@ -53,7 +57,8 @@
$this->verify();
}
- public function testArrayDefineIndexes_チェック対象のキーが一部存在しない場合_配列に追加される() {
+ public function testArrayDefineIndexes_チェック対象のキーが一部存在しない場合_配列に追加される()
+ {
$input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
$defineIndexes = array('tomato', 'banana', 'kiwi');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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__コンパイル済みのファイルを配置するディレクトリが空になる() {
+ public function test__コンパイル済みのファイルを配置するディレクトリが空になる()
+ {
SC_Utils::clearCompliedTemplate();
$this->expected = array();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,23 +31,27 @@
* @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_存在するパスの場合_指定したパス以下が再帰的にコピーされる() {
+ public function testCopyDirectory_存在するパスの場合_指定したパス以下が再帰的にコピーされる()
+ {
/**
* tests/tmp/src
* /dir10
@@ -73,7 +77,8 @@
$this->verify('コピーされたファイル一覧');
}
- public function testCopyDirectory_存在しないパスの場合_何も起こらない() {
+ public function testCopyDirectory_存在しないパスの場合_何も起こらない()
+ {
/**
* tests/tmp/src
* /dir10
@@ -91,7 +96,8 @@
$this->verify('コピーされたファイル一覧');
}
- public function testCopyDirectory_コピー先のディレクトリが元々存在する場合_上書きされる() {
+ public function testCopyDirectory_コピー先のディレクトリが元々存在する場合_上書きされる()
+ {
/**
* tests/tmp/src
* /dir10
@@ -119,7 +125,8 @@
}
- public function testCopyDirectory_コピー先のファイルが元々存在する場合_上書きされる() {
+ public function testCopyDirectory_コピー先のファイルが元々存在する場合_上書きされる()
+ {
/**
* tests/tmp/src
* /dir10
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_チルダが含まれる場合_エンコードされない() {
+ public function testEncodeRFC3986_チルダが含まれる場合_エンコードされない()
+ {
$input = 'http://www.example.co.jp/~';
$this->expected = 'http%3A%2F%2Fwww.example.co.jp%2F~';
$this->actual = SC_Utils::encodeRFC3986($input);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_必須キー指定がない場合_値のみの配列が返る() {
+ public function testGetHash2Array_必須キー指定がない場合_値のみの配列が返る()
+ {
$input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
$this->expected = array('りんご', 'バナナ', 'オレンジ');
$this->actual = SC_Utils::getHash2Array($input_array);
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testGetHash2Array_必須キー指定がある場合_指定キーの値のみの配列が返る() {
+ public function testGetHash2Array_必須キー指定がある場合_指定キーの値のみの配列が返る()
+ {
$input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
$requires = array('banana', 'apple');
$this->expected = array('りんご', 'バナナ');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,20 +31,24 @@
* @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 ポート番号のためのコロンが必ず入ってしまうのはOK?
- public function testGetRealURL_親ディレクトリへの参照を含む場合_正しくパースできる() {
+ public function testGetRealURL_親ディレクトリへの参照を含む場合_正しくパースできる()
+ {
$input = 'http://www.example.jp/aaa/../index.php';
$this->expected = 'http://www.example.jp:/index.php';
$this->actual = SC_Utils::getRealURL($input);
@@ -52,7 +56,8 @@
$this->verify();
}
- public function testGetRealURL_親ディレクトリへの参照を複数回含む場合_正しくパースできる() {
+ public function testGetRealURL_親ディレクトリへの参照を複数回含む場合_正しくパースできる()
+ {
$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);
@@ -60,7 +65,8 @@
$this->verify();
}
- public function testGetRealURL_カレントディレクトリへの参照を含む場合_正しくパースできる() {
+ public function testGetRealURL_カレントディレクトリへの参照を含む場合_正しくパースできる()
+ {
$input = 'http://www.example.jp/aaa/./index.php';
$this->expected = 'http://www.example.jp:/aaa/index.php';
$this->actual = SC_Utils::getRealURL($input);
@@ -68,7 +74,8 @@
$this->verify();
}
- public function testGetRealURL_httpsの場合_正しくパースできる() {
+ public function testGetRealURL_httpsの場合_正しくパースできる()
+ {
$input = 'https://www.example.jp/aaa/./index.php';
$this->expected = 'https://www.example.jp:/aaa/index.php';
$this->actual = SC_Utils::getRealURL($input);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_絶対パスの場合_trueが返る() {
+ public function testIsAbsoluteRealPath_絶対パスの場合_trueが返る()
+ {
if (strpos(PHP_OS, 'WIN')) {
$input = 'C:/Program Files/username/hoge/hoge.txt';
@@ -56,7 +60,8 @@
$this->verify();
}
- public function testIsAbsoluteRealPath_相対パスの場合_trueが返る() {
+ public function testIsAbsoluteRealPath_相対パスの場合_trueが返る()
+ {
if (strpos(PHP_OS, 'WIN')) {
$input = './system32/hoge/hoge.txt';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -34,20 +34,24 @@
* @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_非SSLかつアプリ内URLの場合_trueが返る() {
+ public function testIsAppInnerUrl_非SSLかつアプリ内URLの場合_trueが返る()
+ {
$input = 'http://sample.eccube.jp/admin/';
$this->expected = true;
$this->actual = SC_Utils::isAppInnerUrl($input);
@@ -55,7 +59,8 @@
$this->verify();
}
- public function testIsAppInnerUrl_非SSLかつアプリ外URLの場合_falseが返る() {
+ public function testIsAppInnerUrl_非SSLかつアプリ外URLの場合_falseが返る()
+ {
$input = 'http://outside.eccube.jp/admin/';
$this->expected = false;
$this->actual = SC_Utils::isAppInnerUrl($input);
@@ -63,7 +68,8 @@
$this->verify();
}
- public function testIsAppInnerUrl_SSLかつアプリ内URLの場合_trueが返る() {
+ public function testIsAppInnerUrl_SSLかつアプリ内URLの場合_trueが返る()
+ {
$input = 'https://sample.eccube.jp/admin/';
$this->expected = true;
$this->actual = SC_Utils::isAppInnerUrl($input);
@@ -71,7 +77,8 @@
$this->verify();
}
- public function testIsAppInnerUrl_SSLかつアプリ外URLの場合_falseが返る() {
+ public function testIsAppInnerUrl_SSLかつアプリ外URLの場合_falseが返る()
+ {
$input = 'https://outside.eccube.jp/admin/';
$this->expected = false;
$this->actual = SC_Utils::isAppInnerUrl($input);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,94 +31,113 @@
* @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バイト文字列の場合_trueが返る() {
+ public function testIsBlank_0バイト文字列の場合_trueが返る()
+ {
$input = '';
$this->assertTrue(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_全角スペースの場合_trueが返る() {
+ public function testIsBlank_全角スペースの場合_trueが返る()
+ {
$input = ' ';
$this->assertTrue(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_greedy指定なしで全角スペースの場合_falseが返る() {
+ public function testIsBlank_greedy指定なしで全角スペースの場合_falseが返る()
+ {
$input = ' ';
$this->assertFalse(SC_Utils::isBlank($input, false), $input);
}
- public function testIsBlank_空の配列の場合_trueが返る() {
+ public function testIsBlank_空の配列の場合_trueが返る()
+ {
$input = array();
$this->assertTrue(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_ネストした配列の場合_trueが返る() {
+ public function testIsBlank_ネストした配列の場合_trueが返る()
+ {
$input = array(array(array()));
$this->assertTrue(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_greedy指定なしでネストした配列の場合_falseが返る() {
+ public function testIsBlank_greedy指定なしでネストした配列の場合_falseが返る()
+ {
$input = array(array(array()));
$this->assertFalse(SC_Utils::isBlank($input, false), $input);
}
- public function testIsBlank_空でない配列の場合_falseが返る() {
+ public function testIsBlank_空でない配列の場合_falseが返る()
+ {
$input = array(array(array('1')));
$this->assertFalse(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_greedy指定なしで空でない配列の場合_falseが返る() {
+ public function testIsBlank_greedy指定なしで空でない配列の場合_falseが返る()
+ {
$input = array(array(array('1')));
$this->assertFalse(SC_Utils::isBlank($input, false), $input);
}
- public function testIsBlank_全角スペースと空白の組み合わせの場合_trueが返る() {
+ public function testIsBlank_全角スペースと空白の組み合わせの場合_trueが返る()
+ {
$input = " \n ";
$this->assertTrue(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_greedy指定なしで全角スペースと空白の組み合わせの場合_falseが返る() {
+ public function testIsBlank_greedy指定なしで全角スペースと空白の組み合わせの場合_falseが返る()
+ {
$input = " \n ";
$this->assertFalse(SC_Utils::isBlank($input, false), $input);
}
- public function testIsBlank_全角スペースと非空白の組み合わせの場合_falseが返る() {
+ public function testIsBlank_全角スペースと非空白の組み合わせの場合_falseが返る()
+ {
$input = ' A ';
$this->assertFalse(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_greedy指定なしで全角スペースと非空白の組み合わせの場合_falseが返る() {
+ public function testIsBlank_greedy指定なしで全角スペースと非空白の組み合わせの場合_falseが返る()
+ {
$input = ' A ';
$this->assertFalse(SC_Utils::isBlank($input, false), $input);
}
- public function testIsBlank_数値のゼロを入力した場合_falseが返る() {
+ public function testIsBlank_数値のゼロを入力した場合_falseが返る()
+ {
$input = 0;
$this->assertFalse(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_値が空の配列を入力した場合_trueが返る() {
+ public function testIsBlank_値が空の配列を入力した場合_trueが返る()
+ {
$input = array("");
$this->assertTrue(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_すべてのホワイトスペースを並べた場合_trueが返る() {
+ public function testIsBlank_すべてのホワイトスペースを並べた場合_trueが返る()
+ {
$input = " \t \n\r\x0B\0";
$this->assertTrue(SC_Utils::isBlank($input), $input);
}
- public function testIsBlank_通常の文字が含まれている場合_falseが返る() {
+ public function testIsBlank_通常の文字が含まれている場合_falseが返る()
+ {
$input = " AB \n\t";
$this->assertFalse(SC_Utils::isBlank($input), $input);
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_ドメインが一致する場合_trueが返る() {
+ public function testsfIsInternalDomain_ドメインが一致する場合_trueが返る()
+ {
$url = 'http://test.local/html/index.php';
$this->expected = TRUE;
$this->actual = SC_Utils::sfIsInternalDomain($url);
@@ -51,7 +55,8 @@
$this->verify($url);
}
- public function testsfIsInternalDomain_アンカーを含むURLの場合_trueが返る() {
+ public function testsfIsInternalDomain_アンカーを含むURLの場合_trueが返る()
+ {
$url = 'http://test.local/html/index.php#hoge';
$this->expected = TRUE;
$this->actual = SC_Utils::sfIsInternalDomain($url);
@@ -59,7 +64,8 @@
$this->verify($url);
}
- public function testsfIsInternalDomain_ドメインが一致しない場合_falseが返る() {
+ public function testsfIsInternalDomain_ドメインが一致しない場合_falseが返る()
+ {
$url = 'http://test.local.jp/html/index.php';
$this->expected = TRUE;
$this->actual = SC_Utils::sfIsInternalDomain($url);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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形式にエンコードされた文字列からarrayに変換される() {
+ public function testJsonDecode__JSON形式にエンコードされた文字列からarrayに変換される()
+ {
$input = '{"a":1,"b":2,"c":3,"d":4,"e":5}';
$obj = new stdClass;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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形式にエンコードされた文字列が返る() {
+ public function testJsonEncode__JSON形式にエンコードされた文字列が返る()
+ {
$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);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,23 +31,27 @@
* @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_パーミッションを指定した場合_指定のパーミッションでディレクトリが作られる() {
+ public function testRecursiveMkdir_パーミッションを指定した場合_指定のパーミッションでディレクトリが作られる()
+ {
$path = realpath(dirname(__FILE__)) . "/../../../tmp/dir1/dir2/dir3/";
$mode = 0755;
@@ -58,7 +62,8 @@
$this->verify('作成したディレクトリのパーミッション');
}
- public function testRecursiveMkdir_パーミッションを指定しない場合_0777でディレクトリが作られる() {
+ public function testRecursiveMkdir_パーミッションを指定しない場合_0777でディレクトリが作られる()
+ {
$path = realpath(dirname(__FILE__)) . "/../../../tmp/dir1/dir2/dir3/";
$result = SC_Utils::recursiveMkdir($path);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,39 +31,46 @@
* @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_反復回数が0回の場合_結果が0バイト文字列になる() {
+ public function testRepeatStrWithSeparator_反復回数が0回の場合_結果が0バイト文字列になる()
+ {
$this->expected = '';
$this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 0, '#');
$this->verify('連結済みの文字列');
}
- public function testRepeatStrWithSeparator_反復回数が1回の場合_区切り文字が入らない() {
+ public function testRepeatStrWithSeparator_反復回数が1回の場合_区切り文字が入らない()
+ {
$this->expected = 'ECサイト';
$this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 1, '#');
$this->verify('連結済みの文字列');
}
- public function testRepeatStrWithSeparator_反復回数が2回以上の場合_区切り文字が入って出力される() {
+ public function testRepeatStrWithSeparator_反復回数が2回以上の場合_区切り文字が入って出力される()
+ {
$this->expected = 'ECサイト#ECサイト#ECサイト#ECサイト#ECサイト';
$this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 5, '#');
$this->verify('連結済みの文字列');
}
- public function testRepeatStrWithSeparator_区切り文字が未指定の場合_カンマ区切りとなる() {
+ public function testRepeatStrWithSeparator_区切り文字が未指定の場合_カンマ区切りとなる()
+ {
$this->expected = 'ECサイト,ECサイト,ECサイト';
$this->actual = SC_Utils::repeatStrWithSeparator('ECサイト', 3);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_入力の配列が空の場合_結果も空になる() {
+ public function testSfArrCombine_入力の配列が空の場合_結果も空になる()
+ {
$keys = array();
$values = array();
@@ -54,7 +58,8 @@
}
// TODO 要確認 キーの方が短い場合はエラーで良いのでは？
- public function testSfArrCombine_入力のキー配列の方が短い場合_余った値の配列の要素は無視される() {
+ public function testSfArrCombine_入力のキー配列の方が短い場合_余った値の配列の要素は無視される()
+ {
$keys = array('apple', 'banana');
$values = array('りんご', 'バナナ', 'オレンジ', '梨');
@@ -68,7 +73,8 @@
$this->verify();
}
- public function testSfArrCombine_入力のキー配列の方が長い場合_余ったキーの配列の要素は空になる() {
+ public function testSfArrCombine_入力のキー配列の方が長い場合_余ったキーの配列の要素は空になる()
+ {
$keys = array('apple', 'banana', 'orange', 'pear');
$values = array('りんご', 'バナナ');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,13 +31,15 @@
* @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(
@@ -50,12 +52,14 @@
$this->valuename = 'testvalue';
}
- protected function tearDown() {
+ protected function tearDown()
+ {
// parent::tearDown();
}
/////////////////////////////////////////
- public function testSfArrKeyValue_最大長が配列より短い場合_最大長でカットされる() {
+ public function testSfArrKeyValue_最大長が配列より短い場合_最大長でカットされる()
+ {
$len_max = 3;
$this->expected = array(
@@ -68,7 +72,8 @@
$this->verify();
}
- public function testSfArrKeyValue_最大長が指定されていない場合_全要素が出力される() {
+ public function testSfArrKeyValue_最大長が指定されていない場合_全要素が出力される()
+ {
$this->expected = array(
'1011' => '2001',
'2022' => '2002',
@@ -80,7 +85,8 @@
$this->verify();
}
- public function testSfArrKeyValue_キーサイズが短い場合_キーサイズでカットされる() {
+ public function testSfArrKeyValue_キーサイズが短い場合_キーサイズでカットされる()
+ {
$len_max = 5;
$keysize = 1;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_指定キーに含まれるものがない場合_空の配列が返る() {
+ public function testSfArrayIntersectKeys_指定キーに含まれるものがない場合_空の配列が返る()
+ {
$input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
$key_array = array('kiwi', 'tomato');
@@ -53,7 +57,8 @@
$this->verify();
}
- public function testSfArrayIntersctKeys_指定キーに含まれるものがある場合_含まれるものだけが返る() {
+ public function testSfArrayIntersctKeys_指定キーに含まれるものがある場合_含まれるものだけが返る()
+ {
$input_array = array('apple' => 'りんご', 'banana' => 'バナナ', 'orange' => 'オレンジ');
$key_array = array('orange', 'apple');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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_四捨五入の場合_四捨五入の結果になる() {
+ public function testSfCalcIncTax_四捨五入の場合_四捨五入の結果になる()
+ {
$this->expected = array(141, 152);
$this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 1); // 1:四捨五入
$this->actual[1] = SC_Utils::sfCalcIncTax(150, 1, 1); // 1:四捨五入
@@ -50,7 +54,8 @@
$this->verify('税込価格');
}
- public function testSfCalcIncTax_切り捨ての場合_切り捨ての結果になる() {
+ public function testSfCalcIncTax_切り捨ての場合_切り捨ての結果になる()
+ {
$this->expected = array(142, 153);
$this->actual[0] = SC_Utils::sfCalcIncTax(140, 2, 2); // 2:切り捨て
$this->actual[1] = SC_Utils::sfCalcIncTax(150, 2, 2); // 2:切り捨て
@@ -58,7 +63,8 @@
$this->verify('税込価格');
}
- public function testSfCalcIncTax_切り上げの場合_切り上げの結果になる() {
+ public function testSfCalcIncTax_切り上げの場合_切り上げの結果になる()
+ {
$this->expected = array(142, 152);
$this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 3); // 3:切り上げ
$this->actual[1] = SC_Utils::sfCalcIncTax(150, 1, 3); // 3:切り上げ
@@ -66,7 +72,8 @@
$this->verify('税込価格');
}
- public function testSfCalcIncTax_それ以外の場合_切り上げの結果になる() {
+ public function testSfCalcIncTax_それ以外の場合_切り上げの結果になる()
+ {
$this->expected = array(142, 152);
$this->actual[0] = SC_Utils::sfCalcIncTax(140, 1, 4);
$this->actual[1] = SC_Utils::sfCalcIncTax(150, 1, 4);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,23 +31,27 @@
* @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_ディレクトリでない場合_falseを返し何もしない() {
+ public function testSfCopyDir_ディレクトリでない場合_falseを返し何もしない()
+ {
mkdir(self::$TMP_DIR . "/src", 0777, true);
$fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
fwrite($fp, "hello");
@@ -66,7 +70,8 @@
$this->verify();
}
- public function testSfCopyDir_コピー先のディレクトリが存在しない場合_新たに作成する() {
+ public function testSfCopyDir_コピー先のディレクトリが存在しない場合_新たに作成する()
+ {
mkdir(self::$TMP_DIR . "/src", 0777, true);
$fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
fwrite($fp, "hello");
@@ -88,7 +93,8 @@
// TODO CVS以下のEntriesなどはコピーされないが、CVSという親ディレクトリはコピーされてしまう。
// そもそも、CVSだけ特別扱いする意味がないような…
- public function testSfCopyDir_コピー先のディレクトリが存在する場合_そのままコピーする() {
+ public function testSfCopyDir_コピー先のディレクトリが存在する場合_そのままコピーする()
+ {
mkdir(self::$TMP_DIR . "/src", 0777, true);
mkdir(self::$TMP_DIR . "/dst", 0777, true); // コピー先も作成しておく
$fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
@@ -129,7 +135,8 @@
$this->verify();
}
- public function testSfCopyDir_上書きフラグがONの場合_同名ファイルが上書きされる() {
+ public function testSfCopyDir_上書きフラグがONの場合_同名ファイルが上書きされる()
+ {
mkdir(self::$TMP_DIR . "/src", 0777, true);
mkdir(self::$TMP_DIR . "/dst", 0777, true); // コピー先も作成しておく
$fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
@@ -158,7 +165,8 @@
$this->verify();
}
- public function testSfCopyDir_上書きフラグがONかつ書き込み権限がない場合_同名ファイルが上書きされない() {
+ public function testSfCopyDir_上書きフラグがONかつ書き込み権限がない場合_同名ファイルが上書きされない()
+ {
mkdir(self::$TMP_DIR . "/src", 0777, true);
mkdir(self::$TMP_DIR . "/dst", 0777, true); // コピー先も作成しておく
$fp = fopen(self::$TMP_DIR . "/src/test.txt", "w");
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_マルチバイト指定で指定長より2文字以上長い場合_指定長でカットされる() {
+ public function testSfCutString_マルチバイト指定で指定長より2文字以上長い場合_指定長でカットされる()
+ {
$input = 'あいうえおABC、こんにちは。';
$this->expected = 'あいうえおABC、こんにち...';
$this->actual = SC_Utils::sfCutString($input, 13, false);
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfCutString_マルチバイト指定で指定長より1文字長い場合_カットされない() {
+ public function testSfCutString_マルチバイト指定で指定長より1文字長い場合_カットされない()
+ {
$input = 'あいうえおABC、こんにちは';
$this->expected = 'あいうえおABC、こんにちは';
$this->actual = SC_Utils::sfCutString($input, 13, false);
@@ -59,7 +64,8 @@
$this->verify();
}
- public function testSfCutString_マルチバイト指定で指定長以内の場合_カットされない() {
+ public function testSfCutString_マルチバイト指定で指定長以内の場合_カットされない()
+ {
$input = 'あいうえおABC、こんにち';
$this->expected = 'あいうえおABC、こんにち';
$this->actual = SC_Utils::sfCutString($input, 13, false);
@@ -67,7 +73,8 @@
$this->verify();
}
- public function testSfCutString_1バイト指定で指定長より3文字以上長い場合_指定長でカットされる() {
+ public function testSfCutString_1バイト指定で指定長より3文字以上長い場合_指定長でカットされる()
+ {
$input = 'hello, world!!';
$this->expected = 'hello, worl...';
$this->actual = SC_Utils::sfCutString($input, 11);
@@ -75,7 +82,8 @@
$this->verify();
}
- public function testSfCutString_1バイト指定で指定長より2文字長い場合_カットされない() {
+ public function testSfCutString_1バイト指定で指定長より2文字長い場合_カットされない()
+ {
$input = 'hello, world!';
$this->expected = 'hello, world!';
$this->actual = SC_Utils::sfCutString($input, 11);
@@ -83,7 +91,8 @@
$this->verify();
}
- public function testSfCutString_1バイト指定で指定長より1文字長い場合_カットされない() {
+ public function testSfCutString_1バイト指定で指定長より1文字長い場合_カットされない()
+ {
$input = 'hello, world';
$this->expected = 'hello, world';
$this->actual = SC_Utils::sfCutString($input, 11);
@@ -91,7 +100,8 @@
$this->verify();
}
- public function testSfCutString_1バイト指定で指定長以内の場合_カットされない() {
+ public function testSfCutString_1バイト指定で指定長以内の場合_カットされない()
+ {
$input = 'hello, worl';
$this->expected = 'hello, worl';
$this->actual = SC_Utils::sfCutString($input, 11);
@@ -100,7 +110,8 @@
}
// [までの場合
- public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる1() {
+ public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる1()
+ {
$input = "hello[emoji:135], world.";
$this->expected = 'hello...';
$this->actual = SC_Utils::sfCutString($input, 6);
@@ -109,7 +120,8 @@
}
// ]の直前までの場合
- public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる2() {
+ public function testSfCutString_絵文字を含んでカットされる場合_中途半端な絵文字がカットされる2()
+ {
$input = "hello[emoji:135], world.";
$this->expected = 'hello...';
$this->actual = SC_Utils::sfCutString($input, 15);
@@ -118,7 +130,8 @@
}
// 最初の絵文字の途中
- public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる1() {
+ public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる1()
+ {
$input = "hello[emoji:100][emoji:20], world![emoji:10]";
$this->expected = 'hello...';
$this->actual = SC_Utils::sfCutString($input, 10);
@@ -127,7 +140,8 @@
}
// 2つめの絵文字の途中
- public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる2() {
+ public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる2()
+ {
$input = "hello[emoji:100][emoji:20], world![emoji:10]";
$this->expected = 'hello[emoji:100]...';
$this->actual = SC_Utils::sfCutString($input, 20);
@@ -136,7 +150,8 @@
}
// 3つめの絵文字の途中
- public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる3() {
+ public function testSfCutString_複数の絵文字を含んでいてカットされる場合_中途半端な絵文字がカットされる3()
+ {
$input = "hello[emoji:100][emoji:20], world![emoji:10]";
$this->expected = 'hello[emoji:100][emoji:20], wo...';
$this->actual = SC_Utils::sfCutString($input, 30);
@@ -145,7 +160,8 @@
}
// TODO 要確認 三点リーダ付けない場合は、lenと比較した方が良いのでは？
- public function testSfCutString_三点リーダ付加指定がない場合_付加されない() {
+ public function testSfCutString_三点リーダ付加指定がない場合_付加されない()
+ {
$input = 'hello, world';
$this->expected = 'hello';
$this->actual = SC_Utils::sfCutString($input, 5, true, false);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_時刻にマイクロ秒が含まれている場合_マイクロ秒を無視して変換できる() {
+ public function testSfDbDatetoTime_時刻にマイクロ秒が含まれている場合_マイクロ秒を無視して変換できる()
+ {
$this->expected = mktime(10, 20, 30, 10, 31, 2012);
$this->actual = SC_Utils::sfDbDatetoTime('2012-10-31 10:20:30.000002');
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfDbDatetoTime_時刻にマイクロ秒が含まれていない場合_そのまま変換できる() {
+ public function testSfDbDatetoTime_時刻にマイクロ秒が含まれていない場合_そのまま変換できる()
+ {
$this->expected = mktime(10, 20, 30, 10, 31, 2012);
$this->actual = SC_Utils::sfDbDatetoTime('2012-10-31 10:20:30');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_年が指定されていない場合_0バイト文字列が返る() {
+ public function testSfDispDBDate_年が指定されていない場合_0バイト文字列が返る()
+ {
$dbdate = '-01-23 01:12:24';
$this->expected = '';
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfDispDBDate_月が指定されていない場合_0バイト文字列が返る() {
+ public function testSfDispDBDate_月が指定されていない場合_0バイト文字列が返る()
+ {
$dbdate = '2012--23 01:12:24';
$this->expected = '';
@@ -59,7 +64,8 @@
$this->verify();
}
- public function testSfDispDBDate_日が指定されていない場合_0バイト文字列が返る() {
+ public function testSfDispDBDate_日が指定されていない場合_0バイト文字列が返る()
+ {
$dbdate = '2012-01- 01:12:24';
$this->expected = '';
@@ -67,7 +73,8 @@
$this->verify();
}
- public function testSfDispDBDate_年月日すべて存在する場合_フォーマット済み文字列が返る() {
+ public function testSfDispDBDate_年月日すべて存在する場合_フォーマット済み文字列が返る()
+ {
$dbdate = '2012-1-23 1:12:24';
$this->expected = '2012/01/23 01:12';
@@ -75,7 +82,8 @@
$this->verify();
}
- public function testSfDispDBDate_時刻表示フラグがOFFの場合_時刻なしのフォーマット済み文字列が返る() {
+ public function testSfDispDBDate_時刻表示フラグがOFFの場合_時刻なしのフォーマット済み文字列が返る()
+ {
$dbdate = '2012-1-23 1:12:24';
$this->expected = '2012/01/23';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_ファイルが正常に開けた場合_ファイルがエンコードされ出力先のパスが取得できる() {
+ public function testSfEncodeFile_ファイルが正常に開けた場合_ファイルがエンコードされ出力先のパスが取得できる()
+ {
$outdir = realpath(dirname(__FILE__)) . "/../../../tmp/enc_output/";
SC_Helper_FileManager::deleteFile($outdir);
mkdir($outdir, 0777, TRUE);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,25 +31,30 @@
* @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フラグがONの場合_指定したメッセージが出力される() {
+ public function testSfErrorHeader_printフラグがONの場合_指定したメッセージが出力される()
+ {
global $GLOBAL_ERR;
$this->expectOutputString($GLOBAL_ERR . '<div id="errorHeader">ERROR MESSAGE</div>');
SC_Utils::sfErrorHeader('ERROR MESSAGE', TRUE);
}
- public function testSfErrorHeader_printフラグがOFFの場合_指定したメッセージがグローバル変数に格納される() {
+ public function testSfErrorHeader_printフラグがOFFの場合_指定したメッセージがグローバル変数に格納される()
+ {
global $GLOBAL_ERR;
$this->expectOutputString('');
$old_err = $GLOBAL_ERR;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,31 +32,37 @@
* @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の場合_フラッシュされる() {
+ public function testSfFlush_IEの場合_フラッシュされる()
+ {
$this->expectOutputString('');
echo 'Hello, World!!';
SC_Utils::sfFlush(TRUE);
}
- public function testSfFlush_文字列を指定した場合_フラッシュされる() {
+ public function testSfFlush_文字列を指定した場合_フラッシュされる()
+ {
$this->expectOutputString('');
echo 'Hello, World!!';
SC_Utils::sfFlush('Hello');
}
- public function testSfFlush_参考_この関数を呼ばないとバッファに出力が残る() {
+ public function testSfFlush_参考_この関数を呼ばないとバッファに出力が残る()
+ {
$this->expectOutputString('Hello, World!!');
echo 'Hello, World!!';
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_計算結果が正になる場合_値がそのまま返る() {
+ public function testSfGetAddPoint_計算結果が正になる場合_値がそのまま返る()
+ {
$totalpoint = 100;
$use_point = 2000;
$point_rate = 4;
@@ -54,7 +58,8 @@
$this->verify();
}
- public function testSfGetAddPoint_計算結果が負になる場合_0が返る() {
+ public function testSfGetAddPoint_計算結果が負になる場合_0が返る()
+ {
$totalpoint = 70;
$use_point = 2000;
$point_rate = 4;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,27 +31,32 @@
* @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_住所がヒットしない場合_空の配列が返る() {
+ public function test_住所がヒットしない場合_空の配列が返る()
+ {
$this->expected = array();
$this->actual = SC_Utils::sfGetAddress('9999999');
$this->verify('郵便番号検索結果');
}
- public function test_住所が一件だけヒットする場合_住所データが取得できる() {
+ public function test_住所が一件だけヒットする場合_住所データが取得できる()
+ {
$this->expected = array(
array(
'state' => '1', // 北海道
@@ -68,7 +73,8 @@
// 今の仕様ではこれでOKかもしれないが、そもそも一件目しか使わないのなら
// $data_list[0]を返した方が良いのでは?
/**
- public function test_住所が二件以上ヒットする場合_町名を消した住所データが取得できる() {
+ public function test_住所が二件以上ヒットする場合_町名を消した住所データが取得できる()
+ {
$this->expected = array(
array(
'state' => '5', // 秋田県
@@ -87,7 +93,8 @@
}
*/
- public function test_住所に但し書きが含まれる場合_但し書きが消去される() {
+ public function test_住所に但し書きが含まれる場合_但し書きが消去される()
+ {
$this->expected = array(
array(
'state' => '1', // 北海道
@@ -100,7 +107,8 @@
$this->verify('郵便番号検索結果');
}
- public function test_住所に注意文言がある場合_町名が消去される() {
+ public function test_住所に注意文言がある場合_町名が消去される()
+ {
$this->expected = array(
array(
'state' => '1', // 北海道
@@ -113,7 +121,8 @@
$this->verify('郵便番号検索結果');
}
- public function test_住所に番地の説明が含まれる場合_町名が消去される() {
+ public function test_住所に番地の説明が含まれる場合_町名が消去される()
+ {
$this->expected = array(
array(
'state' => '8', // 茨城県
@@ -128,7 +137,8 @@
//////////////////////////////////////////
- protected function setUpAddress() {
+ protected function setUpAddress()
+ {
$address = array(
array(
変更: 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 2013-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @author Hiroko Tamagawa
* @version $Id$
*/
-class SC_Utils_sfGetBrothersArrayTest extends Common_TestCase {
+class SC_Utils_sfGetBrothersArrayTest extends Common_TestCase
+{
- protected function setUp() {
+ protected function setUp()
+ {
// parent::setUp();
}
- protected function tearDown() {
+ protected function tearDown()
+ {
// parent::tearDown();
}
/////////////////////////////////////////
- public function testSfGetBrothersArray__与えられたIDの兄弟要素だけが抽出される() {
+ public function testSfGetBrothersArray__与えられたIDの兄弟要素だけが抽出される()
+ {
$input_array = array(
array('parent_id' => '1001', 'child_id' => '1001001'),
array('parent_id' => '1002', 'child_id' => '1002001'),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_配列が空の場合_falseが返る() {
+ public function testSfGetCSVList_配列が空の場合_falseが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfGetCSVList(array());
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfGetCSVList_配列に要素が存在する場合_CSV形式に変換した文字列が返る() {
+ public function testSfGetCSVList_配列に要素が存在する場合_CSV形式に変換した文字列が返る()
+ {
$this->expected = '"1つ目の要素","カンマを,含む要素","3つ目の要素"' . "\r\n";
$this->actual = SC_Utils::sfGetCSVList(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,26 +31,31 @@
* @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_引数が一致する場合_チェック済みの文字列が返る() {
+ public function testSfGetChecked_引数が一致する場合_チェック済みの文字列が返る()
+ {
$this->expected = 'checked="checked"';
$this->actual = SC_Utils::sfGetChecked('1', '1');
$this->verify();
}
- public function testSfGetChecked_引数が一致しない場合_0バイト文字列が返る() {
+ public function testSfGetChecked_引数が一致しない場合_0バイト文字列が返る()
+ {
$this->expected = '';
$this->actual = SC_Utils::sfGetChecked('2', '1');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,20 +31,24 @@
* @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__規格分類の件数がIDごとに取得できる() {
+ public function testSfGetClassCatCount__規格分類の件数がIDごとに取得できる()
+ {
$this->expected = array(
'1001' => '2',
@@ -57,7 +61,8 @@
//////////////////////////////////////////
- protected function setUpClassCat() {
+ protected function setUpClassCat()
+ {
$classes = array(
array(
'class_id' => '1001',
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,25 +31,30 @@
* @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_配列が空の場合_FALSEが返る() {
+ public function testSfGetCommaList_配列が空の場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfGetCommaList(array());
$this->verify('連結済みの文字列');
}
- public function testSfGetCommaList_スペースフラグが立っている場合_スペース付きで連結される() {
+ public function testSfGetCommaList_スペースフラグが立っている場合_スペース付きで連結される()
+ {
$this->expected = 'りんご, ミカン, バナナ';
$this->actual = SC_Utils::sfGetCommaList(
array('りんご', 'ミカン', 'バナナ'),
@@ -59,7 +64,8 @@
$this->verify('連結済みの文字列');
}
- public function testSfGetCommaList_スペースフラグが倒れている場合_スペース付きで連結される() {
+ public function testSfGetCommaList_スペースフラグが倒れている場合_スペース付きで連結される()
+ {
$this->expected = 'りんご,ミカン,バナナ';
$this->actual = SC_Utils::sfGetCommaList(
array('りんご', 'ミカン', 'バナナ'),
@@ -70,7 +76,8 @@
}
// TODO 要確認：arrpopの役割
- public function testSfGetCommaList_除外リストが指定されている場合_スペース付きで連結される() {
+ public function testSfGetCommaList_除外リストが指定されている場合_スペース付きで連結される()
+ {
$this->expected = 'りんご, バナナ';
$this->actual = SC_Utils::sfGetCommaList(
array('りんご', 'ミカン', 'バナナ'),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,20 +33,24 @@
* @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 要確認 実際には使われていない?
- public function testSfGetEnabled_falseを指定した場合_無効化するための文字列が返る() {
+ public function testSfGetEnabled_falseを指定した場合_無効化するための文字列が返る()
+ {
$this->expected = ' disabled="disabled"';
$this->actual = SC_Utils::sfGetEnabled(false);
@@ -54,7 +58,8 @@
$this->verify();
}
- public function testSfGetEnabled_trueを指定した場合_0バイト文字列が返る() {
+ public function testSfGetEnabled_trueを指定した場合_0バイト文字列が返る()
+ {
$this->expected = '';
$this->actual = SC_Utils::sfGetEnabled(true);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,20 +31,24 @@
* @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 要確認 実際には使われていない?
- public function testSfGetErrorColor_引数が空でない場合_背景色変更用の文字列が返る() {
+ public function testSfGetErrorColor_引数が空でない場合_背景色変更用の文字列が返る()
+ {
$this->expected = 'background-color:#ffe8e8';
$this->actual = SC_Utils::sfGetErrorColor('value');
@@ -52,7 +56,8 @@
$this->verify();
}
- public function testSfGetErrorColor_引数が空の場合_0バイト文字列が返る() {
+ public function testSfGetErrorColor_引数が空の場合_0バイト文字列が返る()
+ {
$this->expected = '';
$this->actual = SC_Utils::sfGetErrorColor();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,19 +33,23 @@
* @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_暗号化ありの設定になっている場合_文字列が変換される() {
+ public function testSfGetHashString_暗号化ありの設定になっている場合_文字列が変換される()
+ {
$input = 'hello, world';
$salt = 'sample';
@@ -54,7 +58,8 @@
$this->assertNotEquals('入力前後の文字列', $input, $output);
}
- public function testSfGetHashString_暗号化ありの設定になっていてsaltがない場合_文字列が変換される() {
+ public function testSfGetHashString_暗号化ありの設定になっていてsaltがない場合_文字列が変換される()
+ {
$input = 'hello, world';
$output = SC_Utils::sfGetHashString($input);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,20 +33,24 @@
* @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_暗号化なしの設定になっている場合_文字列が変換されない() {
+ public function testSfGetHashString_暗号化なしの設定になっている場合_文字列が変換されない()
+ {
$input = 'hello, world';
$this->expected = $input;
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,20 +31,24 @@
* @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_存在する製品IDのみを指定した場合_カテゴリ0の対応する製品クラスが取得できる() {
+ public function testSfGetProductClassId_存在する製品IDのみを指定した場合_カテゴリ0の対応する製品クラスが取得できる()
+ {
$this->expected = '2001';
$this->actual = SC_Utils::sfGetProductClassId('2001');
@@ -52,7 +56,8 @@
$this->verify('取得した製品クラス');
}
- public function testSfGetProductClassId_存在する製品IDのみを指定してカテゴリ0の製品クラスが存在しなければ_nullが返る() {
+ public function testSfGetProductClassId_存在する製品IDのみを指定してカテゴリ0の製品クラスが存在しなければ_nullが返る()
+ {
$this->expected = null;
$this->actual = SC_Utils::sfGetProductClassId('1001');
@@ -60,7 +65,8 @@
$this->verify('取得結果が空');
}
- public function testSfGetProductClassId_存在する製品IDとカテゴリIDを指定した場合_対応する製品クラスが取得できる() {
+ public function testSfGetProductClassId_存在する製品IDとカテゴリIDを指定した場合_対応する製品クラスが取得できる()
+ {
$this->expected = '1002';
$this->actual = SC_Utils::sfGetProductClassId('1001', '2');
@@ -68,7 +74,8 @@
$this->verify('取得した製品クラス');
}
- public function testSfGetProductClassId_存在する製品IDと存在しないカテゴリIDを指定した場合_nullが返る() {
+ public function testSfGetProductClassId_存在する製品IDと存在しないカテゴリIDを指定した場合_nullが返る()
+ {
$this->expected = null;
$this->actual = SC_Utils::sfGetProductClassId('1001', '999');
@@ -76,7 +83,8 @@
$this->verify('取得結果が空');
}
- public function testSfGetProductClassId_存在しない製品IDを指定した場合_nullが返る() {
+ public function testSfGetProductClassId_存在しない製品IDを指定した場合_nullが返る()
+ {
$this->expected = null;
$this->actual = SC_Utils::sfGetProductClassId('9999');
@@ -84,7 +92,8 @@
}
//////////////////////////////////////////
- protected function setUpProductsClass() {
+ protected function setUpProductsClass()
+ {
$products_class = array(
array(
'product_class_id' => '2001',
@@ -112,7 +121,8 @@
);
$this->objQuery->delete('dtb_products_class');
- foreach ($products_class as $item) {
+ foreach ($products_class as $item)
+{
$this->objQuery->insert('dtb_products_class', $item);
}
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,26 +31,31 @@
* @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();
}
/////////////////////////////////////////
// ランダムな文字列取得なので、文字列長のみ確認します。
- public function testSfGetRandomString_文字列長未指定の場合_長さ1の文字列が取得できる() {
+ public function testSfGetRandomString_文字列長未指定の場合_長さ1の文字列が取得できる()
+ {
$this->expected = 1;
$this->actual = strlen(SC_Utils::sfGetRandomString());
$this->verify('文字列長');
}
- public function testSfGetRandomString_文字列長指定ありの場合_指定した長さの文字列が取得できる() {
+ public function testSfGetRandomString_文字列長指定ありの場合_指定した長さの文字列が取得できる()
+ {
$this->expected = 10;
$this->actual = strlen(SC_Utils::sfGetRandomString(10));
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_正の整数が指定されている場合_指定の値が返る() {
+ public function testSfGetSearchPageMax_正の整数が指定されている場合_指定の値が返る()
+ {
$this->expected = 100;
$this->actual = SC_Utils::sfGetSearchPageMax(100);
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfGetSearchPageMax_正の小数が指定されている場合_整数に変換される() {
+ public function testSfGetSearchPageMax_正の小数が指定されている場合_整数に変換される()
+ {
$this->expected = 99;
$this->actual = SC_Utils::sfGetSearchPageMax(99.5);
@@ -59,7 +64,8 @@
$this->verify();
}
- public function testSfGetSearchPageMax_負の数が指定されている場合_デフォルト値が返る() {
+ public function testSfGetSearchPageMax_負の数が指定されている場合_デフォルト値が返る()
+ {
$this->expected = SEARCH_PMAX;
$this->actual = SC_Utils::sfGetSearchPageMax(-50);
@@ -67,7 +73,8 @@
$this->verify();
}
- public function testSfGetSearchPageMax_指定がない場合_デフォルト値が返る() {
+ public function testSfGetSearchPageMax_指定がない場合_デフォルト値が返る()
+ {
$this->expected = SEARCH_PMAX;
$this->actual = SC_Utils::sfGetSearchPageMax();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_年が設定されていない場合_0バイト文字列が返る() {
+ public function testSfGetTimestamp_年が設定されていない場合_0バイト文字列が返る()
+ {
$year = '';
$month = '10';
$day = '23';
@@ -53,7 +57,8 @@
$this->verify();
}
- public function testSfGetTimestamp_月が設定されていない場合_0バイト文字列が返る() {
+ public function testSfGetTimestamp_月が設定されていない場合_0バイト文字列が返る()
+ {
$year = '2012';
$month = '';
$day = '13';
@@ -63,7 +68,8 @@
$this->verify();
}
- public function testSfGetTimestamp_日が設定されていない場合_0バイト文字列が返る() {
+ public function testSfGetTimestamp_日が設定されていない場合_0バイト文字列が返る()
+ {
$year = '1999';
$month = '09';
$day = '';
@@ -73,7 +79,8 @@
$this->verify();
}
- public function testSfGetTimestamp_年月日すべて設定されている場合_連結された文字列が返る() {
+ public function testSfGetTimestamp_年月日すべて設定されている場合_連結された文字列が返る()
+ {
$year = '1999';
$month = '09';
$day = '23';
@@ -84,7 +91,8 @@
$this->verify();
}
- public function testSfGetTimestamp_最終時刻フラグがONの場合_時刻が深夜のものになる() {
+ public function testSfGetTimestamp_最終時刻フラグがONの場合_時刻が深夜のものになる()
+ {
$year = '1999';
$month = '09';
$day = '23';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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__与えられた親IDを持つ要素だけが抽出される() {
+ public function testSfGetUnderChildrenArray__与えられた親IDを持つ要素だけが抽出される()
+ {
$input_array = array(
array('parent_id' => '1001', 'child_id' => '1001001'),
array('parent_id' => '1002', 'child_id' => '1002001'),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -32,19 +32,23 @@
* @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指定が無い場合_21文字のランダムな文字列が生成される() {
+ public function test_prefix指定が無い場合_21文字のランダムな文字列が生成される()
+ {
$output1 = SC_Utils::sfGetUniqRandomId();
$output2 = SC_Utils::sfGetUniqRandomId();
@@ -53,7 +57,8 @@
$this->assertNotEquals($output1, $output2, '生成結果がランダムになる');
}
- public function test_prefix指定がある場合_prefixのあとに21文字のランダムな文字列が生成される() {
+ public function test_prefix指定がある場合_prefixのあとに21文字のランダムな文字列が生成される()
+ {
$output1 = SC_Utils::sfGetUniqRandomId('hello');
$output2 = SC_Utils::sfGetUniqRandomId('hello');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_環境変数にSSLを示す値が入っている場合_trueが返る() {
+ public function testSfIsHTTPS_環境変数にSSLを示す値が入っている場合_trueが返る()
+ {
$_SERVER['HTTPS'] = 'on';
$this->expected = true;
$this->actual = SC_Utils::sfIsHTTPS();
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfIsHTTPS_環境変数に非SSLを示す値が入っている場合_falseが返る() {
+ public function testSfIsHTTPS_環境変数に非SSLを示す値が入っている場合_falseが返る()
+ {
$_SERVER['HTTPS'] = 'off';
$this->expected = false;
$this->actual = SC_Utils::sfIsHTTPS();
@@ -59,7 +64,8 @@
$this->verify();
}
- public function testSfIsHTTPS_環境変数に値が入っていない場合_falseが返る() {
+ public function testSfIsHTTPS_環境変数に値が入っていない場合_falseが返る()
+ {
unset($_SERVER['HTTPS']);
$this->expected = false;
$this->actual = SC_Utils::sfIsHTTPS();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,53 +31,62 @@
* @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バイト文字列の場合_FALSEが返る() {
+ public function testSfIsInt_0バイト文字列の場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsInt('');
$this->verify('整数かどうか');
}
- public function testSfIsInt_intの最大長より長い場合_FALSEが返る() {
+ public function testSfIsInt_intの最大長より長い場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsInt('10000000000');
$this->verify('整数かどうか');
}
- public function testSfIsInt_intの最大値ギリギリの場合_TRUEが返る() {
+ public function testSfIsInt_intの最大値ギリギリの場合_TRUEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsInt('2147483647');
$this->verify('整数かどうか');
}
- public function testSfIsInt_intの最大値を超える場合_FALSEが返る() {
+ public function testSfIsInt_intの最大値を超える場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsInt('2147483648');
$this->verify('整数かどうか');
}
- public function testSfIsInt_数値でない場合_FALSEが返る() {
+ public function testSfIsInt_数値でない場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsInt('HELLO123');
$this->verify('整数かどうか');
}
- public function testSfIsInt_正の整数の場合_TRUEが返る() {
+ public function testSfIsInt_正の整数の場合_TRUEが返る()
+ {
$this->expected = TRUE;
$this->actual = SC_Utils::sfIsInt('123456789');
@@ -86,7 +95,8 @@
// TODO 「整数かどうか」という関数名なのでここはFALSEになるべきでは？
/**
- public function testSfIsInt_正の小数の場合_FALSEが返る() {
+ public function testSfIsInt_正の小数の場合_FALSEが返る()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsInt('123.456');
@@ -94,7 +104,8 @@
}
*/
- public function testSfIsInt_負の整数の場合_TRUEが返る() {
+ public function testSfIsInt_負の整数の場合_TRUEが返る()
+ {
$this->expected = TRUE;
$this->actual = SC_Utils::sfIsInt('-12345678');
@@ -103,7 +114,8 @@
// TODO 文字列長でチェックしているので負の場合は範囲が小さくなっている
/**
- public function testSfIsInt_負の整数で桁数が最大の場合_TRUEが返る() {
+ public function testSfIsInt_負の整数で桁数が最大の場合_TRUEが返る()
+ {
$this->expected = TRUE;
$this->actual = SC_Utils::sfIsInt('-123456789');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,19 +33,23 @@
* @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_ハッシュ化後の文字列が一致する場合_trueが返る() {
+ public function testSfIsMatchHashPassword_ハッシュ化後の文字列が一致する場合_trueが返る()
+ {
$pass = 'ec-cube';
$salt = 'salt';
$hashpass = SC_Utils_Ex::sfGetHashString($pass, $salt);
@@ -56,7 +60,8 @@
$this->verify('パスワード文字列比較結果');
}
- public function testSfIsMatchHashPassword_ハッシュ化後の文字列が一致しない場合_falseが返る() {
+ public function testSfIsMatchHashPassword_ハッシュ化後の文字列が一致しない場合_falseが返る()
+ {
$pass = 'ec-cube';
$salt = 'salt';
$hashpass = 'ec-cube';
@@ -67,7 +72,8 @@
$this->verify('パスワード文字列比較結果');
}
- public function testSfIsMatchHashPassword_saltが未指定の場合_旧バージョンの暗号化で比較される() {
+ public function testSfIsMatchHashPassword_saltが未指定の場合_旧バージョンの暗号化で比較される()
+ {
$pass = 'ec-cube';
$hashpass = sha1($pass . ':' . AUTH_MAGIC);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,20 +33,24 @@
* @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_文字列が一致する場合_trueが返る() {
+ public function testSfIsMatchHashPassword_文字列が一致する場合_trueが返る()
+ {
$pass = 'ec-cube';
$hashpass = 'ec-cube';
@@ -56,7 +60,8 @@
$this->verify('パスワード文字列比較結果');
}
- public function testSfIsMatchHashPassword_文字列が一致しない場合_falseが返る() {
+ public function testSfIsMatchHashPassword_文字列が一致しない場合_falseが返る()
+ {
$pass = 'ec-cube';
$hashpass = 'EC-cube';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_認証に失敗している場合_falseが返る() {
+ public function testSfIsSuccess_認証に失敗している場合_falseが返る()
+ {
$objSess = new SC_Session_Mock();
$objSess->is_success = SUCCESS + 1;
@@ -53,7 +57,8 @@
$this->verify('認証可否');
}
- public function testSfIsSuccess_認証成功でリファラがない場合_trueが返る() {
+ public function testSfIsSuccess_認証成功でリファラがない場合_trueが返る()
+ {
$objSess = new SC_Session_Mock();
$objSess->is_success = SUCCESS;
@@ -64,7 +69,8 @@
}
// TODO 正規のドメインであることは確認しているが、管理画面からというのはチェックしていないのでは？
- public function testSfIsSuccess_認証成功でリファラが正しい場合_trueが返る() {
+ public function testSfIsSuccess_認証成功でリファラが正しい場合_trueが返る()
+ {
$objSess = new SC_Session_Mock();
$objSess->is_success = SUCCESS;
$_SERVER['HTTP_REFERER'] = 'http://test.local/hoge/fuga';
@@ -75,7 +81,8 @@
$this->verify('認証可否');
}
- public function testSfIsSuccess_認証成功でリファラが不正な場合_falseが返る() {
+ public function testSfIsSuccess_認証成功でリファラが不正な場合_falseが返る()
+ {
$objSess = new SC_Session_Mock();
$objSess->is_success = SUCCESS;
$_SERVER['HTTP_REFERER'] = 'http://test.jp.local/hoge/fuga';
@@ -90,11 +97,13 @@
}
-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;
}
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,32 +31,38 @@
* @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_桁数が1の場合_FALSEを返す() {
+ public function testSfIsZeroFilling_桁数が1の場合_FALSEを返す()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsZeroFilling('0');
$this->verify('ゼロ詰めされているかどうか');
}
- public function testSfIsZeroFilling_桁数が2以上で0埋めされていない場合_FALSEを返す() {
+ public function testSfIsZeroFilling_桁数が2以上で0埋めされていない場合_FALSEを返す()
+ {
$this->expected = FALSE;
$this->actual = SC_Utils::sfIsZeroFilling('12');
$this->verify('ゼロ詰めされているかどうか');
}
- public function testSfIsZeroFilling_桁数が2以上で0埋めされている場合_TRUEを返す() {
+ public function testSfIsZeroFilling_桁数が2以上で0埋めされている場合_TRUEを返す()
+ {
$this->expected = TRUE;
$this->actual = SC_Utils::sfIsZeroFilling('01');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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__多段配列が1次元配列に変換される() {
+ public function testSfMakeHiddenArray__多段配列が1次元配列に変換される()
+ {
$input_array = array(
'vegetable' => '野菜',
'fruit' => array(
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,26 +31,31 @@
* @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の場合_エラーが起きない() {
+ public function testSfMbConvertEncoding_MS932の場合_エラーが起きない()
+ {
$input = 'あいうえお、今日は良い天気です。';
$encode = 'MS932';
$this->assertNotNull(SC_Utils::sfMbConvertEncoding($input, $encode), '変換結果');
}
- public function testSfMbConvertEncoding_UTF8の場合_エラーが起きない() {
+ public function testSfMbConvertEncoding_UTF8の場合_エラーが起きない()
+ {
$input = 'あいうえお、今日は良い天気です。';
$encode = 'UTF8';
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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__掛け算の結果が返る() {
+ public function testSfMultiply__掛け算の結果が返る()
+ {
$this->expected = 520;
$this->actual = SC_Utils::sfMultiply(13, 40);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,33 +31,39 @@
* @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_ファイル名が空の場合_デフォルトのファイル名が返る() {
+ public function testSfNoImageMainList_ファイル名が空の場合_デフォルトのファイル名が返る()
+ {
$this->expected = 'noimage_main_list.jpg';
$this->actual = SC_Utils::sfNoImageMainList('');
$this->verify();
}
- public function testSfNoImageMainList_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る() {
+ public function testSfNoImageMainList_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る()
+ {
$this->expected = 'aaa/bbb/noimage_main_list.jpg';
$this->actual = SC_Utils::sfNoImageMainList('aaa/bbb/');
$this->verify();
}
- public function testSfNoImageMainList_ファイル名が指定されている場合_指定されたファイル名が返る() {
+ public function testSfNoImageMainList_ファイル名が指定されている場合_指定されたファイル名が返る()
+ {
$this->expected = 'aaa/bbb/ccc.png';
$this->actual = SC_Utils::sfNoImageMainList('aaa/bbb/ccc.png');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,33 +31,39 @@
* @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_ファイル名が空の場合_デフォルトのファイル名が返る() {
+ public function testSfNoImageMain_ファイル名が空の場合_デフォルトのファイル名が返る()
+ {
$this->expected = 'noimage_main.png';
$this->actual = SC_Utils::sfNoImageMain('');
$this->verify();
}
- public function testSfNoImageMain_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る() {
+ public function testSfNoImageMain_ディレクトリが指定されている場合_そのディレクトリ以下でデフォルトのファイル名が返る()
+ {
$this->expected = 'aaa/bbb/noimage_main.png';
$this->actual = SC_Utils::sfNoImageMain('aaa/bbb/');
$this->verify();
}
- public function testSfNoImageMain_ファイル名が指定されている場合_指定されたファイル名が返る() {
+ public function testSfNoImageMain_ファイル名が指定されている場合_指定されたファイル名が返る()
+ {
$this->expected = 'aaa/bbb/ccc.png';
$this->actual = SC_Utils::sfNoImageMain('aaa/bbb/ccc.png');
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_入力が0の場合_0バイト文字列が返る() {
+ public function testSfPassLen_入力が0の場合_0バイト文字列が返る()
+ {
$input = '';
$this->expected = '';
$this->actual = SC_Utils::sfPassLen($input);
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfPassLen_入力が正の数の場合_入力と同じ文字数のアスタリスクが返る() {
+ public function testSfPassLen_入力が正の数の場合_入力と同じ文字数のアスタリスクが返る()
+ {
$input = 17;
$this->expected = '*****************';
$this->actual = SC_Utils::sfPassLen($input);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -33,19 +33,23 @@
* @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_四捨五入の設定の場合_四捨五入された値が返る() {
+ public function testSfPrePoint_四捨五入の設定の場合_四捨五入された値が返る()
+ {
$rule = 1; // 四捨五入
$this->expected = 10;
@@ -54,7 +58,8 @@
$this->verify();
}
- public function testSfPrePoint_切り捨ての設定の場合_切り捨てされた値が返る() {
+ public function testSfPrePoint_切り捨ての設定の場合_切り捨てされた値が返る()
+ {
$rule = 2; // 切り捨て
$this->expected = 9;
@@ -63,7 +68,8 @@
$this->verify();
}
- public function testSfPrePoint_切り上げの設定の場合_切り上げされた値が返る() {
+ public function testSfPrePoint_切り上げの設定の場合_切り上げされた値が返る()
+ {
$rule = 3; // 切り上げ
$this->expected = 10;
@@ -72,7 +78,8 @@
$this->verify();
}
- public function testSfPrePoint_存在しない選択肢の場合_切り上げされた値が返る() {
+ public function testSfPrePoint_存在しない選択肢の場合_切り上げされた値が返る()
+ {
$rule = 4; // 存在しない選択肢
$this->expected = 10;
@@ -81,7 +88,8 @@
$this->verify();
}
- public function testSfPrePoint_丸め方法の指定がない場合_定数で指定された値が使われる() {
+ public function testSfPrePoint_丸め方法の指定がない場合_定数で指定された値が使われる()
+ {
$this->expected = array(9, 9);
$this->actual = array(
SC_Utils::sfPrePoint(100, 9.4),
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,21 +31,25 @@
* @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 環境により出力形式が異なるため、テスト不可(デバッグ用なので、テストしなくてもよさそう)
/**
- public function testSfPrintR__指定したオブジェクトの情報が出力される() {
+ public function testSfPrintR__指定したオブジェクトの情報が出力される()
+ {
$output = '<div style="font-size: 12px;color: #00FF00;">' . "\n"
. '<strong>**デバッグ中**</strong><br />' . "\n"
. '<pre>' . "\n"
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_非SSLの場合_スキーマ部分以外の重複スラッシュが1つになる() {
+ public function testSfRmDupSlash_非SSLの場合_スキーマ部分以外の重複スラッシュが1つになる()
+ {
$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);
@@ -51,7 +55,8 @@
$this->verify();
}
- public function testSfRmDupSlash_SSLの場合_スキーマ部分以外の重複スラッシュが1つになる() {
+ public function testSfRmDupSlash_SSLの場合_スキーマ部分以外の重複スラッシュが1つになる()
+ {
$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);
@@ -59,7 +64,8 @@
$this->verify();
}
- public function testSfRmDupSlash_上記以外の場合_すべての重複スラッシュが1つになる() {
+ public function testSfRmDupSlash_上記以外の場合_すべての重複スラッシュが1つになる()
+ {
$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);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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__背景色変更用の文字列が返る() {
+ public function testSfSetErrorStyle__背景色変更用の文字列が返る()
+ {
$this->expected = 'style="background-color:#ffe8e8"';
$this->actual = SC_Utils::sfSetErrorStyle();
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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_カラム名ありの指定の場合_キーに名称が入る() {
+ public function testSfSwapArray_カラム名ありの指定の場合_キーに名称が入る()
+ {
$input_array = array(
array('id' => '1001', 'name' => 'name1001'),
array('id' => '1002', 'name' => 'name1002')
@@ -58,7 +62,8 @@
$this->verify();
}
- public function testSfSwapArray_カラム名なしの指定の場合_キーに名称が入らない() {
+ public function testSfSwapArray_カラム名なしの指定の場合_キーに名称が入らない()
+ {
$input_array = array(
array('id' => '1001', 'name' => 'name1001'),
array('id' => '1002', 'name' => 'name1002')
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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_四捨五入の場合_四捨五入の結果になる() {
+ public function testSfTax_四捨五入の場合_四捨五入の結果になる()
+ {
$this->expected = array(1, 2);
$this->actual[0] = SC_Utils::sfTax(140, 1, 1); // 1:四捨五入
$this->actual[1] = SC_Utils::sfTax(150, 1, 1); // 1:四捨五入
@@ -50,7 +54,8 @@
$this->verify('税額');
}
- public function testSfTax_切り捨ての場合_切り捨ての結果になる() {
+ public function testSfTax_切り捨ての場合_切り捨ての結果になる()
+ {
$this->expected = array(2, 3);
$this->actual[0] = SC_Utils::sfTax(140, 2, 2); // 2:切り捨て
$this->actual[1] = SC_Utils::sfTax(150, 2, 2); // 2:切り捨て
@@ -58,7 +63,8 @@
$this->verify('税額');
}
- public function testSfTax_切り上げの場合_切り上げの結果になる() {
+ public function testSfTax_切り上げの場合_切り上げの結果になる()
+ {
$this->expected = array(2, 2);
$this->actual[0] = SC_Utils::sfTax(140, 1, 3); // 3:切り上げ
$this->actual[1] = SC_Utils::sfTax(150, 1, 3); // 3:切り上げ
@@ -66,7 +72,8 @@
$this->verify('税額');
}
- public function testSfTax_それ以外の場合_切り上げの結果になる() {
+ public function testSfTax_それ以外の場合_切り上げの結果になる()
+ {
$this->expected = array(2, 2);
$this->actual[0] = SC_Utils::sfTax(140, 1, 4);
$this->actual[1] = SC_Utils::sfTax(150, 1, 4);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,40 +31,47 @@
* @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_締め日が月末より早い場合_設定した締め日の通りになる() {
+ public function testSfTermMonth_締め日が月末より早い場合_設定した締め日の通りになる()
+ {
$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_該当月の末日が締め日より早い場合_末日に合わせられる() {
+ public function testSfTermMonth_該当月の末日が締め日より早い場合_末日に合わせられる()
+ {
$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_前月の末日が締め日より早い場合_末日に合わせられる() {
+ public function testSfTermMonth_前月の末日が締め日より早い場合_末日に合わせられる()
+ {
$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_年をまたぐ場合_前月が前年十二月になる() {
+ public function testSfTermMonth_年をまたぐ場合_前月が前年十二月になる()
+ {
$this->expected = array('2012/12/16', '2013/1/15 23:59:59');
$this->actual = SC_Utils::sfTermMonth(2013, 1, 15);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,18 +31,22 @@
* @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_文頭と途中にホワイトスペースがある場合_文頭だけが除去できる() {
+ public function testSfTrim_文頭と途中にホワイトスペースがある場合_文頭だけが除去できる()
+ {
$this->expected = 'あ い うえ' . chr(0x0D) . 'お';
// 0x0A=CR, 0x0d=LF
$this->actual = SC_Utils::sfTrim(chr(0x0A) . chr(0x0D) . ' あ い うえ' . chr(0x0D) . 'お');
@@ -50,7 +54,8 @@
$this->verify('トリム結果');
}
- public function testSfTrim_途中と文末にホワイトスペースがある場合_文末だけが除去できる() {
+ public function testSfTrim_途中と文末にホワイトスペースがある場合_文末だけが除去できる()
+ {
$this->expected = 'あ い うえ' . chr(0x0D) . 'お';
// 0x0A=CR, 0x0d=LF
$this->actual = SC_Utils::sfTrim('あ い うえ' .chr(0x0D) . 'お ' . chr(0x0A) . chr(0x0D));
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,26 +31,31 @@
* @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がスラッシュで終わる場合_スラッシュが取り除かれる() {
+ public function testSfTrimURL_URLがスラッシュで終わる場合_スラッシュが取り除かれる()
+ {
$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末尾にスラッシュがない場合_文字列に変化がない() {
+ public function testSfTrimURL_URL末尾にスラッシュがない場合_文字列に変化がない()
+ {
$input = 'http://www.example.co.jp';
$this->expected = $input;
$this->actual = SC_Utils::sfTrimURL($input);
変更: 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-02-18 10:00:58 UTC (rev 22566)
+++ branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php 2013-02-18 10:09:54 UTC (rev 22567)
@@ -31,19 +31,23 @@
* @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階層上のディレクトリ名が取得できる() {
+ public function testSfUpDirName__1階層上のディレクトリ名が取得できる()
+ {
$_SERVER['SCRIPT_NAME'] = 'dir1/dir2/updir/current';
$this->expected = 'updir';
Svn-src-all メーリングリストの案内