Ignore:
Timestamp:
2011/04/19 22:52:35 (13 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20110419134221-1wtj14593l61zc53
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/admin/design/template.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Ftemplate.tpl
data/Smarty/templates/admin/design/up_down.tpl 16677@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fup_down.tpl
data/class/SC_UploadFile.php 18171@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_UploadFile.php
data/class/helper/SC_Helper_FileManager.php 16253@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_FileManager.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/admin/design/LC_Page_Admin_Design_UpDown.php 20543@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_UpDown.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/user_data/packages/default/sql/update_bloc.sql 17136@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fsql%2Fupdate_bloc.sql
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110419135231-g92tpf1uskbtyyat
bzr:revno:
3574
bzr:revprop:branch-nick:
branches/version-2_11-dev
bzr:root:
branches/version-2_11-dev
bzr:text-revisions:

data/Smarty/templates/admin/design/template.tpl ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
data/Smarty/templates/admin/design/up_down.tpl ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
data/class/SC_UploadFile.php ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
data/class/helper/SC_Helper_FileManager.php ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
html/user_data/packages/default/sql/update_bloc.sql ohkouchi@loop-az.jp-20110419134938-8843gis71oelhuff
bzr:timestamp:
2011-04-19 22:52:31.440999985 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-04-19T13:52:31.441000Z
Message:

#624(軽微な表示乱れを修正)

  • data/class/SC_UploadFile.php の文言修正

#972 (リファクタリング開発:[管理画面]デザイン管理)

  • テンプレート設定
  • テンプレートアップロード
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/class/helper/SC_Helper_FileManager.php

    r20847 r20863  
    364364     * ユーザが作成したファイルをアーカイブしダウンロードさせる 
    365365     * TODO 要リファクタリング 
    366      * @param void 
    367      * @return void 
    368      */ 
    369     function downloadArchiveFiles($dir) { 
    370         $debug_message = ""; 
     366     * @param string $dir アーカイブを行なうディレクトリ 
     367     * @param string $template_code テンプレートコード 
     368     * @return boolean 成功した場合 true; 失敗した場合 false 
     369     */ 
     370    function downloadArchiveFiles($dir, $template_code) { 
    371371        // ダウンロードされるファイル名 
    372         $dlFileName = 'tpl_package_' . date('YmdHis') . '.tar.gz'; 
    373  
     372        $dlFileName = 'tpl_package_' . $template_code . '_' . date('YmdHis') . '.tar.gz'; 
     373 
     374        $debug_message = $dir . " から " . $dlFileName . " を作成します...\n"; 
    374375        // ファイル一覧取得 
    375376        $arrFileHash = SC_Utils_Ex::sfGetFileList($dir); 
     
    378379            $debug_message.= "圧縮:".$val['file_name']."\n"; 
    379380        } 
    380         GC_Utils_Ex::gfDebugLog($debug_message); 
     381        GC_Utils_Ex::gfPrintLog($debug_message); 
    381382 
    382383        // ディレクトリを移動 
     
    384385        // 圧縮をおこなう 
    385386        $tar = new Archive_Tar($dlFileName, true); 
    386         $tar->create($arrFileList); 
    387  
    388         // ダウンロード用HTTPヘッダ出力 
    389         header("Content-disposition: attachment; filename=${dlFileName}"); 
    390         header("Content-type: application/octet-stream; name=${dlFileName}"); 
    391         header("Content-Length: " . filesize($dlFileName)); 
    392         readfile($dlFileName); 
    393         unlink($dir . "/" . $dlFileName); 
    394         exit; 
     387        if ($tar->create($arrFileList)) { 
     388            // ダウンロード用HTTPヘッダ出力 
     389            header("Content-disposition: attachment; filename=${dlFileName}"); 
     390            header("Content-type: application/octet-stream; name=${dlFileName}"); 
     391            header("Cache-Control: "); 
     392            header("Pragma: "); 
     393            readfile($dlFileName); 
     394            unlink($dir . "/" . $dlFileName); 
     395            return true; 
     396        } else { 
     397            return false; 
     398        } 
    395399    } 
    396400 
     
    399403     * 
    400404     * @param string $path アーカイブパス 
    401      * @return string Archive_Tar::extractModify()のエラー 
     405     * @return boolean Archive_Tar::extractModify()のエラー 
    402406     */ 
    403407    function unpackFile($path) { 
     
    412416 
    413417        // 指定されたフォルダ内に解凍する 
    414         $tar->extractModify($dir. "/", $unpacking_name); 
     418        $result = $tar->extractModify($dir. "/", $unpacking_name); 
    415419        GC_Utils_Ex::gfPrintLog("解凍:" . $dir."/".$file_name."->".$dir."/".$unpacking_name); 
    416420 
     
    419423        // 圧縮ファイル削除 
    420424        unlink($path); 
     425        return $result; 
    421426    } 
    422427} 
Note: See TracChangeset for help on using the changeset viewer.