Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/error.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/error.tpl (revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/error.tpl (revision 19807)
@@ -22,5 +22,5 @@
*/
*}-->
-
+
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_complete.tpl (revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_complete.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/products/review.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/review.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/review.tpl (revision 19807)
@@ -22,5 +22,5 @@
*/
*}-->
-
+
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/input_zip.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/input_zip.tpl (revision 19697)
+++ branches/version-2_5-dev/data/Smarty/templates/default/input_zip.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/change.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/change.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/change.tpl (revision 19807)
@@ -35,5 +35,5 @@
Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl (revision 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl (revision 19807)
@@ -28,5 +28,5 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/error.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/error.tpl (revision 19697)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/error.tpl (revision 19807)
@@ -22,5 +22,5 @@
*/
*}-->
-
+
@@ -32,3 +32,3 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/mail_view.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/mail_view.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/mail_view.tpl (revision 19807)
@@ -1,3 +1,3 @@
-
+
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery_addr.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery_addr.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery_addr.tpl (revision 19807)
@@ -22,5 +22,5 @@
*/
*}-->
-
+
@@ -35,5 +35,5 @@
@@ -44,3 +44,3 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl (revision 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl (revision 19807)
@@ -27,5 +27,5 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/forgot/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/forgot/complete.tpl (revision 19697)
+++ branches/version-2_5-dev/data/Smarty/templates/default/forgot/complete.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
@@ -36,3 +36,3 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/forgot/secret.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/forgot/secret.tpl (revision 19697)
+++ branches/version-2_5-dev/data/Smarty/templates/default/forgot/secret.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
@@ -39,3 +39,3 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/forgot/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/forgot/index.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/default/forgot/index.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
@@ -38,3 +38,3 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/entry/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/entry/index.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/default/entry/index.tpl (revision 19807)
@@ -33,5 +33,5 @@
Index: branches/version-2_5-dev/data/Smarty/templates/default/products/review_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/review_complete.tpl (revision 19697)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/review_complete.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
@@ -34,3 +34,3 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl (revision 19807)
@@ -20,5 +20,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*}-->
-
+
@@ -69,3 +69,3 @@
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/default/products/review.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/review.tpl (revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/review.tpl (revision 19807)
@@ -22,5 +22,5 @@
*/
*}-->
-
+
@@ -84,3 +84,3 @@
-
+
Index: branches/version-2_5-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_5-dev/data/mtb_constants_init.php (revision 19805)
+++ branches/version-2_5-dev/data/mtb_constants_init.php (revision 19807)
@@ -9,5 +9,5 @@
define('USER_REALDIR', HTML_REALDIR . USER_DIR);
/** ユーザインクルードファイル保存先 */
-define('USER_INC_PATH', USER_REALDIR . "include/");
+define('USER_INC_REALDIR', USER_REALDIR . "include/");
/** 郵便番号専用DB */
define('ZIP_DSN', DEFAULT_DSN);
@@ -21,9 +21,9 @@
define('USER_PACKAGE_DIR', "packages/");
/** テンプレートファイル保存先 */
-define('USER_TEMPLATE_PATH', USER_REALDIR . USER_PACKAGE_DIR);
+define('USER_TEMPLATE_REALDIR', USER_REALDIR . USER_PACKAGE_DIR);
/** テンプレートファイル一時保存先 */
define('TEMPLATE_TEMP_REALDIR', HTML_REALDIR . "upload/temp_template/");
/** ユーザー作成画面のデフォルトPHPファイル */
-define('USER_DEF_PHP', USER_REALDIR . "__default.php");
+define('USER_DEF_PHP_REALFILE', USER_REALDIR . "__default.php");
/** その他画面のデフォルトページレイアウト */
define('DEF_LAYOUT', "products/list.php");
@@ -239,5 +239,5 @@
define('NO_IMAGE_URL', TPL_DIR . "img/picture/img_blank.gif");
/** 画像がない場合に表示 */
-define('NO_IMAGE_DIR', USER_PACKAGE_DIR . "img/picture/img_blank.gif");
+define('NO_IMAGE_DIR', USER_TEMPLATE_REALDIR . "img/picture/img_blank.gif");
/** システム管理トップ */
define('URL_SYSTEM_TOP', URL_PATH . ADMIN_DIR . "system/" . DIR_INDEX_URL);
@@ -369,21 +369,7 @@
/** メールアドレス種別 */
define('MAIL_TYPE_MOBILE', 2);
-/** 新規注文 */
-define('ORDER_NEW', 1);
-/** 入金待ち */
-define('ORDER_PAY_WAIT', 2);
-/** 入金済み */
-define('ORDER_PRE_END', 6);
-/** キャンセル */
-define('ORDER_CANCEL', 3);
-/** 取り寄せ中 */
-define('ORDER_BACK_ORDER', 4);
-/** 発送済み */
-define('ORDER_DELIV', 5);
-/** 決済処理中 */
-define('ORDER_PENDING', 7);
/** 受注ステータス変更の際にポイント等を加算するステータス番号 (発送済み) */
define('ODERSTATUS_COMMIT', ORDER_DELIV);
-/** 新着情報管理画面 開始年(西暦) */
+/** 新着情報管理画面 開始年(西暦) */
define('ADMIN_NEWS_STARTYEAR', 2005);
/** 会員登録 */
@@ -443,8 +429,6 @@
/** SMARTYテンプレート */
define('SMARTY_TEMPLATES_REALDIR', DATA_REALDIR . "Smarty/templates/");
-/** SMARTYテンプレート */
-define('TPL_DIR', URL_PATH . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/");
-/** SMARTYテンプレート */
-define('TEMPLATE_DIR', SMARTY_TEMPLATES_REALDIR . TEMPLATE_NAME . "/");
+/** SMARTYテンプレート(PC) */
+define('TEMPLATE_REALDIR', SMARTY_TEMPLATES_REALDIR . TEMPLATE_NAME . "/");
/** SMARTYテンプレート(管理機能) */
define('TEMPLATE_ADMIN_REALDIR', SMARTY_TEMPLATES_REALDIR . "admin/");
@@ -455,16 +439,16 @@
/** ブロックファイル保存先 */
define('BLOC_DIR', "frontparts/bloc/");
-/** ブロックファイル保存先 */
-define('BLOC_PATH', TEMPLATE_DIR . BLOC_DIR);
-/** EメールアドレスチェックをRFC準拠にするか(true:準拠する、false:準拠しない) */
-define('RFC_COMPLIANT_EMAIL_CHECK', false);
/** SMARTYテンプレート(mobile) */
-define('MOBILE_TEMPLATE_DIR', SMARTY_TEMPLATES_REALDIR . MOBILE_TEMPLATE_NAME . "/");
+define('MOBILE_TEMPLATE_REALDIR', SMARTY_TEMPLATES_REALDIR . MOBILE_TEMPLATE_NAME . "/");
/** SMARTYコンパイル(mobile) */
define('MOBILE_COMPILE_REALDIR', DATA_REALDIR . "Smarty/templates_c/" . MOBILE_TEMPLATE_NAME . "/");
/** SMARTYテンプレート(smart phone) */
-define('SMARTPHONE_TEMPLATE_DIR', SMARTY_TEMPLATES_REALDIR . SMARTPHONE_TEMPLATE_NAME . "/");
-/** SMARTYコンパイル(smart phone) */
+define('SMARTPHONE_TEMPLATE_REALDIR', SMARTY_TEMPLATES_REALDIR . SMARTPHONE_TEMPLATE_NAME . "/");
+/** SMARTYコンパイル(smartphone) */
define('SMARTPHONE_COMPILE_REALDIR', DATA_REALDIR . "Smarty/templates_c/" . SMARTPHONE_TEMPLATE_NAME . "/");
+/** ブロックファイル保存先 */
+define('BLOC_PATH', TEMPLATE_REALDIR . BLOC_DIR);
+/** EメールアドレスチェックをRFC準拠にするか(true:準拠する、false:準拠しない) */
+define('RFC_COMPLIANT_EMAIL_CHECK', false);
/** モバイルサイトのセッションの存続時間 (秒) */
define('MOBILE_SESSION_LIFETIME', 1800);
@@ -478,5 +462,5 @@
define('MOBILE_KARA_MAIL_ADDRESS_DOMAIN', "");
/** 携帯電話向け変換画像保存ディレクトリ */
-define('MOBILE_IMAGE_DIR', HTML_REALDIR . "upload/mobile_image/");
+define('MOBILE_IMAGE_REALDIR', HTML_REALDIR . "upload/mobile_image/");
/** 携帯電話向け変換画像保存ディレクトリ */
define('MOBILE_IMAGE_URL', URL_PATH . "upload/mobile_image/");
@@ -552,31 +536,53 @@
define('IMAGE_RENAME', true);
/** プラグインディレクトリ */
-define('PLUGIN_DIR', "plugins/");
+define('PLUGIN_REALDIR', "plugins/");
/** プラグイン保存先 */
-define('PLUGIN_PATH', USER_REALDIR . PLUGIN_DIR);
+define('PLUGIN_PATH', USER_REALDIR . PLUGIN_REALDIR);
/** プラグイン URL */
-define('PLUGIN_URL', USER_URL . PLUGIN_DIR);
+define('PLUGIN_URL', USER_URL . PLUGIN_REALDIR);
+/** 日数桁数 */
+define('DOWNLOAD_DAYS_LEN', 3);
+/** ダウンロードファイル登録可能拡張子(カンマ区切り)" */
+define('DOWNLOAD_EXTENSION', "zip,lzh,jpg,jpeg,gif,png,mp3,pdf,csv");
+/** ダウンロード販売ファイル用サイズ制限(KB) */
+define('DOWN_SIZE', 50000);
/** 1:実商品 2:ダウンロード */
define('DEFAULT_PRODUCT_DOWN', 1);
-/** ダウンロード販売機能 ファイルサイズ制限(KB) */
-define('DOWN_SIZE', 50000);
-/** ダウンロード販売機能 ファイル一時保存 */
+/** ダウンロードファイル一時保存 */
define('DOWN_TEMP_REALDIR', DATA_REALDIR . "download/temp/");
-/** ダウンロード販売機能 ファイル保存先 */
+/** ダウンロードファイル保存先 */
define('DOWN_SAVE_REALDIR', DATA_REALDIR . "download/save/");
-/** ダウンロード販売機能 ファイル存在エラー */
+/** ダウンロードファイル存在エラー */
define('DOWNFILE_NOT_FOUND', 22);
-/** ダウンロード販売機能 ダウンロード可能日数桁数 */
-define('DOWNLOAD_DAYS_LEN', 3);
+/** ダウンロード販売機能用オンライン決済payment_id(カンマ区切り) */
+define('ONLINE_PAYMENT', "1");
/** ダウンロード販売機能 ダウンロードファイル読み込みバイト(KB) */
define('DOWNLOAD_BLOCK', 1024);
-/** ダウンロードファイル登録可能拡張子(カンマ区切り) */
-define('DOWNLOAD_EXTENSION', "zip,lzh,jpg,jpeg,gif,png,mp3,pdf,csv");
-/** ダウンロード販売機能用オンライン決済payment_id(カンマ区切り) */
-define('ONLINE_PAYMENT', "1");
+/** 新規注文 */
+define('ORDER_NEW', 1);
+/** 入金待ち */
+define('ORDER_PAY_WAIT', 2);
+/** 入金済み */
+define('ORDER_PRE_END', 6);
+/** キャンセル */
+define('ORDER_CANCEL', 3);
+/** 取り寄せ中 */
+define('ORDER_BACK_ORDER', 4);
+/** 発送済み */
+define('ORDER_DELIV', 5);
+/** 決済処理中 */
+define('ORDER_PENDING', 7);
/** 通常商品 */
define('PRODUCT_TYPE_NORMAL', 1);
/** ダウンロード商品 */
define('PRODUCT_TYPE_DOWNLOAD', 2);
+/** SQLログを取得するフラグ(1:表示, 0:非表示) */
+define('SQL_QUERY_LOG_MODE', 1);
+/** SQLログを取得する時間設定(設定値以上かかった場合に取得) */
+define('SQL_QUERY_LOG_MIN_EXEC_TIME', 2);
+/** ページ表示時間のログを取得するフラグ(1:表示, 0:非表示) */
+define('PAGE_DISPLAY_TIME_LOG_MODE', 1);
+/** ページ表示時間のログを取得する時間設定(設定値以上かかった場合に取得) */
+define('PAGE_DISPLAY_TIME_LOG_MIN_EXEC_TIME', 2);
/** 端末種別: モバイル */
define('DEVICE_TYPE_MOBILE', 1);
@@ -587,5 +593,5 @@
/** 端末種別: 管理画面 */
define('DEVICE_TYPE_ADMIN', 99);
-/** 配置ID 未使用 */
+/** 配置ID: 未使用 */
define('TARGET_ID_UNUSED', 0);
/** 配置ID: LeftNavi */
Index: branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_View.php (revision 19805)
+++ branches/version-2_5-dev/data/class/SC_View.php (revision 19807)
@@ -211,5 +211,5 @@
parent::SC_View();
- $this->_smarty->template_dir = TEMPLATE_DIR;
+ $this->_smarty->template_dir = TEMPLATE_REALDIR;
$this->_smarty->compile_dir = COMPILE_DIR;
@@ -243,5 +243,5 @@
function SC_MobileView($setPrevURL = true) {
parent::SC_SiteView($setPrevURL);
- $this->_smarty->template_dir = MOBILE_TEMPLATE_DIR;
+ $this->_smarty->template_dir = MOBILE_TEMPLATE_REALDIR;
$this->_smarty->compile_dir = MOBILE_COMPILE_REALDIR;
$this->assignTemplatePath(DEVICE_TYPE_MOBILE);
@@ -252,5 +252,5 @@
function SC_SmartphoneView($setPrevURL = true) {
parent::SC_SiteView($setPrevURL);
- $this->_smarty->template_dir = SMARTPHONE_TEMPLATE_DIR;
+ $this->_smarty->template_dir = SMARTPHONE_TEMPLATE_REALDIR;
$this->_smarty->compile_dir = SMARTPHONE_COMPILE_REALDIR;
$this->assignTemplatePath(DEVICE_TYPE_SMARTPHONE);
Index: branches/version-2_5-dev/data/class/SC_MobileImage.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_MobileImage.php (revision 19805)
+++ branches/version-2_5-dev/data/class/SC_MobileImage.php (revision 19807)
@@ -83,5 +83,5 @@
// 画像変換の情報をセットする
$imageConverter = New ImageConverter();
- $imageConverter->setOutputDir(MOBILE_IMAGE_DIR);
+ $imageConverter->setOutputDir(MOBILE_IMAGE_REALDIR);
$imageConverter->setImageType($imageType);
$imageConverter->setImageWidth($imageWidth);
Index: branches/version-2_5-dev/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Fpdf.php (revision 19805)
+++ branches/version-2_5-dev/data/class/SC_Fpdf.php (revision 19807)
@@ -30,10 +30,10 @@
require(DATA_REALDIR . 'module/fpdf/fpdf.php');
require(DATA_REALDIR . 'module/fpdf/japanese.php');
-define('PDF_TEMPLATE_DIR', TEMPLATE_ADMIN_REALDIR . 'pdf/');
+define('PDF_TEMPLATE_REALDIR', TEMPLATE_ADMIN_REALDIR . 'pdf/');
class SC_Fpdf {
function SC_Fpdf($download, $title, $tpl_pdf = 'nouhinsyo1.pdf') {
// デフォルトの設定
- $this->tpl_pdf = PDF_TEMPLATE_DIR . $tpl_pdf; // テンプレートファイル
+ $this->tpl_pdf = PDF_TEMPLATE_REALDIR . $tpl_pdf; // テンプレートファイル
$this->pdf_download = $download; // PDFのダウンロード形式（0:表示、1:ダウンロード）
$this->tpl_title = $title;
@@ -124,5 +124,5 @@
//ロゴ画像
- $logo_file = PDF_TEMPLATE_DIR . 'logo.png';
+ $logo_file = PDF_TEMPLATE_REALDIR . 'logo.png';
$this->pdf->Image($logo_file, 124, 46, 40);
}
Index: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (revision 19807)
@@ -80,5 +80,5 @@
*/
function mobileInit() {
- $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . "frontparts/"
+ $this->tpl_mainpage = MOBILE_TEMPLATE_REALDIR . "frontparts/"
. BLOC_DIR . 'best5.tpl';
}
Index: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 19807)
@@ -79,5 +79,5 @@
*/
function mobileInit() {
- $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . "frontparts/"
+ $this->tpl_mainpage = MOBILE_TEMPLATE_REALDIR . "frontparts/"
. BLOC_DIR . 'category.tpl';
}
Index: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_CategoryList.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 19807)
@@ -70,5 +70,5 @@
function mobileInit() {
$this->init();
- $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . 'products/category_list.tpl';
+ $this->tpl_mainpage = MOBILE_TEMPLATE_REALDIR . 'products/category_list.tpl';
$this->tpl_title = 'カテゴリ一覧ページ';
}
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 19805)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php (revision 19807)
@@ -275,5 +275,5 @@
$this->tpl_search_mode = $tpl_search_mode;
- $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . "products/list.tpl";
+ $this->tpl_mainpage = MOBILE_TEMPLATE_REALDIR . "products/list.tpl";
}
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php (revision 19807)
@@ -51,5 +51,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = '会員登録内容変更(入力ページ)';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mainno = 'mypage';
$this->tpl_mypageno = 'change';
@@ -147,5 +147,5 @@
//確認ページへ
- $this->tpl_mainpage = TEMPLATE_DIR . 'mypage/change_confirm.tpl';
+ $this->tpl_mainpage = TEMPLATE_REALDIR . 'mypage/change_confirm.tpl';
$this->tpl_subtitle = '会員登録内容変更(確認ページ)';
$passlen = strlen($this->arrForm['password']);
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php (revision 19807)
@@ -46,5 +46,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = '退会手続き(完了ページ)';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mypageno = 'refusal';
$this->point_disp = false;
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php (revision 19807)
@@ -46,5 +46,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = '会員登録内容変更(完了ページ)';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mypageno = 'change';
}
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 19807)
@@ -51,5 +51,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = 'お気に入り一覧';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mainno = 'mypage';
$this->tpl_mypageno = 'favorite';
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 19807)
@@ -51,5 +51,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = '購入履歴一覧';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mainno = 'mypage';
$this->tpl_mypageno = 'index';
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 19807)
@@ -46,5 +46,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = '購入履歴詳細';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mainno = 'mypage';
$this->tpl_mypageno = 'index';
@@ -135,5 +135,5 @@
function mobileInit() {
$this->init();
- $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . 'mypage/history.tpl';
+ $this->tpl_mainpage = MOBILE_TEMPLATE_REALDIR . 'mypage/history.tpl';
$this->tpl_title = 'MYページ/購入履歴一覧';
$this->httpCacheControl('nocache');
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 19807)
@@ -46,5 +46,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = '退会手続き(入力ページ)';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mainno = 'mypage';
$this->tpl_mypageno = 'refusal';
@@ -91,5 +91,5 @@
case 'confirm':
- $this->tpl_mainpage = TEMPLATE_DIR . 'mypage/refusal_confirm.tpl';
+ $this->tpl_mainpage = TEMPLATE_REALDIR . 'mypage/refusal_confirm.tpl';
$this->tpl_subtitle = '退会手続き(確認ページ)';
Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 19807)
@@ -46,5 +46,5 @@
$this->tpl_title = 'MYページ';
$this->tpl_subtitle = 'お届け先追加･変更';
- $this->tpl_navi = TEMPLATE_DIR . 'mypage/navi.tpl';
+ $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl';
$this->tpl_mainno = 'mypage';
$this->tpl_mypageno = 'delivery';
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 19805)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 19807)
@@ -206,5 +206,5 @@
function mobileInit() {
$this->init();
- $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . 'shopping/index.tpl';
+ $this->tpl_mainpage = MOBILE_TEMPLATE_REALDIR . 'shopping/index.tpl';
}
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 19805)
+++ branches/version-2_5-dev/data/class/pages/unsupported/LC_Page_Unsupported.php (revision 19807)
@@ -44,5 +44,5 @@
function init() {
parent::init();
- $this->tpl_mainpage = TEMPLATE_DIR . 'mobile/unsupported/index.tpl';
+ $this->tpl_mainpage = TEMPLATE_REALDIR . 'mobile/unsupported/index.tpl';
}
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 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 19807)
@@ -48,5 +48,5 @@
$this->tpl_subnavi = 'customer/subnavi.tpl';
$this->tpl_subno = 'index';
- $this->tpl_pager = TEMPLATE_DIR . 'admin/pager.tpl';
+ $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
$this->tpl_subtitle = '顧客マスタ';
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 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php (revision 19807)
@@ -48,5 +48,5 @@
$this->tpl_subnavi = 'customer/subnavi.tpl';
$this->tpl_subno = 'index';
- $this->tpl_pager = TEMPLATE_DIR . 'admin/pager.tpl';
+ $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
$this->tpl_subtitle = '顧客マスタ';
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php (revision 19807)
@@ -49,5 +49,5 @@
$this->tpl_mainno = 'products';
$this->tpl_subno = 'review';
- $this->tpl_pager = TEMPLATE_DIR . 'admin/pager.tpl';
+ $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
$this->tpl_subtitle = 'レビュー管理';
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Trackback.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Trackback.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Trackback.php (revision 19807)
@@ -48,5 +48,5 @@
$this->tpl_mainno = 'products';
$this->tpl_subno = 'trackback';
- $this->tpl_pager = TEMPLATE_DIR . 'admin/pager.tpl';
+ $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
$this->tpl_subtitle = 'トラックバック管理';
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 19807)
@@ -48,5 +48,5 @@
$this->tpl_subnavi = 'products/subnavi.tpl';
$this->tpl_subno = 'index';
- $this->tpl_pager = TEMPLATE_DIR . 'admin/pager.tpl';
+ $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
$this->tpl_subtitle = '商品マスタ';
Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 19807)
@@ -121,5 +121,5 @@
case 'preview':
// プレビューファイル作成
- $prev_path = USER_INC_PATH . 'preview/bloc_preview.tpl';
+ $prev_path = USER_INC_REALDIR . 'preview/bloc_preview.tpl';
// ディレクトリの作成
SC_Utils::sfMakeDir($prev_path);
Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php (revision 19807)
@@ -382,8 +382,8 @@
// filename が空の場合にはMYページと判断
if($filename == ""){
- $tplfile = TEMPLATE_DIR . "mypage/index";
+ $tplfile = TEMPLATE_REALDIR . "mypage/index";
$filename = 'mypage';
} else {
- $tplfile = TEMPLATE_DIR . $filename;
+ $tplfile = TEMPLATE_REALDIR . $filename;
}
Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php (revision 19807)
@@ -86,5 +86,5 @@
$division = isset($_POST['division']) ? $_POST['division'] : "";
- $pre_DIR = USER_INC_PATH . 'preview/';
+ $pre_DIR = USER_INC_REALDIR . 'preview/';
// データ更新処理
Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 19806)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 19807)
@@ -441,6 +441,6 @@
// ベースとなるPHPファイルの読み込み
- if (file_exists(USER_DEF_PHP)){
- $php_data = file_get_contents(USER_DEF_PHP);
+ if (file_exists(USER_DEF_PHP_REALFILE)){
+ $php_data = file_get_contents(USER_DEF_PHP_REALFILE);
}
Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 19807)
@@ -155,5 +155,5 @@
$template_code = $objForm->getValue('template_code_temp');
// ユーザデータの下のファイルも保存する。
- $from_dir = USER_TEMPLATE_PATH . $template_code . "/";
+ $from_dir = USER_TEMPLATE_REALDIR . $template_code . "/";
$to_dir = SMARTY_TEMPLATES_REALDIR . $template_code . "/_packages/";
SC_Utils::sfMakeDir($to_dir);
@@ -262,5 +262,5 @@
function lfChangeBloc($template_code) {
$objQuery = new SC_Query();
- $filepath = USER_TEMPLATE_PATH. $template_code. "/sql/update_bloc.sql";
+ $filepath = USER_TEMPLATE_REALDIR. $template_code. "/sql/update_bloc.sql";
// ブロック位置更新SQLファイル有
@@ -295,5 +295,5 @@
SC_Utils_Ex::sfDelFile($templates_c_dir);
// ユーザーデータ削除
- $user_dir = USER_TEMPLATE_PATH. $template_code. "/";
+ $user_dir = USER_TEMPLATE_REALDIR. $template_code. "/";
SC_Utils_Ex::sfDelFile($user_dir);
}
@@ -323,5 +323,5 @@
$create_end_dir = $create_dir . "/" . CAMPAIGN_TEMPLATE_END;
// デフォルトファイルディレクトリ
- $default_dir = TEMPLATE_DIR . CAMPAIGN_TEMPLATE_DIR;
+ $default_dir = TEMPLATE_REALDIR . CAMPAIGN_TEMPLATE_REALDIR;
$default_active_dir = $default_dir . "/" . CAMPAIGN_TEMPLATE_ACTIVE;
$default_end_dir = $default_dir . "/" . CAMPAIGN_TEMPLATE_END;
@@ -333,8 +333,8 @@
// キャンペーン実行PHPをコピー
$ret = $objFileManager->sfCreateFile(CAMPAIGN_PATH . $file);
- copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_DIR . "index.php", CAMPAIGN_PATH . $file . "/index.php");
- copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_DIR . "application.php", CAMPAIGN_PATH . $file . "/application.php");
- copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_DIR . "complete.php", CAMPAIGN_PATH . $file . "/complete.php");
- copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_DIR . "entry.php", CAMPAIGN_PATH . $file . "/entry.php");
+ copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_REALDIR . "index.php", CAMPAIGN_PATH . $file . "/index.php");
+ copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_REALDIR . "application.php", CAMPAIGN_PATH . $file . "/application.php");
+ copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_REALDIR . "complete.php", CAMPAIGN_PATH . $file . "/complete.php");
+ copy(HTML_REALDIR . CAMPAIGN_TEMPLATE_REALDIR . "entry.php", CAMPAIGN_PATH . $file . "/entry.php");
// デフォルトテンプレート作成(キャンペーン中)
Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php (revision 19807)
@@ -183,5 +183,5 @@
// 同名のフォルダが存在する場合はエラー
- if(file_exists(USER_TEMPLATE_PATH . $arrForm['template_code'])) {
+ if(file_exists(USER_TEMPLATE_REALDIR . $arrForm['template_code'])) {
$arrErr['template_code'] = "※ 同名のファイルがすでに存在します。
";
}
Index: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php (revision 19807)
@@ -53,5 +53,5 @@
$this->tpl_mainno = 'order';
$this->tpl_subno = 'index';
- $this->tpl_pager = TEMPLATE_DIR . 'admin/pager.tpl';
+ $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
$this->tpl_subtitle = '受注管理';
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 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 19807)
@@ -48,5 +48,5 @@
$this->tpl_subnavi = 'mail/subnavi.tpl';
$this->tpl_subno = "index";
- $this->tpl_pager = TEMPLATE_DIR . 'admin/pager.tpl';
+ $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
$this->tpl_subtitle = '配信内容設定';
Index: branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_SystemError.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_SystemError.php (revision 19805)
+++ branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_SystemError.php (revision 19807)
@@ -76,9 +76,9 @@
$objView = null;
if (SC_MobileUserAgent::isMobile() && $this->adminPage == false) {
- $objView = new SC_InstallView(MOBILE_TEMPLATE_DIR, MOBILE_COMPILE_REALDIR);
+ $objView = new SC_InstallView(MOBILE_TEMPLATE_REALDIR, MOBILE_COMPILE_REALDIR);
} elseif($this->adminPage) {
$objView = new SC_AdminView();
} else {
- $objView = new SC_InstallView(TEMPLATE_DIR, COMPILE_DIR);
+ $objView = new SC_InstallView(TEMPLATE_REALDIR, COMPILE_DIR);
}
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php (revision 19805)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php (revision 19807)
@@ -247,5 +247,5 @@
switch ($device_type_id) {
case DEVICE_TYPE_MOBILE:
- $dir = MOBILE_TEMPLATE_DIR;
+ $dir = MOBILE_TEMPLATE_REALDIR;
$userPath = HTML_REALDIR . MOBILE_DIR . USER_DIR;
$templateName = MOBILE_TEMPLATE_NAME;
@@ -253,5 +253,5 @@
case DEVICE_TYPE_SMARTPHONE:
- $dir = SMARTPHONE_TEMPLATE_DIR;
+ $dir = SMARTPHONE_TEMPLATE_REALDIR;
$userPath = HTML_REALDIR . SMARTPHONE_DIR . USER_DIR;
$templateName = SMARTPHONE_TEMPLATE_NAME;
@@ -260,5 +260,5 @@
case DEVICE_TYPE_PC:
default:
- $dir = TEMPLATE_DIR;
+ $dir = TEMPLATE_REALDIR;
$userPath = USER_REALDIR;
$templateName = TEMPLATE_NAME;