Merge branch 'master' of github.com:gnuboard/yc5 into orderlist

adm/shop_admin/ordercartupdate.php

@@ -253,8 +253,10 @@ $od_misu = ( $cart_price + $send_cost + $od['od_send_cost2'] )
            - ( $od['od_receipt_price'] + $od['od_receipt_point'] - $od['od_refund_price'] );
 
 // 주문정보 반영
+$od_cart_price = $cart_price + $cancel_price;
+
 $sql = " update {$g5['g5_shop_order_table']}
-            set od_cart_price   = '$cart_price',
+            set od_cart_price   = '$od_cart_price',
                 od_cart_coupon  = '$cart_coupon',
                 od_coupon       = '$tot_od_cp_price',
                 od_send_coupon  = '$tot_sc_cp_price',

adm/shop_admin/orderreceiptupdate.php

@@ -34,8 +34,8 @@ if($od['od_tax_flag']) {
     $tot_tax_mny = ( $tax_mny + $od_send_cost + $od_send_cost2 )
                    - ( $od['od_coupon'] + $od['od_send_coupon'] + $od_receipt_point );
     if($tot_tax_mny < 0) {
-        $tot_tax_mny = 0;
         $free_mny += $tot_tax_mny;
+        $tot_tax_mny = 0;
     }
 } else {
     $tot_tax_mny = ( $tax_mny + $free_mny + $od_send_cost + $od_send_cost2 )

css/admin.css

@@ -10,7 +10,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
 header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none}
 label, input, select, img {vertical-align:middle}
 
-select {margin:0;font-size:1em}
+textarea, select {font-size:1em}
 
 input {margin:0;padding:0;border-radius:0;font-family:dotum}
 input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none}
@@ -517,12 +517,7 @@ td {padding:8px 5px;border:1px solid #e9e9e9;line-height:1.5em;word-break:break-
 #point_mng {margin-top:50px}
 /* 회원메일발송 목록 */
 .td_test, .td_send {width:50px;text-align:center}
-<<<<<<< HEAD
-.td_mng {width:100px;text-align:center}
-.td_smallmng {width:70px;text-align:center}
 
-=======
->>>>>>> g5
 /* 투표관리 목록 */
 .td_etc {width:80px;text-align:center}
 /* 게시판관리 목록 */

css/default.css

@@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
 header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
 label, input, select, img {vertical-align:middle}
-
+textarea, 
 select {font-size:1em}
 input {margin:0;padding:0;border-radius:0;font-family:dotum}
 input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none}

css/mobile.css

@@ -11,8 +11,8 @@ header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
 legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 label, input, select, img {vertical-align:middle}
 input,button {margin:0;padding:0}
-input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} /* 모바일에서만 사용 */
-select, textarea {font-size:1em}
+input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em}
+textarea, select {font-size:1em}
 textarea {border-radius:0;-webkit-appearance:none}
 p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all}
 hr {display:none}

install/index.php

@@ -1,6 +1,7 @@
 <?php
 include_once ('../config.php');
 $title = G5_VERSION." 설치 3단계 중 1단계 라이센스 확인";
+require_once('./library.check.php');
 include_once ('./install.inc.php');
 ?>
 

install/library.check.php

@@ -0,0 +1,14 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+function die_utf8($msg)
+{
+    if(!trim($msg))
+        return;
+
+    die('<meta charset="utf-8"><p>'.$msg.'</p>');
+}
+
+if(!extension_loaded('gd') || !function_exists('gd_info'))
+    die('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
+?>

plugin/okname/key/.htaccess

@@ -0,0 +1 @@
+# .htaccess