디자인 수정 중 merge

adm/admin.lib.php

@@ -260,11 +260,11 @@ while ($entry = $tmp->read()) {
 }
 @ksort($amenu);
 
-$qstr = '';
+$arr_query = array();
-if (isset($sst)) $qstr .= '&sst='.$sst;
+if (isset($sst))  $arr_query[] = 'sst='.$sst;
-if (isset($sod)) $qstr .= '&sod='.$sod;
+if (isset($sod))  $arr_query[] = 'sod='.$sod;
-if (isset($sfl)) $qstr .= '&sfl='.$sfl;
+if (isset($sfl))  $arr_query[] = 'sfl='.$sfl;
-if (isset($stx)) $qstr .= '&stx='.$stx;
+if (isset($stx))  $arr_query[] = 'stx='.$stx;
-if (isset($page)) $qstr .= '&page='.$page;
+if (isset($page)) $arr_query[] = 'page='.$page;
-//$qstr = 'sst=$sst&sod=$sod&sfl=$sfl&stx=$stx&page=$page';
+$qstr = implode("&", $arr_query);
 ?>

adm/shop_admin/categorylist.php

@@ -86,9 +86,15 @@ $qstr  = "$qstr&sca=$sca&page=$page&save_stx=$stx";
     <td><a href='<?=$_SERVER['PHP_SELF']?>'>처음</a></td>
     <td>
         <select id="sfl" name="sfl">
+<<<<<<< HEAD
             <option value="ca_name" <?if($sfl == '분류명') echo "selected";?>>분류명</option>
             <option value="ca_id" <?if($sfl == '분류코드') echo "selected";?>>분류코드</option>
             <option value="ca_mb_id" <?if($sfl == '회원아이디') echo "selected";?>>회원아이디</option>
+=======
+            <option value='ca_name' <?=get_selected($_GET['sfl'], "ca_name");?>>분류명</option>
+            <option value='ca_id' <?=get_selected($_GET['sfl'], "ca_id");?>>분류코드</option>
+            <option value='ca_mb_id' <?=get_selected($_GET['sfl'], "ca_mb_id");?>>회원아이디</option>
+>>>>>>> fb8fc827f73dee204fd9c69e55e4d820b47f2234
         </select>
 
         <input type="text" id="stx" name="stx" value="<?=$stx?>">

bbs/poll_result.php

