[Svn-src-all:850] [version-2_5-dev 19737] #628(未使用処理・定義などの削除)
nanasess
admin ＠ mail.ec-cube.net
2010年 12月 17日 (金) 14:43:38 JST
Subversion committed to /home/svn/open 19737
http://svn.ec-cube.net/open_trac/changeset/19737
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2010-12-17 14:43:37 +0900 (金, 17 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#628(未使用処理・定義などの削除)
* module.inc は使用しないため削除
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/site_main.tpl
U branches/version-2_5-dev/data/class/SC_View.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
D branches/version-2_5-dev/data/include/module.inc
U branches/version-2_5-dev/data/install.php
U branches/version-2_5-dev/data/require_base.php
U branches/version-2_5-dev/data/require_safe.php
U branches/version-2_5-dev/html/frontparts/bloc/best5.php
U branches/version-2_5-dev/html/frontparts/bloc/calendar.php
U branches/version-2_5-dev/html/frontparts/bloc/cart.php
U branches/version-2_5-dev/html/frontparts/bloc/category.php
U branches/version-2_5-dev/html/frontparts/bloc/login.php
U branches/version-2_5-dev/html/frontparts/bloc/news.php
U branches/version-2_5-dev/html/frontparts/bloc/search_products.php
変更: branches/version-2_5-dev/data/Smarty/templates/default/site_main.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/site_main.tpl 2010-12-16 18:22:08 UTC (rev 19736)
+++ branches/version-2_5-dev/data/Smarty/templates/default/site_main.tpl 2010-12-17 05:43:37 UTC (rev 19737)
@@ -207,8 +207,4 @@
<!--{* ▲FooterBottom COLUMN*}-->
</div>
-<!--{* EBiSタグ表示用 *}-->
-<!--{$tpl_mainpage|sfPrintEbisTag}-->
-<!--{* アフィリエイトタグ表示用 *}-->
-<!--{$tpl_conv_page|sfPrintAffTag:$tpl_aff_option}-->
</body>
変更: branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_View.php 2010-12-16 18:22:08 UTC (rev 19736)
+++ branches/version-2_5-dev/data/class/SC_View.php 2010-12-17 05:43:37 UTC (rev 19737)
@@ -54,8 +54,6 @@
$this->_smarty->plugins_dir=array("plugins", $SC_VIEW_PHP_DIR . "/../smarty_extends");
$this->_smarty->register_modifier("sf_mb_convert_encoding", array("SC_Utils_Ex", "sf_mb_convert_encoding"));
$this->_smarty->register_modifier("sfGetEnabled", array("SC_Utils_Ex", "sfGetEnabled"));
-// $this->_smarty->register_modifier("sfPrintEbisTag", array("SC_Utils_Ex", "sfPrintEbisTag"));
-// $this->_smarty->register_modifier("sfPrintAffTag", array("SC_Utils_Ex", "sfPrintAffTag"));
$this->_smarty->register_modifier("sfGetCategoryId", array("SC_Utils_Ex", "sfGetCategoryId"));
$this->_smarty->register_modifier("sfNoImageMainList", array("SC_Utils_Ex", "sfNoImageMainList"));
$this->_smarty->register_function("sfIsHTTPS", array("SC_Utils_Ex", "sfIsHTTPS"));
変更: 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 2010-12-16 18:22:08 UTC (rev 19736)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2010-12-17 05:43:37 UTC (rev 19737)
@@ -120,13 +120,13 @@
switch ($_POST['mode']) {
// 新規ブロック作成
case 'new_bloc':
- $this->objDisplay->redirect($this->getLocation("./bloc.php"));
+ $this->objDisplay->redirect($this->getLocation("./bloc.php", array("device_type_id" => $device_type_id)));
exit;
break;
// 新規ページ作成
case 'new_page':
- $this->objDisplay->redirect($this->getLocation("./main_edit.php"));
+ $this->objDisplay->redirect($this->getLocation("./main_edit.php", array("device_type_id" => $device_type_id)));
exit;
break;
変更: 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 2010-12-16 18:22:08 UTC (rev 19736)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2010-12-17 05:43:37 UTC (rev 19737)
@@ -78,8 +78,6 @@
// ページ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;
@@ -102,17 +100,17 @@
}
// page_id が指定されている場合にはテンプレートデータの取得
- if (is_numeric($page_id) and $page_id != '') {
+ if (is_numeric($page_id) && $page_id != '') {
$this->arrPageData = $this->lfGetPageData($page_id, $device_type_id, $objView);
}
if (!isset($_POST['mode'])) $_POST['mode'] = "";
switch ($_POST['mode']) {
- case 'preview':
- $this->lfPreviewPageData($page_id, $device_type_id);
- exit;
- break;
+ case 'preview':
+ $this->lfPreviewPageData($page_id, $device_type_id);
+ exit;
+ break;
case 'delete':
if (!$this->objLayout->lfCheckBaseData($page_id, $device_type_id)) {
@@ -258,7 +256,7 @@
*/
function lfConfirmPageData($page_id, $device_type_id) {
// エラーチェック
- $this->arrErr = $this->lfErrorCheck($_POST);
+ $this->arrErr = $this->lfErrorCheck($_POST, $device_type_id);
// エラーがなければ更新処理を行う
if (count($this->arrErr) == 0) {
@@ -271,19 +269,10 @@
$this->lfCreatePHPFile($_POST['url'], $device_type_id);
}
- // FIXME
// TPLファイル作成
$cre_tpl = $this->objLayout->getTemplatePath($device_type_id, true) . basename($_POST['url']) . '.tpl';
$this->lfCreateFile($cre_tpl, $_POST['tpl_data']);
- /*
- // 新規作成の場合、
- if ($page_id == '') {
- // ページIDを取得する
- $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,
@@ -319,7 +308,7 @@
}
// page_id が空 若しくは データが存在していない場合にはINSERTを行う
- if ($arrData['page_id'] === '' or !isset($arrChk[0])) {
+ if ($arrData['page_id'] === '' || !isset($arrChk[0])) {
// FIXME device_type_id ごとの連番にする
$sqlval['page_id'] = $objQuery->nextVal('dtb_pagelayout_page_id');
$sqlval['device_type_id'] = $device_type_id;
@@ -353,7 +342,8 @@
// ベースデータの場合には変更しない。
if (!$this->objLayout->lfCheckBaseData($arrData['page_id'], $device_type_id)) {
$arrUpdData['page_name'] = $arrData['page_name'] ;
- $arrUpdData['url'] = $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php';
+ $arrUpdData['url'] = preg_replace('|^' . preg_quote(URL_DIR) . '|', '',
+ $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php');
$arrUpdData['php_dir'] = dirname($arrUpdData['url']);
if ($arrUpdData['php_dir'] == '.') {
$arrUpdData['php_dir'] = '';
@@ -383,9 +373,10 @@
* 入力項目のエラーチェックを行う.
*
* @param array $arrData 入力データ
+ * @param integer $device_type_id 端末種別ID
* @return array エラー情報
*/
- function lfErrorCheck($array) {
+ function lfErrorCheck($array, $device_type_id) {
$objErr = new SC_CheckError($array);
$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"));
@@ -408,7 +399,7 @@
$params = array();
$sqlWhere = 'url = ?';
- $params[] = USER_DIR . $array['url'] . '.php';
+ $params[] = $this->objLayout->getUserDir($device_type_id) . $array['url'] . '.php';
// プレビュー用のレコードは除外
$sqlWhere .= ' AND page_id <> 0';
削除: branches/version-2_5-dev/data/include/module.inc
===================================================================
(バイナリファイルが異なっています)
変更: branches/version-2_5-dev/data/require_base.php
===================================================================
--- branches/version-2_5-dev/data/require_base.php 2010-12-16 18:22:08 UTC (rev 19736)
+++ branches/version-2_5-dev/data/require_base.php 2010-12-17 05:43:37 UTC (rev 19737)
@@ -31,9 +31,6 @@
// 各種クラス読み込み
require_once(DATA_PATH . "require_classes.php");
-// モジュールの読み込み
-require_once(DATA_PATH . "include/module.inc");
-
// インストール中で無い場合、
if (!SC_Utils_Ex::sfIsInstallFunction()) {
// インストールチェック
変更: branches/version-2_5-dev/data/require_safe.php
===================================================================
--- branches/version-2_5-dev/data/require_safe.php 2010-12-16 18:22:08 UTC (rev 19736)
+++ branches/version-2_5-dev/data/require_safe.php 2010-12-17 05:43:37 UTC (rev 19737)
@@ -39,8 +39,4 @@
// 各種クラス読み込み
require_once(DATA_PATH . "require_classes.php");
-
-// FIXME 互換性保持のため空の関数を残しておく
-function sfPrintEbisTag() {}
-function sfPrintAffTag() {}
?>
Svn-src-all メーリングリストの案内