From 468cca81d157b1b41e69d84406d84457ed8a6ab0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@sir.co.kr>
Date: Wed, 5 Oct 2016 09:48:29 +0900
Subject: [PATCH] =?UTF-8?q?js=20css=20=EB=B2=84=EC=A0=84=20=EC=83=81?=
 =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/admin.tail.php        |  2 +-
 adm/board_copy.php        |  2 +-
 extend/version.extend.php |  6 ++++++
 head.sub.php              | 10 +++++-----
 lib/common.lib.php        |  9 ++++++++-
 theme/basic/head.sub.php  |  8 ++++----
 6 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 extend/version.extend.php

diff --git a/adm/admin.tail.php b/adm/admin.tail.php
index 55ba62359..6f5514788 100644
--- a/adm/admin.tail.php
+++ b/adm/admin.tail.php
@@ -21,7 +21,7 @@ if (!defined('_GNUBOARD_')) exit;
 
 <!-- <p>실행시간 : <?php echo get_microtime() - $begin_time; ?> -->
 
-<script src="<?php echo G5_ADMIN_URL ?>/admin.js"></script>
+<script src="<?php echo G5_ADMIN_URL ?>/admin.js<?php echo G5_JS_VER; ?>"></script>
 <script>
 $(function(){
     var hide_menu = false;
diff --git a/adm/board_copy.php b/adm/board_copy.php
index 3c4a38a2b..e45ea25a3 100644
--- a/adm/board_copy.php
+++ b/adm/board_copy.php
@@ -8,7 +8,7 @@ $g5['title'] = '게시판 복사';
 include_once(G5_PATH.'/head.sub.php');
 ?>
 
-<script src="<?php echo G5_ADMIN_URL ?>/admin.js"></script>
+<script src="<?php echo G5_ADMIN_URL ?>/admin.js<?php echo G5_JS_VER; ?>"></script>
 
 <div class="new_win">
     <h1><?php echo $g5['title']; ?></h1>
diff --git a/extend/version.extend.php b/extend/version.extend.php
new file mode 100644
index 000000000..6da47972f
--- /dev/null
+++ b/extend/version.extend.php
@@ -0,0 +1,6 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+define('G5_JS_VER',  '161020');
+define('G5_CSS_VER', '161020');
+?>
\ No newline at end of file
diff --git a/head.sub.php b/head.sub.php
index 00220f503..fc658d1aa 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -55,9 +55,9 @@ if($config['cf_add_meta'])
 <?php
 if (defined('G5_IS_ADMIN')) {
     if(!defined('_THEME_PREVIEW_'))
-        echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css">'.PHP_EOL;
+        echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css?ver='.G5_CSS_VER.'">'.PHP_EOL;
 } else {
-    echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css">'.PHP_EOL;
+    echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css?ver='.G5_CSS_VER.'">'.PHP_EOL;
 }
 ?>
 <!--[if lte IE 8]>
@@ -79,9 +79,9 @@ var g5_admin_url = "<?php echo G5_ADMIN_URL; ?>";
 <?php } ?>
 </script>
 <script src="<?php echo G5_JS_URL ?>/jquery-1.8.3.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery.menu.js"></script>
-<script src="<?php echo G5_JS_URL ?>/common.js"></script>
-<script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
+<script src="<?php echo G5_JS_URL ?>/jquery.menu.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/common.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/wrest.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <?php
 if(G5_IS_MOBILE) {
     echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 082b2523f..586aed030 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -2423,6 +2423,8 @@ class html_process {
                 if(!trim($link[1]))
                     continue;
 
+                $link[1] = preg_replace('#\.css([\'\"]?>)$#i', '.css?ver='.G5_CSS_VER.'$1', $link[1]);
+
                 $stylesheet .= PHP_EOL.$link[1];
             }
         }
@@ -2447,6 +2449,8 @@ class html_process {
                 if(!trim($js[1]))
                     continue;
 
+                $js[1] = preg_replace('#\.js([\'\"]?>)$#i', '.js?ver='.G5_JS_VER.'$1', $js[1]);
+
                 $javascript .= $php_eol.$js[1];
                 $php_eol = PHP_EOL;
             }
@@ -2464,7 +2468,10 @@ class html_process {
         <body>
         전에 스킨의 자바스크립트가 위치하도록 하게 한다.
         */
-        $buffer = preg_replace('#(</head>[^<]*<body[^>]*>)#', "$javascript\n$1", $buffer);
+        $nl = '';
+        if($javascript)
+            $nl = "\n";
+        $buffer = preg_replace('#(</head>[^<]*<body[^>]*>)#', "$javascript{$nl}$1", $buffer);
 
         return $buffer;
     }
diff --git a/theme/basic/head.sub.php b/theme/basic/head.sub.php
index 33998c4e1..64a552e6c 100644
--- a/theme/basic/head.sub.php
+++ b/theme/basic/head.sub.php
@@ -46,7 +46,7 @@ if($config['cf_add_meta'])
     echo $config['cf_add_meta'].PHP_EOL;
 ?>
 <title><?php echo $g5_head_title; ?></title>
-<link rel="stylesheet" href="<?php echo G5_THEME_CSS_URL; ?>/<?php echo G5_IS_MOBILE ? 'mobile' : 'default'; ?>.css">
+<link rel="stylesheet" href="<?php echo G5_THEME_CSS_URL; ?>/<?php echo G5_IS_MOBILE ? 'mobile' : 'default'; ?>.css?ver=<?php echo G5_CSS_VER; ?>">
 <!--[if lte IE 8]>
 <script src="<?php echo G5_JS_URL ?>/html5.js"></script>
 <![endif]-->
@@ -63,9 +63,9 @@ var g5_editor    = "<?php echo ($config['cf_editor'] && $board['bo_use_dhtml_edi
 var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
 </script>
 <script src="<?php echo G5_JS_URL ?>/jquery-1.8.3.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery.menu.js"></script>
-<script src="<?php echo G5_JS_URL ?>/common.js"></script>
-<script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
+<script src="<?php echo G5_JS_URL ?>/jquery.menu.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/common.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/wrest.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <?php
 if(G5_IS_MOBILE) {
     echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지