Merge branch 'g5'

adm/popular_rank.php

@@ -1,7 +1,6 @@
 <?php
 $sub_menu = "300400";
 include_once('./_common.php');
-include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 
 auth_check($auth[$sub_menu], 'r');
 
@@ -31,13 +30,14 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
 
 $g5['title'] = '인기검색어순위';
 include_once('./admin.head.php');
+include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 
 $colspan = 3;
 ?>
 
 <script>
 $(function(){
-    $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" }); 
+    $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" });
 });
 </script>
 

adm/visit.sub.php

@@ -1,9 +1,9 @@
 <?php
 if (!defined('_GNUBOARD_')) exit;
 
-include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 include_once(G5_LIB_PATH.'/visit.lib.php');
 include_once('./admin.head.php');
+include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 
 if (empty($fr_date)) $fr_date = G5_TIME_YMD;
 if (empty($to_date)) $to_date = G5_TIME_YMD;
@@ -38,7 +38,7 @@ $query_string = $qstr ? '?'.$qstr : '';
 
 <script>
 $(function(){
-    $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" }); 
+    $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" });
 });
 
 function fvisit_submit(act)

adm/visit_search.php

@@ -1,13 +1,13 @@
-<?php 
+<?php
 $sub_menu = '200810';
 include_once('./_common.php');
 include_once(G5_PATH.'/lib/visit.lib.php');
-include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 
 auth_check($auth[$sub_menu], 'r');
 
 $g5['title'] = '접속자검색';
 include_once('./admin.head.php');
+include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 
 $search_word = escape_trim($_GET['search_word']);
 $search_sort = escape_trim($_GET['search_sort']);
@@ -22,7 +22,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'">처음</a>'; //페이지 처음
     <?=$listall?>
     <label for="sch_sort" class="sound_only">검색분류</label>
     <select name="search_sort" id="sch_sort" class="search_sort">
-        <?php 
+        <?php
         //echo '<option value="vi_ip" '.($search_sort=='vi_ip'?'selected="selected"':'').'>IP</option>'; //selected 추가
         if($search_sort=='vi_ip'){ //select 안의 옵셥값이 vi_ip면
             echo '<option value="vi_ip" selected="selected">IP</option>'; //selected 추가
@@ -59,7 +59,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'">처음</a>'; //페이지 처음
     </tr>
     </thead>
     <tbody>
-    <?php 
+    <?php
     $sql_common = " from {$g5['visit_table']} ";
     if ($search_sort) {
         if($search_sort=='vi_ip' || $search_sort=='vi_date'){
@@ -79,7 +79,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'">처음</a>'; //페이지 처음
     if ($page == "") $page = 1; // 페이지가 없으면 첫 페이지 (1 페이지)
     $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
-    $sql = " select * 
+    $sql = " select *
                 {$sql_common}
                 {$sql_search}
                 order by vi_id desc
@@ -150,12 +150,12 @@ $(function(){
     }
 });
 
-function fvisit_submit(f) 
+function fvisit_submit(f)
 {
     return true;
 }
 </script>
 
-<?php 
+<?php
 include_once('./admin.tail.php');
 ?>

plugin/jquery-ui/datepicker.php

@@ -1,37 +1,34 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+?>
 
-// 환경설정 변수 추가 스크립트, css 에 jquery ui 의 datepicker 코드를 더한다.
-$config['cf_add_script'] .= <<<EOT
 <link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css" rel="stylesheet" />
 <style>
 .ui-datepicker { font:12px dotum; }
-.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-month,
 .ui-datepicker select.ui-datepicker-year { width: 70px;}
 .ui-datepicker-trigger { margin:0 0 -5px 2px; }
 </style>
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
 <script>
 jQuery(function($){
-    $.datepicker.regional["ko"] = { 
+    $.datepicker.regional["ko"] = {
-        closeText: "닫기", 
+        closeText: "닫기",
-        prevText: "이전달", 
+        prevText: "이전달",
-        nextText: "다음달", 
+        nextText: "다음달",
-        currentText: "오늘", 
+        currentText: "오늘",
-        monthNames: ["1월(JAN)","2월(FEB)","3월(MAR)","4월(APR)","5월(MAY)","6월(JUN)", "7월(JUL)","8월(AUG)","9월(SEP)","10월(OCT)","11월(NOV)","12월(DEC)"], 
+        monthNames: ["1월(JAN)","2월(FEB)","3월(MAR)","4월(APR)","5월(MAY)","6월(JUN)", "7월(JUL)","8월(AUG)","9월(SEP)","10월(OCT)","11월(NOV)","12월(DEC)"],
-        monthNamesShort: ["1월","2월","3월","4월","5월","6월", "7월","8월","9월","10월","11월","12월"], 
+        monthNamesShort: ["1월","2월","3월","4월","5월","6월", "7월","8월","9월","10월","11월","12월"],
-        dayNames: ["일","월","화","수","목","금","토"], 
+        dayNames: ["일","월","화","수","목","금","토"],
-        dayNamesShort: ["일","월","화","수","목","금","토"], 
+        dayNamesShort: ["일","월","화","수","목","금","토"],
-        dayNamesMin: ["일","월","화","수","목","금","토"], 
+        dayNamesMin: ["일","월","화","수","목","금","토"],
-        weekHeader: "Wk", 
+        weekHeader: "Wk",
-        dateFormat: "yymmdd", 
+        dateFormat: "yymmdd",
-        firstDay: 0, 
+        firstDay: 0,
-        isRTL: false, 
+        isRTL: false,
-        showMonthAfterYear: true, 
+        showMonthAfterYear: true,
         yearSuffix: ""
     };
 	$.datepicker.setDefaults($.datepicker.regional["ko"]);
 });
-</script>
+</script>
-EOT;
-?>