From d49ab21345bfb6cded26d15d08eeffa4cb39f627 Mon Sep 17 00:00:00 2001
From: Sascha Leib <sascha.leib@kolmio.com>
Date: Sat, 25 Oct 2025 15:58:32 +0200
Subject: [PATCH] UI improvements

And also style changes
---
 action.php                   | 124 ++++++++++++++++++---------
 admin.css                    |  21 ++++-
 admin.js                     | 162 ++++++++++++++++++++++-------------
 captcha.js                   |  33 ++++---
 conf/default.php             |   4 +-
 config/default-whitelist.txt |  12 ++-
 config/known-ipranges.json   |   7 +-
 img/captcha.png              | Bin 0 -> 2705 bytes
 img/stages.png               | Bin 3484 -> 4215 bytes
 lang/de/wordlist.txt         |   5 +-
 style.less                   |  22 ++++-
 11 files changed, 261 insertions(+), 129 deletions(-)
 create mode 100644 img/captcha.png

diff --git a/action.php b/action.php
index 75869d0..46bdcf3 100644
--- a/action.php
+++ b/action.php
@@ -23,17 +23,23 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 
 		global $ACT;
 
+		// initialize the session id and type with random data:
+		$this->sessionId = rand(1000000, 9999999);
+		$this->sessionType = 'rnd';
+
 		// insert header data into the page:
-		if ($ACT == 'show') {
+		if ($ACT == 'show' || $ACT == 'edit' || $ACT == 'media') {
 			$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'insertHeader');
+
+			// Override the page rendering, if a captcha needs to be displayed:
+			$controller->register_hook('TPL_ACT_RENDER', 'BEFORE', $this, 'showCaptcha');
+
 		} else if ($ACT == 'admin' && isset($_REQUEST['page']) && $_REQUEST['page'] == 'botmon') {
 			$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'insertAdminHeader');
-		}
-	
-		// Override the page rendering, if a captcha needs to be displayed:
-		if ($ACT !== 'admin') {
-			$controller->register_hook('TPL_ACT_RENDER', 'BEFORE', $this, 'showCaptcha');
-		}
+		} 
+
+		// also show a captcha before the image preview
+		$controller->register_hook('TPL_IMG_DISPLAY', 'BEFORE', $this, 'showImageCaptcha');
 
 		// write to the log after the page content was displayed:
 		$controller->register_hook('TPL_CONTENT_DISPLAY', 'AFTER', $this, 'writeServerLog');
@@ -59,14 +65,8 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 		// populate the session id and type:
 		$this->getSessionInfo();
 
-		// is there a user logged in?
-		$username = ( !empty($INFO['userinfo']) && !empty($INFO['userinfo']['name']) ?  $INFO['userinfo']['name'] : '');
-
 		// build the tracker code:
-		$code = "document._botmon = {t0: Date.now(), session: " . json_encode($this->sessionId) . ", seed: " . json_encode($this->getConf('captchaSeed')) . ", ip: " . json_encode($_SERVER['REMOTE_ADDR']) . "};" . NL;
-		if ($username) {
-			$code .= DOKU_TAB . DOKU_TAB . 'document._botmon.user = "' . $username . '";'. NL;
-		}
+		$code = $this->getBMHeader();
 
 		// add the deferred script loader::
 		$code .= DOKU_TAB . DOKU_TAB . "addEventListener('DOMContentLoaded', function(){" . NL;
@@ -78,6 +78,22 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 		$event->data['script'][] = ['_data' => $code];
 	}
 
+	/* create the BM object code for insertion into a script element: */
+	private function getBMHeader() {
+	
+		// build the tracker code:
+		$code = DOKU_TAB . DOKU_TAB . "document._botmon = {t0: Date.now(), session: " . json_encode($this->sessionId) . ", seed: " . json_encode($this->getConf('captchaSeed')) . ", ip: " . json_encode($_SERVER['REMOTE_ADDR']) . "};" . NL;
+
+		// is there a user logged in?
+		$username = ( !empty($INFO['userinfo']) && !empty($INFO['userinfo']['name']) ?  $INFO['userinfo']['name'] : '');
+		if ($username) {
+			$code .= DOKU_TAB . DOKU_TAB . 'document._botmon.user = "' . $username . '";'. NL;
+		}
+
+		return $code;
+
+	}
+
 	/**
 	 * Inserts tracking code to the page header
 	 * (only called on 'show' actions)
@@ -120,7 +136,8 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 			substr($conf['lang'],0,2), /* page language */
 			implode(',', array_unique(array_map( function($it) { return substr(trim($it),0,2); }, explode(',',trim($_SERVER['HTTP_ACCEPT_LANGUAGE'], " \t;,*"))))), /* accepted client languages */
 			$this->getCountryCode(), /* GeoIP country code */
