diff --git a/adm/_rewrite_config_form.php b/adm/_rewrite_config_form.php new file mode 100644 index 000000000..4c2b79dca --- /dev/null +++ b/adm/_rewrite_config_form.php @@ -0,0 +1,104 @@ +', 11); +add_stylesheet('', 12); +add_javascript('', 10); +?> +
+

짧은 주소 설정

+ +
+

+ 게시판과 컨텐츠 페이지에 짧은 URL 을 사용합니다. +

+
+ +
+ + + + + +
+ +
+ + + + + + + + array('label'=>'사용안함', 'url'=>G5_URL.'/board.php?bo_table=free&wr_id=123'), + '1'=>array('label'=>'숫자', 'url'=>G5_URL.'/free/123'), + '2'=>array('label'=>'글 이름', 'url'=>G5_URL.'/free/안녕하세요/'), + ); + foreach($short_url_arrs as $k=>$v){ + $checked = ((int) $config['cf_bbs_rewrite'] === (int) $k) ? 'checked' : ''; + ?> + + + + + + +
짧은주소 설정
>
+
+ +
+ + + + +
+
\ No newline at end of file diff --git a/adm/admin.head.php b/adm/admin.head.php index 9c35b557c..1ed34b228 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -1,7 +1,7 @@
- +
- 관리자 + 관리자 로그아웃
diff --git a/mobile/tail.php b/mobile/tail.php index 74335a2af..e3c984bde 100644 --- a/mobile/tail.php +++ b/mobile/tail.php @@ -18,9 +18,9 @@ if(defined('G5_THEME_PATH')) {
Copyright © 소유하신 도메인. All rights reserved.
diff --git a/plugin/debugbar/debugbar.php b/plugin/debugbar/debugbar.php new file mode 100644 index 000000000..f93cf3be5 --- /dev/null +++ b/plugin/debugbar/debugbar.php @@ -0,0 +1,254 @@ +', 0); +?> + +
+
+
+
+ +
+
+
+
+ +
+ + +
+

+ 총 쿼리수 : +

+ +
+ + + + + + + + + + + $query){ + + if( empty($query) ) continue; + + $executed_time = $query['end_time'] - $query['start_time']; + $show_excuted_time = number_format((float)$executed_time * 1000, 2, '.', ''); + ?> + + + + + + + + + +
+ 쿼리 목록 +
실행순서쿼리문실행시간
+
+
+ +
+ +
+ +
+ + + + + + + + + + + + + $count){ + + if( $tag === 'count' ) continue; + if( empty($count) ) continue; + + $datas = array(); + if( isset($event_callbacks[$tag]) ){ + + $event_callbacks_tag = $event_callbacks[$tag]; + ksort($event_callbacks_tag); + + foreach((array) $event_callbacks_tag as $priority=>$event_args){ + if( empty($event_args) ) continue; + + foreach($event_args as $index=>$funcs){ + $datas[] = array( + 'priority' => $priority, + 'function' => $funcs['function'], + 'arguments' => $funcs['arguments'], + ); + } //end foreach + } //end foreach + + $rowspan = $datas ? ' rowspan='.count($datas) : ''; + + $is_print = $rowspan; + + foreach($datas as $data){ + ?> + + + + + + + + + + + + + + + + + + + +
+ HOOK 목록 +
event_tag (갯수)event_function인수의 수우선 순위
>('.$count.')'; ?> + +
('.$count.')'; ?>   
+
+ +
+ + + + + + + + + + + + + $count){ + + if( $tag === 'count' ) continue; + if( empty($count) ) continue; + + $datas = array(); + if( isset($replace_callbacks[$tag]) ){ + + $replace_callbacks_tag = $replace_callbacks[$tag]; + ksort($replace_callbacks_tag); + + foreach((array) $replace_callbacks_tag as $priority=>$replace_args){ + if( empty($replace_args) ) continue; + + foreach($replace_args as $index=>$funcs){ + $datas[] = array( + 'priority' => $priority, + 'function' => $funcs['function'], + 'arguments' => $funcs['arguments'], + ); + } //end foreach + } //end foreach + + $rowspan = $datas ? ' rowspan='.count($datas) : ''; + + $is_print = $rowspan; + + foreach($datas as $data){ + ?> + + + + + + + + + + + + + + + + + + + +
+ HOOK 목록 +
replace_tag (갯수)replace_function인수의 수우선 순위
>('.$count.')'; ?> + +
('.$count.')'; ?>   
+
+ +
+
+ +
+
+
+ \ No newline at end of file diff --git a/plugin/debugbar/index.php b/plugin/debugbar/index.php new file mode 100644 index 000000000..e69de29bb diff --git a/plugin/debugbar/style.css b/plugin/debugbar/style.css new file mode 100644 index 000000000..e01415591 --- /dev/null +++ b/plugin/debugbar/style.css @@ -0,0 +1,51 @@ +.debug_bar_wrap{display:block;position:relative;z-index:80;height:32px;background-color:#1ABC9C} +.debug_bar_content{display:none;position:absolute;z-index:81;width:100%;top:32px;min-height:300px;overflow:hidden;background:#fff;overflow-y:scroll;box-sizing:content-box;border-top:thin solid gray} +.debug_bar_text_group{position:relative;padding:0 20px 0 120px;line-height:32px;} +.debug_bar_btn_group{position:absolute;top:0;left:1em;line-height:32px;text-align:left} +.debug_bar_text{line-height:32px;display:block;width:100%;color:#fff;text-align:right;font-size:1.2em;overflow:hidden;text-overflow: ellipsis;-o-text-overflow:ellipsis;white-space:nowrap;word-wrap:normal !important} +.sql_query_list li{padding:1em;line-height:1em} +.debug_bar_content .content_inner{position:relative;padding:1em} +.debug_bar_content .debug_table_wrap{margin:10px 0} +.debugbar_tab::after{display:block;visibility:hidden;clear:both;content:""} +.debugbar_tab li{float:left;margin-bottom:-1px;position:relative;display:block;position:relative;display:block;padding:10px 15px} +.debugbar_tab li.debug_tab{border-bottom:2px solid #DDD} +.debugbar_tab li.active a,.debugbar_tab li.active a:focus,.debugbar_tab li.active a:hover{border-width:0} +.debugbar_tab li a{border:none;color:#666} +.debugbar_tab li.active a,.debugbar_tab li a:hover{border:none;color:#4285F4!important;background:transparent} +.debugbar_tab li a::after{content:"";background:#4285F4;height:2px;position:absolute;width:100%;left:0;bottom:-1px;transition:all 250ms ease 0;transform:scale(0)} +.debugbar_tab li.active a::after,.debugbar_tab li:hover a::after{transform:scale(1)} +.debugbar_tab li a::after{background:#21527d none repeat scroll 0 0;color:#fff} +.inner_debug {display:none} +.inner_debug h3.query_top{padding:1em;font-size:1.3em} +#debug_executed_query{display:block} +.lang_domain_list td .num{margin-right:10px;color:#9b9ea5;font-size:9px} +.debugbar_close_btn_el{position:absolute;top:20px;right:20px} +.debug_table{border:1px solid #ccc;border-collapse:collapse;margin:0;padding:0;width:100%} +.debug_table caption{display:none} +.debug_table tr{background:#f8f8f8;border:1px solid #ddd;padding:.35em} +.debug_table th,.debug_table td{padding:.625em;text-align:center} +.debug_table tbody tr:hover td{background:#c7d4dd!important} +.debug_table tbody tr:nth-child(even){background-color:#fff} +.debug_table td.left{text-align:left} +.debug_table th{font-size:.85em;letter-spacing:.1em;text-transform:uppercase} +.debug_table td img{text-align:center} + +.debug_table.hook_table th, .debug_table.hook_table td {text-align:left;border:1px solid #ddd;} +.hook_table .hook_count{margin-left:3px;font-size:0.9em;color:#7cbc0a} + +.debug_bar_btn_group button.debug_button{margin-top:3px} +button.debug_button{background-color:#7fbf4d;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#7fbf4d),color-stop(100%,#63a62f));background-image:-webkit-linear-gradient(top,#7fbf4d,#63a62f);background-image:-moz-linear-gradient(top,#7fbf4d,#63a62f);background-image:-ms-linear-gradient(top,#7fbf4d,#63a62f);background-image:-o-linear-gradient(top,#7fbf4d,#63a62f);background-image:linear-gradient(top,#7fbf4d,#63a62f);border:1px solid #63a62f;border-bottom:1px solid #5b992b;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 0 #96ca6d;box-shadow:inset 0 1px 0 0 #96ca6d;color:#fff;padding:3px 0 4px;text-align:center;text-shadow:0 -1px 0 #4c9021;width:100px;font-weight:700;font-size:14px;vertical-align:top} +button.debug_button:hover{background-color:#76b347;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#76b347),color-stop(100%,#5e9e2e));background-image:-webkit-linear-gradient(top,#76b347,#5e9e2e);background-image:-moz-linear-gradient(top,#76b347,#5e9e2e);background-image:-ms-linear-gradient(top,#76b347,#5e9e2e);background-image:-o-linear-gradient(top,#76b347,#5e9e2e);background-image:linear-gradient(top,#76b347,#5e9e2e);-webkit-box-shadow:inset 0 1px 0 0 #8dbf67;box-shadow:inset 0 1px 0 0 #8dbf67;cursor:pointer} +button.debug_button:active{border:1px solid #5b992b;border-bottom:1px solid #538c27;-webkit-box-shadow:inset 0 0 8px 4px #548c29,0 1px 0 0 #eee;box-shadow:inset 0 0 8px 4px #548c29,0 1px 0 0 #eee} + +@media screen and (max-width: 600px) { + .debug_table{border:0} + .debug_table caption{font-size:1.3em} + .debug_table thead{display:none} + .debug_table tr{border-bottom:3px solid #ddd;display:block;margin-bottom:.625em} + .debug_table td{border-bottom:1px solid #ddd;display:block;font-size:.8em;text-align:right} + .debug_table td.left{text-align:right} + .debug_table td:before{content:attr(data-label);float:left;font-weight:700;text-transform:uppercase} + .debug_table.hook_table th, .debug_table.hook_table td{border:0 none;border-bottom:1px solid #ddd;text-align:right} + .debug_table td:last-child{border-bottom:0 !important} +} \ No newline at end of file diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index f17507837..6238be68d 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -165,7 +165,7 @@ add_stylesheet('', 0 diff --git a/skin/latest/basic/latest.skin.php b/skin/latest/basic/latest.skin.php index 1c1a60698..2671779af 100644 --- a/skin/latest/basic/latest.skin.php +++ b/skin/latest/basic/latest.skin.php @@ -7,7 +7,7 @@ add_javascript('', 10); ?>
-

+

  • @@ -48,6 +48,6 @@ add_javascript('', 10);
  • 게시물이 없습니다.
- 더보기 + 더보기
diff --git a/skin/latest/notice/latest.skin.php b/skin/latest/notice/latest.skin.php index 5091d3178..d994b10f3 100644 --- a/skin/latest/notice/latest.skin.php +++ b/skin/latest/notice/latest.skin.php @@ -7,7 +7,7 @@ add_javascript('', 10); ?>
-

+

  • diff --git a/skin/latest/pic_basic/latest.skin.php b/skin/latest/pic_basic/latest.skin.php index 5b9eb2726..e2dda77ff 100644 --- a/skin/latest/pic_basic/latest.skin.php +++ b/skin/latest/pic_basic/latest.skin.php @@ -9,7 +9,7 @@ $thumb_height = 150; ?>
    -

    +

      게시물이 없습니다.
    - 더보기 + 더보기
    diff --git a/skin/outlogin/basic/outlogin.skin.2.php b/skin/outlogin/basic/outlogin.skin.2.php index 2341db4c8..d8e745e95 100644 --- a/skin/outlogin/basic/outlogin.skin.2.php +++ b/skin/outlogin/basic/outlogin.skin.2.php @@ -15,7 +15,7 @@ add_stylesheet('' 님 로그아웃 - 관리자 + 관리자
    • diff --git a/tail.php b/tail.php index 9a83862d4..427dc513e 100644 --- a/tail.php +++ b/tail.php @@ -37,9 +37,9 @@ if (G5_IS_MOBILE) {
      <?php echo G5_VERSION ?>
      diff --git a/tail.sub.php b/tail.sub.php index a5d0a87b4..cf859d92f 100644 --- a/tail.sub.php +++ b/tail.sub.php @@ -25,6 +25,8 @@ $(function() { + + \ No newline at end of file diff --git a/theme/basic/head.php b/theme/basic/head.php index 61aaaef61..774c39de5 100644 --- a/theme/basic/head.php +++ b/theme/basic/head.php @@ -33,7 +33,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
    • 정보수정
    • 로그아웃
    • -
    • 관리자
    • +
    • 관리자
    • 회원가입
    • diff --git a/theme/basic/head.sub.php b/theme/basic/head.sub.php index fdbcf09af..5e18db3cb 100644 --- a/theme/basic/head.sub.php +++ b/theme/basic/head.sub.php @@ -2,7 +2,7 @@ // 이 파일은 새로운 파일 생성시 반드시 포함되어야 함 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -$begin_time = get_microtime(); +$g5_debug['php']['begin_time'] = $begin_time = get_microtime(); if (!isset($g5['title'])) { $g5['title'] = $config['cf_title']; diff --git a/theme/basic/skin/latest/basic/latest.skin.php b/theme/basic/skin/latest/basic/latest.skin.php index cd7d11efd..a580b753d 100644 --- a/theme/basic/skin/latest/basic/latest.skin.php +++ b/theme/basic/skin/latest/basic/latest.skin.php @@ -6,7 +6,7 @@ add_stylesheet('', ?>
      -

      +

      • @@ -47,6 +47,6 @@ add_stylesheet('',
      • 게시물이 없습니다.
      - 더보기 + 더보기
      diff --git a/theme/basic/skin/latest/notice/latest.skin.php b/theme/basic/skin/latest/notice/latest.skin.php index 5091d3178..d994b10f3 100644 --- a/theme/basic/skin/latest/notice/latest.skin.php +++ b/theme/basic/skin/latest/notice/latest.skin.php @@ -7,7 +7,7 @@ add_javascript('', 10); ?>
      -

      +

      • diff --git a/theme/basic/skin/latest/pic_basic/latest.skin.php b/theme/basic/skin/latest/pic_basic/latest.skin.php index 3e826bd9c..3e94c4d8e 100644 --- a/theme/basic/skin/latest/pic_basic/latest.skin.php +++ b/theme/basic/skin/latest/pic_basic/latest.skin.php @@ -9,7 +9,7 @@ $thumb_height = 150; ?>
        -

        +

          게시물이 없습니다.
        - 더보기 + 더보기
        diff --git a/theme/basic/skin/outlogin/basic/outlogin.skin.2.php b/theme/basic/skin/outlogin/basic/outlogin.skin.2.php index 2341db4c8..d8e745e95 100644 --- a/theme/basic/skin/outlogin/basic/outlogin.skin.2.php +++ b/theme/basic/skin/outlogin/basic/outlogin.skin.2.php @@ -15,7 +15,7 @@ add_stylesheet('' 님 로그아웃 - 관리자 + 관리자