Index: branches/version-2_5-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_5-dev/data/mtb_constants_init.php (revision 19711)
+++ branches/version-2_5-dev/data/mtb_constants_init.php (revision 19713)
@@ -611,3 +611,25 @@
/** 端末種別: 管理画面 */
define('DEVICE_TYPE_ADMIN', 99);
+/** 配置ID 未使用 */
+define('TARGET_ID_UNUSED', 0);
+/** 配置ID: LeftNavi */
+define('TARGET_ID_LEFT', 1);
+/** 配置ID: MainHead */
+define('TARGET_ID_MAIN_HEAD', 2);
+/** 配置ID: RightNavi */
+define('TARGET_ID_RIGHT', 3);
+/** 配置ID: MainFoot */
+define('TARGET_ID_MAIN_FOOT', 4);
+/** 配置ID: TopNavi */
+define('TARGET_ID_TOP', 5);
+/** 配置ID: BottomNavi */
+define('TARGET_ID_BOTTOM', 6);
+/** 配置ID: HeadNavi */
+define('TARGET_ID_HEAD', 7);
+/** 配置ID: HeadTopNavi */
+define('TARGET_ID_HEAD_TOP', 8);
+/** 配置ID: FooterBottomNavi */
+define('TARGET_ID_FOOTER_BOTTOM', 9);
+/** 配置ID: HeaderInternalNavi */
+define('TARGET_ID_HEADER_INTERNAL', 10);
?>
Index: branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php (revision 19711)
+++ branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php (revision 19713)
@@ -86,6 +86,6 @@
$url = SC_Utils_Ex::sfIsHTTPS()
- ? SPHONE_SSL_URL
- : SPHONE_SITE_URL
+ ? SMARTPHONE_SSL_URL
+ : SMARTPHONE_SITE_URL
;
Index: branches/version-2_5-dev/data/class/pages/LC_Page_Index.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_Index.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_Index.php (revision 19713)
@@ -74,7 +74,4 @@
*/
function action() {
- // レイアウトデザインを取得
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false, "index.php");
$this->tpl_title = '';
}
Index: branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php (revision 19713)
@@ -73,8 +73,4 @@
$layout = new SC_Helper_PageLayout_Ex();
$objDb = new SC_Helper_DB_Ex();
-
- // レイアウトデザインを取得
- $layout->sfGetPageLayout($this, false, DEF_LAYOUT);
- $this->arrRet = $objDb->sfGetBasisData();
}
Index: branches/version-2_5-dev/data/class/pages/LC_Page.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/LC_Page.php (revision 19713)
@@ -73,6 +73,6 @@
var $transactionid;
- /** テンプレート名 */
- var $template;
+ /** メインテンプレート名 */
+ var $template = SITE_FRAME;
// }}}
@@ -89,16 +89,15 @@
$this->tpl_authority = $_SESSION['authority'];
- // XXX すべてのページで宣言するべき
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false);
-
- $this->template = SITE_FRAME;
// ディスプレイクラス生成
$this->objDisplay = new SC_Display();
+ $layout = new SC_Helper_PageLayout_Ex();
+ $layout->sfGetPageLayout($this, false, $_SERVER['PHP_SELF'],
+ $this->objDisplay->detectDevice());
+
// プラグインクラス生成
- // $this->objPlugin = new SC_Helper_Plugin_Ex();
- // $this->objPlugin->preProcess($this);
+ $this->objPlugin = new SC_Helper_Plugin_Ex();
+ $this->objPlugin->preProcess($this);
}
@@ -123,6 +122,7 @@
*/
function sendResponse() {
+
// post-prosess処理(暫定的)
- //$this->objPlugin->process($this);
+ $this->objPlugin->process($this);
$this->objDisplay->prepare($this);
Index: branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php (revision 19713)
@@ -59,5 +59,5 @@
if (isset($_SESSION['preview']) && $_SESSION['preview'] === "ON") {
- // レイアウトデザインを取得
+ // プレビュー用のレイアウトデザインを取得
$objLayout = new SC_Helper_PageLayout_Ex();
$objLayout->sfGetPageLayout($this, true);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php (revision 19713)
@@ -78,8 +78,4 @@
$this->CustomerPoint = $objCustomer->getvalue('point');
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
-
//$objView->assignobj($this);
//$objView->display(SITE_FRAME);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php (revision 19713)
@@ -71,8 +71,4 @@
//$objView = new SC_SiteView();
$objCustomer = new SC_Customer();
-
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
//ログイン判定
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 19713)
@@ -82,8 +82,4 @@
// 退会判定用情報の取得
$this->tpl_login = $objCustomer->isLoginSuccess();
-
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
// ログインチェック
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 19713)
@@ -83,8 +83,4 @@
// 退会判定用情報の取得
$this->tpl_login = $objCustomer->isLoginSuccess();
-
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
// ログインチェック
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 19713)
@@ -79,8 +79,4 @@
$objDb = new SC_Helper_DB_Ex();
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
-
// FIXME 他の画面と同様のバリデーションを行なう
if (!SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 19713)
@@ -88,9 +88,4 @@
}
-
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
-
if (!isset($_POST['mode'])) $_POST['mode'] = "";
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php (revision 19713)
@@ -94,8 +94,4 @@
//}
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
-
$mode = isset($_POST['mode']) ? $_POST['mode'] : '';
$customerId = $objCustomer->getValue('customer_id');
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 19711)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php (revision 19713)
@@ -92,8 +92,4 @@
$objCustomer = new SC_Customer();
$this->tpl_login = $objCustomer->isLoginSuccess();
-
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, "mypage/index.php");
// 生年月日選択肢の取得
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 18701)
+++ branches/version-2_5-dev/data/class/pages/unsupported/LC_Page_Unsupported.php (revision 19713)
@@ -55,8 +55,4 @@
$objView = new SC_MobileView();
- // レイアウトデザインを取得
- //$objHelper = new SC_Helper_PageLayout_Ex();
- //$objHelper->sfGetPageLayout($this, false, DEF_LAYOUT);
-
$objView->assignobj($this);
$objView->display($this->tpl_mainpage);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 19713)
@@ -66,4 +66,6 @@
* Page のアクション.
*
+ * FIXME テンプレートパスの取得方法を要修正
+ *
* @return void
*/
@@ -71,25 +73,32 @@
$this->objLayout = new SC_Helper_PageLayout_Ex();
$package_path = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/";
-
+
// 認証可否の判定
$objSess = new SC_Session();
SC_Utils_Ex::sfIsSuccess($objSess);
+ // ページIDを取得
+ if (isset($_REQUEST['bloc_id']) && is_numeric($_REQUEST['bloc_id'])) {
+ $bloc_id = $_REQUEST['bloc_id'];
+ } else {
+ $bloc_id = 1;
+ }
+ $this->bloc_id = $bloc_id;
+
+ // 端末種別IDを取得
+ if (isset($_REQUEST['device_type_id'])
+ && is_numeric($_REQUEST['device_type_id'])) {
+ $device_type_id = $_REQUEST['device_type_id'];
+ } else {
+ $device_type_id = DEVICE_TYPE_PC;
+ }
+
// ブロック一覧を取得
- $this->arrBlocList = $this->lfgetBlocData();
-
- // ブロックIDを取得
- if (isset($_POST['bloc_id'])) {
- $bloc_id = $_POST['bloc_id'];
- }else if (isset($_GET['bloc_id'])) {
- $bloc_id = $_GET['bloc_id'];
- }else{
- $bloc_id = '';
- }
- $this->bloc_id = $bloc_id;
+ $this->arrBlocList = $this->lfgetBlocData("device_type_id = ?", array($device_type_id));
// bloc_id が指定されている場合にはブロックデータの取得
if ($bloc_id != '') {
- $arrBlocData = $this->lfgetBlocData(" bloc_id = ? " , array($bloc_id));
+ $arrBlocData = $this->lfGetBlocData("bloc_id = ? AND device_type_id = ?",
+ array($bloc_id, $device_type_id));
// ユーザー作成ブロックが存在する場合
@@ -101,5 +110,5 @@
$arrBlocData[0]['tpl_path'] = TEMPLATE_DIR . $arrBlocData[0]['tpl_path'];
}
-
+
// テンプレートファイルの読み込み
$arrBlocData[0]['tpl_data'] = file_get_contents($arrBlocData[0]['tpl_path']);
@@ -114,11 +123,11 @@
if (!isset($_POST['mode'])) $_POST['mode'] = "";
-
+
switch($_POST['mode']) {
case 'preview':
// プレビューファイル作成
$prev_path = USER_INC_PATH . 'preview/bloc_preview.tpl';
- // ディレクトリの作成
- SC_Utils::sfMakeDir($prev_path);
+ // ディレクトリの作成
+ SC_Utils::sfMakeDir($prev_path);
$fp = fopen($prev_path,"w");
fwrite($fp, $_POST['bloc_html']); // FIXME いきなり POST はちょっと...
@@ -132,7 +141,7 @@
$this->arrBlocData['filename'] = $_POST['filename'];
$this->text_row = $_POST['html_area_row'];
- break;
+ break;
case 'confirm':
- $this->preview = "off";
+ $this->preview = "off";
// エラーチェック
$this->arrErr = $this->lfErrorCheck($_POST);
@@ -148,18 +157,20 @@
unlink($old_bloc_path);
}
-
+
// ファイル作成
$new_bloc_path = $package_path . BLOC_DIR . $_POST['filename'] . ".tpl";
- // ディレクトリの作成
- SC_Utils::sfMakeDir($new_bloc_path);
+ // ディレクトリの作成
+ SC_Utils::sfMakeDir($new_bloc_path);
$fp = fopen($new_bloc_path,"w");
fwrite($fp, $_POST['bloc_html']); // FIXME いきなり POST はちょっと...
fclose($fp);
- $arrBlocData = $this->lfgetBlocData(" filename = ? " , array($_POST['filename']));
+ $arrBlocData = $this->lfGetBlocData("filename = ? AND device_type_id = ?",
+ array($_POST['filename'], $device_type_id));
$bloc_id = $arrBlocData[0]['bloc_id'];
$this->objDisplay->redirect($this->getLocation("./bloc.php",
array("bloc_id" => $bloc_id,
+ "device_type_id" => $device_type_id,
"msg" => "on")));
exit;
@@ -168,8 +179,8 @@
$this->arrBlocData = $_POST;
}
- break;
+ break;
case 'delete':
- $this->preview = "off";
- // DBへデータを更新する
+ $this->preview = "off";
+ // DBへデータを更新する
$objQuery = new SC_Query(); // DB操作オブジェクト
$sql = ""; // データ更新SQL生成用
@@ -183,12 +194,12 @@
if ($_POST['bloc_id'] !== '') {
// SQL生成
- $sql = " DELETE FROM dtb_bloc WHERE bloc_id = ?";
+ $sql = " DELETE FROM dtb_bloc WHERE bloc_id = ? AND device_type_id = ?";
// SQL実行
- $ret = $objQuery->query($sql,array($_POST['bloc_id']));
+ $ret = $objQuery->query($sql,array($_POST['bloc_id'], $device_type_id));
// ページに配置されているデータも削除する
- $sql = "DELETE FROM dtb_blocposition WHERE bloc_id = ?";
+ $sql = "DELETE FROM dtb_blocposition WHERE bloc_id = ? AND device_type_id = ?";
// SQL実行
- $ret = $objQuery->query($sql,array($_POST['bloc_id']));
+ $ret = $objQuery->query($sql,array($_POST['bloc_id'], $device_type_id));
// ファイルの削除
@@ -198,13 +209,14 @@
}
}
- $this->objDisplay->redirect($this->getLocation("./bloc.php"));
+ $this->objDisplay->redirect($this->getLocation("./bloc.php",
+ array("device_type_id" => $device_type_id)));
exit;
- break;
+ break;
default:
- if(isset($_POST['mode'])) {
- GC_Utils::gfPrintLog("MODEエラー：".$_POST['mode']);
- }
- break;
- }
+ if(isset($_POST['mode'])) {
+ GC_Utils::gfPrintLog("MODEエラー：".$_POST['mode']);
+ }
+ break;
+ }
}
@@ -225,32 +237,8 @@
* @return array ブロック情報
*/
- function lfgetBlocData($where = '', $arrVal = ''){
- $objQuery = new SC_Query(); // DB操作オブジェクト
- $sql = ""; // データ取得SQL生成用
- $arrRet = array(); // データ取得用
-
- // SQL生成
- $sql = " SELECT ";
- $sql .= " bloc_id";
- $sql .= " ,bloc_name";
- $sql .= " ,tpl_path";
- $sql .= " ,filename";
- $sql .= " ,create_date";
- $sql .= " ,update_date";
- $sql .= " ,php_path";
- $sql .= " ,del_flg";
- $sql .= " FROM ";
- $sql .= " dtb_bloc";
-
- // where句の指定があれば追加
- if ($where != '') {
- $sql .= " WHERE " . $where;
- }
-
- $sql .= " ORDER BY bloc_id";
-
- $arrRet = $objQuery->getAll($sql, $arrVal);
-
- return $arrRet;
+ function lfgetBlocData($where = '', $arrVal = array()){
+ $objQuery =& SC_Query::getSingletonInstance();
+ $objQuery->setOrder("bloc_id");
+ return $objQuery->select("*", "dtb_bloc", $where, $arrVal);
}
@@ -262,9 +250,9 @@
*/
function lfEntryBlocData($arrData){
- $objQuery = new SC_Query(); // DB操作オブジェクト
- $sql = ""; // データ更新SQL生成用
- $ret = ""; // データ更新結果格納用
- $arrUpdData = array(); // 更新データ生成用
- $arrChk = array(); // 排他チェック用
+ $objQuery = new SC_Query(); // DB操作オブジェクト
+ $sql = ""; // データ更新SQL生成用
+ $ret = ""; // データ更新結果格納用
+ $arrUpdData = array(); // 更新データ生成用
+ $arrChk = array(); // 排他チェック用
// 更新データ生成
@@ -273,17 +261,18 @@
// データが存在しているかチェックを行う
if($arrData['bloc_id'] !== ''){
- $arrChk = $this->lfgetBlocData("bloc_id = ?", array($arrData['bloc_id']));
- }
-
-
- }
+ $arrChk = $this->lfgetBlocData("bloc_id = ? AND device_type_id = ?",
+ array($arrData['bloc_id'], $arrData['device_type_id']));
+ }
+
// bloc_id が空 若しくは データが存在していない場合にはINSERTを行う
if ($arrData['bloc_id'] === '' or !isset($arrChk[0])) {
// SQL生成
+ // FIXME device_type_id ごとの連番にする
$arrUpdData['bloc_id'] = $objQuery->nextVal('dtb_bloc_bloc_id');
$arrUpdData['create_date'] = "now()";
$ret = $objQuery->insert('dtb_bloc', $arrUpdData);
} else {
- $ret = $objQuery->update('dtb_bloc', $arrUpdData, 'bloc_id = ?', array($arrData['bloc_id']));
+ $ret = $objQuery->update('dtb_bloc', $arrUpdData, 'bloc_id = ? AND device_type_id = ?',
+ array($arrData['bloc_id'], $arrData['device_type_id']));
}
return $ret;
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 19711)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php (revision 19713)
@@ -24,7 +24,4 @@
// {{{ requires
require_once(CLASS_PATH . "pages/admin/LC_Page_Admin.php");
-
-/** ターゲットID 未使用 */
-define('TARGET_ID_UNUSED', 0);
/**
@@ -53,4 +50,6 @@
$this->tpl_mainno = "design";
$this->tpl_subtitle = 'レイアウト編集';
+ $masterData = new SC_DB_MasterData_Ex();
+ $this->arrTarget = $masterData->getMasterData("mtb_target");
}
@@ -68,9 +67,11 @@
* Page のアクション.
*
+ * TODO パラメータの数値チェック
+ *
* @return void
*/
function action() {
- $objSess = new SC_Session();
$objLayout = new SC_Helper_PageLayout_Ex();
+ $objQuery =& SC_Query::getSingletonInstance();
// 認証可否の判定
@@ -79,35 +80,31 @@
// ページIDを取得
- if (isset($_GET['page_id'])) {
- $page_id = $_GET['page_id'];
- }else if (isset($_POST['page_id'])){
- $page_id = $_POST['page_id'];
+ if (isset($_REQUEST['page_id']) && is_numeric($_REQUEST['page_id'])) {
+ $page_id = $_REQUEST['page_id'];
+ } else {
+ $page_id = 1;
+ }
+ // 端末種別IDを取得
+ if (isset($_REQUEST['device_type_id'])
+ && is_numeric($_REQUEST['device_type_id'])) {
+ $device_type_id = $_REQUEST['device_type_id'];
+ } else {
+ $device_type_id = DEVICE_TYPE_PC;
+ }
+
+ // 編集可能ページを取得
+ $this->arrEditPage = $objLayout->lfGetPageData("page_id <> 0 AND device_type_id = ?", array($device_type_id));
+
+ // レイアウト情報を取得
+ $arrBlocPos = $objLayout->lfGetNaviData($page_id, $device_type_id);
+
+ // データの存在チェックを行う
+ $arrPageData = $objLayout->lfGetPageData("page_id = ? AND device_type_id = ?", array($page_id, $device_type_id));
+
+ if (count($arrPageData) <= 0) {
+ $this->exists_page = 0;
}else{
- $page_id = 1;
- }
-
- // 編集可能ページを取得
- $this->arrEditPage = $objLayout->lfgetPageData();
-
- // ブロック配置用データを取得
- $sel = ", pos.target_id, pos.bloc_id, pos.bloc_row ,pos.anywhere";
- $from = ", dtb_blocposition AS pos";
- $where = " where ";
- $where .= "( pos.anywhere = 1 OR (lay.device_type_id = ? AND lay.page_id = ? AND ";
- $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id ";
- // $where .= "((lay.page_id = ? AND ";
- // $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id ";
-
- $arrData = array($_GET['device_type_id'], $page_id);
- $arrBlocPos = $this->lfgetLayoutData($sel, $from, $where, $arrData );
-
- // データの存在チェックを行う
- $arrPageData = $objLayout->lfgetPageData("page_id = ?", array($page_id));
- if (count($arrPageData) <= 0) {
- $exists_page = 0;
- }else{
- $exists_page = 1;
- }
- $this->exists_page = $exists_page;
+ $this->exists_page = 1;
+ }
// メッセージ表示
@@ -117,61 +114,61 @@
// ブロックを取得
- $arrBloc = $this->lfgetBlocData();
+ $arrBloc = $objQuery->select("*", "dtb_bloc", "device_type_id = ?", array($device_type_id));
if (!isset($_POST['mode'])) $_POST['mode'] = "";
+ switch ($_POST['mode']) {
// 新規ブロック作成
- if ($_POST['mode'] == 'new_bloc') {
+ case 'new_bloc':
$this->objDisplay->redirect($this->getLocation("./bloc.php"));
exit;
- }
+ break;
// 新規ページ作成
- if ($_POST['mode'] == 'new_page') {
+ case 'new_page':
$this->objDisplay->redirect($this->getLocation("./main_edit.php"));
exit;
- }
-
- // データ登録処理
- if ($_POST['mode'] == 'confirm' or $_POST['mode'] == 'preview') {
+ break;
+
+ case 'confirm':
+ case 'preview':
$page_id = $_POST['page_id'];
if ($_POST['mode'] == 'preview') {
$page_id = '0';
}
- $masterData = new SC_DB_MasterData_Ex();
- $arrTarget = $masterData->getMasterData("mtb_target");
// 更新用にデータを整える
$arrUpdBlocData = array();
- $arrTargetFlip = array_flip($arrTarget);
-
- $upd_cnt = 1;
- $arrUpdData[$upd_cnt]['page_id'] = $page_id;
+
+ // delete実行
+ $arrRet = $objQuery->delete("dtb_blocposition",
+ "page_id = ? AND device_type_id = ?",
+ array($page_id, $device_type_id));
+
+ $arrTargetFlip = array_flip($this->arrTarget);
// POSTのデータを使いやすいように修正
- for($upd_cnt = 1; $upd_cnt <= $_POST['bloc_cnt']; $upd_cnt++){
+ for ($upd_cnt = 1; $upd_cnt <= $_POST['bloc_cnt']; $upd_cnt++) {
if (!isset($_POST['id_'.$upd_cnt])) {
break;
}
- $arrUpdBlocData[$upd_cnt]['name'] = $_POST['name_'.$upd_cnt]; // ブロック名称
- $arrUpdBlocData[$upd_cnt]['id'] = $_POST['id_'.$upd_cnt]; // ブロックID
- $arrUpdBlocData[$upd_cnt]['target_id'] = $arrTargetFlip[$_POST['target_id_'.$upd_cnt]]; // ターゲットID
- $arrUpdBlocData[$upd_cnt]['top'] = $_POST['top_'.$upd_cnt]; // TOP座標
- $arrUpdBlocData[$upd_cnt]['anywhere'] = $_POST['anywhere_'.$upd_cnt]; // 全ページ適用か
- $arrUpdBlocData[$upd_cnt]['update_url'] = $_SERVER['HTTP_REFERER']; // 更新URL
-
- }
-
- // データの更新を行う
- $objQuery = new SC_Query(); // DB操作オブジェクト
- $arrRet = array(); // データ取得用
-
- // delete実行
- $del_sql = "";
- $del_sql .= "DELETE FROM dtb_blocposition WHERE page_id = ? ";
- $arrRet = $objQuery->query($del_sql,array($page_id));
+
+ // ブロック名称
+ $arrUpdBlocData[$upd_cnt]['name'] = $_POST['name_'.$upd_cnt];
+ // ブロックID
+ $arrUpdBlocData[$upd_cnt]['id'] = $_POST['id_'.$upd_cnt];
+ // ターゲットID
+ $arrUpdBlocData[$upd_cnt]['target_id'] = $arrTargetFlip[$_POST['target_id_'.$upd_cnt]];
+ // TOP座標
+ $arrUpdBlocData[$upd_cnt]['top'] = $_POST['top_'.$upd_cnt];
+ // 全ページ適用か
+ $arrUpdBlocData[$upd_cnt]['anywhere'] = $_POST['anywhere_'.$upd_cnt];
+ // 更新URL
+ $arrUpdBlocData[$upd_cnt]['update_url'] = $_SERVER['HTTP_REFERER'];
+ }
+
// ブロックの順序を取得し、更新を行う
- foreach($arrUpdBlocData as $key => $val){
+ foreach ($arrUpdBlocData as $key => $val) {
if ($arrUpdBlocData[$key]['target_id'] == TARGET_ID_UNUSED) {
continue;
@@ -179,43 +176,30 @@
// ブロックの順序を取得
- $bloc_row = $this->lfGetRowID($arrUpdBlocData, $val);
- $arrUpdBlocData[$key]['bloc_row'] = $bloc_row;
- $arrUpdBlocData[$key]['page_id'] = $page_id; // ページID
-
- // insert文生成
- $ins_sql = "";
- $ins_sql .= "INSERT INTO dtb_blocposition ";
- $ins_sql .= " values ( ";
- $ins_sql .= " ? "; // ページID
- $ins_sql .= " ,? "; // ターゲットID
- $ins_sql .= " ,? "; // ブロックID
- $ins_sql .= " ,? "; // ブロックの並び順序
- $ins_sql .= " ,(SELECT filename FROM dtb_bloc WHERE bloc_id = ?) "; // ファイル名称
- $ins_sql .= " ,? "; // 全ページフラグ
- $ins_sql .= " ) ";
+ $arrUpdBlocData[$key]['bloc_row'] = $this->lfGetRowID($arrUpdBlocData, $val);
// insertデータ生成
- $arrInsData = array($page_id,
- $arrUpdBlocData[$key]['target_id'],
- $arrUpdBlocData[$key]['id'],
- $arrUpdBlocData[$key]['bloc_row'],
- $arrUpdBlocData[$key]['id'],
- $arrUpdBlocData[$key]['anywhere'] ? 1 : 0
- );
- $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id']));
-
- if($arrUpdBlocData[$key]['anywhere'] == 1){
- $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id']));
- if($count != 0){
+ $arrInsData = array('device_type_id' => $device_type_id,
+ 'page_id' => $page_id,
+ 'target_id' => $arrUpdBlocData[$key]['target_id'],
+ 'bloc_id' => $arrUpdBlocData[$key]['id'],
+ 'bloc_row' => $arrUpdBlocData[$key]['bloc_row'],
+ 'anywhere' => $arrUpdBlocData[$key]['anywhere'] ? 1 : 0);
+ $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ? AND device_type_id = ?",
+ array($arrUpdBlocData[$key]['id'], $device_type_id));
+
+ if ($arrUpdBlocData[$key]['anywhere'] == 1) {
+ $count = $objQuery->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ? AND device_type_id = ?",
+ array($arrUpdBlocData[$key]['id'], $device_type_id));
+ if ($count != 0) {
continue;
- }else{
}
- }else{
- if($count > 0){
- $objQuery->query("DELETE FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id']));
+ } else {
+ if ($count > 0) {
+ $objQuery->query("DELETE FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ? AND device_type_id = ?",
+ array($arrUpdBlocData[$key]['id'], $device_type_id));
}
}
// SQL実行
- $arrRet = $objQuery->query($ins_sql,$arrInsData);
+ $arrRet = $objQuery->insert("dtb_blocposition", $arrInsData);
}
@@ -233,18 +217,23 @@
exit;
- }else{
+ } else {
$this->objDisplay->redirect($this->getLocation(DIR_INDEX_URL,
- array("page_id" => $page_id,
- "msg" => "on")));
+ array("device_type_id" => $device_type_id, "page_id" => $page_id, "msg" => "on")));
exit;
}
- }
-
- // データ削除処理 ベースデータでなければファイルを削除
- if ($_POST['mode'] == 'delete' and !$objLayout->lfCheckBaseData($page_id)) {
- $objLayout->lfDelPageData($page_id);
- $this->objDisplay->redirect($this->getLocation(DIR_INDEX_URL));
- exit;
+ break;
+
+ // データ削除処理
+ case 'delete':
+ //ベースデータでなければファイルを削除
+ if (!$objLayout->lfCheckBaseData($page_id, $device_type_id)) {
+ $objLayout->lfDelPageData($page_id, $device_type_id);
+ $this->objDisplay->redirect($this->getLocation(DIR_INDEX_URL));
+ exit;
+ }
+ break;
+
+ default:
}
@@ -257,8 +246,6 @@
$tpl_arrBloc = $this->lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt);
$cnt++;
- }else{
- }
- }
-
+ }
+ }
// 未使用のブロックデータを追加
foreach($arrBloc as $key => $val){
@@ -267,5 +254,4 @@
$tpl_arrBloc = $this->lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt);
$cnt++;
- }else{
}
}
@@ -276,5 +262,5 @@
// ページ名称を取得
- $arrPageData = $objLayout->lfgetPageData(' page_id = ?', array($page_id));
+ $arrPageData = $objLayout->lfGetPageData('page_id = ? AND device_type_id = ?', array($page_id, $device_type_id));
$this->arrPageData = $arrPageData[0];
@@ -301,101 +287,15 @@
/**
- * 編集可能なページ情報を取得する.
- *
- * @param string $sel Select句文
- * @param string $where Where句文
- * @param array $arrVa Where句の絞込条件値
- * @return array ページレイアウト情報の配列
- */
- function lfgetLayoutData($sel = '' , $from = '', $where = '', $arrVal = ''){
- $objQuery = new SC_Query(); // DB操作オブジェクト
- $sql = ""; // データ取得SQL生成用
- $arrRet = array(); // データ取得用
-
- // SQL生成
-
- $sql = "";
- $sql .= " select ";
- $sql .= " lay.page_id ";
- $sql .= " ,lay.page_name ";
- $sql .= " ,lay.url ";
- $sql .= " ,lay.author ";
- $sql .= " ,lay.description ";
- $sql .= " ,lay.keyword ";
- $sql .= " ,lay.update_url ";
- $sql .= " ,lay.create_date ";
- $sql .= " ,lay.update_date ";
-
- // Select句の指定があれば追加
- if ($sel != '') {
- $sql .= $sel;
- }
-
- $sql .= " from dtb_pagelayout AS lay ";
- // From句の指定があれば追加
- if ($from != '') {
- $sql .= $from;
- }
-
- // where句の指定があれば追加
- if ($where != '') {
- $sql .= $where;
- }else{
- $sql .= " ORDER BY lay.page_id ";
- }
-
- $arrRet = $objQuery->getAll($sql, $arrVal);
-
- return $arrRet;
- }
-
- /**
- * ブロック情報を取得する.
- *
- * @param string $where Where句文
- * @param array $arrVal Where句の絞込条件値
- * @return array ブロック情報の配列
- */
- function lfgetBlocData($where = '', $arrVal = ''){
- $objQuery = new SC_Query(); // DB操作オブジェクト
- $sql = ""; // データ取得SQL生成用
- $arrRet = array(); // データ取得用
-
- // SQL生成
- $sql = "";
- $sql .= " SELECT ";
- $sql .= " bloc_id";
- $sql .= " ,bloc_name";
- $sql .= " ,tpl_path";
- $sql .= " ,filename";
- $sql .= " ,update_date";
- $sql .= " FROM ";
- $sql .= " dtb_bloc";
-
- // where句の指定があれば追加
- if ($where != '') {
- $sql .= " WHERE " . $where;
- }
-
- $sql .= " ORDER BY bloc_id";
-
- $arrRet = $objQuery->getAll($sql, $arrVal);
-
- return $arrRet;
- }
-
- /**
* ブロック情報の配列を生成する.
*
* @param array $arrBloc Bloc情報
* @param array $tpl_arrBloc データをセットする配列
+ * @param array $val DBから取得したブロック情報
* @param integer $cnt 配列番号
* @return array データをセットした配列
*/
function lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt) {
- $masterData = new SC_DB_MasterData_Ex();
- $arrTarget = $masterData->getMasterData("mtb_target");
-
- $tpl_arrBloc[$cnt]['target_id'] = $arrTarget[$val['target_id']];
+
+ $tpl_arrBloc[$cnt]['target_id'] = $this->arrTarget[$val['target_id']];
$tpl_arrBloc[$cnt]['bloc_id'] = $val['bloc_id'];
$tpl_arrBloc[$cnt]['bloc_row'] =
@@ -457,4 +357,6 @@
/**
* プレビューするデータを DB に保存する.
+ *
+ * FIXME
*
* @param array $arrPageData ページ情報の配列
@@ -500,5 +402,5 @@
// 更新データの取得
$sql = "select page_id,page_name, header_chk, footer_chk from dtb_pagelayout where page_id = ? OR page_id = (SELECT page_id FROM dtb_blocposition WHERE anywhere = 1)" ;
-
+
$ret = $objQuery->getAll($sql, array($arrPageData[0]['page_id']));
@@ -523,5 +425,5 @@
,$filename
// ,$ret[0]['anywhere']
-
+
);
Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (revision 19670)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (revision 19713)
@@ -65,4 +65,6 @@
/**
* Page のアクション.
+ *
+ * FIXME css ファイルの取得方法を要修正
*
* @return void
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 19670)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php (revision 19713)
@@ -65,4 +65,6 @@
/**
* Page のアクション.
+ *
+ * FIXME テンプレートの取得方法を要修正
*
* @return void
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 19670)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 19713)
@@ -76,17 +76,24 @@
SC_Utils_Ex::sfIsSuccess($objSess);
+ // ページIDを取得
+ if (isset($_REQUEST['page_id']) && is_numeric($_REQUEST['page_id'])) {
+ $page_id = $_REQUEST['page_id'];
+ } else {
+ $page_id = 1;
+ }
+
+ $this->page_id = $page_id;
+
+ // 端末種別IDを取得
+ if (isset($_REQUEST['device_type_id'])
+ && is_numeric($_REQUEST['device_type_id'])) {
+ $device_type_id = $_REQUEST['device_type_id'];
+ } else {
+ $device_type_id = DEVICE_TYPE_PC;
+ }
+
// ページ一覧を取得
- $this->arrPageList = $this->objLayout->lfgetPageData();
-
- // ブロックIDを取得
- if (isset($_POST['page_id'])) {
- $page_id = $_POST['page_id'];
- }else if (isset($_GET['page_id'])){
- $page_id = $_GET['page_id'];
- }else{
- $page_id = '';
- }
-
- $this->page_id = $page_id;
+ $this->arrPageList = $this->objLayout->lfgetPageData("page_id <> 0 AND device_type_id = ?",
+ array($device_type_id));
// メッセージ表示
@@ -101,20 +108,21 @@
if (!isset($_POST['mode'])) $_POST['mode'] = "";
-
- // プレビュー処理
- if ($_POST['mode'] == 'preview') {
- $this->lfPreviewPageData($page_id);
- exit;
- }
-
- // データ登録処理
- if ($_POST['mode'] == 'confirm') {
+
+ switch ($_POST['mode']) {
+ case 'preview':
+ $this->lfPreviewPageData($page_id);
+ exit;
+ break;
+
+ case 'delete':
+ if (!$this->objLayout->lfCheckBaseData($page_id)) {
+ $this->lfDeletePageData($page_id);
+ exit;
+ }
+ break;
+
+ case 'confirm':
$this->lfConfirmPageData($page_id);
- }
-
- // データ削除処理 ベースデータでなければファイルを削除
- if ($_POST['mode'] == 'delete' and !$this->objLayout->lfCheckBaseData($page_id)) {
- $this->lfDeletePageData($page_id);
- exit;
+ default:
}
}
@@ -133,9 +141,11 @@
*
* @param integer $page_id ページID
+ * @param integer $device_type_id 端末種別ID
* @param object $objView ビューオブジェクト
* @return void
*/
- function lfGetPageData($page_id, $objView){
- $arrPageData = $this->objLayout->lfgetPageData(" page_id = ? " , array($page_id));
+ function lfGetPageData($page_id, $device_type_id, $objView){
+ $arrPageData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?",
+ array($page_id, $device_type_id));
if (strlen($arrPageData[0]['filename']) == 0) {
@@ -147,4 +157,5 @@
}
+ // FIXME
// テンプレートファイルが存在していれば読み込む
$tpl_file = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . $arrPageData[0]['filename'] . ".tpl";
@@ -170,7 +181,8 @@
*
* @param integer $page_id ページID
- * @return void
- */
- function lfPreviewPageData($page_id){
+ * @param integer $device_type_id 端末種別ID
+ * @return void
+ */
+ function lfPreviewPageData($page_id, $device_type_id) {
$page_id_old = $page_id;
@@ -184,5 +196,6 @@
$tmpPost['tpl_dir'] = USER_PATH . "templates/preview/";
- $arrPreData = $this->objLayout->lfgetPageData("page_id = ?" , array($page_id));
+ $arrPreData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?",
+ array($page_id, $device_type_id));
// tplファイルの削除 (XXX: 処理の意図が不明。存在していると都合が悪いファイル?)
@@ -234,7 +247,8 @@
*
* @param integer $page_id ページID
- * @return void
- */
- function lfConfirmPageData($page_id){
+ * @param integer $device_type_id 端末種別ID
+ * @return void
+ */
+ function lfConfirmPageData($page_id, $device_type_id) {
// エラーチェック
$this->arrErr = $this->lfErrorCheck($_POST);
@@ -246,9 +260,10 @@
// ベースデータでなければファイルを削除し、PHPファイルを作成する
- if (!$this->objLayout->lfCheckBaseData($page_id)) {
+ if (!$this->objLayout->lfCheckBaseData($page_id, $device_type_id)) {
// PHPファイル作成
$this->lfCreatePHPFile($_POST['url']);
}
+ // FIXME
// TPLファイル作成
$cre_tpl = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . basename($_POST['url']) . '.tpl';
@@ -258,9 +273,10 @@
if ($page_id == '') {
// ページIDを取得する
- $arrPageData = $this->objLayout->lfgetPageData(" url = ? AND page_id <> 0" , array(USER_DIR . $_POST['url'] . '.php'));
+ $arrPageData = $this->objLayout->lfGetPageData("url = ? AND page_id <> 0" , array(USER_DIR . $_POST['url'] . '.php'));
$page_id = $arrPageData[0]['page_id'];
}
$this->objDisplay->redirect($this->getLocation("./main_edit.php",
array("page_id" => $page_id,
+ "device_type_id" => $device_type_id,
"msg" => "on")));
exit;
@@ -281,5 +297,5 @@
* @return void
*/
- function lfEntryPageData($arrData){
+ function lfEntryPageData($arrData, $device_type_id){
$objQuery = new SC_Query();
$arrChk = array(); // 排他チェック用
@@ -290,10 +306,13 @@
// データが存在しているかチェックを行う
if($arrData['page_id'] !== ''){
- $arrChk = $this->objLayout->lfgetPageData("page_id = ?", array($arrData['page_id']));
+ $arrChk = $this->objLayout->lfgetPageData("page_id = ? AND device_type_id = ?",
+ array($arrData['page_id'], $device_type_id));
}
// page_id が空 若しくは データが存在していない場合にはINSERTを行う
if ($arrData['page_id'] === '' or !isset($arrChk[0])) {
+ // FIXME device_type_id ごとの連番にする
$sqlval['page_id'] = $objQuery->nextVal('dtb_pagelayout_page_id');
+ $sqlval['device_type_id'] = $device_type_id;
$sqlval['create_date'] = 'now()';
$objQuery->insert('dtb_pagelayout', $sqlval);
@@ -301,5 +320,6 @@
// データが存在してる場合にはアップデートを行う
else {
- $objQuery->update('dtb_pagelayout', $sqlval, 'page_id = ?', array($arrData['page_id']));
+ $objQuery->update('dtb_pagelayout', $sqlval, 'page_id = ? AND device_type_id = ?',
+ array($arrData['page_id'], $device_type_id));
}
}
@@ -342,7 +362,8 @@
* @return void
*/
- function lfDeletePageData($page_id){
- $this->objLayout->lfDelPageData($_POST['page_id']);
- $this->objDisplay->redirect($this->getLocation("./main_edit.php"));
+ function lfDeletePageData($page_id, $device_type_id){
+ $this->objLayout->lfDelPageData($page_id, $device_type_id);
+ $this->objDisplay->redirect($this->getLocation("./main_edit.php",
+ array("device_type_id" => $device_type_id)));
}
@@ -357,5 +378,5 @@
$objErr->doFunc(array("名称", "page_name", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
$objErr->doFunc(array("URL", "url", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-
+
// URLチェック
$okUrl = true;
@@ -371,5 +392,5 @@
$objErr->arrErr['url'] = "※ URLを正しく入力してください。
";
}
-
+
// 同一のURLが存在している場合にはエラー
$params = array();
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 19670)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 19713)
@@ -85,4 +85,6 @@
/**
* Page のアクション.
+ *
+ * FIXME ロジックを見直し
*
* @return void
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 19670)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php (revision 19713)
@@ -68,4 +68,6 @@
/**
* Page のアクション.
+ *
+ * FIXME ロジックを見直し
*
* @return void
Index: branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact_Complete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact_Complete.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact_Complete.php (revision 19713)
@@ -65,7 +65,5 @@
*/
function action() {
- // レイアウトデザインを取得
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false, DEF_LAYOUT);
+ // do nothing...
}
Index: branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php (revision 19713)
@@ -98,8 +98,4 @@
$this->arrData = isset($_SESSION['customer']) ? $_SESSION['customer'] : "";
-
- // レイアウトデザインを取得
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false, DEF_LAYOUT);
if (!isset($_POST['mode'])) $_POST['mode'] = "";
Index: branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist_Complete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist_Complete.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist_Complete.php (revision 19713)
@@ -70,8 +70,4 @@
$objQuery = new SC_Query();
$objCampaignSess = new SC_CampaignSession();
-
- // レイアウトデザインを取得
- $helper = new SC_Helper_PageLayout_Ex();
- $helper->sfGetPageLayout($this, false, DEF_LAYOUT);
}
Index: branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php (revision 19713)
@@ -68,8 +68,4 @@
*/
function action() {
- // レイアウトデザインを取得
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
$this->objSiteInfo = new SC_SiteInfo();
$this->objSiteInfo->data['pref'] =
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 19711)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Charge.php (revision 19713)
@@ -70,8 +70,4 @@
*/
function mobileProcess() {
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
$objView = new SC_MobileView();
$objView->assignobj($this);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_About.php (revision 19713)
@@ -70,8 +70,4 @@
*/
function mobileProcess() {
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
$objView = new SC_MobileView();
$objView->assignobj($this);
Index: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php (revision 19713)
@@ -82,8 +82,4 @@
break;
}
-
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
$this->arrRet = $objDb->sfGetBasisData();
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 19711)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php (revision 19713)
@@ -70,8 +70,4 @@
*/
function mobileProcess() {
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
// 利用規約を取得する。
$this->lfGetKiyaku(intval(@$_GET['page']), $this);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php (revision 19713)
@@ -70,8 +70,4 @@
*/
function mobileProcess() {
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
$objView = new SC_MobileView();
$objView->assignobj($this);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide.php (revision 19713)
@@ -70,8 +70,4 @@
*/
function mobileProcess() {
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
$objView = new SC_MobileView();
$objView->assignobj($this);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Usage.php (revision 19713)
@@ -80,8 +80,4 @@
}
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
$objView = new SC_MobileView();
$objView->assignobj($this);
Index: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php (revision 19713)
@@ -181,8 +181,4 @@
SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true);
}
-
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
//---- 登録用カラム配列
@@ -393,8 +389,4 @@
}
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
//---- 登録用カラム配列
$arrRegistColumn = array(
Index: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php (revision 19713)
@@ -79,8 +79,4 @@
SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true);
}
-
- // レイアウトデザインを取得
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false, DEF_LAYOUT);
}
@@ -110,7 +106,5 @@
*/
function mobileAction() {
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
+ // do nothing...
}
Index: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php (revision 19711)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php (revision 19713)
@@ -66,8 +66,4 @@
$objCustomer = new SC_Customer();
- // レイアウトデザインを取得
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
// 規約内容の取得
$objQuery = new SC_Query();
@@ -113,8 +109,4 @@
$next = $offset;
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
// 規約内容の取得
$objQuery = new SC_Query();
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 19711)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 19713)
@@ -96,8 +96,4 @@
//$objView = new SC_MobileView();
- // レイアウトデザインを取得
- $objLayout = new SC_Helper_PageLayout_Ex();
- $objLayout->sfGetPageLayout($this, false, DEF_LAYOUT);
-
// カテゴリー情報を取得する。
$this->lfGetCategories(@$_GET['category_id'], true, $this);
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 19711)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php (revision 19713)
@@ -136,8 +136,4 @@
$this->arrSearch['name'] = $this->arrSearchData['name'];
}
-
- // レイアウトデザインを取得
- $layout = new SC_Helper_PageLayout_Ex();
- $layout->sfGetPageLayout($this, false, "products/list.php");
foreach ($this->arrProducts as $arrProduct) {
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 19711)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 19713)
@@ -97,8 +97,4 @@
$objDb = new SC_Helper_DB_Ex();
- // レイアウトデザインを取得
- $helper = new SC_Helper_PageLayout_Ex();
- $helper->sfGetPageLayout($this, false, "products/detail.php");
-
// ログイン中のユーザが商品をお気に入りにいれる処理
if ($objCustomer->isLoginSuccess() === true && strlen($_POST['mode']) > 0 && $_POST['mode'] == "add_favorite" && strlen($_POST['favorite_product_id']) > 0 ) {
Index: branches/version-2_5-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Initial.php (revision 19670)
+++ branches/version-2_5-dev/data/class/SC_Initial.php (revision 19713)
@@ -63,5 +63,5 @@
/**
- * 初期設定ファイルを読み込む.
+ * 初期設定ファイルを読み込み, パスの設定を行う.
*
* @access protected
@@ -71,4 +71,18 @@
require_once(realpath(dirname( __FILE__)) ."/../install.php");
+
+ define('MOBILE_DIR', 'mobile/');
+ define('MOBILE_HTML_PATH', HTML_PATH . MOBILE_DIR);
+ define('MOBILE_SITE_URL', SITE_URL . MOBILE_DIR);
+ define('MOBILE_SSL_URL', SSL_URL . MOBILE_DIR);
+ define('MOBILE_URL_DIR', URL_DIR . MOBILE_DIR);
+
+ define('SMARTPHONE_DIR', 'sphone/');
+ define('SMARTPHONE_HTML_PATH', HTML_PATH . SMARTPHONE_DIR);
+ define('SMARTPHONE_SITE_URL', SITE_URL . SMARTPHONE_DIR);
+ define('SMARTPHONE_SSL_URL', SSL_URL . SMARTPHONE_DIR);
+ define('SMARTPHONE_URL_DIR', URL_DIR . SMARTPHONE_DIR);
+
+ define('ADMIN_DIR', 'admin/'); // TODO
}
@@ -220,4 +234,8 @@
if (!file_exists(MOBILE_COMPILE_DIR)) {
mkdir(MOBILE_COMPILE_DIR);
+ }
+
+ if (!file_exists(SMARTPHONE_COMPILE_DIR)) {
+ mkdir(SMARTPHONE_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 19711)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php (revision 19713)
@@ -39,10 +39,11 @@
* LC_Page オブジェクトにページのレイアウト情報をセットする.
*
- * @param LC_Page $objPage ページ情報
+ * @param LC_Page $objPage ページ情報のインスタンス
* @param boolean $preview プレビュー表示の場合 true
- * @param string $url ページのURL
+ * @param string $url ページのURL($_SERVER['PHP_SELF'] の情報)
+ * @param integer $device_type_id 端末種別ID
* @return void
*/
- function sfGetPageLayout(&$objPage, $preview = false, $url = ""){
+ function sfGetPageLayout(&$objPage, $preview = false, $url = "", $device_type_id = DEVICE_TYPE_PC) {
$debug_message = "";
$arrPageLayout = array();
@@ -50,76 +51,54 @@
// 現在のURLの取得
if ($preview === false) {
- if ($url == "") {
- $url = "http://" . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
- }
-
- $url = preg_replace('|^http://[^/]+' . preg_quote(URL_DIR) . '|', '', $url);
+ $url = preg_replace('|^' . preg_quote(URL_DIR) . '|', '', $url);
+
// URLを元にページデザインを取得
- $arrPageData = $this->lfgetPageData("url = ? AND page_id <> 0" , array($url));
+ $arrPageData = $this->lfGetPageData("device_type_id = ? AND url = ? AND page_id <> 0" , array($device_type_id, $url));
} else {
- $arrPageData = $this->lfgetPageData("page_id = 0");
- $objPage->tpl_mainpage = USER_PATH . "templates/preview/"
- . TEMPLATE_NAME . "/" . $arrPageData[0]['filename'] . ".tpl";
- }
-
- if (!empty($arrPageData[0])) {
- foreach($arrPageData[0] as $key => $val) {
- $debug_message.= "arrPageData[$key]：" . $val . "\n";
- }
- }
-
- $debug_message.= "TEMPLATE_NAME：".TEMPLATE_NAME . "\n";
-
+ // TODO
+ $arrPageData = $this->lfGetPageData("device_type_id = ? AND page_id = 0", array($device_type_id));
+ $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id, true)
+ . "preview/" . $arrPageData[0]['filename'] . ".tpl";
+ }
+
+ $arrPageLayout = $arrPageData[0];
+
// tpl_mainpageの設定なし、又はトップページの場合
if (!isset($objPage->tpl_mainpage) || $url == "index.php") {
// ユーザテンプレートのパスを取得
- $user_tpl = HTML_PATH . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/" . $arrPageData[0]['filename'] . ".tpl";
- $debug_message.= "ユーザテンプレートチェック：".$user_tpl."\n";
-
+ $user_tpl = $this->getTemplatePath($device_type_id, true)
+ . $arrPageLayout['filename'] . ".tpl";
+
// ユーザテンプレートの存在チェック
if (is_file($user_tpl)) {
$objPage->tpl_mainpage = $user_tpl;
- $debug_message.= "tpl_mainpage：ユーザーテンプレート\n";
+ }
// 存在しない場合は指定テンプレートを使用
- } else {
- $objPage->tpl_mainpage = TEMPLATE_DIR . $arrPageData[0]['filename'] . ".tpl";
- $debug_message.= "tpl_mainpage：標準テンプレート\n";
- }
- } else {
- $debug_message.= "tpl_mainpage：設定あり" . "\n";
- }
-
- $debug_message.= "tpl_mainpage：" . $objPage->tpl_mainpage . "\n";
+ else {
+ $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id)
+ . $arrPageLayout['filename'] . ".tpl";
+ }
+ }
// ページタイトルを設定
if (!isset($objPage->tpl_title)) {
- $objPage->tpl_title = $arrPageData[0]['page_name'];
- }
-
- $arrPageLayout = $arrPageData[0];
+ $objPage->tpl_title = $arrPageLayout['page_name'];
+ }
// 全ナビデータを取得する
- $arrNavi = $this->lfGetNaviData($arrPageLayout['page_id']);
-
- $arrPageLayout['LeftNavi'] = $this->lfGetNavi($arrNavi,1); // LEFT NAVI
- $arrPageLayout['MainHead'] = $this->lfGetNavi($arrNavi,2); // メイン上部
- $arrPageLayout['RightNavi'] = $this->lfGetNavi($arrNavi,3); // RIGHT NAVI
- $arrPageLayout['MainFoot'] = $this->lfGetNavi($arrNavi,4); // メイン下部
- $arrPageLayout['TopNavi'] = $this->lfGetNavi($arrNavi,5); //上部
- $arrPageLayout['BottomNavi'] = $this->lfGetNavi($arrNavi,6); //下部
- $arrPageLayout['HeadNavi'] = $this->lfGetNavi($arrNavi,7); //上部
- $arrPageLayout['HeaderTopNavi'] = $this->lfGetNavi($arrNavi,8); //上部
- $arrPageLayout['FooterBottomNavi'] = $this->lfGetNavi($arrNavi,9); //下部
- $arrPageLayout['HeaderInternalNavi'] = $this->lfGetNavi($arrNavi,10); //ヘッダ中
-
-
- GC_Utils::gfDebugLog($arrPageLayout);
-
+ $arrNavi = $this->lfGetNaviData($arrPageLayout['page_id'], $device_type_id);
+ $masterData = new SC_DB_MasterData();
+ $arrTarget = $masterData->getMasterData("mtb_target");
+
+ foreach (array_keys($arrTarget) as $key) {
+ if (TARGET_ID_UNUSED != $key) {
+ $arrPageLayout[$arrTarget[$key]]
+ = $this->lfGetNavi($arrNavi, $key, $device_type_id);
+ }
+ }
$objPage->arrPageLayout = $arrPageLayout;
-
+
// カラム数を取得する
$objPage->tpl_column_num = $this->lfGetColumnNum($arrPageLayout);
-
- GC_Utils::gfDebugLog($debug_message);
}
@@ -131,37 +110,8 @@
* @return array ページ情報を格納した配列
*/
- function lfgetPageData($where = 'page_id <> 0', $where_vals = array()) {
-
- $objQuery = new SC_Query; // DB操作オブジェクト
- $arrRet = array(); // データ取得用
-
- // 取得するカラム
- $col = " page_id"; // ページID
- $col .= " ,page_name"; // 名称
- $col .= " ,url"; // URL
- $col .= " ,php_dir"; // php保存先ディレクトリ
- $col .= " ,tpl_dir"; // tpl保存先ディレクトリ
- $col .= " ,filename"; // ファイル名称
- $col .= " ,header_chk "; // ヘッダー使用FLG
- $col .= " ,footer_chk "; // フッター使用FLG
- $col .= " ,edit_flg "; // 編集可能FLG
- $col .= " ,author"; // authorタグ
- $col .= " ,description"; // descriptionタグ
- $col .= " ,keyword"; // keywordタグ
- $col .= " ,update_url"; // 更新URL
- $col .= " ,create_date"; // データ作成日
- $col .= " ,update_date"; // データ更新日
-
- // 取得するテーブル
- $table = "dtb_pagelayout";
-
- // 並び変え
+ function lfGetPageData($where = 'page_id <> 0', $arrVal = array()) {
+ $objQuery =& SC_Query::getSingletonInstance();
$objQuery->setOrder('page_id');
-
- // SQL実行
- $arrRet = $objQuery->select($col, $table, $where, $where_vals);
-
- // 結果を返す
- return $arrRet;
+ return $objQuery->select("*", "dtb_pagelayout", $where, $arrVal);
}
@@ -169,28 +119,20 @@
* ナビ情報を取得する.
*
- * @param string $url ページのURL
+ * @param integer $page_id ページID
+ * @param integer $device_type_id 端末種別ID
* @return array ナビ情報の配列
*/
- function lfGetNaviData($page_id){
- $objQuery = new SC_Query; // DB操作オブジェクト
-
- // 取得するカラム
- $col = "target_id, bloc_name, tpl_path, php_path,anywhere";
-
- // 取得するテーブル
- $table = "dtb_blocposition AS pos INNER JOIN dtb_bloc AS bloc ON bloc.bloc_id = pos.bloc_id";
-
- // where文生成
- $where = "anywhere = 1 OR page_id = ?";
- $where_vals[] = $page_id;
-
- // 並び変え
+ function lfGetNaviData($page_id, $device_type_id = DEVICE_TYPE_PC) {
+ $objQuery =& SC_Query::getSingletonInstance();
+ $table = <<< __EOF__
+ dtb_blocposition AS pos
+ JOIN dtb_bloc AS bloc
+ ON bloc.bloc_id = pos.bloc_id
+ AND bloc.device_type_id = pos.device_type_id
+__EOF__;
+ $where = "bloc.device_type_id = ? AND (anywhere = 1 OR pos.page_id = ?)";
$objQuery->setOrder('target_id, bloc_row');
-
- // SQL実行
- $arrRet = $objQuery->select($col, $table, $where, $where_vals);
-
- // 結果を返す
- return $arrRet;
+ return $objQuery->select("*", $table, $where,
+ array($device_type_id, $page_id));
}
@@ -199,26 +141,26 @@
*
* @param array $arrNavi ナビ情報の配列
- * @param integer|string $target_id ターゲットID
+ * @param integer $target_id ターゲットID
+ * @param integer $device_type_id 端末種別ID
* @return array ブロック情報の配列
*/
- function lfGetNavi($arrNavi, $target_id) {
+ function lfGetNavi($arrNavi, $target_id, $device_type_id = DEVICE_TYPE_PC) {
$arrRet = array();
- if(is_array($arrNavi)) {
- foreach($arrNavi as $key => $val){
+ if (is_array($arrNavi)) {
+ foreach ($arrNavi as $key => $val) {
// 指定された箇所と同じデータだけを取得する
- if ($target_id == $val['target_id'] ){
+ if ($target_id == $val['target_id'] ) {
if ($val['php_path'] != '') {
$arrNavi[$key]['php_path'] = HTML_PATH . $val['php_path'];
- }else{
- $user_block_path = USER_TEMPLATE_PATH . TEMPLATE_NAME . "/" . $val['tpl_path'];
- if(is_file($user_block_path)) {
+ } else {
+ $user_block_path = $this->getTemplatePath($device_type_id, true) . "/" . $val['tpl_path'];
+ if (is_file($user_block_path)) {
$arrNavi[$key]['tpl_path'] = $user_block_path;
} else {
- $arrNavi[$key]['tpl_path'] = TEMPLATE_DIR . $val['tpl_path'];
+ $arrNavi[$key]['tpl_path'] = $this->getTemplatePath($device_type_id) . $val['tpl_path'];
}
}
-
// phpから呼び出されるか、tplファイルが存在する場合
- if($val['php_path'] != '' || is_file($arrNavi[$key]['tpl_path'])) {
+ if ($val['php_path'] != '' || is_file($arrNavi[$key]['tpl_path'])) {
$arrRet[] = $arrNavi[$key];
} else {
@@ -233,5 +175,5 @@
/**
* カラム数を取得する.
- *
+ *
* @param array $arrPageLayout レイアウト情報の配列
* @return integer $col_num カラム数
@@ -244,5 +186,5 @@
// RIGHT NAVI
if (count($arrPageLayout['RightNavi']) > 0) $col_num++;
-
+
return $col_num;
}
@@ -251,10 +193,10 @@
* ページ情報を削除する.
*
- * @param integer|string $page_id ページID
+ * @param integer $page_id ページID
+ * @param integer $device_type_id 端末種別ID
* @return integer 削除数
*/
- function lfDelPageData($page_id){
- $objQuery = new SC_Query; // DB操作オブジェクト
- $ret = ""; // 結果格納用
+ function lfDelPageData($page_id, $device_type_id = DEVICE_TYPE_PC) {
+ $objQuery =& SC_Query::getSingletonInstance();
$arrDelData = array(); // 抽出データ用
@@ -262,7 +204,7 @@
if ($page_id != '') {
- $arrPageData = $this->lfgetPageData(" page_id = ? " , array($page_id));
+ $arrPageData = $this->lfGetPageData("page_id = ? AND device_type_id = ?" , array($page_id, $device_type_id));
// SQL実行
- $ret = $objQuery->delete("dtb_pagelayout", "page_id = ?", array($page_id));
+ $ret = $objQuery->delete("dtb_pagelayout", "page_id = ? AND device_type_id = ?", array($page_id, $device_type_id));
// ファイルの削除
@@ -278,5 +220,5 @@
* @return void // TODO boolean にするべき?
*/
- function lfDelFile($arrData){
+ function lfDelFile($arrData) {
// ファイルディレクトリ取得
$del_php = HTML_PATH . $arrData['php_dir'] . $arrData['filename'] . ".php";
@@ -284,10 +226,10 @@
// phpファイルの削除
- if (file_exists($del_php)){
+ if (file_exists($del_php)) {
unlink($del_php);
}
// tplファイルの削除
- if (file_exists($del_tpl)){
+ if (file_exists($del_tpl)) {
unlink($del_tpl);
}
@@ -297,21 +239,50 @@
* データがベースデータかどうか.
*
- * @param integer|string $data ページID
+ * @param integer $page_id ページID
+ * @param integer $device_type_id 端末種別ID
* @return boolean ベースデータの場合 true
*/
- function lfCheckBaseData($data){
- $ret = false;
-
- if ($data == 0) {
- return $ret;
- }
-
- $arrChkData = $this->lfgetPageData("page_id = ?", array($data));
-
- if ($arrChkData[0]['edit_flg'] == 2){
- $ret = true;
- }
-
- return $ret;
+ function lfCheckBaseData($page_id, $device_type_id) {
+ $result = false;
+
+ if ($page_id == 0) {
+ return $result;
+ }
+
+ $arrChkData = $this->lfgetPageData("page_id = ? AND device_type_id = ?",
+ array($page_id, $device_type_id));
+
+ if ($arrChkData[0]['edit_flg'] == 2) {
+ $result = true;
+ }
+
+ return $result;
+ }
+
+ /**
+ * テンプレートのパスを取得する.
+ */
+ function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false) {
+ $templateName = "";
+ switch ($device_type_id) {
+ case DEVICE_TYPE_MOBILE:
+ $dir = MOBILE_TEMPLATE_DIR;
+ $templateName = MOBILE_TEMPLATE_NAME;
+ break;
+
+ case DEVICE_TYPE_SMARTPHONE:
+ $dir = SMARTPHONE_TEMPLATE_DIR;
+ $templateName = SMARTPHONE_TEMPLATE_NAME;
+ break;
+
+ case DEVICE_TYPE_PC:
+ default:
+ $dir = TEMPLATE_DIR;
+ $templateName = TEMPLATE_NAME;
+ }
+ if ($isUser) {
+ $dir = USER_TEMPLATE_DIR . $templateName . "/";
+ }
+ return $dir;
}
}
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl (revision 19712)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl (revision 19713)
@@ -32,8 +32,8 @@
- |
-
-
-
+ |
+
+
+
@@ -55,8 +55,8 @@
|
-
+ 
+ 
+
+ 
+ 
+ 
