Changeset 6324

Timestamp:

06/20/08 21:06:57 (2 years ago)

Author:

inureyes

Message:

#1029

• 변경사항을 1.7 트리에 반영

Location:

branches/1.7

Files:

• interface/owner/communication/comment/index.php (modified) (1 diff)
• interface/owner/communication/notify/index.php (modified) (2 diffs)
• lib/model/blog.comment.php (modified) (2 diffs)

branches/1.7/interface/owner/communication/comment/index.php

@@ -442 +442 @@
                                     <input type="text" id="search" class="input-text" name="search" value="<?php echo htmlspecialchars($search);?>" onkeydown="if (event.keyCode == '13') { document.getElementById('search-form').withSearch.value = 'on'; document.getElementById('search-form').submit(); }" />
                                     <input type="hidden" name="withSearch" value="" />
+                                    <input type="hidden" name="status" value="<?php echo $_POST['status'];?>" />
                                     <input type="submit" class="search-button input-button" value="<?php echo _t('검색');?>" onclick="document.getElementById('search-form').withSearch.value = 'on'; document.getElementById('search-form').submit();" />
                                 </div>

branches/1.7/interface/owner/communication/notify/index.php

@@ -5 +5 @@
 if (isset($_POST['page']))
     $_GET['page'] = $_POST['page'];
+if (isset($_GET['category'])) $_POST['category'] = $_GET['category'];
+if (isset($_GET['ip'])) $_POST['ip'] = $_GET['ip'];
+if (isset($_GET['name'])) $_POST['name'] = $_GET['name'];
+if (isset($_GET['perPage'])) $_POST['perPage'] = $_GET['perPage'];
+if (isset($_GET['search'])) $_POST['search'] = $_GET['search'];
+if (isset($_GET['withSearch'])) $_POST['withSearch'] = $_GET['withSearch'];
+
 if(count($_POST) > 0) {
     $IV = array(
@@ -173 +180 @@
                             
                             <form id="list-form" method="post" action="<?php echo $blogURL;?>/owner/communication/notify">
+<?php
+    if(isset($_POST['search'])) echo '                              <input type="hidden" name="search" value="'.$_POST['search'].'" />'.CRLF;
+    if(isset($_POST['withSearch'])) echo '                              <input type="hidden" name="withSearch" value="'.$_POST['withSearch'].'" />'.CRLF;
+?>      
                                 <table class="data-inbox" cellspacing="0" cellpadding="0">
                                     <thead>

branches/1.7/lib/model/blog.comment.php

@@ -125 +125 @@
 function getCommentsNotifiedWithPagingForOwner($blogid, $category, $name, $ip, $search, $page, $count) {
     global $database;
+    $postfix = '';
+
     if (empty($name) && empty($ip) && empty($search)) {
         $sql = "SELECT
@@ -166 +168 @@
                 {$database['prefix']}CommentsNotifiedSiteInfo csiteinfo ON c.siteId = csiteinfo.id
             WHERE c.blogid = $blogid AND (c.parent is null) ";
-        if (!empty($name))
+        if (!empty($name)) {
             $sql .= ' AND ( c.name = \'' . POD::escapeString($name) . '\') ' ;
-        if (!empty($ip))
+            $postfix .= '&name=' . rawurlencode($name);
+        }
+        if (!empty($ip)) {
             $sql .= ' AND ( c.ip = \'' . POD::escapeString($ip) . '\') ';
+            $postfix .= '&ip=' . rawurlencode($ip);
+        }
         if (!empty($search)) {
             $sql .= " AND ((c.name LIKE '%$search%') OR (c.homepage LIKE '%$search%') OR (c.comment LIKE '%$search%')) ";
+            $postfix .= '&search=' . rawurlencode($search);
         }
         $sql .= $childListStr . ' ORDER BY c.modified DESC';
     }
-    return fetchWithPaging($sql, $page, $count);
+
+    list($comments, $paging) = fetchWithPaging($sql, $page, $count);
+    if (strlen($postfix) > 0) {
+        $postfix .= '&withSearch=on';
+        $paging['postfix'] .= $postfix;
+    }
+
+    return array($comments, $paging);
 }