@@ -53,8 +53,9 @@ $sql = " select a.*, b.mb_open
           where po_id = '{$po_id}' order by pc_id desc ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++) {
-    $list2[$i]['name'] = get_sideview($row['mb_id'], cut_str($row['pc_name'],10), '', '', $row['mb_open']);
+    $list2[$i]['pc_name']  = $row['pc_name'];
-    $list2[$i]['idea'] = get_text(cut_str($row['pc_idea'], 255));
+    $list2[$i]['name']     = get_sideview($row['mb_id'], cut_str($row['pc_name'],10), '', '', $row['mb_open']);
+    $list2[$i]['idea']     = get_text(cut_str($row['pc_idea'], 255));
     $list2[$i]['datetime'] = $row['pc_datetime'];
 
     $list2[$i]['del'] = '';

css/default.css

@@ -32,24 +32,24 @@ pre {overflow-x:scroll;font-size:1.1em}
 #hd h1 {width:0;height:0;overflow:hidden}
 #hd_wrapper {position:relative;margin:0 auto;width:980px}
 
-#snb {position:absolute;top:10px;right:190px;zoom:1}
+#snb {position:absolute;top:10px;right:0;zoom:1}
 #snb:after {display:block;visibility:hidden;clear:both;content:""}
 #snb li {float:left}
 #snb a {display:inline-block;margin-right:1px;padding:7px 7px 6px;color:#000;text-decoration:none}
 #snb a:focus,
 #snb a:hover {background:#109ff1;color:#fff}
 
-#schall {position:absolute;top:10px;right:0;margin:0;padding:0;width:180px;border:0;letter-spacing:-5px}
+#schall {position:absolute;top:10px;left:0;margin:0;padding:0;width:180px;border:0;letter-spacing:-5px}
 #schall legend {width:0;height:0;overflow:hidden}
 #schall_stx {width:150px;height:21px;border:3px solid #484848;border-right:0;background:#fff;line-height:1.5em}
 
-#logo {clear:both;padding:30px 0 40px}
+#logo {clear:both;padding:30px 0 40px;text-align:center}
 
 /* 중간 레이아웃 */
 #wrapper {margin:0 auto;padding-bottom:30px;width:980px;zoom:1}
 #wrapper:after {display:block;visibility:hidden;clear:both;content:""}
 #wrapper_title {margin-bottom:20px;font-size:1.2em}
-#lnb {float:right;width:219px;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#f7f7f5}
+#lnb {float:right;width:229px;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#f7f7f2}
 #container {float:left;width:730px;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}
 
@@ -203,9 +203,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#109ff1;color:#f
 .ol a {color:#000;text-decoration:none}
 
 #ol_before fieldset {position:relative}
-#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:178px;height:22px;border:1px solid #d1d1d1;background:#fff;line-height:1.6em}
+#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:188px;height:22px;border:1px solid #d1d1d1;background:#fff;line-height:1.6em}
 .ol_idlabel {position:absolute;top:6px;left:5px;color:#696969;font-size:0.9em}
-#ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:178px;height:22px;border:1px solid #d1d1d1;background:#fff;vertical-align:top;line-height:1.6em}
+#ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:188px;height:22px;border:1px solid #d1d1d1;background:#fff;vertical-align:top;line-height:1.6em}
 .ol_pwlabel {position:absolute;top:35px;left:5px;color:#696969;font-size:0.9em}
 #auto_login {}
 #auto_login_label {letter-spacing:-0.1em}
@@ -334,7 +334,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#109ff1;color:#f
 #profile h2 {margin:0}
 
 /* 최근게시물 스킨 (latest) */
-.lt {float:left;margin-bottom:20px;padding:20px 15px;width:324px;height:149px;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fcfcfc}
+.lt {float:left;margin-bottom:20px;padding:20px 15px;width:324px;height:149px;border-bottom:1px solid #eee}
 .lt ul {margin:0;padding:0;list-style:none}
 .lt li {padding:3px 0}
 .lt a {color:#000;text-decoration:none}
@@ -421,6 +421,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#109ff1;color:#f
 .cnt_cmt {display:inline-block;margin:0 4px;color:#109ff1}
 
 /* 게시판 읽기 */
+/*
 #bo_v_title {padding:0 20px 10px;font-weight:bold}
 
 #bo_v {position:relative;margin-bottom:30px}
@@ -462,6 +463,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#109ff1;color:#f
 #bo_v_atc:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
 
+
 #bo_v_img {margin:10px auto;width:689px;border-right:1px solid #ddd;overflow:hidden}
 #bo_v_img img {max-width:100%;height:auto}
 #bo_v_con {padding:20px 20px 30px;width:689px;min-height:200px;height:auto !important;height:200px;border-right:1px solid #ddd;line-height:1.8em;word-break:break-all;overflow:hidden}
@@ -473,8 +475,10 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#109ff1;color:#f
 #bo_v_act strong {color:#109ff1}
 
 #bo_v form {padding-top:20px}
+*/
 
 /* 게시판 댓글 */
+/*
 #bo_vc {margin:0 0 10px;padding:20px 20px 20px 20px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#f9f9f9}
 #bo_vc h2 {margin-bottom:10px}
 #bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc}
@@ -509,6 +513,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#109ff1;color:#f
 .bo_vc_act li {float:left;margin-left:5px}
 
 #bo_vc form {padding:0}
+*/
 
 /* 사이드뷰 */
 .sv_wrap {display:inline-block;position:relative;font-weight:normal}

head.php

@@ -68,8 +68,10 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
             </script>
         </fieldset>
 
-        <div id="logo"><a href="<?=G4_URL?>"><img src="<?=G4_IMG_URL?>/logo.jpg" alt="처음으로" width="224" height="38"></a></div>
+        <div id="logo"><a href="<?=G4_URL?>"><img src="<?=G4_IMG_URL?>/logo.jpg" alt="처음으로" width="57" height="38"></a></div>
-        <?if (defined('_INDEX_')) {?><div id="idx_catch"><img src="<?=G4_URL?>/img/idx_catch.jpg" alt="Sharing All Possibilities" width="471" height="61"></div><?}?>
+        <?if (defined('_INDEX_')) {?>
+        <div id="idx_catch"><img src="<?=G4_URL?>/img/idx_catch.jpg" alt="Sharing All Possibilities" width="471" height="61"></div>
+        <?}?>
 
     </div>
 </header>

lib/common.lib.php

@@ -18,7 +18,7 @@ function get_microtime()
 // 현재페이지, 총페이지수, 한페이지에 보여줄 행, URL
 function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
 {
-    $url = preg_replace('#(&|&)?page\=[0-9]+#', '', $url);
+    $url = preg_replace('#&page=[0-9]*(&page=)$#', '$1', $url);
 
     $str = '';
     if ($cur_page > 1) {
@@ -748,7 +748,15 @@ function subject_sort_link($col, $query_string='', $flag='asc')
         }
     }
 
-    return '<a href="'.$_SERVER['PHP_SELF'].'?'.$query_string.'&amp;'.$q1.'&amp;'.$q2.'&amp;sfl='.$sfl.'&amp;stx='.$stx.'&amp;page='.$page.'">';
+    $arr_query = array();
+    $arr_query[] = $q1;
+    $arr_query[] = $q2;
+    $arr_query[] = 'sfl='.$sfl;
+    $arr_query[] = 'stx='.$stx;
+    $arr_query[] = 'page='.$page;
+    $qstr = implode("&amp;", $arr_query);
+
+    return "<a href=\"{$_SERVER['PHP_SELF']}?{$qstr}\">";
 }
 
 
@@ -1649,12 +1657,9 @@ function abs_ip2long($ip='')
 }
 
 
-function get_selected($field, $value, $first=false)
+function get_selected($field, $value)
 {
-    $selected = ($field==$value) ? ' selected="selected"' : '';
+    return ($field==$value) ? ' selected="selected"' : '';
-    if ($first && !$selected)
-        $selected = ($field=="") ? ' selected="selected"' : '';
-    return $selected;
 }
 
 

skin/outlogin/neo/outlogin.skin.1.php

@@ -27,7 +27,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 $omi = $('#ol_id');
 $omp = $('#ol_pw');
 $omp.css('display','inline-block');
-$omp.css('width',114);
+$omp.css('width',124);
 $omi_label = $('#ol_idlabel');
 $omp_label = $('#ol_pwlabel');
 $omi_label.addClass('ol_idlabel');

skin/poll/neo/poll_result.skin.php

@@ -37,7 +37,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         <article>
             <header>
                 <h1><?=$list2[$i]['pc_name']?><span class="sound_only">님의 의견</span></h1>
-                <?=$list2[$i]['name']?>
+                <?=$list2[$i]['pc_name']?>
                 <span class="poll_datetime"><?=$list2[$i]['datetime']?></span>
             </header>
             <p>

test.php

@@ -1,24 +1,8 @@
-<!doctype html>
+<?
-<html lang="ko">
+$qstr1 = "&amp;stx=ddd&amp;page=123";
-<head>
+$qstr2 = "&amp;stx=ddd&amp;page=123&amp;";
-<title>title</title>
+$qstr3 = "&amp;stx=ddd&amp;page=&amp;";
-<meta charset="utf-8">
+$qstr3 = "&amp;stx=ddd&amp;page=x&amp;";
-<script src="js/jquery-1.8.3.min.js"></script>
-</head>
-<body>
 
-<p>이 문자열에서 부분을 치환합니다.</p>
+echo preg_replace('#(&amp;|&)?page\=[^&]*#', '', $qstr3);
-
+?>
-<a href="#" title="치환">치환하기</a>
-
-<script>
-$(function(){
-    $('a').click(function(){
-        $('p').text("치환");
-    });
-});
-</script>
-
-
-</body>
-</html>