From 30218f0efeb868fd34b80860c9b2bc605e515b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E5=90=8D=E5=AE=85=E3=80=82?= <tinymins@gmail.com>
Date: Sun, 16 Jul 2017 02:48:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=B8=AA=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=9C=B0=E5=9D=80=E8=AE=BF=E9=97=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Access_Core.php  | 9 +++++++--
 page/console.php | 8 +++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Access_Core.php b/Access_Core.php
index 03ef3e6..4f473db 100644
--- a/Access_Core.php
+++ b/Access_Core.php
@@ -66,8 +66,6 @@ class Access_Core
     {
         $type = $this->request->get('type', 1);
         $filter = $this->request->get('filter', 'all');
-        $ip = $this->request->get('ip', '');
-        $cid = $this->request->get('cid', '');
         $pagenum = $this->request->get('page', 1);
         $offset = (max(intval($pagenum), 1) - 1) * $this->config->pageSize;
         $query = $this->db->select()->from('table.access_log')
@@ -88,14 +86,21 @@ class Access_Core
         }
         switch ($filter) {
             case 'ip':
+                $ip = $this->request->get('ip', '');
                 $ip = bindec(decbin(ip2long($ip)));
                 $query->where('ip = ?', $ip);
                 $qcount->where('ip = ?', $ip);
                 break;
             case 'post':
+                $cid = $this->request->get('cid', '');
                 $query->where('content_id = ?', $cid);
                 $qcount->where('content_id = ?', $cid);
                 break;
+            case 'path':
+                $path = $this->request->get('path', '');
+                $query->where('path = ?', $path);
+                $qcount->where('path = ?', $path);
+                break;
         }
         $list = $this->db->fetchAll($query);
         foreach ($list as &$row) {
diff --git a/page/console.php b/page/console.php
index 566d0da..0bb1662 100644
--- a/page/console.php
+++ b/page/console.php
@@ -48,6 +48,7 @@ $access = new Access_Core();
                                 <option <?php if($request->filter == 'all'): ?> selected="true"<?php endif; ?>value="all"><?php _e('所有'); ?></option>
                                 <option <?php if($request->filter == 'ip'): ?> selected="true"<?php endif; ?>value="ip"><?php _e('按IP'); ?></option>
                                 <option <?php if($request->filter == 'post'): ?> selected="true"<?php endif; ?>value="post"><?php _e('按文章'); ?></option>
+                                <option <?php if($request->filter == 'path'): ?> selected="true"<?php endif; ?>value="path"><?php _e('按路由'); ?></option>
                             </select>
                             <input style="<?php if($request->get('filter', 'all') != 'ip'): ?>display: none<?php endif; ?>" type="text" class="text-s" placeholder="" value="<?php echo htmlspecialchars($request->ip); ?>" name="ip" />
                             <select style="<?php if($request->get('filter', 'all') != 'post'): ?>display: none<?php endif; ?>" name="cid">
@@ -55,6 +56,7 @@ $access = new Access_Core();
                                 <option <?php if($request->cid == $content['cid']): ?> selected="true"<?php endif; ?>value="<?php echo $content['cid'];?>"><?php echo $content['title'];?> (<?php echo $content['count'];?>)</option>
                                 <?php endforeach;?>
                             </select>
+                            <input style="<?php if($request->get('filter', 'all') != 'path'): ?>display: none<?php endif; ?>" type="text" class="text-s" placeholder="" value="<?php echo htmlspecialchars($request->path); ?>" name="path" />
                             <select name="type">
                                 <option <?php if($request->type == 1): ?> selected="true"<?php endif; ?>value="1"><?php _e('默认(仅人类)'); ?></option>
                                 <option <?php if($request->type == 2): ?> selected="true"<?php endif; ?>value="2"><?php _e('仅爬虫'); ?></option>
@@ -92,7 +94,7 @@ $access = new Access_Core();
                             <?php foreach ($access->logs['list'] as $log): ?>
                             <tr id="<?php echo $log['id']; ?>" data-id="<?php echo $log['id']; ?>">
                                 <td><input type="checkbox" data-id="<?php echo $log['id']; ?>" value="<?php echo $log['id']; ?>" name="id[]"/></td>
-                                <td><a target="_blank" href="<?php echo str_replace("%23", "#", $log['url']); ?>"><?php echo urldecode(str_replace("%23", "#", $log['url'])); ?></a></td>
+                                <td><a target="_self" href="<?php $options->adminUrl('extending.php?panel=' . Access_Plugin::$panel . '&filter=path&path=' . $log['path']); ?>"><?php echo urldecode(str_replace("%23", "#", $log['url'])); ?></a></td>
                                 <td><a data-action="ua" href="#" title="<?php echo $log['ua'];?>"><?php echo $log['display_name']; ?></a></td>
                                 <td><a data-action="ip" data-ip="<?php echo long2ip($log['ip']); ?>" href="#"><?php echo long2ip($log['ip']); ?></a><?php if($request->filter != 'ip'): ?> <a target="_self" href="<?php $options->adminUrl('extending.php?panel=' . Access_Plugin::$panel . '&filter=ip&ip=' . long2ip($log['ip'])); ?>">[ ? ]</a><?php endif; ?></td>
                                 <td><a target="_blank" data-action="referer" href="<?php echo $log['referer']; ?>"><?php echo $log['referer']; ?></a></td>
@@ -329,6 +331,7 @@ $(document).ready(function() {
     var $form = $('form.search-form');
     var $ipInput = $form.find('input[name="ip"]');
     var $cidSelect = $form.find('select[name="cid"]');
+    var $pathInput = $form.find('input[name="path"]');
     var $filterSelect = $form.find('select[name="filter"]');
 
     var hideInactive = function () {
@@ -346,6 +349,9 @@ $(document).ready(function() {
             case 'post':
                 $cidSelect.show();
                 break;
+            case 'path':
+                $pathInput.attr('placeholder', '输入路由').show();
+                break;
         }
     });