Index: branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transform_List.php
===================================================================
--- branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transform_List.php (revision 21476)
+++ branches/version-2_12-dev/data/class/plugin/SC_Plugin_Template_Transform_List.php (revision 21479)
@@ -145,5 +145,5 @@
* @return void
*/
- function setHeadNavi($url){
+ function setHeadNavi($url) {
$this->arrHeadNaviBlocsByPlugin[$url] = TARGET_ID_HEAD;
}
@@ -155,5 +155,5 @@
* @return void
*/
- function setHeadNaviBlocs(&$arrBlocs){
+ function setHeadNaviBlocs(&$arrBlocs) {
foreach ($this->arrHeadNaviBlocsByPlugin as $key => $value) {
$arrBlocs[] = array(
Index: branches/version-2_12-dev/data/class/SC_UploadFile.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21442)
+++ branches/version-2_12-dev/data/class/SC_UploadFile.php (revision 21479)
@@ -502,5 +502,5 @@
* @return string
*/
- function lfGetTmpImageName($rename, $keyname = "", $uploadfile = ""){
+ function lfGetTmpImageName($rename, $keyname = "", $uploadfile = "") {
if ($rename === true) {
Index: branches/version-2_12-dev/data/class/SC_CheckError.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21450)
+++ branches/version-2_12-dev/data/class/SC_CheckError.php (revision 21479)
@@ -616,5 +616,5 @@
* @return void
*/
- function EMAIL_CHECK($value){
+ function EMAIL_CHECK($value) {
if (isset($this->arrErr[$value[1]])) {
return;
@@ -666,5 +666,5 @@
// メールアドレスに使用する文字を正規表現で判定する
// value[0] = 項目名 value[1] = 判定対象メールアドレス
- function EMAIL_CHAR_CHECK($value){
+ function EMAIL_CHAR_CHECK($value) {
if (isset($this->arrErr[$value[1]])) {
return;
@@ -679,5 +679,5 @@
// URLを正規表現で判定する。デフォルトでhttp://があってもOK
// value[0] = 項目名 value[1] = 判定対象URL
- function URL_CHECK($value){
+ function URL_CHECK($value) {
if (isset($this->arrErr[$value[1]])) {
return;
@@ -690,5 +690,5 @@
/* IPアドレスの判定 */
// value[0] = 項目名 value[1] = 判定対象IPアドレス文字列
- function IP_CHECK($value){
+ function IP_CHECK($value) {
if (isset($this->arrErr[$value[1]])) {
return;
@@ -952,5 +952,5 @@
// value[6] = end_month
// value[7] = end_day
- function CHECK_SET_TERM ($value) {
+ function CHECK_SET_TERM($value) {
// 期間指定
@@ -1003,5 +1003,5 @@
/*-----------------------------------------------------------------*/
- function CHECK_SET_TERM2 ($value) {
+ function CHECK_SET_TERM2($value) {
// 期間指定
@@ -1047,5 +1047,5 @@
// value[4] = end_year
// value[5] = end_month
- function CHECK_SET_TERM3 ($value) {
+ function CHECK_SET_TERM3($value) {
// 期間指定
@@ -1073,5 +1073,5 @@
//ディレクトリ存在チェック
- function DIR_CHECK ($value) {
+ function DIR_CHECK($value) {
if (isset($this->arrErr[$value[1]])) {
return;
@@ -1084,5 +1084,5 @@
// ドメインチェック
- function DOMAIN_CHECK ($value) {
+ function DOMAIN_CHECK($value) {
if (isset($this->arrErr[$value[1]])) {
return;
@@ -1096,5 +1096,5 @@
// メールアドレスを正規表現で判定する
// value[0] = 項目名 value[1] = 判定対象メールアドレス
- function MOBILE_EMAIL_CHECK($value){
+ function MOBILE_EMAIL_CHECK($value) {
if (isset($this->arrErr[$value[1]])) {
return;
@@ -1115,5 +1115,5 @@
* @return void
*/
- function CHECK_REGIST_CUSTOMER_EMAIL ($value) {
+ function CHECK_REGIST_CUSTOMER_EMAIL($value) {
if (isset($this->arrErr[$value[1]])) {
return;
Index: branches/version-2_12-dev/data/class/SC_Plugin.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Plugin.php (revision 20764)
+++ branches/version-2_12-dev/data/class/SC_Plugin.php (revision 21479)
@@ -10,9 +10,9 @@
var $path;
- function SC_Plugin(){
+ function SC_Plugin() {
$this->__construct();
}
- function __construct(){
+ function __construct() {
if (!defined(PLUGIN_REALDIR)) {
define('PLUGIN_REALDIR', USER_REALDIR . 'plugins/');
@@ -21,29 +21,29 @@
}
- function init(){
+ function init() {
}
- function enable($classname){
+ function enable($classname) {
}
- function getVersion(){
+ function getVersion() {
}
- function getName(){
+ function getName() {
}
- function process(){
+ function process() {
}
- function mobileprocess(){
+ function mobileprocess() {
}
- function install(){
+ function install() {
}
- function uninstall(){
+ function uninstall() {
}
- function disablePlugin(){
+ function disablePlugin() {
$objQuery = new SC_Query_Ex();
$name = preg_replace("/.php/", "", __FILE__); // XXX 正規表現エスケープ漏れでは?
@@ -51,5 +51,5 @@
}
- function enablePlugin(){
+ function enablePlugin() {
$objQuery = new SC_Query_Ex();
$name = preg_replace("/.php/", "", __FILE__); // XXX 正規表現エスケープ漏れでは?
@@ -61,8 +61,8 @@
* @return String インストール用のSQL
*/
- function getInstallSQL(){
+ function getInstallSQL() {
}
- function getUninstallSQL(){
+ function getUninstallSQL() {
}
}
Index: branches/version-2_12-dev/data/class/SC_Response.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Response.php (revision 21441)
+++ branches/version-2_12-dev/data/class/SC_Response.php (revision 21479)
@@ -71,5 +71,5 @@
}
- function setResposeBody($body){
+ function setResposeBody($body) {
$this->body = $body;
}
Index: branches/version-2_12-dev/data/class/SC_SelectSql.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SelectSql.php (revision 21446)
+++ branches/version-2_12-dev/data/class/SC_SelectSql.php (revision 21479)
@@ -44,5 +44,5 @@
//-- SQL分生成
- function getSql($mode = ""){
+ function getSql($mode = "") {
$this->sql = $this->select ." ". $this->where ." ". $this->group ." ";
@@ -185,5 +185,5 @@
*/
- function setWhereByOR($arrWhere){
+ function setWhereByOR($arrWhere) {
$count = count($arrWhere);
@@ -206,5 +206,5 @@
}
- function setWhere($where){
+ function setWhere($where) {
if ($where != "") {
if ($this->where) {
@@ -219,5 +219,5 @@
}
- function setOrder($order){
+ function setOrder($order) {
$this->order = "ORDER BY " . $order;
@@ -231,5 +231,5 @@
}
- function setLimitOffset($limit, $offset){
+ function setLimitOffset($limit, $offset) {
if (is_numeric($limit) and is_numeric($offset)) {
@@ -240,5 +240,5 @@
}
- function clearSql(){
+ function clearSql() {
$this->select = "";
$this->where = "";
Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21441)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php (revision 21479)
@@ -312,5 +312,5 @@
* @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);
@@ -336,5 +336,5 @@
* @return void
*/
- function sfCustomerMypageParam (&$objFormParam) {
+ function sfCustomerMypageParam(&$objFormParam) {
SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
SC_Helper_Customer_Ex::sfCustomerRegisterParam($objFormParam, false, true);
@@ -355,5 +355,5 @@
* @return void
*/
- function sfCustomerOtherDelivParam (&$objFormParam) {
+ function sfCustomerOtherDelivParam(&$objFormParam) {
SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam);
$objFormParam->addParam("", 'other_deliv_id');
@@ -367,5 +367,5 @@
* @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"));
@@ -390,5 +390,5 @@
* @return void
*/
- function sfCustomerRegisterParam (&$objFormParam, $isAdmin = false, $is_mypage = false) {
+ function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false) {
$objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK"));
$objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php (revision 21442)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Mail.php (revision 21479)
@@ -332,5 +332,5 @@
* @todo 表示順も引数で変更できるように
*/
- function sfGetMailmagaTemplate($template_id = null){
+ function sfGetMailmagaTemplate($template_id = null) {
// 初期化
$where = '';
@@ -358,5 +358,5 @@
* @return array 送信履歴情報を格納した配列
*/
- function sfGetSendHistory($send_id = null){
+ function sfGetSendHistory($send_id = null) {
// 初期化
$where = '';
Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php (revision 21441)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Session.php (revision 21479)
@@ -81,6 +81,5 @@
* @return bool セッションの書き込みに成功した場合 true
*/
- function sfSessWrite($id, $sess_data)
- {
+ function sfSessWrite($id, $sess_data) {
$objQuery = new SC_Query_Ex();
$exists = $objQuery->exists("dtb_session", "sess_id = ?", array($id));
Index: branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (revision 21446)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (revision 21479)
@@ -358,5 +358,5 @@
* @return string 親カテゴリを連結した文字列
*/
- function sfGetCatCombName($category_id){
+ function sfGetCatCombName($category_id) {
// 商品が属するカテゴリIDを縦に取得
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -383,5 +383,5 @@
* @return array 指定したカテゴリIDのカテゴリ
*/
- function sfGetCat($category_id){
+ function sfGetCat($category_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -399,5 +399,5 @@
* @return array 指定したカテゴリIDの大カテゴリ
*/
- function sfGetFirstCat($category_id){
+ function sfGetFirstCat($category_id) {
// 商品が属するカテゴリIDを縦に取得
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -648,5 +648,5 @@
* @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();
@@ -1276,5 +1276,5 @@
* @return void
*/
- function sfCountMaker($objQuery){
+ function sfCountMaker($objQuery) {
$sql = "";
Index: branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php (revision 21465)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_HandleError.php (revision 21479)
@@ -94,5 +94,5 @@
$message = $now . " [$errfile:$errline] FATAL Error($errno) $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n";
error_log($message, 3, $log_file_path);
-
+
self::displaySystemError($errstr);
exit(1);
Index: branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php (revision 21442)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_CSV.php (revision 21479)
@@ -116,5 +116,5 @@
* @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();
@@ -302,5 +302,5 @@
* @return void
*/
- function lfDownloadCsv($arrData, $prefix = ""){
+ function lfDownloadCsv($arrData, $prefix = "") {
if ($prefix == "") {
Index: branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php (revision 21478)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php (revision 21479)
@@ -115,5 +115,5 @@
* 稼働中のプラグインを取得する。
*/
- function getEnablePlugin(){
+ function getEnablePlugin() {
$objQuery = new SC_Query_Ex();
$col = '*';
@@ -134,5 +134,5 @@
* @return array $arrRet インストールされているプラグイン.
*/
- function getAllPlugin(){
+ function getAllPlugin() {
$objQuery = new SC_Query_Ex();
$col = '*';
@@ -153,5 +153,5 @@
* @return array プラグインの基本情報.
*/
- function getPluginByPluginId($plugin_id){
+ function getPluginByPluginId($plugin_id) {
$objQuery = new SC_Query_Ex();
$col = '*';
@@ -173,5 +173,5 @@
* @return array プラグインの基本情報.
*/
- function getPluginByPluginCode($plugin_code){
+ function getPluginByPluginCode($plugin_code) {
$objQuery = new SC_Query_Ex();
$col = '*';
Index: branches/version-2_12-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Query.php (revision 21477)
+++ branches/version-2_12-dev/data/class/SC_Query.php (revision 21479)
@@ -442,5 +442,5 @@
* @return SC_Query 自分自身のインスタンス
*/
- function setLimit($limit){
+ function setLimit($limit) {
if (is_numeric($limit)) {
$this->option = " LIMIT " .$limit;
@@ -774,5 +774,5 @@
* @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);
@@ -1003,5 +1003,5 @@
* @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);
Index: branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php
===================================================================
--- branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php (revision 21450)
+++ branches/version-2_12-dev/data/class/batch/SC_Batch_Update.php (revision 21479)
@@ -216,5 +216,5 @@
* @param string $path 絶対パス
*/
- function lfMkdirRecursive($path){
+ function lfMkdirRecursive($path) {
$path = dirname($path);
Index: branches/version-2_12-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_View.php (revision 21452)
+++ branches/version-2_12-dev/data/class/SC_View.php (revision 21479)
@@ -163,5 +163,5 @@
// デバッグ
- function debug($var = true){
+ function debug($var = true) {
$this->_smarty->debugging = $var;
}
Index: branches/version-2_12-dev/data/class/SC_Date.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Date.php (revision 21446)
+++ branches/version-2_12-dev/data/class/SC_Date.php (revision 21479)
@@ -35,9 +35,9 @@
}
- function setStartYear($year){
+ function setStartYear($year) {
$this->start_year = $year;
}
- function getStartYear(){
+ function getStartYear() {
return $this->start_year;
}
@@ -51,9 +51,9 @@
}
- function setMonth($month){
+ function setMonth($month) {
$this->month = $month;
}
- function setDay ($day){
+ function setDay($day) {
$this->day = $day;
}
@@ -93,5 +93,5 @@
}
- function getZeroYear($year = ''){
+ function getZeroYear($year = '') {
if ($year) $this->setStartYear($year);
@@ -111,5 +111,5 @@
}
- function getZeroMonth(){
+ function getZeroMonth() {
$month_array = array();
@@ -144,5 +144,5 @@
}
- function getHour(){
+ function getHour() {
$day_array = array();
@@ -154,5 +154,5 @@
}
- function getMinutes(){
+ function getMinutes() {
$minutes_array = array();
@@ -164,5 +164,5 @@
}
- function getMinutesInterval(){
+ function getMinutesInterval() {
$minutes_array = array("00"=>"00", "30"=>"30");
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/contact/LC_Page_Contact.php (revision 21479)
@@ -187,5 +187,5 @@
* @return void
*/
- function lfSendMail(&$objPage){
+ function lfSendMail(&$objPage) {
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
$objPage->tpl_shopname = $CONF['shop_name'];
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 21479)
@@ -280,5 +280,5 @@
* FIXME: メールテンプレート編集の方に足すのが望ましい
*/
- function lfSendMail(&$CONF, $email, $customer_name, $new_password){
+ function lfSendMail(&$CONF, $email, $customer_name, $new_password) {
// パスワード変更お知らせメール送信
$objMailText = new SC_SiteView_Ex(false);
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php (revision 21479)
@@ -204,5 +204,5 @@
* @return void
*/
- function lfSendMail($uniqid, $arrForm){
+ function lfSendMail($uniqid, $arrForm) {
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
@@ -257,5 +257,5 @@
* @return boolean kiyaku.php からの妥当な遷移であれば true
*/
- function lfCheckReferer(&$post, $referer){
+ function lfCheckReferer(&$post, $referer) {
if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE
Index: branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/LC_Page_Sitemap.php (revision 21479)
@@ -255,5 +255,5 @@
* @return array $arrPageList ブロック情報
*/
- function getPageData($where = '', $arrVal = ''){
+ function getPageData($where = '', $arrVal = '') {
$objQuery = SC_Query_Ex::getSingletonInstance(); // DB操作オブジェクト
$sql = ""; // データ取得SQL生成用
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (revision 21479)
@@ -88,5 +88,5 @@
* @return array $arrCalendar カレンダー情報の配列を返す
*/
- function lfGetCalendar($disp_month = 1){
+ function lfGetCalendar($disp_month = 1) {
for ($j = 0; $j <= $disp_month-1; ++$j) {
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (revision 21479)
@@ -85,5 +85,5 @@
* @return array $arrBestProducts 検索結果配列
*/
- function lfGetRanking(){
+ function lfGetRanking() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objProduct = new SC_Product_Ex();
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (revision 21479)
@@ -152,5 +152,5 @@
* @return String $json 新着情報のJSONを返す
*/
- function lfGetNewsForJson(&$objFormParam){
+ function lfGetNewsForJson(&$objFormParam) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -181,5 +181,5 @@
* @return String $json 新着情報1件分のJSONを返す
*/
- function lfGetNewsDetailForJson(&$objFormParam){
+ function lfGetNewsDetailForJson(&$objFormParam) {
$objQuery = SC_Query_Ex::getSingletonInstance();
@@ -198,5 +198,5 @@
* @return Integer $count 新着情報の件数を返す
*/
- function lfGetNewsCount(){
+ function lfGetNewsCount() {
$count = 0;
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Review.php (revision 21479)
@@ -194,5 +194,5 @@
//登録実行
- function lfRegistRecommendData (&$objFormParam) {
+ function lfRegistRecommendData(&$objFormParam) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrRegist = $objFormParam->getDbArray();
Index: 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 (revision 21455)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php (revision 21479)
@@ -346,5 +346,5 @@
* @return str
*/
- function lfGetPageTitle($mode, $category_id = 0){
+ function lfGetPageTitle($mode, $category_id = 0) {
if ($mode == 'search') {
return "検索結果";
@@ -362,5 +362,5 @@
* @return array
*/
- function lfGetSearchConditionDisp($arrSearchData){
+ function lfGetSearchConditionDisp($arrSearchData) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrSearch = array('category' => '指定なし', 'maker' => '指定なし', 'name' => '指定なし');
@@ -387,5 +387,5 @@
* @return int
*/
- function lfGetProductAllNum($searchCondition){
+ function lfGetProductAllNum($searchCondition) {
// 検索結果対象となる商品の数を取得
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -400,5 +400,5 @@
* @return array
*/
- function lfGetSearchCondition($arrSearchData){
+ function lfGetSearchCondition($arrSearchData) {
$searchCondition = array(
'where' => "",
@@ -459,5 +459,5 @@
* @return str
*/
- function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id){
+ function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id) {
$js_fnOnLoad = "";
foreach (array_keys($arrProducts) as $key) {
@@ -480,5 +480,5 @@
* @return void
*/
- function lfAddCart($arrForm, $referer){
+ function lfAddCart($arrForm, $referer) {
$product_class_id = $arrForm['product_class_id'];
$objCartSess = new SC_CartSession_Ex();
@@ -494,5 +494,5 @@
* @return Array $arrProducts 商品一覧情報
*/
- function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage){
+ function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage) {
foreach ($arrProducts['productStatus'] as $product_id => $arrValues) {
Index: 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 (revision 21442)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss.php (revision 21479)
@@ -98,5 +98,5 @@
* @return array $arrNews 取得結果を配列で返す
*/
- function lfGetNews(&$objQuery){
+ function lfGetNews(&$objQuery) {
$col = "";
$col .= "news_id "; // 新着情報ID
Index: 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 (revision 21442)
+++ branches/version-2_12-dev/data/class/pages/rss/LC_Page_Rss_Products.php (revision 21479)
@@ -243,5 +243,5 @@
* @return array $arrProduct 取得結果を配列で返す
*/
- function lfGetProductsDetail(&$objQuery, $product_id = 'all'){
+ function lfGetProductsDetail(&$objQuery, $product_id = 'all') {
$objProduct = new SC_Product_Ex();
@@ -284,5 +284,5 @@
* @return array $arrProduct 取得結果を配列で返す
*/
- function lfGetProductsAllclass(&$objQuery){
+ function lfGetProductsAllclass(&$objQuery) {
// --- 商品一覧の取得
$objQuery->setOrder('product_id');
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php (revision 21479)
@@ -208,5 +208,5 @@
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfMobileHeader($realpath,$sdown_filename){
+ function lfMobileHeader($realpath,$sdown_filename) {
$objHelperMobile = new SC_Helper_Mobile_Ex();
//ファイルの拡張子からコンテンツタイプを取得する
@@ -225,5 +225,5 @@
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfMobileAuDownload($realpath,$sdown_filename){
+ function lfMobileAuDownload($realpath,$sdown_filename) {
//モバイル用ヘッダー出力
$this->lfMobileHeader($realpath,$sdown_filename);
@@ -257,5 +257,5 @@
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfMobileDownload($realpath,$sdown_filename){
+ function lfMobileDownload($realpath,$sdown_filename) {
//モバイル用ヘッダー出力
$this->lfMobileHeader($realpath,$sdown_filename);
@@ -315,5 +315,5 @@
* @param string $sdown_filename ダウンロード時の指定ファイル名
*/
- function lfDownload($realpath,$sdown_filename){
+ function lfDownload($realpath,$sdown_filename) {
// 拡張子を取得
$extension = pathinfo($realpath, PATHINFO_EXTENSION);
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (revision 21479)
@@ -136,6 +136,5 @@
//不正アクセス判定
- if (!$objCustomer->isLoginSuccess(true)
- || count($arrOtherDeliv) == 0){
+ if (!$objCustomer->isLoginSuccess(true) || count($arrOtherDeliv) == 0) {
SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
}
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 21479)
@@ -158,5 +158,5 @@
/* 仕方がない処理。。 */
- function lfMakeWhere ($tablename, $arrProductId) {
+ function lfMakeWhere($tablename, $arrProductId) {
// 取得した表示すべきIDだけを指定して情報を取得。
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 21479)
@@ -93,5 +93,5 @@
* @return void
*/
- function lfDeleteCustomer($customer_id){
+ function lfDeleteCustomer($customer_id) {
$objQuery = SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 21479)
@@ -114,5 +114,5 @@
* PDF作成フォームのデフォルト値の生成
*/
- function createFromValues($order_id,$pdf_order_id){
+ function createFromValues($order_id,$pdf_order_id) {
// ここが$arrFormの初登場ということを明示するため宣言する。
$arrForm = array();
@@ -148,5 +148,5 @@
* @param SC_FormParam $objFormParam
*/
- function createPdf(&$objFormParam){
+ function createPdf(&$objFormParam) {
$arrErr = $this->lfCheckError($objFormParam);
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_MailView.php (revision 21479)
@@ -79,5 +79,5 @@
* @param int $send_id
*/
- function getMailHistory($send_id){
+ function getMailHistory($send_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = "subject, mail_body";
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (revision 21479)
@@ -130,5 +130,5 @@
* @param SC_Product $objProduct
*/
- function getProductList($arrProductId, &$objProduct){
+ function getProductList($arrProductId, &$objProduct) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -144,5 +144,5 @@
* @param array $arrProducts
*/
- function getFnOnload($arrProducts){
+ function getFnOnload($arrProducts) {
foreach ($arrProducts as $arrProduct) {
$js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});";
@@ -155,5 +155,5 @@
* @param SC_Product $objProduct
*/
- function getTplJavascript(&$objProduct){
+ function getTplJavascript(&$objProduct) {
return 'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
}
@@ -164,5 +164,5 @@
* @param SC_Product $objProduct
*/
- function getProducts($whereAndBind,&$objProduct, $page_max, $startno){
+ function getProducts($whereAndBind,&$objProduct, $page_max, $startno) {
$where = $whereAndBind['where'];
$bind = $whereAndBind['bind'];
@@ -184,5 +184,5 @@
* @param SC_Product $objProduct
*/
- function getLineCount($whereAndBind,&$objProduct){
+ function getLineCount($whereAndBind,&$objProduct) {
$where = $whereAndBind['where'];
$bind = $whereAndBind['bind'];
@@ -200,5 +200,5 @@
* @param SC_FormParam $objFormParam
*/
- function createWhere(&$objFormParam,&$objDb){
+ function createWhere(&$objFormParam,&$objDb) {
$arrForm = $objFormParam->getHashArray();
$where = "alldtl.del_flg = 0";
@@ -240,5 +240,5 @@
* @param unknown_type $globalParams
*/
- function getNo($globalParams){
+ function getNo($globalParams) {
foreach ($globalParams as $params) {
if (isset($params['no']) && $params['no']!= '') {
@@ -254,5 +254,5 @@
* @param $productList
*/
- function sortProducts($arrProduct_id,$productList){
+ function sortProducts($arrProduct_id,$productList) {
$products = array();
foreach ($productList as $item) {
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php (revision 21479)
@@ -122,5 +122,5 @@
* @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";
@@ -135,5 +135,5 @@
* @param SC_FormParam $objFormParam
*/
- function doSend(&$objFormParam){
+ function doSend(&$objFormParam) {
$arrErr = $objFormParam->checkerror();
@@ -157,5 +157,5 @@
* @param SC_FormParam $objFormParam
*/
- function confirm(&$objFormParam){
+ function confirm(&$objFormParam) {
$arrErr = $objFormParam->checkerror();
// メールの送信
@@ -184,5 +184,5 @@
* @param SC_FormParam $objFormParam
*/
- function changeData(&$objFormParam){
+ function changeData(&$objFormParam) {
if (SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php (revision 21479)
@@ -166,5 +166,5 @@
// 対応状況一覧の表示
- function lfStatusDisp($status,$pageno){
+ function lfStatusDisp($status,$pageno) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php (revision 21479)
@@ -119,5 +119,5 @@
* @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"));
@@ -130,5 +130,5 @@
* @return Array エラー内容
*/
- function lfCheckError(&$objFormParam){
+ function lfCheckError(&$objFormParam) {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
@@ -142,5 +142,5 @@
* @param SC_FormParam $objFormParam
*/
- function createWhere(&$objFormParam,&$objDb){
+ function createWhere(&$objFormParam,&$objDb) {
$arrForm = $objFormParam->getHashArray();
$where = "alldtl.del_flg = 0";
@@ -180,5 +180,5 @@
* @param SC_Product $objProduct
*/
- function getLineCount($whereAndBind,&$objProduct){
+ function getLineCount($whereAndBind,&$objProduct) {
$where = $whereAndBind['where'];
$bind = $whereAndBind['bind'];
@@ -195,5 +195,5 @@
* @param SC_Product $objProduct
*/
- function getProducts($whereAndBind,&$objProduct, $page_max, $startno){
+ function getProducts($whereAndBind,&$objProduct, $page_max, $startno) {
$where = $whereAndBind['where'];
$bind = $whereAndBind['bind'];
@@ -213,5 +213,5 @@
* @param SC_Product $objProduct
*/
- function getProductList($arrProductId, &$objProduct){
+ function getProductList($arrProductId, &$objProduct) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21442)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 21479)
@@ -166,5 +166,5 @@
* @return Array エラー内容
*/
- function lfCheckError(&$objFormParam){
+ function lfCheckError(&$objFormParam) {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
@@ -177,5 +177,5 @@
* @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"));
@@ -194,5 +194,5 @@
* @param Integer $member_id 登録した管理者のID
*/
- function lfNewsInsert($arrPost,$member_id){
+ function lfNewsInsert($arrPost,$member_id) {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -217,5 +217,5 @@
}
- function lfNewsUpdate($arrPost,$member_id){
+ function lfNewsUpdate($arrPost,$member_id) {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -239,5 +239,5 @@
* @return string 登録日を示す文字列
*/
- function getRegistDate($arrPost){
+ function getRegistDate($arrPost) {
$registDate = $arrPost['year'] ."/". $arrPost['month'] ."/". $arrPost['day'];
return $registDate;
@@ -249,5 +249,5 @@
* @return int
*/
- function checkLinkMethod($link_method){
+ function checkLinkMethod($link_method) {
if (strlen($link_method) == 0) {
$link_method = 1;
@@ -260,5 +260,5 @@
* @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';
@@ -280,5 +280,5 @@
* @param Integer $news_id
*/
- function getRankByNewsId($news_id){
+ function getRankByNewsId($news_id) {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'rank';
@@ -295,5 +295,5 @@
* @param Integer $rank
*/
- function computeRankForDelete($news_id,$rank){
+ function computeRankForDelete($news_id,$rank) {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->begin();
@@ -320,5 +320,5 @@
* @param String $news_date
*/
- function splitNewsDate($news_date){
+ function splitNewsDate($news_date) {
return explode("-", $news_date);
}
@@ -328,5 +328,5 @@
* @return Intger $max ランクの最大値の値
*/
- function getRankMax(){
+ function getRankMax() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'MAX(rank) as max';
@@ -342,5 +342,5 @@
* @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;
Index: 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 (revision 21442)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 21479)
@@ -132,5 +132,5 @@
* @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"));
@@ -144,5 +144,5 @@
* @return Array エラー内容
*/
- function lfCheckError(&$objFormParam){
+ function lfCheckError(&$objFormParam) {
$objErr = new SC_CheckError_Ex($objFormParam->getHashArray());
$objErr->arrErr = $objFormParam->checkError();
@@ -154,5 +154,5 @@
* @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.*';
@@ -175,5 +175,5 @@
* @param Integer $member_id 登録した管理者を示すID
*/
- function insertRecommendProduct($arrPost,$member_id){
+ function insertRecommendProduct($arrPost,$member_id) {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
// 古いおすすめ商品のデータを削除する。
@@ -196,5 +196,5 @@
* @param Array $arrPost POSTの値を格納した配列
*/
- function deleteProduct($arrPost){
+ function deleteProduct($arrPost) {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$table = 'dtb_best_products';
@@ -209,5 +209,5 @@
* @return Array $arrProduct 商品のデータを格納した配列
*/
- function getProduct($product_id){
+ function getProduct($product_id) {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
$col = 'product_id,main_list_image,name';
@@ -224,5 +224,5 @@
* @param Array $arrItems フロントに表示される商品の情報を格納した配列
*/
- function setProducts($arrPost,$arrItems){
+ function setProducts($arrPost,$arrItems) {
$arrProduct = $this->getProduct($arrPost['product_id']);
if (count($arrProduct) > 0) {
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php (revision 21479)
@@ -302,5 +302,5 @@
* @return void
*/
- function setDispParam($key, $val){
+ function setDispParam($key, $val) {
$this->$key = $val;
}
@@ -313,5 +313,5 @@
* @return boolean ディレクトリ作成できたかどうか
*/
- function tryCreateDir($objFileManager, $objFormParam){
+ function tryCreateDir($objFileManager, $objFormParam) {
$create_dir_flg = false;
$create_dir = ereg_replace("/$", "", $objFormParam->getValue('now_dir'));
@@ -329,5 +329,5 @@
* @return boolean ファイル表示するかどうか
*/
- function tryView(&$objFormParam){
+ function tryView(&$objFormParam) {
$view_flg = false;
$now_dir = $this->lfCheckSelectDir($objFormParam, dirname($objFormParam->getValue('select_file')));
@@ -345,5 +345,5 @@
* @return void
*/
- function setParentDir($objFormParam){
+ function setParentDir($objFormParam) {
$parent_dir = $this->lfGetParentDir($objFormParam->getValue('now_dir'));
$this->setDispParam('tpl_parent_dir', $parent_dir);
@@ -356,5 +356,5 @@
* @return void
*/
- function setDispPath($objFormParam){
+ function setDispPath($objFormParam) {
$tpl_now_dir = "";
// Windows 環境で DIRECTORY_SEPARATOR が JavaScript に渡るとエスケープ文字と勘違いするので置換
@@ -372,5 +372,5 @@
* @return void
*/
- function setDispError($key, $value){
+ function setDispError($key, $value) {
// 既にエラーがある場合は、処理しない
if (SC_Utils_Ex::isBlank($this->arrErr[$key])) {
@@ -385,5 +385,5 @@
* @return void
*/
- function setTplOnLoad($tpl_onload){
+ function setTplOnLoad($tpl_onload) {
$this->tpl_onload .= $tpl_onload;
}
@@ -440,5 +440,5 @@
* @return void
*/
- function setDispTree($objFileManager, $objFormParam){
+ function setDispTree($objFileManager, $objFormParam) {
$tpl_onload = '';
// ツリーを表示する divタグid, ツリー配列変数名, 現在ディレクトリ, 選択ツリーhidden名, ツリー状態hidden名, mode hidden名
@@ -472,5 +472,5 @@
* @return void
*/
- function setIsTopDir($objFormParam){
+ function setIsTopDir($objFormParam) {
// トップディレクトリか調査
$is_top_dir = false;
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (revision 21479)
@@ -223,5 +223,5 @@
* @return boolean 成功:true
*/
- function lfUpdCsvOutput($csv_id, $arrData = array()){
+ function lfUpdCsvOutput($csv_id, $arrData = array()) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// ひとまず、全部使用しないで更新する
Index: 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 (revision 21444)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 21479)
@@ -245,5 +245,5 @@
* @return array テーブル名一覧
*/
- function lfGetTableList(){
+ function lfGetTableList() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
// 実テーブル上のカラム設定を見に行く仕様に変更 ref #476
@@ -271,5 +271,5 @@
* @return array カラム一覧の配列
*/
- function lfGetColList($table){
+ function lfGetColList($table) {
if (SC_Utils_Ex::isBlank($table)) {
return array();
@@ -289,5 +289,5 @@
* @return array 取得結果の配列
*/
- function lfGetSqlList($where = "" , $arrVal = array()){
+ function lfGetSqlList($where = "" , $arrVal = array()) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = "dtb_csv_sql";
@@ -302,5 +302,5 @@
* @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);
@@ -372,5 +372,5 @@
* @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";
@@ -396,5 +396,5 @@
* @return boolean 実行結果 true：成功
*/
- function lfDelData($sql_id){
+ function lfDelData($sql_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = "dtb_csv_sql";
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/LC_Page_Admin_Home.php (revision 21479)
@@ -140,5 +140,5 @@
* @return integer 会員数
*/
- function lfGetCustomerCnt(){
+ function lfGetCustomerCnt() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$col = "COUNT(customer_id)";
@@ -154,5 +154,5 @@
* @return integer 結果数値
*/
- function lfGetOrderYesterday($method){
+ function lfGetOrderYesterday($method) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -169,5 +169,5 @@
* @return integer 結果数値
*/
- function lfGetOrderMonth($method){
+ function lfGetOrderMonth($method) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$month = date("Y/m", mktime());
@@ -198,5 +198,5 @@
* @return integer 昨日のレビュー書き込み数
*/
- function lfGetReviewYesterday(){
+ function lfGetReviewYesterday() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -212,5 +212,5 @@
* @return integer レビュー書き込み非表示数
*/
- function lfGetReviewNonDisp(){
+ function lfGetReviewNonDisp() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php (revision 21479)
@@ -140,5 +140,5 @@
* @return integer 更新結果
*/
- function lfUpdPageData($arrUpdData = array()){
+ function lfUpdPageData($arrUpdData = array()) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sql = "";
@@ -177,5 +177,5 @@
* @return array 表示データ
*/
- function lfSetData($arrPageData, $arrDispData){
+ function lfSetData($arrPageData, $arrDispData) {
foreach ($arrPageData as $device_key => $arrVal) {
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php (revision 21479)
@@ -207,6 +207,5 @@
}
- function lfInitParam($mode, &$objFormParam)
- {
+ function lfInitParam($mode, &$objFormParam) {
switch ($mode) {
case 'edit':
Index: 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 (revision 21444)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php (revision 21479)
@@ -129,5 +129,5 @@
}
- function lfRegistMailTemplate($post, $member_id){
+ function lfRegistMailTemplate($post, $member_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php (revision 21479)
@@ -308,5 +308,5 @@
* @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);
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php (revision 21479)
@@ -42,6 +42,5 @@
* @return void
*/
- function init()
- {
+ function init() {
parent::init();
$this->tpl_mainpage = 'customer/search_customer.tpl';
@@ -97,6 +96,5 @@
* @return void
*/
- function destroy()
- {
+ function destroy() {
parent::destroy();
}
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 21479)
@@ -211,5 +211,5 @@
* @return array key:template_id value:サブジェクト【配信形式】
*/
- function lfGetMailTemplateList($arrTemplate){
+ function lfGetMailTemplateList($arrTemplate) {
if (is_array($arrTemplate)) {
foreach ($arrTemplate as $line) {
@@ -227,5 +227,5 @@
* @return void
*/
- function lfGetTemplateData(&$objFormParam, $template_id){
+ function lfGetTemplateData(&$objFormParam, $template_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->setOrder("template_id DESC");
@@ -240,5 +240,5 @@
* @return integer 登録した行の dtb_send_history.send_id の値
*/
- function lfRegisterData(&$objFormParam){
+ function lfRegisterData(&$objFormParam) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -282,5 +282,5 @@
* @return array
*/
- function lfGetMailQuery($send_id){
+ function lfGetMailQuery($send_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php (revision 21479)
@@ -135,5 +135,5 @@
* @return void
*/
- function lfDeleteHistory($send_id){
+ function lfDeleteHistory($send_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->update("dtb_send_history",
Index: 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 (revision 21442)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php (revision 21479)
@@ -99,5 +99,5 @@
* @return void
*/
- function lfDeleteMailTemplate($template_id){
+ function lfDeleteMailTemplate($template_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->update("dtb_mailmaga_template",
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 21479)
@@ -123,5 +123,5 @@
* @return void
*/
- function lfRegistData( &$objFormParam, $template_id = null){
+ function lfRegistData(&$objFormParam, $template_id = null) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (revision 21479)
@@ -153,5 +153,5 @@
* @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, ";
@@ -173,5 +173,5 @@
* @return void
*/
- function lfRegistReviewData($review_id, &$objFormParam){
+ function lfRegistReviewData($review_id, &$objFormParam) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrValues = $objFormParam->getDbArray();
Index: 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 (revision 21444)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21479)
@@ -633,5 +633,5 @@
* @return void
*/
- function lfSetScaleImage(&$objUpFile, $image_key){
+ function lfSetScaleImage(&$objUpFile, $image_key) {
$subno = str_replace("sub_large_image", "", $image_key);
switch ($image_key) {
@@ -676,5 +676,5 @@
* @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 = "";
@@ -1384,5 +1384,5 @@
* @return string
*/
- function lfGetAddSuffix($to_key){
+ function lfGetAddSuffix($to_key) {
if( IMAGE_RENAME === true) return ;
Index: 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 (revision 21446)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php (revision 21479)
@@ -183,6 +183,5 @@
* @return void
*/
- function lfGetIndexList()
- {
+ function lfGetIndexList() {
// データベースからインデックス設定一覧を取得する
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 21478)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 21479)
@@ -813,5 +813,5 @@
* @return boolean
*/
- function checkUploadFileName($tar_obj, $dir_name){
+ function checkUploadFileName($tar_obj, $dir_name) {
// ファイル一覧を取得
$arrayFile = $tar_obj->listContent();
@@ -829,5 +829,5 @@
* @param string $dir_path 作成するディレクトリのパス
*/
- function makeDir($dir_path){
+ function makeDir($dir_path) {
// ディレクトリ作成
if (!file_exists($dir_path)) {
@@ -842,5 +842,5 @@
* @return string $conflict_alert_message メッセージ
*/
- function checkConflictPlugin($plugin_id){
+ function checkConflictPlugin($plugin_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = "dtb_plugin_hookpoint";
Index: 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 (revision 21442)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php (revision 21479)
@@ -146,5 +146,5 @@
* @return void
*/
- function lfCheckAdminArea(&$arrForm, &$arrErr){
+ function lfCheckAdminArea(&$arrForm, &$arrErr) {
$admin_dir = trim($arrForm['admin_dir'])."/";
@@ -165,5 +165,5 @@
//管理機能ディレクトリのリネームと CONFIG_REALFILE の変更
- function lfUpdateAdminData(&$arrForm){
+ function lfUpdateAdminData(&$arrForm) {
$admin_dir = trim($arrForm['admin_dir'])."/";
$admin_force_ssl = 'FALSE';
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 21479)
@@ -230,5 +230,5 @@
* @return $arrErr
*/
- function lfCheckError(&$arrForm, $mode){
+ function lfCheckError(&$arrForm, $mode) {
$arrVal = array();
@@ -268,5 +268,5 @@
* @return boolean|int 結果。true:成功 int:失敗 FIXME 本来は int ではなく、エラーメッセージを戻すべき
*/
- function lfCreateBkupData($bkup_name, $work_dir){
+ function lfCreateBkupData($bkup_name, $work_dir) {
// 実行時間を制限しない
set_time_limit(0);
@@ -388,5 +388,5 @@
// バックアップテーブルにデータを更新する
- function lfUpdBkupData($data){
+ function lfUpdBkupData($data) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -400,5 +400,5 @@
// バックアップテーブルからデータを取得する
- function lfGetBkupData($where = "", $data = array()){
+ function lfGetBkupData($where = "", $data = array()) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -421,5 +421,5 @@
* @return void
*/
- function lfRestore($bkup_name, $bkup_dir, $bkup_ext, $mode){
+ function lfRestore($bkup_name, $bkup_dir, $bkup_ext, $mode) {
// 実行時間を制限しない
set_time_limit(0);
@@ -475,5 +475,5 @@
* @return void
*/
- function lfExeInsertSQL(&$objQuery, $dir, $mode){
+ function lfExeInsertSQL(&$objQuery, $dir, $mode) {
$tbl_flg = false;
@@ -532,5 +532,5 @@
// 自動採番をセット
- function lfSetAutoInc(&$objQuery, $csv){
+ function lfSetAutoInc(&$objQuery, $csv) {
// csvファイルからデータの取得
$arrCsvData = file($csv);
@@ -544,5 +544,5 @@
// DBを全てクリアする
- function lfDeleteAll(&$objQuery){
+ function lfDeleteAll(&$objQuery) {
$ret = true;
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 21479)
@@ -168,5 +168,5 @@
* @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);
Index: 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 (revision 21442)
+++ branches/version-2_12-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php (revision 21479)
@@ -235,5 +235,5 @@
* @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();
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php (revision 21479)
@@ -192,5 +192,5 @@
* @return array
*/
- function getOwnersStoreSettings(){
+ function getOwnersStoreSettings() {
$table = 'dtb_ownersstore_settings';
$colmuns = '*';
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_SystemError.php (revision 21479)
@@ -72,5 +72,5 @@
* @return void
*/
- function action(){
+ function action() {
$this->tpl_error = "システムエラーが発生しました。
大変お手数ですが、サイト管理者までご連絡ください。";
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error.php (revision 21479)
@@ -84,5 +84,5 @@
* @return void
*/
- function action(){
+ function action() {
switch ($this->type) {
case PRODUCT_NOT_FOUND:
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class/pages/error/LC_Page_Error_DispError.php (revision 21479)
@@ -68,5 +68,5 @@
* @return void
*/
- function action(){
+ function action() {
switch ($this->type) {
case LOGIN_ERROR:
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php (revision 21479)
@@ -208,5 +208,5 @@
* @return
*/
- function lfUpdateOrderTempid($pre_uniqid,$uniqid){
+ function lfUpdateOrderTempid($pre_uniqid,$uniqid) {
$sqlval['order_temp_id'] = $uniqid;
$where = "order_temp_id = ?";
@@ -224,5 +224,5 @@
* @return void
*/
- function lfGetCartPrevUrl(&$session,$referer){
+ function lfGetCartPrevUrl(&$session,$referer) {
if (!preg_match("/cart/", $referer)) {
if (!empty($session['cart_referer_url'])) {
@@ -248,5 +248,5 @@
* @return void
*/
- function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey){
+ function lfSetCurrentCart(&$objSiteSess, &$objCartSess, $cartKey) {
// 正常に登録されたことを記録しておく
$objSiteSess->setRegistFlag();
Index: branches/version-2_12-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Customer.php (revision 21446)
+++ branches/version-2_12-dev/data/class/SC_Customer.php (revision 21479)
@@ -301,5 +301,5 @@
//受注関連の会員情報を更新
- function updateOrderSummary($customer_id){
+ function updateOrderSummary($customer_id) {
$objQuery = new SC_Query_Ex();
$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));
Index: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 21455)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 21479)
@@ -220,5 +220,5 @@
* @return string アスタリスクへ変換した文字列
*/
- function sfPassLen($passlen){
+ function sfPassLen($passlen) {
$ret = "";
for ($i=0;$i<$passlen;true) {
@@ -234,5 +234,5 @@
* @return bool
*/
- function sfIsHTTPS () {
+ function sfIsHTTPS() {
// HTTPS時には$_SERVER['HTTPS']には空でない値が入る
// $_SERVER['HTTPS'] != 'off' はIIS用
@@ -303,5 +303,5 @@
}
- function sfGetCSVData($data, $prefix = ""){
+ function sfGetCSVData($data, $prefix = "") {
if ($prefix == "") {
$dir_name = SC_Utils_Ex::sfUpDirName();
@@ -552,5 +552,5 @@
/* ３．エラー (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) {
// 期間指定
@@ -575,5 +575,5 @@
// エラー箇所の背景色を変更するためのfunction SC_Viewで読み込む
- function sfSetErrorStyle(){
+ function sfSetErrorStyle() {
return 'style="background-color:'.ERR_COLOR.'"';
}
@@ -667,5 +667,5 @@
// 桁数を指定して四捨五入
- function sfRound($value, $pow = 0){
+ function sfRound($value, $pow = 0) {
$adjust = pow(10 ,$pow-1);
@@ -825,5 +825,5 @@
// 二回以上繰り返されているスラッシュ[/]を一つに変換する。
- function sfRmDupSlash($istr){
+ function sfRmDupSlash($istr) {
if (ereg("^http://", $istr)) {
$str = substr($istr, 7);
@@ -1067,5 +1067,5 @@
* @deprecated SC_Query::quote() を使用すること
*/
- function sfQuoteSmart($in){
+ function sfQuoteSmart($in) {
if (is_int($in) || is_double($in)) {
@@ -1108,5 +1108,5 @@
// ディレクトリ以下のファイルを再帰的にコピー
- function sfCopyDir($src, $des, $mess = "", $override = false){
+ function sfCopyDir($src, $des, $mess = "", $override = false) {
if (!is_dir($src)) {
return false;
@@ -1160,5 +1160,5 @@
// 指定したフォルダ内のファイルを全て削除する
- function sfDelFile($dir){
+ function sfDelFile($dir) {
if (file_exists($dir)) {
$dh = opendir($dir);
@@ -1223,5 +1223,5 @@
* @return void
*/
- function sfFlush($output = false, $sleep = 0){
+ function sfFlush($output = false, $sleep = 0) {
// 出力をバッファリングしない(==日本語自動変換もしない)
while (@ob_end_flush());
Index: branches/version-2_12-dev/data/class/util/GC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21446)
+++ branches/version-2_12-dev/data/class/util/GC_Utils.php (revision 21479)
@@ -39,5 +39,5 @@
* [注釈] 引数は１，２ともカンマ区切りになっていること
*----------------------------------------------------------------------*/
- function gfDownloadCsv($header, $contents){
+ function gfDownloadCsv($header, $contents) {
$fiest_name = date('YmdHis') .".csv";
@@ -65,5 +65,5 @@
* [注釈] -
*----------------------------------------------------------------------*/
- function gfSetCsv($array, $arrayIndex = ""){
+ function gfSetCsv($array, $arrayIndex = "") {
//引数$arrayIndexは、$arrayが連想配列のときに添え字を指定してやるために使用する
@@ -94,6 +94,5 @@
* [注釈] -
*----------------------------------------------------------------------*/
- function gfGetAge($dbdate)
- {
+ function gfGetAge($dbdate) {
$ty = date('Y');
$tm = date('m');
Index: branches/version-2_12-dev/data/class/SC_Display.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Display.php (revision 21441)
+++ branches/version-2_12-dev/data/class/SC_Display.php (revision 21479)
@@ -54,5 +54,5 @@
}
- function setPrevURL(){
+ function setPrevURL() {
// TODO SC_SiteSession で実装した方が良さげ
$objCartSess = new SC_CartSession_Ex();
@@ -66,5 +66,5 @@
* @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();
@@ -80,9 +80,9 @@
* 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;
}
@@ -91,5 +91,5 @@
* ヘッダを追加する.
*/
- function addHeader($name, $value){
+ function addHeader($name, $value) {
$this->response->addHeader($name, $value);
}
@@ -99,5 +99,5 @@
* Enter description here ...
*/
- function setDevice($device = DEVICE_TYPE_PC){
+ function setDevice($device = DEVICE_TYPE_PC) {
switch ($device) {
@@ -121,5 +121,5 @@
* SC_View インスタンスを設定する.
*/
- function setView($view){
+ function setView($view) {
$this->view = $view;
}
@@ -135,5 +135,5 @@
* @return integer 端末種別ID
*/
- function detectDevice(){
+ function detectDevice() {
$nu = new Net_UserAgent_Mobile();
$su = new SC_SmartphoneUserAgent_Ex();
@@ -148,13 +148,13 @@
}
- 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);
}
Index: 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 (revision 21448)
+++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (revision 21479)
@@ -60,5 +60,5 @@
* @return string MySQL 用に置換した SQL 文
*/
- function sfChangeMySQL($sql){
+ function sfChangeMySQL($sql) {
// 改行、タブを1スペースに変換
$sql = preg_replace("/[\r\n\t]/"," ",$sql);
@@ -236,5 +236,5 @@
* @return string 変換後の SQL 文
*/
- function sfChangeILIKE($sql){
+ function sfChangeILIKE($sql) {
$changesql = preg_replace('/(^|[^\w])ILIKE([^\w]|$)/i', '$1LIKE$2', $sql);
return $changesql;
@@ -248,5 +248,5 @@
* @return string 変換後の SQL 文
*/
- function sfChangeRANDOM($sql){
+ function sfChangeRANDOM($sql) {
$changesql = preg_replace('/(^|[^\w])RANDOM\(/i', '$1RAND(', $sql);
return $changesql;
@@ -260,5 +260,5 @@
* @return string 変換後の SQL 文
*/
- function sfChangeTrunc($sql){
+ function sfChangeTrunc($sql) {
$changesql = preg_replace('/(^|[^\w])TRUNC([^\w]|$)/i', '$1TRUNCATE$2', $sql);
return $changesql;
@@ -272,5 +272,5 @@
* @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);
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php (revision 21479)
@@ -60,5 +60,5 @@
* @return string MySQL 用に置換した SQL 文
*/
- function sfChangeMySQL($sql){
+ function sfChangeMySQL($sql) {
return $sql;
}
Index: branches/version-2_12-dev/data/class/SC_Image.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Image.php (revision 21446)
+++ branches/version-2_12-dev/data/class/SC_Image.php (revision 21479)
@@ -78,5 +78,5 @@
* @param array 新ファイル名を格納した配列
*/
- function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = ''){
+ function MakeThumb($FromImgPath , $ToImgPath , $tmpMW , $tmpMH, $newFileName = '') {
// 画像の最大横幅（単位：ピクセル）
$ThmMaxWidth = LARGE_IMAGE_WIDTH;
@@ -111,5 +111,6 @@
$re_size = $size;
- if (!$size[2] || $size[2] > 3){ // 画像の種類が不明 or swf
+ // 画像の種類が不明 or swf
+ if (!$size[2] || $size[2] > 3) {
return array(0,"画像形式がサポートされていません。");
}
@@ -178,5 +179,6 @@
$TmpPath = $ToImgPath.$ToFile;
@Imagepng($ImgNew,$TmpPath);
- if (!@file_exists($TmpPath)){ // 画像が作成されていない場合
+ // 画像が作成されていない場合
+ if (!@file_exists($TmpPath)) {
return array(0,"画像の出力に失敗しました。");
}
@@ -204,5 +206,6 @@
$TmpPath = $ToImgPath.$ToFile;
@ImageJpeg($ImgNew,$TmpPath);
- if (!@file_exists($TmpPath)){ // 画像が作成されていない場合
+ // 画像が作成されていない場合
+ if (!@file_exists($TmpPath)) {
return array(0,"画像の出力に失敗しました。
${ImgNew}
${TmpPath}");
}
@@ -224,5 +227,6 @@
$TmpPath = $ToImgPath.$ToFile;
@ImagePNG($ImgNew,$TmpPath);
- if (!@file_exists($TmpPath)){ // 画像が作成されていない場合
+ // 画像が作成されていない場合
+ if (!@file_exists($TmpPath)) {
return array(0,"画像の出力に失敗しました。");
}
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/smarty_extends/function.html_radios_ex.php (revision 21479)
@@ -39,6 +39,5 @@
* @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');
Index: branches/version-2_12-dev/data/smarty_extends/function.from_to.php
===================================================================
--- branches/version-2_12-dev/data/smarty_extends/function.from_to.php (revision 21420)
+++ branches/version-2_12-dev/data/smarty_extends/function.from_to.php (revision 21479)
@@ -31,6 +31,5 @@
* @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');
Index: 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 (revision 21441)
+++ branches/version-2_12-dev/data/smarty_extends/function.html_checkboxes_ex.php (revision 21479)
@@ -39,6 +39,5 @@
* @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');
Index: 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 (revision 21420)
+++ branches/version-2_12-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_SearchCustomer_Ex.php (revision 21479)
@@ -45,6 +45,5 @@
* @return void
*/
- function init()
- {
+ function init() {
parent::init();
}
@@ -55,6 +54,5 @@
* @return void
*/
- function process()
- {
+ function process() {
parent::process();
}
@@ -65,6 +63,5 @@
* @return void
*/
- function destroy()
- {
+ function destroy() {
parent::destroy();
}