From 34cd2f25d6bd0850f8591a723b1ab3998f70c1c5 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Thu, 9 Jan 2020 15:26:11 +0100
Subject: [PATCH] nolog ip ignoring empty lines in file, fixing checking

---
 public/moodle-test-userscript | 2 +-
 utils/logger.js               | 5 ++++-
 utils/question-classes        | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/moodle-test-userscript b/public/moodle-test-userscript
index 13de491..fe74436 160000
--- a/public/moodle-test-userscript
+++ b/public/moodle-test-userscript
@@ -1 +1 @@
-Subproject commit 13de491da0290def7b357c7dafc12f22bfb77276
+Subproject commit fe74436ab119a31fdb35f7a3bbae50a572b0fb21
diff --git a/utils/logger.js b/utils/logger.js
index 97869d8..c93f3f6 100644
--- a/utils/logger.js
+++ b/utils/logger.js
@@ -79,7 +79,7 @@ function LogReq (req, toFile, sc) {
     let ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress
 
     let nolog = noLogips.some((x) => {
-      return x.includes(ip)
+      return ip.includes(x)
     })
     if (nolog) {
       return
@@ -118,6 +118,9 @@ function parseNoLogFile (newData) {
   if (noLogips[noLogips.length - 1] === '') {
     noLogips.pop()
   }
+  noLogips = noLogips.filter((x) => {
+    return x !== ''
+  })
   Log('\tNo Log IP-s changed: ' + noLogips.join(', '))
 }
 
diff --git a/utils/question-classes b/utils/question-classes
index 100ca77..0cfd9cf 160000
--- a/utils/question-classes
+++ b/utils/question-classes
@@ -1 +1 @@
-Subproject commit 100ca7750d88400b227c9e1592300c4d1ea7db5c
+Subproject commit 0cfd9cfda377ff8917df50e68f105ec43f5e9311