-			$this->showCaptcha /* show captcha? */		);
+			$this->showCaptcha /* show captcha? */
+		);
 
 		//* create the log line */
 		$filename = __DIR__ .'/logs/' . gmdate('Y-m-d') . '.srv.txt'; /* use GMT date for filename */
@@ -182,37 +199,68 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 			$this->sessionId = $_SERVER['REMOTE_ADDR'];
 			$this->sessionType = 'ip';
 		}
-		if (!$this->sessionId) { /* if everything else fails, just us a random ID */
-			$this->sessionId = rand(1000000, 9999999);
-			$this->sessionType = 'rand';
-		}
 	}
 
 	public function showCaptcha(Event $event) {
 
 		$useCaptcha = $this->getConf('useCaptcha');
 
-		if ($useCaptcha !== 'disabled' && $this->checkCaptchaCookie() && !$this->captchaWhitelisted()) {
+		$cCode = '-';
+		if ($useCaptcha !== 'disabled') {
+			if ($this->captchaWhitelisted()) {
+				$cCode = 'W'; // whitelisted
+			} elseif ($this->hasCaptchaCookie()) {
+				$cCode  = 'N'; // user already has a cookie
+			} else {
+				$cCode  = 'Y'; // show the captcha
 
-			$this->showCaptcha = 'Y'; // captcha will be shown.
 
-			echo '<h1 class="sectionedit1">'; tpl_pagetitle(); echo "</h1>\n"; // always show the original page title
-			$event->preventDefault(); // don't show normal content
-			switch ($useCaptcha) {
-				case 'blank':
-					$this->insertBlankBox();  // show dada filler instead of text
-					break;
-				case 'dada':
-					$this->insertDadaFiller();  // show dada filler instead of text
-					break;
+				echo '<h1 class="sectionedit1">'; tpl_pagetitle(); echo "</h1>\n"; // always show the original page title
+				$event->preventDefault(); // don't show normal content
+				switch ($useCaptcha) {
+					case 'blank':
+						$this->insertBlankBox();  // show dada filler instead of text
+						break;
+					case 'dada':
+						$this->insertDadaFiller();  // show dada filler instead of text
+						break;
+				}
+				$this->insertCaptchaLoader(); // and load the captcha
 			}
-			$this->insertCaptchaLoader(); // and load the captcha
-		} else {
-			$this->showCaptcha = 'N'; // do not show a captcha
 		}
+		$this->showCaptcha = $cCode; // store the captcha code for the logfile
+
 	}
 
-	private function checkCaptchaCookie() {
+	public function showImageCaptcha(Event $event, $param) {
+		
+		$useCaptcha = $this->getConf('useCaptcha');
+
+		echo '<script>' . $this->getBMHeader($event, $param) . '</script>';
+
+		$cCode = '-';
+		if ($useCaptcha !== 'disabled') {
+			if ($this->captchaWhitelisted()) {
+				$cCode = 'W'; // whitelisted
+			}
+			elseif ($this->hasCaptchaCookie()) {
+				$cCode  = 'N'; // user already has a cookie
+			}
+			else {
+				$cCode  = 'Y'; // show the captcha
+
+				echo '<svg width="100%" height="100%" viewBox="0 0 800 400" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M1,1l798,398" style="fill:none;stroke:#f00;stroke-width:1px;"/><path d="M1,399l798,-398" style="fill:none;stroke:#f00;stroke-width:1px;"/><rect x="1" y="1" width="798" height="398" style="fill:none;stroke:#000;stroke-width:1px;"/></svg>'; // placeholder image
+				$event->preventDefault(); // don't show normal content
+				
+				// TODO Insert dummy image
+				$this->insertCaptchaLoader(); // and load the captcha
+			}
+		};
+
+		$this->showCaptcha = $cCode; // store the captcha code for the logfile
+	}
+
+	private function hasCaptchaCookie() {
 
 		$cookieVal = isset($_COOKIE['DWConfirm']) ? $_COOKIE['DWConfirm'] : null;
 
@@ -223,7 +271,7 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 
 		//echo '<ul><li>cookie: ' . $cookieVal . '</li><li>expected: ' . $expected . '</li><li>matches: ' .($cookieVal == $expected ? 'true' : 'false') . '</li></ul>';
 
-		return $cookieVal !== $expected;
+		return $cookieVal == $expected;
 	}
 
 	// check if the visitor's IP is on a whitelist:
@@ -251,15 +299,13 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 						$to = inet_pton($col[1]);
 
 						if ($ip >= $from && $ip <= $to) {
-							//echo "<p>Found my IP in range: " . $col[0] . " - " . $col[1] . "</p>";
-							return true;
+							return true; /* IP whitelisted */
 						}
 					}
 				}
 			}
 		}
