merge

adm/_common.php

@@ -2,4 +2,5 @@
 $g4_path = ".."; // common.php 의 상대 경로
 include_once ($g4_path.'/common.php');
 include_once($g4['admin_path'].'/admin.lib.php');
-?>
+$admin_index = false;
+?>

adm/admin.head.php

@@ -100,13 +100,21 @@ function textarea_size(fld, size)
                 $href2 = '</a>';
             }
             $current_class = "";
+<<<<<<< HEAD
             if ((isset($sub_menu) && substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2)) || defined('_ADMIN_INDEX_'))
+=======
+            if (isset($sub_menu) && (substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2) || $admin_index))
+>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
                 $current_class = " gnb_1depth_on";
             echo "<li class=\"gnb_1depth".$current_class."\">";
             echo $href1 . $menu['menu'.$key][0][1] . $href2;
             echo print_menu1('menu'.$key, 1);
             echo "</li>";
+<<<<<<< HEAD
             if ($current_class || !defined('_ADMIN_INDEX_')) $current_class = ""; // 클래스 반복부여 방지
+=======
+            if ($current_class || !$admin_index) $current_class = ""; // 클래스 반복부여 방지
+>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
         }
 
         ?>

adm/board_form.php

@@ -24,10 +24,17 @@ if ($w == '') {
 
     $board['bo_count_delete'] = 1;
     $board['bo_count_modify'] = 1;
+<<<<<<< HEAD
     $board['bo_read_point'] = $config[cf_read_point];
     $board['bo_write_point'] = $config[cf_write_point];
     $board['bo_comment_point'] = $config[cf_comment_point];
     $board['bo_download_point'] = $config[cf_download_point];
+=======
+    $board['bo_read_point'] = $config['cf_read_point'];
+    $board['bo_write_point'] = $config['cf_write_point'];
+    $board['bo_comment_point'] = $config['cf_comment_point'];
+    $board['bo_download_point'] = $config['cf_download_point'];
+>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
 
     $board['bo_gallery_cols'] = 4;
     $board['bo_table_width'] = 97;

adm/board_list.php

@@ -60,6 +60,7 @@ $sql = " select *
             limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
+$listall = '';
 if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
     $listall = '<a href="'.$_SERVER['PHP_SELF'].'">전체목록</a>';
 

adm/index.php

@@ -2,7 +2,7 @@
 include_once('./_common.php');
 
 $g4['title'] = '관리자메인';
-define('_ADMIN_INDEX_', true);
+$admin_index = true;
 include_once ('./admin.head.php');
 
 $new_member_rows = 5;

adm/member_form.php

@@ -55,6 +55,7 @@ else if ($w == 'u')
 else
     alert('제대로 된 값이 넘어오지 않았습니다.');
 
+<<<<<<< HEAD
 if ($mb['mb_mailling'] == 1) $mailling_checked = 'checked="checked"'; //메일수신
 else {
     $mailing_checked = '';
@@ -67,6 +68,28 @@ else {
 }
 if ($mb['mb_open']) $open_checked = 'checked="checked"'; // 정보 공개
 else {
+=======
+$mailling_no_checked = '';
+$sms_no_checked = '';
+$open_no_checked = '';
+if ($mb['mb_mailling'] == 1) {
+    $mailling_checked = 'checked="checked"'; //메일수신
+} else {
+    $mailing_checked = '';
+    $mailling_no_checked = 'checked="checked"';
+}
+
+if ($mb['mb_sms']) {
+    $sms_checked = 'checked="checked"'; // SMS 수신
+} else {
+    $sms_checked = '';
+    $sms_no_checked = 'checked="checked"';
+}
+
+if ($mb['mb_open']) {
+    $open_checked = 'checked="checked"'; // 정보 공개
+} else {
+>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
     $open_checked = '';
     $open_no_checked = 'checked="checked"';
 }
@@ -266,7 +289,7 @@ if (typeof(document.fmember.mb_level) != "undefined")
 
 function fmember_submit(f)
 {
-    if (!f.mb_icon.value.match(/\.(gif|jp[e]g|png)$/i) && f.mb_icon.value) {
+    if (!f.mb_icon.value.match(/\.(gif|jp['e']g|png)$/i) && f.mb_icon.value) {
         alert('아이콘이 이미지 파일이 아닙니다. (bmp 제외)');
         return false;
     }

adm/visit_list.php

@@ -15,9 +15,8 @@ $colspan = 5;
 
 $sql_common = " from {$g4['visit_table']} ";
 $sql_search = " where vi_date between '{$fr_date}' and '{$to_date}' ";
-if ($domain) {
+if (isset($domain))
     $sql_search .= " and vi_referer like '%{$domain}%' ";
-}
 
 $sql = " select count(*) as cnt
             {$sql_common}
@@ -106,7 +105,14 @@ if ($i == 0)
 </tbody>
 </table>
 <?
+<<<<<<< HEAD
 $page = get_paging($config['cf_write_pages'], $page, $total_page, "$_SERVER[PHP_SELF]?$qstr&amp;domain=$domain&amp;page=");
+=======
+if (isset($domain)) 
+    $qstr .= "&amp;domain=$domain";
+$qstr .= "&amp;page=";
+$page = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr");
+>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
 if ($page) {
 ?>
 <div class="pg">