diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php index 3c0935afe..4fda1c81f 100644 --- a/classes/optimizer/Optimizer.class.php +++ b/classes/optimizer/Optimizer.class.php @@ -139,9 +139,7 @@ $content_filename = substr($filename, 0, -4); $file_object = FileHandler::openFile($path."/".$content_filename, "w"); - $str_to_write = ''; - if($type == 'css') $str_to_write .= '@charset "UTF-8";'."\n"; - + if($type == 'css') $file_object->write('@charset "UTF-8";'."\n"); foreach($targets as $file) { $str = FileHandler::readFile($file['file']); @@ -152,15 +150,11 @@ $str = $this->replaceCssPath($file['file'], $str); if($file['media'] != 'all') $str = '@media '.$file['media'].' {'."\n".$str."\n".'}'; } - $str_to_write .= $str; - $str_to_write .= "\n"; + $file_object->write($str); + $file_object->write("\n"); unset($str); } - $db_info = Context::getDBInfo(); - if($db_info->use_spaceremover != 'N') $str_to_write = $this->doCompressCode($str_to_write, $db_info->use_spaceremover); - - $file_object->write($str_to_write); $file_object->close(); /** @@ -251,19 +245,5 @@ if(!$cached) { return 'url("'.$target.'")'; } - - function doCompressCode($str_code, $condition = 'Y') { - if($condition == 'N' || ($condition != 'P' && $condition != 'Y')) return $str_code; - - if($condition == 'P' && ((int)date('H') < 1 || 5 < (int)date('H'))) return $str_code; - - $str_code = str_replace("\r", "\n", $str_code); - $str_code = preg_replace("!^([ \t]+)!m", '', $str_code); - $str_code = preg_replace("!([ \t]+)$!m", '', $str_code); - $str_code = preg_replace("!(\n{2,})!m", "\n", $str_code); - - return trim($str_code); - } - } ?> diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html index 0b5b608e1..7a0185af8 100644 --- a/modules/admin/tpl/config.html +++ b/modules/admin/tpl/config.html @@ -64,19 +64,6 @@

{$lang->about_optimizer}

- - -
{$lang->use_spaceremover}
- - -

{$lang->about_spaceremover}

- - -
Language
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index f117d7e35..855ed5d4c 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -51,10 +51,6 @@ $use_optimizer = Context::get('use_optimizer'); if($use_optimizer!='Y') $use_optimizer = 'N'; - $use_spaceremover = Context::get('use_spaceremover'); - if(!$use_spaceremover && $use_optimizer!='Y') $use_spaceremover = 'N'; - elseif($use_spaceremover != 'P' && $use_spaceremover != 'Y') $use_spaceremover = 'N'; - $time_zone = Context::get('time_zone'); $qmail_compatibility = Context::get('qmail_compatibility'); @@ -77,7 +73,6 @@ $db_info->use_db_session = $use_db_session; $db_info->use_rewrite = $use_rewrite; $db_info->use_optimizer = $use_optimizer; - $db_info->use_spaceremover = $use_spaceremover; $db_info->use_ssl = $use_ssl; if($http_port) $db_info->http_port = (int) $http_port; else if($db_info->http_port) unset($db_info->http_port); diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php index 8856e0407..9519718b7 100644 --- a/modules/install/lang/en.lang.php +++ b/modules/install/lang/en.lang.php @@ -163,12 +163,6 @@ EndOfLicense; $lang->env_title = 'Configuration'; $lang->use_optimizer = 'Enable Optimizer'; $lang->about_optimizer = 'If optimizer is enabled, users can quickly access to this site, since multiple CSS / JS files are put together and compressed before transmission.
Nevertheless, this optimization might be problematic according to CSS or JS. If you disable it, it would work properly though it would work slower.'; - $lang->use_spaceremover = 'Remove Spaces at optimized file'; - $lang->about_spaceremover = 'Making a file, optimizer removes spaces before lines or after lines and overlapped line breakers. It might makes a optimized file smaller than a normal optimized file that is not processed.
\'During dawn\' option will apply this process between 1 a.m. and 5 a.m.'; - $lang->use_spaceremover_condition = array( - 'Y' => 'Always', - 'P' => 'During dawn', - 'N' => 'Never'); $lang->use_rewrite = 'Rewrite Mod'; $lang->about_rewrite = "If web server provides rewrite mod, long URL such as http://blah/?document_srl=123 can be shortened like http://blah/123"; $lang->time_zone = 'Time Zone'; diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php index cf3f98f76..298eddd46 100644 --- a/modules/install/lang/ko.lang.php +++ b/modules/install/lang/ko.lang.php @@ -256,12 +256,6 @@ EndOfLicense; $lang->env_title = '환경 설정'; $lang->use_optimizer = 'Optimizer 사용'; $lang->about_optimizer = 'Optimizer를 사용하면 다수의 CSS/JS파일을 통합/압축 전송하여 매우 빠르게 사이트 접속이 가능하게 합니다.
다만 CSS나 JS에 따라서 문제가 생길 수 있습니다. 이때는 Optimizer 비활성화 하시면 정상적인 동작은 가능합니다.'; - $lang->use_spaceremover = '통합된 파일 공백 제거'; - $lang->about_spaceremover = 'Optimizer로 파일을 통합할 때, 공백과 중복된 줄 바꿈을 제거합니다. 스크립트 파일 크기를 줄일 수 있습니다.
새벽 시간대에만 적용 옵션은 오전 1시 - 오전 5시 사이에 생성되는 파일에만 공백 제거 옵션을 적용합니다.'; - $lang->use_spaceremover_condition = array( - 'Y' => '항상 사용', - 'P' => '새벽 시간대에만 적용', - 'N' => '사용 안함'); $lang->use_rewrite = 'rewrite mod 사용'; $lang->about_rewrite = '웹서버에서 rewrite mod를 지원하면 http://주소/?document_srl=123 같이 복잡한 주소를 http://주소/123과 같이 간단하게 줄일 수 있습니다.'; $lang->time_zone = '표준 시간대';