-
-		return false;
+		return false; /* IP not found in whitelist */
 	}
 
 	private function insertCaptchaLoader() {
diff --git a/admin.css b/admin.css
index 734ee97..d8dad0e 100644
--- a/admin.css
+++ b/admin.css
@@ -108,6 +108,12 @@
 		&.cl_operaold::before { background-position-y: -380px }
 		&.cl_other::before { background-image: url('img/more.svg') }
 
+		/* Captcha statuses */
+		&.captcha::before { background-image: url('img/captcha.png') }
+		&.cap_Y::before { background-position-y: -20px }
+		&.cap_YN::before { background-position-y: -40px }
+		&.cap_W::before { background-position-y: -60px }
+
 		/* Country flags */
 		/* Note: flag images and CSS adapted from: https://github.com/lafeber/world-flags-sprite/ */
 		&.country::before {
@@ -730,21 +736,28 @@
 				background-image: url('img/info.svg')
 			}
 
-			/* pageviews */
-			span.pageviews {
+			/* pages seen */
+			span.pageseen, span.pageviews {
 				border: #999 solid 1px;
 				padding: 0 2px;
 				font-size: smaller;
 				border-radius: .5em;
 				margin-right: .25em;
 			}
-			span.pageviews::before {
+			span.pageseen::before {
 				content : '';
 				display: inline-block;
 				width: 1.25em; height: 1.25em;
 				background: transparent url('img/page.svg') center no-repeat;
 				background-size: 1.25em;
 			}
+			span.pageviews::before {
+				content : '';
+				display: inline-block;
+				width: 1.25em; height: 1.25em;
+				background: transparent url('img/views.svg') center no-repeat;
+				background-size: 1.25em;
+			}
 		}
 
 		/* item footer */
@@ -890,7 +903,7 @@
 						border-top-color: #CCC;
 					}
 				}
