From 8c7b80c48cc72122e2c30daf7c79a9431ad3227f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=A5=EC=84=A0=EA=B7=BC?= <songwritersg@naver.com>
Date: Wed, 28 Aug 2019 17:03:01 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 41 ++++++++++++++-----
 .../controllers/admin/ajax/Members.php        |  1 +
 .../controllers/admin/ajax/Statics.php        |  1 +
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 64b57ad..2b85be5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1575,7 +1575,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1596,12 +1597,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1616,17 +1619,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1743,7 +1749,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1755,6 +1762,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1769,6 +1777,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1776,12 +1785,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -1800,6 +1811,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1880,7 +1892,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1892,6 +1905,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1977,7 +1991,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2013,6 +2028,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2032,6 +2048,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2075,12 +2092,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/wheeparam/application/controllers/admin/ajax/Members.php b/wheeparam/application/controllers/admin/ajax/Members.php
index 31f7c2f..3e7ddc7 100644
--- a/wheeparam/application/controllers/admin/ajax/Members.php
+++ b/wheeparam/application/controllers/admin/ajax/Members.php
@@ -26,6 +26,7 @@ class Members extends REST_Controller
 
         $this->db->select("SQL_CALC_FOUND_ROWS *", FALSE);
         $this->db->from('member');
+        $this->db->limit($page_rows, $start);
 
         $result = $this->db->get();
         $return['lists'] = $result->result_array();
diff --git a/wheeparam/application/controllers/admin/ajax/Statics.php b/wheeparam/application/controllers/admin/ajax/Statics.php
index 41adbeb..90a51b3 100644
--- a/wheeparam/application/controllers/admin/ajax/Statics.php
+++ b/wheeparam/application/controllers/admin/ajax/Statics.php
@@ -35,6 +35,7 @@ class Statics extends REST_Controller
             $row['nums'] = $return['totalCount'] - $i - $start;
             $row['sta_ip'] = long2ip((int)$row['sta_ip']);
             $row['sta_is_mobile'] = ($row['sta_is_mobile'] == 'Y');
+            $row['sta_device'] = $row['sta_is_mobile'] ? $row['sta_mobile'] : $row['sta_platform'];
         }
 
         $this->response($return, 200);