Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php (revision 20538)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php (revision 20540)
@@ -68,5 +68,5 @@
$error = $arrInfo['email04'];
$tosubject = $this->sfMakeSubject($tmp_subject, $objMailView);
-
+
$objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error);
$objSendMail->setTo($to, $to_name);
@@ -195,5 +195,5 @@
$error = $arrInfo['email04'];
$tosubject = $this->sfMakeSubject($tmp_subject, $objMailView);
-
+
$objSendMail->setItem($to, $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
$objSendMail->sendMail();
@@ -209,5 +209,5 @@
$error = $arrInfo['email04'];
$tosubject = $this->sfMakeSubject($tmp_subject);
-
+
$objSendMail->setItem($to, $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
$objSendMail->sendMail();
@@ -220,5 +220,5 @@
}
$objTplAssign = new stdClass;
-
+
$arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
$objTplAssign->tpl_shopname=$arrInfo['shop_name'];
@@ -283,5 +283,5 @@
$CONF = SC_Helper_DB_Ex::sfGetBasisData();
-
+
$objMailText = new SC_SiteView_Ex();
$objMailText->assign('CONF', $CONF);
@@ -326,5 +326,5 @@
return true;
}
-
+
/**
* 保存されているメルマガテンプレートの取得
@@ -337,5 +337,5 @@
$where = '';
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
// 条件文
$where = 'del_flg = ?';
@@ -346,12 +346,12 @@
$arrValues[] = $template_id;
}
-
+
// 表示順
$objQuery->setOrder("create_date DESC");
-
+
$arrResults = $objQuery->select('*', 'dtb_mailmaga_template', $where, $arrValues);
return $arrResults;
}
-
+
/**
* 保存されているメルマガ送信履歴の取得
@@ -363,9 +363,9 @@
$where = '';
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
// 条件文
$where = 'del_flg = ?';
$arrValues[] = 0;
-
+
//send_id指定時
if (SC_Utils_Ex::sfIsInt($send_id) === true) {
@@ -373,8 +373,8 @@
$arrValues[] = $send_id;
}
-
+
// 表示順
$objQuery->setOrder("create_date DESC");
-
+
$arrResults = $objQuery->select('*', 'dtb_send_history', $where, $arrValues);
return $arrResults;
@@ -392,5 +392,5 @@
$objSite = $objDb->sfGetBasisData();
$objMail = new SC_SendMail_Ex();
-
+
$where = 'del_flg = 0 AND send_id = ?';
$arrMail = $objQuery->getRow('*', 'dtb_send_history', $where, array($send_id));
@@ -406,9 +406,9 @@
array($send_id)
);
-
+
// 現在の配信数
$complete_count = $arrMail['complete_count'];
if(SC_Utils_Ex::isBlank($arrMail)) $complete_count = 0;
-
+
foreach ($arrDestinationList as $arrDestination) {
@@ -428,5 +428,5 @@
$objSite["email04"] // errors_to
);
-
+
// テキストメール配信の場合
if ($arrMail["mail_method"] == 2) {
@@ -445,5 +445,5 @@
$complete_count++;
}
-
+
// 送信結果情報を更新
$objQuery->update('dtb_send_customer',
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_FileManager.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_FileManager.php (revision 20538)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_FileManager.php (revision 20540)
@@ -339,5 +339,5 @@
return $str;
}
-
+
/**
* ファイル書込を行う.
@@ -398,15 +398,15 @@
// 圧縮フラグTRUEはgzip解凍をおこなう
$tar = new Archive_Tar($path, true);
-
+
$dir = dirname($path);
$file_name = basename($path);
-
+
// 拡張子を切り取る
$unpacking_name = preg_replace("/(\.tar|\.tar\.gz)$/", "", $file_name);
-
+
// 指定されたフォルダ内に解凍する
$tar->extractModify($dir. "/", $unpacking_name);
GC_Utils_Ex::gfPrintLog("解凍：" . $dir."/".$file_name."->".$dir."/".$unpacking_name);
-
+
// フォルダ削除
SC_Utils_Ex::sfDelFile($dir . "/" . $unpacking_name);
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php (revision 20538)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php (revision 20540)
@@ -105,8 +105,8 @@
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';
$table = 'dtb_csv';
-
+
if(SC_Utils_Ex::sfIsInt($csv_id)){
if($where == "") {
@@ -118,5 +118,5 @@
}
$objQuery->setOrder($order);
-
+
$arrRet = $objQuery->select($cols, $table, $where, $arrVal);
return $arrRet;
@@ -143,5 +143,5 @@
return $result;
}
-
+
/**
* CSVが出力設定で更新可能かのチェック
@@ -161,5 +161,5 @@
return $result;
}
-
+
/**
* CSVファイルのカウント数を得る.
@@ -218,5 +218,5 @@
$objQuery->setOrder($order);
$cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols, true);
-
+
// TODO: 固有処理 なんかエレガントな処理にしたい
if($csv_id == '1') {
@@ -229,5 +229,5 @@
// 顧客の場合
$sql = "SELECT " . $cols . " FROM dtb_customer " . $where;
-
+
}
// 固有処理ここまで
@@ -318,18 +318,18 @@
,'del_flg = 0'
);
-
+
$outputArray = array();
-
+
// ヘッダ行
$outputArray[] = $arrOutput['disp_name'];
-
+
// データ行
foreach ($dataRows as $row) {
$outputArray[] = $row;
}
-
+
// CSVを送信する。
$this->lfDownloadCsv($outputArray, 'category');
-
+
// 成功終了
return true;
@@ -431,18 +431,18 @@
return "";
}
-
+
if( strlen($enclosure) < 1 ) {
trigger_error('enclosure must be a single character', E_USER_WARNING);
return "";
}
-
+
foreach (array_keys($fields) as $key) {
$field =& $fields[$key];
-
+
// 配列を「|」区切りの文字列に変換する
if (is_array($field)) {
$field = implode($arrayDelimiter, $field);
}
-
+
/* enclose a field that contains a delimiter, an enclosure character, or a newline */
if (
@@ -453,8 +453,8 @@
}
}
-
+
return implode($delimiter, $fields);
}
-
+
/**
* CSVを送信する。
@@ -482,5 +482,5 @@
}
}
-
+
/**
* CSVファイルを送信する。
@@ -488,5 +488,5 @@
function lfDownloadCSVFile($filepath, $prefix = "") {
$file_name = $prefix . date('YmdHis') . ".csv";
-
+
/* HTTPヘッダの出力 */
Header("Content-disposition: attachment; filename=${file_name}");
@@ -494,5 +494,5 @@
Header("Cache-Control: ");
Header("Pragma: ");
-
+
/* データを出力 */
// file_get_contentsはメモリマッピングも自動的に使ってくれるので高速＆省メモリ
Index: branches/version-2_5-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Query.php (revision 20538)
+++ branches/version-2_5-dev/data/class/SC_Query.php (revision 20540)
@@ -217,5 +217,5 @@
return $this->query($str, $arrval);
}
-
+
/**
* クエリを実行し、結果行毎にコールバック関数を適用する
@@ -240,5 +240,5 @@
return;
}
-
+
while($data = $affected->fetchRow($fetchmode)) {
$result = call_user_func($cbFunc, $data);
@@ -514,7 +514,7 @@
}
}
-
+
$arrVal = array_merge($arrVal, $arrRawSqlVal);
-
+
if (empty($arrCol)) {
return false;
@@ -737,8 +737,8 @@
return $sth;
}
-
+
//PREPAREの解放
$sth->free();
-
+
return $result;
}
@@ -785,5 +785,5 @@
return $objManager->listTableIndexes($table);
}
-
+
/**
* テーブルにインデックスを付与する
Index: branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php
===================================================================
--- branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php (revision 20538)
+++ branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php (revision 20540)
@@ -218,5 +218,5 @@
function lfMkdirRecursive($path){
$path = dirname($path);
-
+
// HTML_REALDIR/DATA_REALDIRの判別
if (preg_match("@\Q".HTML_REALDIR."\E@", $path) > 0) {
Index: branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_View.php (revision 20538)
+++ branches/version-2_5-dev/data/class/SC_View.php (revision 20540)
@@ -120,5 +120,5 @@
function assignobj($obj) {
$data = get_object_vars($obj);
-
+
foreach ($data as $key => $value){
$this->_smarty->assign($key, $value);
Index: branches/version-2_5-dev/data/class/SC_Date.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Date.php (revision 20538)
+++ branches/version-2_5-dev/data/class/SC_Date.php (revision 20540)
@@ -28,5 +28,5 @@
var $day;
var $end_year;
-
+
// コンストラクタ
function SC_Date($start_year='', $end_year='') {
@@ -34,29 +34,29 @@
if ( $end_year ) $this->setEndYear($end_year);
}
-
+
function setStartYear($year){
$this->start_year = $year;
}
-
+
function getStartYear(){
return $this->start_year;
}
-
+
function setEndYear($endYear) {
$this->end_year = $endYear;
}
-
+
function getEndYear() {
return $this->end_year;
}
-
+
function setMonth($month){
$this->month = $month;
}
-
+
function setDay ($day){
$this->day = $day;
}
-
+
/**
* 年プルダウン用の配列を返す
@@ -71,17 +71,17 @@
function getYear($year = '', $default_year = false, $default_key = '----') {
if ( $year ) $this->setStartYear($year);
-
+
$year = $this->start_year;
if ( ! $year ) $year = DATE('Y');
-
+
$end_year = $this->end_year;
if ( ! $end_year ) $end_year = (DATE('Y') + 3);
-
+
$year_array = array();
-
+
if ($default_year === true) {
$year_array[$default_key] = '----';
}
-
+
for ($i = $year; $i <= $end_year; $i++) {
$year_array[$i] = $i;
@@ -92,16 +92,16 @@
return $year_array;
}
-
+
function getZeroYear($year = ''){
if ( $year ) $this->setStartYear($year);
-
+
$year = $this->start_year;
if ( ! $year ) $year = DATE('Y');
-
+
$end_year = $this->end_year;
if ( ! $end_year ) $end_year = (DATE('Y') + 3);
-
+
$year_array = array();
-
+
for ($i = $year; $i <= $end_year; $i++) {
$key = substr($i, -2);
@@ -110,7 +110,7 @@
return $year_array;
}
-
+
function getZeroMonth(){
-
+
$month_array = array();
for ($i=1; $i <= 12; $i++){
@@ -120,11 +120,11 @@
return $month_array;
}
-
-
+
+
function getMonth($default = false) {
$month_array = array();
-
+
if ($default) $month_array[''] = '--';
-
+
for ($i=0; $i < 12; $i++){
$month_array[$i + 1 ] = $i + 1;
@@ -132,39 +132,39 @@
return $month_array;
}
-
+
function getDay($default = false) {
$day_array = array();
-
+
if ($default) $day_array[''] = '--';
-
+
for ($i=0; $i < 31; $i++){
$day_array[ $i + 1 ] = $i + 1;
}
-
+
return $day_array;
}
function getHour(){
-
+
$day_array = array();
for ($i=0; $i<=23; $i++){
$hour_array[$i] = $i;
}
-
+
return $hour_array;
}
function getMinutes(){
-
+
$minutes_array = array();
for ($i=0; $i<=59; $i++){
$minutes_array[$i] = $i;
}
-
+
return $minutes_array;
}
-
+
function getMinutesInterval(){
-
+
$minutes_array = array("00"=>"00", "30"=>"30");
return $minutes_array;
Index: branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php (revision 20540)
@@ -164,5 +164,5 @@
return $errmsg;
}
-
+
/**
* メールアドレス確認におけるパラメーター情報の初期化
@@ -203,5 +203,5 @@
if (isset($result[0]['reminder']) and isset($arrReminder[$result[0]['reminder']])
and $result[0]['reminder'] == $arrForm['reminder']) {
-
+
if (SC_Utils_Ex::sfIsMatchHashPassword($arrForm['reminder_answer'],
$result[0]['reminder_answer'], $result[0]['salt'])) {
Index: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php (revision 20540)
@@ -109,5 +109,5 @@
$masterData = new SC_DB_MasterData_Ex();
$arrDisableLogout = $masterData->getMasterData('mtb_disable_logout');
-
+
$current_page = $_SERVER['PHP_SELF'];
Index: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (revision 20540)
@@ -92,5 +92,5 @@
// 商品が1つ以上入っている場合には商品名称を取得
if (count($arrCartList) > 0){
-
+
foreach($arrCartList['productsClass'] as $key => $val){
$arrCartList[$key]['product_name'] = $val['name'];
@@ -102,16 +102,16 @@
$total_quantity += $objCart->getTotalQuantity($cart_key);
}
-
+
// 店舗情報の取得
$arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
-
+
// 送料無料までの金額
$arrCartList[0]['ProductsTotal'] = $products_total;
$arrCartList[0]['TotalQuantity'] = $total_quantity;
-
+
$deliv_free = $arrInfo['free_rule'] - $products_total;
$arrCartList[0]['free_rule'] = $arrInfo['free_rule'];
$arrCartList[0]['deliv_free'] = $deliv_free;
-
+
return $arrCartList;
}
Index: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (revision 20540)
@@ -87,5 +87,5 @@
parent::destroy();
}
-
+
/**
* 商品IDを取得する.
@@ -100,5 +100,5 @@
return $product_id;
}
-
+
/**
* カテゴリIDを取得する.
@@ -113,5 +113,5 @@
return $category_id;
}
-
+
/**
* メーカーIDを取得する.
@@ -126,5 +126,5 @@
return $maker_id;
}
-
+
/**
* 選択中のカテゴリIDを取得する
Index: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (revision 20540)
@@ -92,5 +92,5 @@
$sql .= " ORDER BY ";
$sql .= " rank DESC ";
-
+
$arrNewsList = $objQuery->getAll($sql);
return $arrNewsList;
Index: branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php (revision 20540)
@@ -74,7 +74,7 @@
function init() {
parent::init();
-
+
$this->staticURL = array();
-
+
$this->staticURL[] = HTTP_URL . 'rss/' . DIR_INDEX_PATH;
if (USE_MOBILE !== false) {
@@ -215,5 +215,5 @@
*/
function getAllProducts() {
-
+
// XXX: 商品登録の無いカテゴリーは除外する方が良い気もする
$objQuery = SC_Query_Ex::getSingletonInstance();
@@ -224,8 +224,8 @@
foreach ($result as $row) {
// :TODO: カテゴリの最終更新日を取得できるようにする
-
+
$arrPage['url'] = HTTP_URL . 'products/list.php?category_id=' . $row['category_id'];
$arrRet[] = $arrPage;
-
+
// モバイルサイト
if (USE_MOBILE !== false) {
@@ -249,10 +249,10 @@
$arrRet = array();
foreach ($result as $row) {
-
+
$arrPage["update_date"] = $row['update_date'];
-
+
$arrPage['url'] = HTTP_URL . substr(P_DETAIL_URLPATH, strlen(ROOT_URLPATH)) . $row['product_id'];
$arrRet[] = $arrPage;
-
+
// モバイルサイト
if (USE_MOBILE !== false) {
@@ -302,5 +302,5 @@
$arrPageList = $objQuery->getAll($sql, $arrVal);
-
+
// URL にプロトコルの記載が無い場合、HTTP_URL を前置する。
foreach (array_keys($arrPageList) as $key) {
@@ -312,5 +312,5 @@
}
unset($arrPage);
-
+
return $arrPageList;
}
Index: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 20540)
@@ -54,5 +54,5 @@
/** アップロードファイル */
var $objUpFile;
-
+
/** モード */
var $mode;
@@ -404,5 +404,5 @@
$objQuery->setOrder("rank DESC");
$arrRecommendData = $objQuery->select("recommend_product_id, comment", "dtb_recommend_products", "product_id = ?", array($product_id));
-
+
$arrRecommendProductId = array();
foreach($arrRecommendData as $recommend){
@@ -410,7 +410,7 @@
$arrRecommendData[$recommend["recommend_product_id"]] = $recommend['comment'];
}
-
+
$objProduct = new SC_Product_Ex();
-
+
$where = "";
if (!empty($arrRecommendProductId)) {
@@ -513,5 +513,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$count = $objQuery->count("dtb_customer_favorite_products", "customer_id = ? AND product_id = ?", array($customer_id, $favorite_product_id));
-
+
if ($count == 0) {
$sqlval['customer_id'] = $customer_id;
@@ -519,5 +519,5 @@
$sqlval['update_date'] = "now()";
$sqlval['create_date'] = "now()";
-
+
$objQuery->begin();
$objQuery->insert('dtb_customer_favorite_products', $sqlval);
Index: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_ReviewComplete.php (revision 20540)
@@ -57,5 +57,5 @@
$this->sendResponse();
}
-
+
/**
* Page のAction.
Index: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php (revision 20540)
@@ -101,5 +101,5 @@
//modeの取得
$this->mode = $this->getMode();
-
+
//表示条件の取得
$this->arrSearchData = array(
@@ -109,5 +109,5 @@
);
$this->orderby = $this->arrForm['orderby'];
-
+
//ページング設定
$this->tpl_pageno = $this->arrForm['pageno'];
@@ -311,5 +311,5 @@
$arrProducts[] = $arrProducts2[$product_id];
}
-
+
// 規格を設定
$objProduct->setProductsClassByProductIds($arrProduct_id);
@@ -395,5 +395,5 @@
return $arrSearch;
}
-
+
/**
* 該当件数の取得
@@ -408,5 +408,5 @@
return $objProduct->findProductCount($objQuery, $searchCondition['arrval']);
}
-
+
/**
* 検索条件のwhere文とかを取得
@@ -421,5 +421,5 @@
'arrvalCategory'=>array()
);
-
+
// カテゴリからのWHERE文字列取得
if ($arrSearchData["category_id"] != 0) {
@@ -483,5 +483,5 @@
return $js_fnOnLoad;
}
-
+
/**
* カートに商品を追加
Index: branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss.php (revision 20540)
@@ -60,5 +60,5 @@
//新着情報を取得
$arrNews = $this->lfGetNews($objQuery);
-
+
//キャッシュしない(念のため)
header("pragma: no-cache");
@@ -113,5 +113,5 @@
$objQuery->setOrder($order);
$arrNews = $objQuery->select($col,$from,$where);
-
+
// RSS用に変換
foreach (array_keys($arrNews) as $key) {
@@ -120,5 +120,5 @@
$row['news_date'] = date('r', strtotime($row['news_date']));
}
-
+
return $arrNews;
}
Index: branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss_Products.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss_Products.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/rss/LC_Page_Rss_Products.php (revision 20540)
@@ -65,8 +65,8 @@
function action() {
$objView = new SC_SiteView_Ex();
-
+
//店舗情報をセット
$this->arrSiteInfo = SC_Helper_DB_Ex::sfGetBasisData();
-
+
//商品IDを取得
if ( isset($_GET['product_id']) && $_GET['product_id'] != '' && is_numeric($_GET['product_id']) ) {
@@ -75,5 +75,5 @@
$product_id = '';
}
-
+
// モードによって分岐
$mode = $this->getMode();
@@ -97,19 +97,19 @@
break;
}
-
+
// 商品情報をセット
$this->arrProduct = $arrProduct;
$this->arrProductKeys = $this->lfGetProductKeys($arrProduct);
-
+
//セットしたデータをテンプレートファイルに出力
$objView->assignobj($this);
-
+
//キャッシュしない(念のため)
header("Pragma: no-cache");
-
+
//XMLテキスト(これがないと正常にRSSとして認識してくれないツールがあるため)
header("Content-type: application/xml");
P_DETAIL_URLPATH;
-
+
//画面表示
$objView->display($this->tpl_mainpage, true);
Index: branches/version-2_5-dev/data/class/pages/LC_Page_InputZip.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_InputZip.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_InputZip.php (revision 20540)
@@ -64,5 +64,5 @@
}
echo $tpl_message;
-
+
// エラー無し
} else {
@@ -119,5 +119,5 @@
$arrErr['input2'] = "※ 入力形式が不正です。
";
}
-
+
return $arrErr;
}
Index: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 20540)
@@ -129,5 +129,5 @@
}
}
-
+
SC_Response_Ex::sendRedirect(
$this->getNextLocation($this->cartKey, $this->tpl_uniqid,
Index: branches/version-2_5-dev/data/class/pages/unsupported/LC_Page_Unsupported.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/unsupported/LC_Page_Unsupported.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/unsupported/LC_Page_Unsupported.php (revision 20540)
@@ -59,5 +59,5 @@
function action() {}
-
+
/**
* デストラクタ.
Index: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Index.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Index.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Index.php (revision 20540)
@@ -75,5 +75,5 @@
// パラメータ管理クラス
$objFormParam = new SC_FormParam_Ex();
-
+
switch ($this->getMode()) {
case 'login':
@@ -96,5 +96,5 @@
$this->setTemplate(LOGIN_FRAME);
}
-
+
/**
* パラメーター情報の初期化
@@ -107,5 +107,5 @@
$objFormParam->addParam('PASSWORD', 'password', ID_MAX_LEN, '', array('EXIST_CHECK', 'ALNUM_CHECK', 'MAX_LENGTH_CHECK'));
}
-
+
/**
* パラメーターのエラーチェック
@@ -129,5 +129,5 @@
return $arrErr;
}
-
+
/**
* 有効な管理者ID/PASSかどうかチェックする
@@ -153,5 +153,5 @@
return false;
}
-
+
/**
* 管理者ログイン設定処理
@@ -172,5 +172,5 @@
$this->lfSetLoginData($sid, $arrData['member_id'], $login_id, $arrData['authority'], $arrData['login_date']);
}
-
+
/**
* ログイン情報セッション登録
@@ -199,5 +199,5 @@
return $objSess->GetSID();
}
-
+
/**
* ログイン情報の記録
@@ -215,5 +215,5 @@
. "lastlogin=$last_login sid=$sid";
GC_Utils_Ex::gfPrintLog($str_log);
-
+
// 最終ログイン日時更新
$objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -224,5 +224,5 @@
$objQuery->update($table, $sqlval, $where, array($member_id));
}
-
+
/**
* ログイン失敗情報の記録
Index: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php (revision 20540)
@@ -124,5 +124,5 @@
return "PHP " . phpversion();
}
-
+
/**
* DBバージョンの取得
@@ -156,5 +156,5 @@
function lfGetOrderYesterday($method){
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
// TODO: DBFactory使わないでも共通化できそうな気もしますが
$dbFactory = SC_DB_DBFactory_Ex::getInstance();
@@ -172,5 +172,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$month = date("Y/m", mktime());
-
+
// TODO: DBFactory使わないでも共通化できそうな気もしますが
$dbFactory = SC_DB_DBFactory_Ex::getInstance();
@@ -186,5 +186,5 @@
function lfGetTotalCustomerPoint() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
$col = "SUM(point)";
$where = "del_flg = 0";
@@ -214,5 +214,5 @@
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";
$where = "A.del_flg = 0 AND A.status = 2 AND B.del_flg = 0";
@@ -227,5 +227,5 @@
function lfGetSoldOut() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
$cols = "product_id, name";
$table = "dtb_products";
@@ -243,5 +243,5 @@
function lfGetNewOrder() {
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
$sql = "SELECT
ord.order_id,
@@ -316,5 +316,5 @@
// タイムアウト時間設定
$context = array('http' => array('timeout' => HTTP_REQUEST_TIMEOUT));
-
+
$jsonStr = @file_get_contents($url, false, stream_context_create($context));
Index: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php (revision 20540)
@@ -118,5 +118,5 @@
case 'pre_edit':
$arrRet = $this->lfGetData($post['payment_id']);
-
+
$objFormParam->addParam("支払方法", "payment_method", STEXT_LEN, 'KVa', array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
$objFormParam->addParam("手数料", 'charge', PRICE_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
Index: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 20540)
@@ -70,5 +70,5 @@
$objDb = new SC_Helper_DB_Ex();
$this->arrCatList = $objDb->sfGetCategoryList();
-
+
$this->httpCacheControl('nocache');
}
@@ -218,5 +218,5 @@
$objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
$order = "update_date DESC, customer_id DESC";
-
+
require_once CLASS_EX_REALDIR . 'helper_extends/SC_Helper_CSV_Ex.php';
$objCSV = new SC_Helper_CSV_Ex();
Index: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php (revision 20540)
@@ -64,5 +64,5 @@
$this->arrMonth = $objDate->getMonth();
$this->arrDay = $objDate->getDay();
-
+
// 支払い方法種別
$objDb = new SC_Helper_DB_Ex();
@@ -150,5 +150,5 @@
$this->arrPagenavi['mode'] = 'return';
$this->tpl_pageno = $objFormParam->getValue("search_pageno");
-
+
break;
case 'complete':
@@ -233,5 +233,5 @@
return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
}
-
+
/**
* フォーム入力パラメーターエラーチェック
@@ -242,5 +242,5 @@
function lfCheckError(&$objFormParam) {
$arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam, true);
-
+
//メアド重複チェック(共通ルーチンは使えない)
$objQuery =& SC_Query_Ex::getSingletonInstance();
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php (revision 20540)
@@ -93,5 +93,5 @@
parent::destroy();
}
-
+
/**
* メールテンプレートの削除
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 20540)
@@ -71,5 +71,5 @@
function action() {
$objMailHelper = new SC_Helper_Mail_Ex();
-
+
switch ($this->getMode()) {
case 'edit':
@@ -83,10 +83,10 @@
// 新規登録
$objFormParam = new SC_FormParam_Ex();
-
+
$this->lfInitParam($objFormParam);
$objFormParam->setParam($_POST);
$this->arrErr = $objFormParam->checkError();
$this->arrForm = $objFormParam->getHashArray();
-
+
if (SC_Utils_Ex::isBlank($this->arrErr)) {
// エラーが無いときは登録・編集
@@ -124,5 +124,5 @@
*/
function lfRegistData( &$objFormParam, $template_id = null ){
-
+
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sqlval = $objFormParam->getDbArray();
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 20540)
@@ -59,5 +59,5 @@
$this->arrHtmlmail = array( "" => "両方", 1 => 'HTML', 2 => 'TEXT' );
$this->arrMailType = $masterData->getMasterData("mtb_mail_type");
-
+
// 日付プルダウン設定
$objDate = new SC_Date_Ex(BIRTH_YEAR);
@@ -70,8 +70,8 @@
$objDb = new SC_Helper_DB_Ex();
$this->arrCatList = $objDb->sfGetCategoryList();
-
+
// テンプレート一覧設定
$this->arrTemplate = $this->lfGetMailTemplateList(SC_Helper_Mail_Ex::sfGetMailmagaTemplate());
-
+
$this->httpCacheControl('nocache');
}
@@ -106,5 +106,5 @@
$this->arrForm = $objFormParam->getFormParamList();
if(!SC_Utils_Ex::isBlank($this->arrErr)) return;
-
+
// モードによる処理切り替え
switch ($this->getMode()) {
@@ -189,5 +189,5 @@
$objFormParam->addParam('配信メールアドレス種別', 'search_mail_type', INT_LEN, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
}
-
+
/**
* パラメーター情報の追加（テンプレート選択）
@@ -202,5 +202,5 @@
$objFormParam->addParam("テンプレートID", "template_id", INT_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"), "", false);
}
-
+
/**
* メルマガテンプレート一覧情報の取得
@@ -217,5 +217,5 @@
return $return;
}
-
+
/**
* テンプレートIDから情報の取得して$objFormParamにset_paramする
@@ -232,5 +232,5 @@
$objFormParam->setParam($arrResults);
}
-
+
/**
* 配信内容と配信リストを書き込む
@@ -240,5 +240,5 @@
function lfRegisterData(&$objFormParam){
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
list($linemax, $arrSendCustomer, $objNavi) = SC_Helper_Customer_Ex::sfGetSearchData($objFormParam->getHashArray());
$send_customer_cnt = count($arrSendCustomer);
@@ -270,5 +270,5 @@
return $send_id;
}
-
+
/**
* 配信履歴から条件を取得する
@@ -278,7 +278,7 @@
*/
function lfGetMailQuery($send_id){
-
+
$objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
// 送信履歴より、送信条件確認画面
$sql = "SELECT search_data FROM dtb_send_history WHERE send_id = ?";
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php (revision 20540)
@@ -79,5 +79,5 @@
break;
}
-
+
list($this->tpl_linemax, $this->arrDataList, $this->arrPagenavi) = $this->lfDoSearch($_POST['search_pageno']);
}
@@ -91,5 +91,5 @@
parent::destroy();
}
-
+
/**
* 実行履歴の取得
@@ -99,5 +99,5 @@
*/
function lfDoSearch($search_pageno = 1) {
-
+
// 引数の初期化
if(SC_Utils_Ex::sfIsInt($search_pageno)===false) $search_pageno = 1;
@@ -105,5 +105,5 @@
$objSelect =& SC_Query_Ex::getSingletonInstance(); // 一覧データ取得用
$objQuery =& SC_Query_Ex::getSingletonInstance(); // 件数取得用
-
+
// 該当全体件数の取得
$linemax = $objQuery->count("dtb_send_history","del_flg = 0");
@@ -111,5 +111,5 @@
// 一覧データの取得
$objSelect->setOrder("start_date DESC, send_id DESC");
-
+
$col = "*";
$col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id) AS count_all";
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php (revision 20540)
@@ -63,5 +63,5 @@
*/
function action() {
-
+
$objMailHelper = new SC_Helper_Mail_Ex();
@@ -84,5 +84,5 @@
}
-
+
$this->setTemplate($this->tpl_mainpage);
}
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 20540)
@@ -345,5 +345,5 @@
$_SESSION['member_id']);
}
-
+
/**
* カテゴリの表示順序を上へ移動する.
@@ -411,5 +411,5 @@
$objFormParam->addParam("カテゴリ名", "category_name", STEXT_LEN, 'KVa', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
}
-
+
/**
* ぱんくず文字列を生成する.
@@ -514,5 +514,5 @@
$objQuery->commit(); // トランザクションの終了
}
-
+
/**
* カテゴリの階層が上限を超えているかを判定する
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 20540)
@@ -134,5 +134,5 @@
$errFlg = false;
-
+
while (!feof($fp)) {
$arrRow = fgetcsv($fp, CSV_LINE_MAX);
@@ -181,5 +181,5 @@
break;
}
-
+
$count = $objQuery->count("dtb_category", "category_id = ?", array($arrRow['category_id']));
@@ -205,5 +205,5 @@
$where = "category_id = ?";
$objQuery->update("dtb_category", $arrCategory, $where, array($arrRow['category_id']));
-
+
$message = "[更新] カテゴリID: " . $arrRow['category_id'] . " カテゴリ名 : " . $arrRow['category_name'];
$this->addRowResult($line_count, $message);
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 20540)
@@ -74,5 +74,5 @@
// POST値をセット
$objFormParam->setParam($_POST);
-
+
// POST値の入力文字変換
$objFormParam->convParam();
@@ -232,5 +232,5 @@
function lfRankChange($maker_id, $mode) {
$objDb = new SC_Helper_DB_Ex();
-
+
switch($mode) {
case 'up':
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 20540)
@@ -55,5 +55,5 @@
var $arrRowResult;
-
+
/**
* Page を初期化する.
@@ -99,5 +99,5 @@
function action() {
$this->objDb = new SC_Helper_DB_Ex();
-
+
// CSV管理ヘルパー
$objCSV = new SC_Helper_CSV_Ex();
@@ -179,8 +179,8 @@
SC_Utils_Ex::sfDispError("");
}
-
+
// 登録先テーブル カラム情報の初期化
$this->lfInitTableInfo();
-
+
// 登録フォーム カラム情報
$this->arrFormKeyList = $objFormParam->getKeyList();
@@ -256,5 +256,5 @@
return;
}
-
+
/**
* デストラクタ.
Index: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php (revision 20540)
@@ -93,5 +93,5 @@
}
}
-
+
// エラー処理
else {
Index: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 20540)
@@ -73,5 +73,5 @@
$this->lfInitParam($objFormParam);
$objFormParam->setParam($_POST);
-
+
$mode = $this->getMode();
@@ -87,5 +87,5 @@
$plugin_id = $objFormParam->getValue('plugin_id');
$plugin_code = $objFormParam->getValue('plugin_code');
-
+
// プラグインファイルを読み込み、modeで指定されたメソッドを実行
$this->arrErr = $this->lfExecPlugin($plugin_id, $plugin_code, $mode);
@@ -228,5 +228,5 @@
function lfUploadPlugin(&$objUpFile, $plugin_dir, $plugin_code, $plugin_file_name) {
$arrErr = array();
-
+
// 必須チェック
$arrErr = $objUpFile->checkEXISTS('plugin_file');
@@ -266,5 +266,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sqlval = array();
-
+
$sqlval['plugin_id'] = $objQuery->nextVal('dtb_plugin_plugin_id');
$sqlval['plugin_code'] = $plugin_code;
@@ -290,5 +290,5 @@
$arrErr['plugin_error'] = "※ " . $plugin_code . ".phpが存在しないため実行できません。
";
}
-
+
return $arrErr;
}
@@ -308,5 +308,5 @@
// プラグインファイル読み込み
$arrErr = $this->lfRequirePluginFile($plugin_code);
-
+
if(count($arrErr) == 0) {
$plugin = new $plugin_code();
Index: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 20540)
@@ -141,5 +141,5 @@
$clean_id = "";
$clean_mode_flg = 'new';
-
+
// idが0より大きい数字で整数の場合
if (isset($_GET['id']) && SC_Utils_Ex::sfIsInt($_GET['id']) && $_GET['id'] > 0) {
Index: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php (revision 20540)
@@ -167,5 +167,5 @@
}
-
+
//管理機能ディレクトリのリネームと CONFIG_REALFILE の変更
function lfUpdateAdminData(&$arrForm){
@@ -196,5 +196,5 @@
$diff ++;
}
-
+
if(strpos($line,"ADMIN_FORCE_SSL") !== false){
$installData[$key] = 'define("ADMIN_FORCE_SSL",'.$admin_force_ssl.');';
@@ -206,5 +206,5 @@
}
}
-
+
if($diff > 0) {
$fp = fopen(CONFIG_REALFILE,'wb');
Index: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 20540)
@@ -95,7 +95,7 @@
// エラーがなければバックアップ処理を行う
if (SC_Utils_Ex::isBlank($arrErrTmp[1]) && SC_Utils_Ex::isBlank($arrErrTmp[2])) {
-
+
$arrData = $objFormParam->getHashArray();
-
+
// バックアップファイル作成
$arrErrTmp[3] = $this->lfCreateBkupData($arrData['bkup_name'], $this->bkup_dir);
@@ -408,5 +408,5 @@
$arrVal['bkup_memo'] = $data['bkup_memo'];
$arrVal['create_date'] = "now()";
-
+
$objQuery->insert('dtb_bkup', $arrVal);
}
Index: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin.php (revision 20540)
@@ -44,5 +44,5 @@
function init() {
$this->template = MAIN_FRAME;
-
+
//IP制限チェック
$allow_hosts = unserialize(ADMIN_ALLOW_HOSTS);
@@ -53,5 +53,5 @@
}
}
-
+
//SSL制限チェック
if(ADMIN_FORCE_SSL == TRUE){
Index: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 20540)
@@ -91,5 +91,5 @@
// 入力値の変換
$this->objFormParam->convParam();
-
+
// どんな状態の時に isset($arrRet) == trueになるんだ? これ以前に$arrRet無いが、、、、
if (!isset($arrRet)) $arrRet = array();
@@ -149,5 +149,5 @@
*/
function createPdf(&$objFormParam){
-
+
$arrErr = $this->lfCheckError($objFormParam);
$arrRet = $objFormParam->getHashArray();
@@ -221,13 +221,13 @@
$arrErr['month'] = "発行月は数値で入力してください。";
}else if(0 >= $month && 12 < $month){
-
+
$arrErr['month'] = "発行月は1〜12の間で入力してください。";
}
-
+
$day = $objFormParam->getValue('day');
if(!is_numeric($day)){
$arrErr['day'] = "発行日は数値で入力してください。";
}else if(0 >= $day && 31 < $day){
-
+
$arrErr['day'] = "発行日は1〜31の間で入力してください。";
}
Index: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (revision 20540)
@@ -177,5 +177,5 @@
// 表示順序
$objQuery->setOrder($order);
-
+
// 検索結果の取得
return $objProduct->findProductIdsOrder($objQuery, $bind);
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 20540)
@@ -196,9 +196,9 @@
function lfNewsInsert($arrPost,$member_id){
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
// rankの最大+1を取得する
$rank_max = $this->getRankMax();
$rank_max = $rank_max + 1;
-
+
$table = 'dtb_news';
$sqlval = array();
@@ -223,5 +223,5 @@
}
-
+
function lfNewsUpdate($arrPost,$member_id){
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 20540)
@@ -73,5 +73,5 @@
$objFormParam->setParam($_POST);
$objFormParam->convParam();
-
+
switch ($this->getMode()) {
case 'regist': // 商品を登録する。
@@ -110,5 +110,5 @@
break;
}
-
+
$this->category_id = intval($arrPost['category_id']);
$this->arrItems = $arrItems;
@@ -162,5 +162,5 @@
$objQuery->setOrder($order);
$arrProducts = $objQuery->select($col, $table, $where);
-
+
$arrReturnProducts = array();
foreach( $arrProducts as $data ){
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php (revision 20540)
@@ -91,5 +91,5 @@
$objFormParam->setParam($this->createSetParam($_POST));
$objFormParam->convParam();
-
+
$this->arrErr = $objFormParam->checkError();
if (SC_Utils_Ex::isBlank($this->arrErr)) {
@@ -105,5 +105,5 @@
$objFormParam->setParam($this->createSetParam($_POST));
$objFormParam->convParam();
-
+
$this->arrErr = $objFormParam->checkError();
if (SC_Utils_Ex::isBlank($this->arrErr)) {
@@ -153,5 +153,5 @@
$objFormParam->setParam($this->createSetParam($_POST));
$objFormParam->convParam();
-
+
$this->arrErr = $objFormParam->checkError();
if (SC_Utils_Ex::isBlank($this->arrErr)) {
@@ -267,5 +267,5 @@
$objFormParam->addParam("ツリー選択ディレクトリ", "tree_select_file", MTEXT_LEN, 'a', array());
}
-
+
/*
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 20540)
@@ -149,5 +149,5 @@
$objFormParam->addParam('SQL文', 'csv_sql', "30000", 'KVa', array("MAX_LENGTH_CHECK","SPTAB_CHECK"));
}
-
+
/**
* SQL登録エラーチェック
Index: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php (revision 20540)
@@ -56,5 +56,5 @@
$this->sendResponse();
}
-
+
/**
* Page のアクション.
Index: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php (revision 20540)
@@ -56,5 +56,5 @@
$this->sendResponse();
}
-
+
/**
* Page のアクション.
Index: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide.php (revision 20540)
@@ -56,5 +56,5 @@
$this->sendResponse();
}
-
+
/**
* Page のアクション.
@@ -63,5 +63,5 @@
*/
function action() {}
-
+
/**
* デストラクタ.
Index: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Usage.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Usage.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Usage.php (revision 20540)
@@ -56,5 +56,5 @@
$this->sendResponse();
}
-
+
/**
* Page のアクション.
Index: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Charge.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Charge.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Charge.php (revision 20540)
@@ -56,5 +56,5 @@
$this->sendResponse();
}
-
+
/**
* Page のアクション.
Index: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_About.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_About.php (revision 20534)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_About.php (revision 20540)
@@ -66,5 +66,5 @@
$this->arrSiteInfo = $objDb->sfGetBasisData();
}
-
+
/**
* デストラクタ.
Index: branches/version-2_5-dev/data/class/SC_CustomerList.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_CustomerList.php (revision 20538)
+++ branches/version-2_5-dev/data/class/SC_CustomerList.php (revision 20540)
@@ -142,5 +142,5 @@
// E-MAIL(mobile)
if (!isset($this->arrSql['search_email_mobile'])) $this->arrSql['search_email_mobile'] = "";
-
+
if (strlen($this->arrSql['search_email_mobile']) > 0) {
//カンマ区切りで複数の条件指定可能に
Index: branches/version-2_5-dev/data/class/db/SC_DB_MasterData.php
===================================================================
--- branches/version-2_5-dev/data/class/db/SC_DB_MasterData.php (revision 20538)
+++ branches/version-2_5-dev/data/class/db/SC_DB_MasterData.php (revision 20540)
@@ -158,5 +158,5 @@
return $i;
}
-
+
/**
* マスタデータを追加する.
@@ -186,5 +186,5 @@
$sqlVal[$columns[3]] = $comment;
$this->objQuery->insert($name, $sqlVal);
-
+
if ($autoCommit) {
$this->objQuery->commit();
Index: branches/version-2_5-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Initial.php (revision 20538)
+++ branches/version-2_5-dev/data/class/SC_Initial.php (revision 20540)
@@ -139,5 +139,5 @@
ini_set('arg_separator.output', '&');
-
+
//ロケールを明示的に設定
setlocale(LC_ALL, LOCALE);
Index: branches/version-2_5-dev/data/class/SC_SendMail.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_SendMail.php (revision 20539)
+++ branches/version-2_5-dev/data/class/SC_SendMail.php (revision 20540)
@@ -60,5 +60,5 @@
$this->arrRecip[$key] = $recipient;
}
-
+
// 宛先の設定
function setTo($to, $to_name = "") {
@@ -235,5 +235,5 @@
return $arrHeader;
}
-
+
/**
* メーラーバックエンドに応じた送信先を返す