Ignore:
Timestamp:
2010/12/17 14:43:37 (16 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19736
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/Smarty/templates/admin/design/bloc.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fbloc.tpl
data/Smarty/templates/admin/design/css.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fcss.tpl
data/Smarty/templates/default/site_main.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsite_main.tpl
data/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.php
data/class/helper/SC_Helper_PageLayout.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_PageLayout.php
data/class/pages/admin/design/LC_Page_Admin_Design.php 15680@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design.php
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php 15689@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_CSS.php
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php 15688@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Header.php
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 15682@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_MainEdit.php
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 16430@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Template.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php 16530@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Best5.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 17073@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Calendar.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Cart.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Category.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Login.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_News.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_SearchProducts.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
data/require_base.php 17578@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Frequire_base.php
data/require_safe.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_safe.php
html/frontparts/bloc/best5.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ffrontparts%2Fbloc%2Fbest5.php
html/frontparts/bloc/calendar.php 17073@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fhtml%2Ffrontparts%2Fbloc%2Fcalendar.php
html/frontparts/bloc/cart.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ffrontparts%2Fbloc%2Fcart.php
html/frontparts/bloc/category.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ffrontparts%2Fbloc%2Fcategory.php
html/frontparts/bloc/login.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ffrontparts%2Fbloc%2Flogin.php
html/frontparts/bloc/news.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ffrontparts%2Fbloc%2Fnews.php
html/frontparts/bloc/search_products.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ffrontparts%2Fbloc%2Fsearch_products.php
bzr:mapping-version:
v4
bzr:merge:

[email protected]
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
2466
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/design/bloc.tpl [email protected]
data/Smarty/templates/admin/design/css.tpl [email protected]
data/Smarty/templates/default/site_main.tpl [email protected]
data/class/SC_View.php [email protected]
data/class/helper/SC_Helper_PageLayout.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php [email protected]
data/require_base.php [email protected]
data/require_safe.php [email protected]
html/frontparts/bloc/best5.php [email protected]
html/frontparts/bloc/calendar.php [email protected]
html/frontparts/bloc/cart.php [email protected]
html/frontparts/bloc/category.php [email protected]
html/frontparts/bloc/login.php [email protected]
html/frontparts/bloc/news.php [email protected]
html/frontparts/bloc/search_products.php [email protected]
bzr:timestamp:
2010-12-17 14:43:32.022000074 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2010-12-17T05:43:32.022000Z
Message:

#628(未使用処理・定義などの削除)

  • module.inc は使用しないため削除
Location:
branches/version-2_5-dev/data/class/pages/admin/design
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php

    r19722 r19737  
    121121        // 新規ブロック作成 
    122122        case 'new_bloc': 
    123             $this->objDisplay->redirect($this->getLocation("./bloc.php")); 
     123            $this->objDisplay->redirect($this->getLocation("./bloc.php", array("device_type_id" => $device_type_id))); 
    124124            exit; 
    125125            break; 
    … …  
    127127        // 新規ページ作成 
    128128        case 'new_page': 
    129             $this->objDisplay->redirect($this->getLocation("./main_edit.php")); 
     129            $this->objDisplay->redirect($this->getLocation("./main_edit.php", array("device_type_id" => $device_type_id))); 
    130130            exit; 
    131131            break; 

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php

    r19725 r19737  
    7979        if (isset($_REQUEST['page_id']) && is_numeric($_REQUEST['page_id'])) { 
    8080            $page_id = $_REQUEST['page_id']; 
    81         } else { 
    82             $page_id = 1; 
    8381        } 
    8482 
    … …  
    103101 
    104102        // page_id が指定されている場合にはテンプレートデータの取得 
    105         if (is_numeric($page_id) and $page_id != '') { 
     103        if (is_numeric($page_id) && $page_id != '') { 
    106104            $this->arrPageData = $this->lfGetPageData($page_id, $device_type_id, $objView); 
    107105        } 
    … …  
    110108 
    111109        switch ($_POST['mode']) { 
    112             case 'preview': 
    113                 $this->lfPreviewPageData($page_id, $device_type_id); 
    114                 exit; 
    115                 break; 
     110        case 'preview': 
     111            $this->lfPreviewPageData($page_id, $device_type_id); 
     112            exit; 
     113            break; 
    116114 
    117115        case 'delete': 
    … …  
    259257    function lfConfirmPageData($page_id, $device_type_id) { 
    260258        // エラーチェック 
    261         $this->arrErr = $this->lfErrorCheck($_POST); 
     259        $this->arrErr = $this->lfErrorCheck($_POST, $device_type_id); 
    262260 
    263261        // エラーがなければ更新処理を行う 
    … …  
    272270            } 
    273271 
    274             // FIXME 
    275272            // TPLファイル作成 
    276273            $cre_tpl = $this->objLayout->getTemplatePath($device_type_id, true) . basename($_POST['url']) . '.tpl'; 
    277274            $this->lfCreateFile($cre_tpl, $_POST['tpl_data']); 
    278275 
    279             /* 
    280             // 新規作成の場合、 
    281             if ($page_id == '') { 
    282                 // ページIDを取得する 
    283                 $arrPageData = $this->objLayout->lfGetPageData("url = ? AND page_id <> 0" , array(USER_DIR . $_POST['url'] . '.php')); 
    284                 $page_id = $arrPageData[0]['page_id']; 
    285             } 
    286             */ 
    287276            $this->objDisplay->redirect($this->getLocation("./main_edit.php", 
    288277                                    array("page_id" => $page_id, 
    … …  
    320309 
    321310        // page_id が空 若しくは データが存在していない場合にはINSERTを行う 
    322         if ($arrData['page_id'] === '' or !isset($arrChk[0])) { 
     311        if ($arrData['page_id'] === '' || !isset($arrChk[0])) { 
    323312            // FIXME device_type_id ごとの連番にする 
    324313            $sqlval['page_id'] = $objQuery->nextVal('dtb_pagelayout_page_id'); 
    … …  
    354343        if (!$this->objLayout->lfCheckBaseData($arrData['page_id'], $device_type_id)) { 
    355344            $arrUpdData['page_name']    = $arrData['page_name'] ; 
    356             $arrUpdData['url']          = $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php'; 
     345            $arrUpdData['url']          = preg_replace('|^' . preg_quote(URL_DIR) . '|', '', 
     346                                                       $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php'); 
    357347            $arrUpdData['php_dir']      = dirname($arrUpdData['url']); 
    358348            if ($arrUpdData['php_dir'] == '.') { 
    … …  
    384374     * 
    385375     * @param array $arrData 入力データ 
     376     * @param integer $device_type_id 端末種別ID 
    386377     * @return array エラー情報 
    387378     */ 
    388     function lfErrorCheck($array) { 
     379    function lfErrorCheck($array, $device_type_id) { 
    389380        $objErr = new SC_CheckError($array); 
    390381        $objErr->doFunc(array("名称", "page_name", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    … …  
    409400         
    410401        $sqlWhere = 'url = ?'; 
    411         $params[] = USER_DIR . $array['url'] . '.php'; 
     402        $params[] = $this->objLayout->getUserDir($device_type_id) . $array['url'] . '.php'; 
    412403         
    413404        // プレビュー用のレコードは除外 
Note: See TracChangeset for help on using the changeset viewer.