-				span.pageviews {
+				span.pageseen, span.pageviews {
 					border-color: #555;
 				}
 
diff --git a/admin.js b/admin.js
index 49765e5..0661f9e 100644
--- a/admin.js
+++ b/admin.js
@@ -291,7 +291,7 @@ BotMon.live = {
 				// shortcut to make code more readable:
 				const model = BotMon.live.data.model;
 
-				const timeout = 60 * 60 * 1000; // session timeout: One hour
+				//const timeout = 60 * 60 * 1000; // session timeout: One hour
 
 				if (visitor._type == BM_USERTYPE.KNOWN_BOT) { // known bots match by their bot ID:
 
@@ -303,13 +303,14 @@ BotMon.live = {
 							return v;
 						}
 					}
+
 				} else { // other types match by their DW/PHPIDs:
 
 					// loop over all visitors already registered and check for ID matches:
 					for (let i=0; i<model._visitors.length; i++) {
 						const v = model._visitors[i];
 
-						if ( v.id == visitor.id) { // match the DW/PHP IDs
+						if ( v.id.trim() !== '' && v.id == visitor.id) { // match the DW/PHP IDs
 							return v;
 						}
 					}
@@ -379,21 +380,35 @@ BotMon.live = {
 				// check if it already exists:
 				let visitor = model.findVisitor(nv, type);
 				if (!visitor) {
-					visitor = nv;
-					visitor._seenBy = [type];
-					visitor._pageViews = []; // array of page views
-					visitor._hasReferrer = false; // has at least one referrer
-					visitor._jsClient = false; // visitor has been seen logged by client js as well
-					visitor._client = BotMon.live.data.clients.match(nv.agent) ?? null; // client info
-					visitor._platform = BotMon.live.data.platforms.match(nv.agent); // platform info
+					visitor = {...nv, ...{
+						_seenBy: [type],
+						_viewCount: 0, // number of page views
+						_loadCount: 0, // number of page loads (not necessarily views!)
+						_pageViews: [], // array of page views
+						_hasReferrer: false, // has at least one referrer
+						_jsClient: false, // visitor has been seen logged by client js as well
+						_client: BotMon.live.data.clients.match(nv.agent) ?? null, // client info
+						_platform: BotMon.live.data.platforms.match(nv.agent), // platform info
+						_captcha: {'-': 0, 'Y': 0, 'N': 0, 'W':0} // captcha counter
+					}};
 					model._visitors.push(visitor);
-				} else { // update existing 
-					if (visitor._firstSeen > nv.ts) {
-						visitor._firstSeen = nv.ts;
-					}
+				};
+
+				// update first and last seen:
+				if (visitor._firstSeen > nv.ts) {
+					visitor._firstSeen = nv.ts;
+				}
+				if (visitor._lastSeen < nv.ts) {
+					visitor._lastSeen = nv.ts;
 				}
 
-				// find browser 
+				// update total loads and views (not the same!):
+				visitor._loadCount += 1;
+				visitor._viewCount += (nv.captcha == 'Y' ? 0 : 1);
+
+				// ...because also a captcha is a "load", but not a "view".
+				// let's count the captcha statuses as well:
+				if (nv.captcha) visitor._captcha[nv.captcha] += 1;
 
 				// is this visit already registered?
 				let prereg = model._getPageView(visitor, nv);
@@ -401,14 +416,15 @@ BotMon.live = {
 					// add new page view:
 					prereg = model._makePageView(nv, type);
 					visitor._pageViews.push(prereg);
-				} else {
-					// update last seen date
-					prereg._lastSeen = nv.ts;
-					// increase view count:
-					prereg._viewCount += 1;
-					prereg._tickCount += 1;
 				}
 
+				// update last seen date
+				prereg._lastSeen = nv.ts;
+
+				// increase view count:
+				prereg._loadCount += (visitor.captcha == 'Y' ? 0 : 1);
+				//prereg._tickCount += 1;
+
 				// update referrer state:
 				visitor._hasReferrer = visitor._hasReferrer || 
 					(prereg.ref !== undefined && prereg.ref !== '');
@@ -520,7 +536,8 @@ BotMon.live = {
 					_lastSeen: data.ts,
 					_seenBy: [type],
 					_jsClient: ( type !== BM_LOGTYPE.SERVER),
-					_viewCount: 1,
+					_viewCount: 0,
+					_loadCount: 0,
 					_tickCount: 0
 				};
 			}
@@ -572,19 +589,19 @@ BotMon.live = {
 
 					// count visits and page views:
 					this.data.totalVisits += 1;
-					this.data.totalPageViews += v._pageViews.length;
+					this.data.totalPageViews += v._viewCount;
 					
 					// check for typical bot aspects:
 					let botScore = 0;
 
 					if (v._type == BM_USERTYPE.KNOWN_BOT) { // known bots
 
-						this.data.bots.known += v._pageViews.length;
+						this.data.bots.known += v._viewCount;
 						this.groups.knownBots.push(v);
 
 					} else if (v._type == BM_USERTYPE.KNOWN_USER) { // known users */
 
-						this.data.bots.users += v._pageViews.length;
+						this.data.bots.users += v._viewCount;
 						this.groups.users.push(v);
 
 					} else {
@@ -596,11 +613,11 @@ BotMon.live = {
 
 						if (e.isBot) { // likely bots
 							v._type = BM_USERTYPE.LIKELY_BOT;
-							this.data.bots.suspected += v._pageViews.length;
+							this.data.bots.suspected += v._viewCount;
 							this.groups.suspectedBots.push(v);
 						} else { // probably humans
 							v._type = BM_USERTYPE.PROBABLY_HUMAN;
-							this.data.bots.human += v._pageViews.length;
+							this.data.bots.human += v._viewCount;
 							this.groups.humans.push(v);
 						}						
 					}
@@ -640,7 +657,7 @@ BotMon.live = {
 				//console.log(BotMon.live.data.analytics.groups.knownBots);
 
 				let botsList = BotMon.live.data.analytics.groups.knownBots.toSorted( (a, b) => {
-					return b._pageViews.length - a._pageViews.length;
+					return b._viewCount - a._viewCount;
 				});
 
 				const other = {
@@ -659,12 +676,12 @@ BotMon.live = {
 							rList.push({
 								id: it._bot.id,
 								name: (it._bot.n ? it._bot.n : it._bot.id),
-								count: it._pageViews.length
+								count: it._viewCount
 							});
 						} else {
 							other.count += it._pageViews.length;
 						};
-						total += it._pageViews.length;
+						total += it._viewCount;
 					}
 				};
 
@@ -997,7 +1014,7 @@ BotMon.live = {
 				const list = me.groups[type];
 				
 				list.forEach(it => {
-					bounces += (it._pageViews.length <= 1 ? 1 : 0);
+					bounces += (it._viewCount <= 1 ? 1 : 0);
 				});
 
 				return bounces;
@@ -1085,7 +1102,7 @@ BotMon.live = {
 				}
 
 				// add to counter:
-				ipRec.count += v._pageViews.length;
+				ipRec.count += v._viewCount;
 
 			},
 
@@ -1520,12 +1537,13 @@ BotMon.live = {
 
 				// are there at lest num pages loaded?
 				smallPageCount: function(visitor, num) {
-					return (visitor._pageViews.length <= Number(num));
+					return (visitor._viewCount <= Number(num));
 				},
 
 				// There was no entry in a specific log file for this visitor:
 				// note that this will also trigger the "noJavaScript" rule:
 				noRecord: function(visitor, type) {
+					if (!visitor._seenBy.includes('srv')) return false; // only if 'srv' is also specified!
 					return !visitor._seenBy.includes(type);
 				},
 
@@ -1613,7 +1631,7 @@ BotMon.live = {
 				// At least x page views were recorded, but they come within less than y seconds
 				loadSpeed: function(visitor, minItems, maxTime) {
 
-					if (visitor._pageViews.length >= minItems) {
+					if (visitor._viewCount >= minItems) {
 						//console.log('loadSpeed', visitor._pageViews.length, minItems, maxTime);
 
 						const pvArr = visitor._pageViews.map(pv => pv._lastSeen).sort();
@@ -1704,7 +1722,7 @@ BotMon.live = {
 			switch (type) {
 				case "srv":
 					typeName = "Server";
-					columns = ['ts','ip','pg','id','typ','usr','agent','ref','lang','accept','geo'];
+					columns = ['ts','ip','pg','id','typ','usr','agent','ref','lang','accept','geo','captcha'];
 					break;
 				case "log":
 					typeName = "Page load";
@@ -2299,20 +2317,11 @@ BotMon.live = {
 					}, data.id));
 				}
 
-				// seen by icon:
-				span1.appendChild(make('span', {
-					'class': 'icon_only seenby sb_' + data._seenBy.join(''),
-					'title': "Seen by: " + data._seenBy.join('+')
-				}, data._seenBy.join(', ')));
+				span1.appendChild(make('span', { /* page views */
+					'class': 'has_icon pageseen',
+					'title': data._pageViews.length + " page load(s)"
+				}, data._pageViews.length));
 
-				// country flag:
-				if (data.geo && data.geo !== 'ZZ') {
-					span1.appendChild(make('span', {
-						'class': 'icon_only country ctry_' + data.geo.toLowerCase(),
-						'data-ctry': data.geo,
-						'title': "Country: " + ( data._country || "Unknown")
-					}, ( data._country || "Unknown") ));
-				}
 
 				// referer icons:
 				if ((data._type == BM_USERTYPE.PROBABLY_HUMAN || data._type == BM_USERTYPE.LIKELY_BOT) && data.ref) {
@@ -2326,15 +2335,26 @@ BotMon.live = {
 				summary.appendChild(span1);
 				const span2 = make('span'); /* right-hand group */
 
-					span2.appendChild(make('span', { /* first-seen */
-						'class': 'has_iconfirst-seen',
-						'title': "First seen: " + data._firstSeen.toLocaleString() + " UTC"
-					}, BotMon.t._formatTime(data._firstSeen)));
+				// country flag:
+					if (data.geo && data.geo !== 'ZZ') {
+						span2.appendChild(make('span', {
+							'class': 'icon_only country ctry_' + data.geo.toLowerCase(),
+							'data-ctry': data.geo,
+							'title': "Country: " + ( data._country || "Unknown")
+						}, ( data._country || "Unknown") ));
+					}
 
-					span2.appendChild(make('span', { /* page views */
-						'class': 'has_icon pageviews',
-						'title': data._pageViews.length + " page view(s)"
-					}, data._pageViews.length));
+					span2.appendChild(make('span', { // seen-by icon:
+						'class': 'icon_only seenby sb_' + data._seenBy.join(''),
+						'title': "Seen by: " + data._seenBy.join('+')
+					}, data._seenBy.join(', ')));
+
+					const captchaCode = '' + ( data._captcha['Y'] > 0 ? 'Y' : '' ) + ( data._captcha['N'] > 0 ? 'N' : '' ) + ( data._captcha['W'] > 0 ? 'W' : '' );
+					if (captchaCode !== '') {
+						span2.appendChild(make('span', { // captcha status
+							'class': 'icon_only captcha cap_' + captchaCode,
+						}, captchaCode));
+					}
 
 				summary.appendChild(span2);
 
@@ -2414,6 +2434,13 @@ BotMon.live = {
 					dl.appendChild(make('dd', {'class': 'lastSeen'}, data._lastSeen.toLocaleString()));
 				}
 
+				dl.appendChild(make('dt', {}, "Actions:"));
+				dl.appendChild(make('dd', {'class': 'views'},
+					"Page loads: " + data._loadCount.toString() +
+					( data._captcha['Y'] > 0 || data._captcha['W'] || data._captcha['-'] > 0 ? ", captchas: " + (data._captcha['Y']+data._captcha['W']+data._captcha['-']).toString() : '') +
+					", views: " + data._viewCount.toString()
+				));
+
 				dl.appendChild(make('dt', {}, "User-Agent:"));
 				dl.appendChild(make('dd', {'class': 'agent'}, data.agent));
 
@@ -2441,6 +2468,12 @@ BotMon.live = {
 						'title': "Country: " + data._country
 					}, data._country + ' (' + data.geo + ')'));
 				}
+				if (data.captcha && data.captcha !=='') {
+					dl.appendChild(make('dt', {}, "Captcha-status:"));
+					dl.appendChild(make('dd', {
+						'class': 'captcha'
+					}, data.captcha));
+				}
 
 				dl.appendChild(make('dt', {}, "Session ID:"));
 				dl.appendChild(make('dd', {'class': 'has_icon session typ_' + data.typ}, data.id));
@@ -2528,12 +2561,19 @@ BotMon.live = {
 						'title': "PageID: " + page.pg
 					}, page.pg)); /* DW Page ID */
 
-					// get the time difference:
-					row1.appendChild(make('span', {
-						'class': 'first-seen',
-						'title': "First visited: " + page._firstSeen.toLocaleString() + " UTC"
-					}, BotMon.t._formatTime(page._firstSeen)));
-					
+					const rightGroup = row1.appendChild(make('div')); // right-hand group
+
+						// get the time difference:
+						rightGroup.appendChild(make('span', {
+							'class': 'first-seen',
+							'title': "First visited: " + page._firstSeen.toLocaleString() + " UTC"
+						}, BotMon.t._formatTime(page._firstSeen)));
+						
+						rightGroup.appendChild(make('span', { /* page loads */
+							'class': 'has_icon pageviews',
+							'title': page._viewCount.toString() + " page load(s)"
+						}, page._viewCount.toString()));
+
 				pgLi.appendChild(row1);
 
 				/* LINE 2 */
diff --git a/captcha.js b/captcha.js
index 9f64912..cb79a4e 100644
--- a/captcha.js
+++ b/captcha.js
@@ -26,7 +26,7 @@ const $BMCaptcha = {
 
 		// Checkbox:
 		const lbl = document.createElement('label');
-		lbl.innerHTML = '<span class="confirm">Click to confirm.</span><span class="busy"></span><span class="checking">Checking&nbsp;&hellip;</span><span class="loading">Loading&nbsp;&hellip;</span>';
+		lbl.innerHTML = '<span class="confirm">Click to confirm.</span><span class="busy"></span><span class="checking">Checking&nbsp;&hellip;</span><span class="loading">Loading&nbsp;&hellip;</span><span class="erricon">&#65533;</span><span class="error">An error occured.</span>';
 		const cb = document.createElement('input');
 		cb.setAttribute('type', 'checkbox');
 		cb.setAttribute('disabled', 'disabled');
@@ -152,26 +152,35 @@ const $BMCaptcha = {
 		if (e.target.checked) {
 			//document.getElementById('botmon_captcha_box').close();
 
-			const dat = [ // the data to encode
-				document._botmon.seed || '',
-				location.hostname,
-				document._botmon.ip || '0.0.0.0',
-				(document._botmon.t0 ? new Date(document._botmon.t0) : new Date()).toISOString().substring(0, 10)
-			];
-			const hash = $BMCaptcha.digest.hash(dat.join('|'));
+			try {
+				var $status = 'loading';
 
-			// set the cookie:
-			document.cookie = "DWConfirm=" + hash + ';path=/;';
+				// generate the hash:
+				const dat = [ // the data to encode
+					document._botmon.seed || '',
+					location.hostname,
+					document._botmon.ip || '0.0.0.0',
+					(new Date()).toISOString().substring(0, 10)
+				];
+				const hash = $BMCaptcha.digest.hash(dat.join('|'));
+
+				// set the cookie:
+				document.cookie = "DWConfirm=" + hash + ';path=/;';
+
+			} catch (err) {
+				console.error(err);
+				$status = 'error';
+			}
 
 			// change the interface:
 			const dlg = document.getElementById('botmon_captcha_box');
 			if (dlg) {
 				dlg.classList.remove('ready');
-				dlg.classList.add('loading');
+				dlg.classList.add( $status );
 			}
 
 			// reload the page:
-			window.location.reload(true);
+			if ($status !== 'error')window.location.reload(true);
 		}
 	},
 
diff --git a/conf/default.php b/conf/default.php
index 48f2cf5..53540b4 100644
--- a/conf/default.php
+++ b/conf/default.php
@@ -6,5 +6,5 @@
  */
 
 $conf['geoiplib']		= 'disabled';
-$conf['useCaptcha']		= 0;
-$conf['captchaSeed']	= 'b472719ba5634d378a7d7f9bfc46659f';
+$conf['useCaptcha']		= 'disabled';
+$conf['captchaSeed']	= 'c53bc5f94929451987efa6c768d8856b';
diff --git a/config/default-whitelist.txt b/config/default-whitelist.txt
index eaa0688..397720d 100644
--- a/config/default-whitelist.txt
+++ b/config/default-whitelist.txt
@@ -335,6 +335,12 @@
 2001:4860:4801:000c::	2001:4860:4801:000c:FFFF:FFFF:FFFF:FFFF	64
 2001:4860:4801:000f::	2001:4860:4801:000f:FFFF:FFFF:FFFF:FFFF	64
 
-# PlagAware Bot - from previous visits’ IPs
-157.90.90.163	157.90.90.163	32
-2a01:4f8:2190:21a0::2	2a01:4f8:2190:21a0::2	64
+# SeznamBot - IPs from: https://o-seznam.cz/napoveda/vyhledavani/en/seznambot-crawler/
+77.75.76.0	77.75.79.255	22
+2a02:0598:0064:8a00:0000:0000:3100:0000	2a02:0598:0064:8a00:0000:0000:3100:001f	123
+2a02:0598:0128:8a00:0000:0000:0b00:0000	2a02:0598:0128:8a00:0000:0000:0b00:001f	123
+2a02:0598:0096:8a00:0000:0000:1200:0120	2a02:0598:0096:8a00:0000:0000:1200:013f	123
+
+# localhosts
+127.0.0.1	127.255.255.255	8
+::1	::1	128	
\ No newline at end of file
diff --git a/config/known-ipranges.json b/config/known-ipranges.json
index 466dddd..4e955cb 100644
--- a/config/known-ipranges.json
+++ b/config/known-ipranges.json
@@ -1,10 +1,12 @@
 {
 	"groups": [
 		{"id": "alibaba", "name": "Alibaba"},
-		{"id": "amazon", "name": "Amazon DS"},
+		{"id": "amazon", "name": "Amazon"},
+		{"id": "bezeq", "name": "Bezeq Int."},
 		{"id": "brasilnet", "name": "BrasilNet"},
 		{"id": "charter", "name": "Charter Inc."},
 		{"id": "chinanet", "name": "Chinanet"},
+		{"id": "cloudflare", "name": "Cloudflare Inc."},
 		{"id": "cnisp", "name": "China ISP"},
 		{"id": "cnmob", "name": "China Mobile"},
 		{"id": "google", "name": "Google LLC"},
@@ -44,7 +46,7 @@
 		{"from": "52.96.0.0", "to": "52.127.255.254", "m": 11, "g": "microsoft"},
 		{"from": "54.0.0.0", "to": "54.255.255.254", "m": 8, "g": "amazon"},
 		{"from": "66.249.64.0", "to": "66.249.95.254", "m": 19, "g": "google"},
-		{"from": "84.37.35.0", "to": "84.37.255.254", "g": "gtt"},
+		{"from": "82.80.0.0", "to": "82.81.255.255", "m": 15, "g": "bezeq"},
 		{"from": "94.74.64.0", "to": "94.74.127.254", "m": 18, "g": "huawei"},
 		{"from": "91.84.96.0", "to": "91.84.127.254", "m": 19, "g": "vdsina"},
 		{"from": "101.0.0.0", "to": "101.255.255.254", "m": 8,"g": "chinanet"},
@@ -98,6 +100,7 @@
 		{"from": "2603:8000::::::", "to": "2603:80ff:ffff:ffff:ffff:ffff:ffff:ffff", "m": 24, "g": "charter"},
 		{"from": "2607:a400::::::", "to": "2607:a400:ffff:ffff:ffff:ffff:ffff:ffff", "m": 32, "g": "zenlayer"},
 		{"from": "2804:::::::", "to": "2804:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF", "m": 16, "g": "misc_sa"},
+		{"from": "2a09:bac3::::::", "to": "2a09:bac3:ffff:ffff:ffff:ffff:ffff:ffff", "m": 32,"g": "cloudflare"},
 		{"from": "2a0a:4cc0::::::", "to": "2a0a:4cc0:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF", "g": "netcup"}
 	]
 }
\ No newline at end of file
diff --git a/img/captcha.png b/img/captcha.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e43e46b9398dcd2ce6643325e4fcffc6b4cd08f
GIT binary patch
literal 2705
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
b%Kil1QB_LDXVw4u(g92iEf7`u?)Ux+Dn!D~

literal 0
HcmV?d00001

diff --git a/img/stages.png b/img/stages.png
index 0ac0c9e63f0e2fb3795cf0bd10fff93b9f0df13c..4d2621f7a7008c399283d728209c79182e7ab3ad 100644
GIT binary patch
delta 3938
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

delta 3201
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

diff --git a/lang/de/wordlist.txt b/lang/de/wordlist.txt
index d756082..f1a1c0f 100644
--- a/lang/de/wordlist.txt
+++ b/lang/de/wordlist.txt
@@ -232,7 +232,7 @@ weiter	13
 gleich	13
 gute	13
 vom	13
-Warte	12
+warte	12
 deinen	12
 ins	12
 denke	12
@@ -2730,4 +2730,5 @@ zahle	1
 brauchten	1
 stinkt	1
 treiben	1
-welch	1
\ No newline at end of file
+welch	1
+Warte	1
diff --git a/style.less b/style.less
index c145472..fb29653 100644
--- a/style.less
+++ b/style.less
@@ -4,11 +4,17 @@ body.botmon_captcha {
 			color: transparent !important;
 			text-shadow: 0 0 .25em rgba(0,.0,0,.8);
 		}
-		p, h2, h3, h4, h5, h6 {
+		p, dt, dd, h2, h3, h4, h5, h6, a:link, a:visited {
 			color: transparent !important;
 			text-shadow: 0 0 .35em rgba(0,0,0,.5);
 			user-select: none;
 		}
+		svg {
+			width: auto; height: auto;
+			-webkit-filter: blur(8px); /* For Safari */
+			filter: blur(8px);
+		}
+		
 	}
 	#botmon_captcha_box {
 		& {
@@ -58,6 +64,9 @@ body.botmon_captcha {
 				background: transparent url('img/busy-light.svg') center no-repeat;
 				background-size: 24px;
 			}
+			span.error, span.erricon {
+				color: #f96c6c;
+			}
 		}
 		input[type="checkbox"] {
 			width: 24px; height: 24px;
@@ -74,20 +83,25 @@ body.botmon_captcha {
 			display: none;
 		}
 		&.checking {
-			input[type="checkbox"], span.confirm, span.loading { display: none;}
+			input[type="checkbox"], span.confirm, span.loading, span.erricon, span.error { display: none;}
 			span.busy, span.checking { display: initial; }
 			label, input[type="checkbox"] { cursor: wait; }
 		}
 		&.ready {
 			input[type="checkbox"], span.confirm { display: initial;}
-			span.busy, span.checking, span.loading { display: none; }
+			span.busy, span.checking, span.loading, span.erricon, span.error { display: none; }
 			label, input[type="checkbox"] { cursor: pointer; }
 		}
 		&.loading {
 			span.busy, span.loading { display: initial; }
-			input[type="checkbox"], span.confirm, span.checking { display: none;}
+			input[type="checkbox"], span.confirm, span.checking, span.erricon, span.error { display: none;}
 			label { cursor: wait; }
 		}
+		&.error {
+			span.erricon, span.error { display: initial; }
+			input[type="checkbox"], span.confirm, span.checking, span.busy, span.loading { display: none;}
+			label { cursor: initial; }
+		}
 	}
 }