r7442 추가 gzip 설정 및 기타 css/js load시 optimized true로 변경, qtip.min error 수정

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-05-12 02:11:53 +00:00
parent 0e1ed22922
commit 328d40a2a3
7 changed files with 60 additions and 51 deletions

View file

@ -163,7 +163,11 @@
$this->addCSSFile("./common/css/button.css"); $this->addCSSFile("./common/css/button.css");
// for admin page, add admin css // for admin page, add admin css
if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0) $this->addCssFile("./modules/admin/tpl/css/admin.css", false); if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){
$this->addCssFile("./modules/admin/tpl/css/font.css", true, 'all', 10000);
$this->addCssFile("./modules/admin/tpl/css/pagination.css", true, 'all', 100001);
$this->addCssFile("./modules/admin/tpl/css/admin.css", true, 'all', 100002);
}
// set locations for javascript use // set locations for javascript use
if($_SERVER['REQUEST_METHOD'] == 'GET') { if($_SERVER['REQUEST_METHOD'] == 'GET') {

View file

@ -9,7 +9,7 @@
class Optimizer { class Optimizer {
var $cache_path = "./files/cache/optimized/"; var $cache_path = "./files/cache/optimized/";
var $script_file = "./common/script.php?l=%s&t=.%s"; var $script_file = "./common/script.php?l=%s&t=.%s";
/** /**
* @brief Constructor which check if a directory, 'optimized' exists in designated path. If not create a new one * @brief Constructor which check if a directory, 'optimized' exists in designated path. If not create a new one

File diff suppressed because one or more lines are too long

View file

@ -5,14 +5,17 @@
* *
**/ **/
if(!$_GET['t'] || !$_GET['l']) exit; if(!$_GET['t'] || !$_GET['l']) exit;
if(version_compare(PHP_VERSION, '5.3.0') >= 0)
{
date_default_timezone_set(@date_default_timezone_get());
}
// set env // set env
$XE_PATH = substr(dirname(__FILE__),0,strlen('common')*-1); $XE_PATH = substr(dirname(__FILE__),0,strlen('common')*-1);
define('__XE_PATH__', $XE_PATH);
define('__ZBXE__', true);
define('__XE_LOADED_CLASS__', true);
include $XE_PATH . 'config/config.inc.php';
$XE_WEB_PATH = substr($XE_PATH,strlen($_SERVER['DOCUMENT_ROOT'])); $XE_WEB_PATH = substr($XE_PATH,strlen($_SERVER['DOCUMENT_ROOT']));
if(substr($XE_WEB_PATH,-1) != "/") $XE_WEB_PATH .= "/"; if(substr($XE_WEB_PATH,-1) != "/") $XE_WEB_PATH .= "/";
$cache_path = $XE_PATH . 'files/cache/optimized/'; $cache_path = $XE_PATH . 'files/cache/optimized/';
@ -24,7 +27,6 @@ if(!file_exists($list_file)) exit;
$list = include($list_file); $list = include($list_file);
if(!is_array($list)) exit; if(!is_array($list)) exit;
function getRealPath($file){ function getRealPath($file){
global $XE_PATH; global $XE_PATH;
if($file{0}=='.' && $file{1} =='/') $file = $XE_PATH.substr($file, 2); if($file{0}=='.' && $file{1} =='/') $file = $XE_PATH.substr($file, 2);
@ -43,7 +45,7 @@ function getMaxMtime($list){
} }
// max mtime // max mtime
$mtime = getMaxMtime($list); $mtime = getMaxMtime(array_merge($list,array($list_file)));
if($type == '.css'){ if($type == '.css'){
$content_type = 'text/css'; $content_type = 'text/css';
} else if($type == '.js') { } else if($type == '.js') {
@ -68,21 +70,26 @@ header("Connection: close");
header("Last-Modified: " . substr(gmdate('r', $mtime), 0, -5). "GMT"); header("Last-Modified: " . substr(gmdate('r', $mtime), 0, -5). "GMT");
header("ETag: \"". md5(join(' ', $list)) .'-'. dechex($mtime)."\""); header("ETag: \"". md5(join(' ', $list)) .'-'. dechex($mtime)."\"");
function printFileList($list){ function printFileList($list){
$output = ''; $output = '';
for($i=0,$c=count($list);$i<$c;$i++){ for($i=0,$c=count($list);$i<$c;$i++){
$file = getRealPath($list[$i]); $file = getRealPath($list[$i]);
if(file_exists($file)){ if(file_exists($file)){
//$f = fopen($file,"r");
//fpassthru($f);
$output .= file_get_contents($file); $output .= file_get_contents($file);
$output .= "\n"; $output .= "\n";
//print("\n");
} }
} }
header("Content-Encoding: gzip");
print ob_gzhandler($output, 5); if( (defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1)
&& strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false
&& function_exists('ob_gzhandler')
&& extension_loaded('zlib')) {
header("Content-Encoding: gzip");
$output = ob_gzhandler($output, 5);
}
header("Content-Length: ". strlen($output));
echo $output;
} }
if($type == '.css'){ if($type == '.css'){
@ -164,14 +171,14 @@ if($type == '.css'){
global $tmp_css_path, $XE_WEB_PATH; global $tmp_css_path, $XE_WEB_PATH;
$path = str_replace(array('"',"'"),'',$matches[1]); $path = str_replace(array('"',"'"),'',$matches[1]);
if(substr($path,0,1)=='/' || strpos($path,'://')!==false || strpos($path,'.htc')!==false) return 'url("'.$path.'")'; if(substr($path,0,1)=='/' || strpos($path,'://')!==false || strpos($path,'.htc')!==false) return 'url('.$path.')';
if(substr($path,0,2)=='./') $path = substr($path,2); if(substr($path,0,2)=='./') $path = substr($path,2);
$target = $XE_WEB_PATH.$tmp_css_path.$path; $target = $XE_WEB_PATH.$tmp_css_path.$path;
while(strpos($target,'/../')!==false) { while(strpos($target,'/../')!==false) {
$target = preg_replace('/\/([^\/]+)\/\.\.\//','/',$target); $target = preg_replace('/\/([^\/]+)\/\.\.\//','/',$target);
} }
return 'url("'.$target.'")'; return 'url('.$target.')';
} }
foreach($list as $file){ foreach($list as $file){

View file

@ -107,11 +107,6 @@
require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php'; require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
} }
/**
* @brief 간단하게 사용하기 위한 함수 정의한 파일 require
**/
require(_XE_PATH_.'config/func.inc.php');
/** /**
* @brief Set Timezone as server time * @brief Set Timezone as server time
**/ **/
@ -120,29 +115,35 @@
date_default_timezone_set(@date_default_timezone_get()); date_default_timezone_set(@date_default_timezone_get());
} }
if(!defined('__XE_LOADED_CLASS__')){
/**
* @brief 간단하게 사용하기 위한 함수 정의한 파일 require
**/
require(_XE_PATH_.'config/func.inc.php');
if(__DEBUG__) define('__StartTime__', getMicroTime()); if(__DEBUG__) define('__StartTime__', getMicroTime());
/** /**
* @brief 기본적인 class 파일 include * @brief 기본적인 class 파일 include
* @TODO : PHP5 기반으로 바꾸게 되면 _autoload() 이용할 있기에 제거 대상 * @TODO : PHP5 기반으로 바꾸게 되면 _autoload() 이용할 있기에 제거 대상
**/ **/
if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime()); if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
require(_XE_PATH_.'classes/object/Object.class.php'); require(_XE_PATH_.'classes/object/Object.class.php');
require(_XE_PATH_.'classes/extravar/Extravar.class.php'); require(_XE_PATH_.'classes/extravar/Extravar.class.php');
require(_XE_PATH_.'classes/handler/Handler.class.php'); require(_XE_PATH_.'classes/handler/Handler.class.php');
require(_XE_PATH_.'classes/xml/XmlParser.class.php'); require(_XE_PATH_.'classes/xml/XmlParser.class.php');
require(_XE_PATH_.'classes/xml/XmlJsFilter.class.php'); require(_XE_PATH_.'classes/xml/XmlJsFilter.class.php');
require(_XE_PATH_.'classes/context/Context.class.php'); require(_XE_PATH_.'classes/context/Context.class.php');
require(_XE_PATH_.'classes/db/DB.class.php'); require(_XE_PATH_.'classes/db/DB.class.php');
require(_XE_PATH_.'classes/file/FileHandler.class.php'); require(_XE_PATH_.'classes/file/FileHandler.class.php');
require(_XE_PATH_.'classes/widget/WidgetHandler.class.php'); require(_XE_PATH_.'classes/widget/WidgetHandler.class.php');
require(_XE_PATH_.'classes/editor/EditorHandler.class.php'); require(_XE_PATH_.'classes/editor/EditorHandler.class.php');
require(_XE_PATH_.'classes/module/ModuleObject.class.php'); require(_XE_PATH_.'classes/module/ModuleObject.class.php');
require(_XE_PATH_.'classes/module/ModuleHandler.class.php'); require(_XE_PATH_.'classes/module/ModuleHandler.class.php');
require(_XE_PATH_.'classes/display/DisplayHandler.class.php'); require(_XE_PATH_.'classes/display/DisplayHandler.class.php');
require(_XE_PATH_.'classes/template/TemplateHandler.class.php'); require(_XE_PATH_.'classes/template/TemplateHandler.class.php');
require(_XE_PATH_.'classes/mail/Mail.class.php'); require(_XE_PATH_.'classes/mail/Mail.class.php');
require(_XE_PATH_.'classes/page/PageHandler.class.php'); require(_XE_PATH_.'classes/page/PageHandler.class.php');
if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__; if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
}
?> ?>

View file

@ -1,6 +1,4 @@
@charset "utf-8"; @charset "utf-8";
@import url("./font.css");
@import url("./pagination.css");
/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */ /* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
#xeAdmin {/* background-color:#fff; */} #xeAdmin {/* background-color:#fff; */}

View file

@ -1,9 +1,9 @@
<!--#include("_header.html")--> <!--#include("_header.html")-->
<!--%import("../../install/lang")--> <!--%import("../../install/lang")-->
<!--%import("../../module/tpl/js/module_admin.js",optimized=false)--> <!--%import("../../module/tpl/js/module_admin.js")-->
<!--%import("../../session/tpl/js/session.js",optimized=false)--> <!--%import("../../session/tpl/js/session.js")-->
<!--%import("../../addon/tpl/js/addon.js",optimized=false)--> <!--%import("../../addon/tpl/js/addon.js")-->
<!--%import("../../addon/tpl/filter/toggle_activate_addon.xml")--> <!--%import("../../addon/tpl/filter/toggle_activate_addon.xml")-->
<div class="content"> <div class="content">