Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed visitors feature

Browse Source
This commit is contained in:
Roman 2024-04-12 16:10:33 +02:00
parent 12c6c665fc
commit c892ef5b6e
10 changed files with 4 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Core/API/Stats.class.php
View File

@ -36,40 +36,11 @@ class Stats extends Request {
return $this->success;
}
private function getVisitorCount() {
$sql = $this->context->getSQL();
$date = new DateTime();
$monthStart = $date->format("Ym00");
$monthEnd = $date->modify("+1 month")->format("Ym00");
$res = $sql->select(new Count(new Distinct("cookie")))
->from("Visitor")
->where(new Compare("day", $monthStart, ">="))
->where(new Compare("day", $monthEnd, "<"))
->where(new Compare("count", 2, ">="))
->execute();
$this->success = ($res !== false);
$this->lastError = $sql->getLastError();
return ($this->success ? $res[0]["count"] : $this->success);
}
public function _execute(): bool {
$sql = $this->context->getSQL();
$userCount = User::count($sql);
$pageCount = Route::count($sql, new CondBool("active"));
$groupCount = Group::count($sql);
$req = new \Core\API\Visitors\Stats($this->context);
$this->success = $req->execute(array("type"=>"monthly"));
$this->lastError = $req->getLastError();
if (!$this->success) {
return false;
}
$visitorStatistics = $req->getResult()["visitors"];
$visitorCount = $this->getVisitorCount();
if (!$this->success) {
return false;
}
$req = new \Core\API\Logs\Get($this->context, false);
$success = $req->execute([
@ -96,8 +67,6 @@ class Stats extends Request {
"userCount" => $userCount,
"pageCount" => $pageCount,
"groupCount" => $groupCount,
"visitors" => $visitorStatistics,
"visitorsTotal" => $visitorCount,
"errorCount" => $errorCount,
"server" => [
"version" => WEBBASE_VERSION,

122
Core/API/VisitorsAPI.class.php
View File

@ -1,122 +0,0 @@
<?php
namespace Core\API {
use Core\Objects\Context;
abstract class VisitorsAPI extends Request {
public function __construct(Context $context, bool $externalCall = false, array $params = []) {
parent::__construct($context, $externalCall, $params);
}
}
}
namespace Core\API\Visitors {
use Core\API\Parameter\Parameter;
use Core\API\Parameter\StringType;
use Core\API\VisitorsAPI;
use Core\Driver\SQL\Expression\Count;
use Core\Driver\SQL\Query\Insert;
use Core\Objects\DatabaseEntity\Group;
use DateTime;
use Core\Driver\SQL\Condition\Compare;
use Core\Driver\SQL\Expression\Add;
use Core\Driver\SQL\Query\Select;
use Core\Driver\SQL\Strategy\UpdateStrategy;
use Core\Objects\Context;
class ProcessVisit extends VisitorsAPI {
public function __construct(Context $context, bool $externalCall = false) {
parent::__construct($context, $externalCall, array(
"cookie" => new StringType("cookie", 26)
));
$this->isPublic = false;
}
public function _execute(): bool {
$sql = $this->context->getSQL();
$cookie = $this->getParam("cookie");
$day = (new DateTime())->format("Ymd");
$sql->insert("Visitor", array("cookie", "day"))
->addRow($cookie, $day)
->onDuplicateKeyStrategy(new UpdateStrategy(
array("day", "cookie"),
array("count" => new Add("Visitor.count", 1))))
->execute();
return $this->success;
}
}
class Stats extends VisitorsAPI {
public function __construct(Context $context, bool $externalCall = false) {
parent::__construct($context, $externalCall, array(
'type' => new StringType('type', 32),
'date' => new Parameter('date', Parameter::TYPE_DATE, true, new DateTime())
));
}
private function setConditions(string $type, DateTime $date, Select $query): bool {
if ($type === "yearly") {
$yearStart = $date->format("Y0000");
$yearEnd = $date->modify("+1 year")->format("Y0000");
$query->where(new Compare("day", $yearStart, ">="));
$query->where(new Compare("day", $yearEnd, "<"));
} else if($type === "monthly") {
$monthStart = $date->format("Ym00");
$monthEnd = $date->modify("+1 month")->format("Ym00");
$query->where(new Compare("day", $monthStart, ">="));
$query->where(new Compare("day", $monthEnd, "<"));
} else if($type === "weekly") {
$weekStart = ($date->modify("monday this week"))->format("Ymd");
$weekEnd = ($date->modify("sunday this week"))->format("Ymd");
$query->where(new Compare("day", $weekStart, ">="));
$query->where(new Compare("day", $weekEnd, "<="));
} else {
return $this->createError("Invalid scope: $type");
}
return true;
}
public function _execute(): bool {
$date = $this->getParam("date");
$type = $this->getParam("type");
$sql = $this->context->getSQL();
$query = $sql->select(new Count(), "day")
->from("Visitor")
->whereGt("count", 1)
->groupBy("day")
->orderBy("day")
->ascending();
$this->success = $this->setConditions($type, $date, $query);
if (!$this->success) {
return false;
}
$res = $query->execute();
$this->success = ($res !== FALSE);
$this->lastError = $sql->getLastError();
if ($this->success) {
$this->result["type"] = $type;
$this->result["visitors"] = array();
foreach($res as $row) {
$day = DateTime::createFromFormat("Ymd", $row["day"])->format("Y/m/d");
$count = $row["count"];
$this->result["visitors"][$day] = $count;
}
}
return $this->success;
}
public static function getDefaultACL(Insert $insert): void {
$insert->addRow(self::getEndpoint(), [Group::ADMIN, Group::SUPPORT], "Allows users to view visitor statistics", true);
}
}
}

6
Core/Configuration/CreateDatabase.class.php
View File

@ -18,12 +18,6 @@ class CreateDatabase extends DatabaseScript {
self::loadEntities($queries, $sql);
$queries[] = $sql->createTable("Visitor")
->addInt("day")
->addInt("count", false, 1)
->addString("cookie", 26)
->unique("day", "cookie");
$queries[] = $sql->createTable("Settings")
->addString("name", 32)
->addString("value", 1024, true)

1
Core/Localization/de_DE/admin.php
View File

@ -3,7 +3,6 @@
return [
"title" => "Administration",
"dashboard" => "Dashboard",
"visitor_statistics" => "Besucherstatistiken",
"user_groups" => "Benutzer & Gruppen",
"users" => "Benutzer",
"groups" => "Gruppen",

1
Core/Localization/en_US/admin.php
View File

@ -3,7 +3,6 @@
return [
"title" => "Administration",
"dashboard" => "Dashboard",
"visitor_statistics" => "Visitor Statistics",
"user_groups" => "Users & Groups",
"users" => "Users",
"groups" => "Groups",

12
Core/Objects/Context.class.php
View File

@ -139,18 +139,6 @@ class Context {
return false;
}
public function processVisit(): void {
if (isset($_COOKIE["PHPSESSID"]) && !empty($_COOKIE["PHPSESSID"])) {
if ($this->isBot()) {
return;
}
$cookie = $_COOKIE["PHPSESSID"];
$req = new \Core\API\Visitors\ProcessVisit($this);
$req->execute(["cookie" => $cookie]);
}
}
private function isBot(): bool {
if (empty($_SERVER["HTTP_USER_AGENT"])) {
return false;

7
index.php
View File

@ -64,7 +64,7 @@ if ($installation) {
}
if ($router !== null) {
$logger = $router->getLogger();
if ((!isset($_GET["site"]) || $_GET["site"] === "/") && isset($_GET["error"]) &&
is_string($_GET["error"]) && preg_match("/^\d+$/", $_GET["error"])) {
$response = $router->returnStatusCode(intval($_GET["error"]));
@ -84,12 +84,13 @@ if ($installation) {
} else {
$response = $router->returnStatusCode(403, ["message" => $error]);
}
$logger->warning("The site was accessed by an untrusted domain: $currentHostName");
} else {
$response = $route->call($router, $pathParams);
}
} catch (\Throwable $e) {
http_response_code(500);
$router->getLogger()->error($e->getMessage());
$logger->error($e->getMessage());
$response = $router->returnStatusCode(500);
}
}
@ -97,8 +98,6 @@ if ($installation) {
http_response_code(500);
$response = "Router could not be instantiated.";
}
$context->processVisit();
}
$context->sendCookies();

4
react/admin-panel/src/elements/sidebar.js
View File

@ -40,10 +40,6 @@ export default function Sidebar(props) {
"name": "admin.dashboard",
"icon": "tachometer-alt"
},
"visitors": {
"name": "admin.visitor_statistics",
"icon": "chart-bar",
},
"users": {
"name": "admin.users",
"icon": "users"

38
react/admin-panel/src/views/overview.js
View File

@ -1,6 +1,5 @@
import * as React from "react";
import {Link} from "react-router-dom";
import {format, getDaysInMonth} from "date-fns";
import {useCallback, useContext, useEffect, useState} from "react";
import {LocaleContext} from "shared/locale";
import {ArrowCircleRight, BugReport, Groups, LibraryBooks, People} from "@mui/icons-material";
@ -57,41 +56,6 @@ export default function Overview(props) {
onFetchStats();
}, []);
const today = new Date();
const numDays = getDaysInMonth(today);
let colors = [ '#ff4444', '#ffbb33', '#00C851', '#33b5e5' ];
while (colors.length < numDays) {
colors = colors.concat(colors);
}
let data = new Array(numDays).fill(0);
let visitorCount = 0;
/*
for (let date in this.state.visitors) {
if (this.state.visitors.hasOwnProperty(date)) {
let day = parseInt(date.split("/")[2]) - 1;
if (day >= 0 && day < numDays) {
let count = parseInt(this.state.visitors[date]);
data[day] = count;
visitorCount += count;
}
}
}
*/
let labels = Array.from(Array(numDays), (_, i) => i + 1);
let chartOptions = {};
let chartData = {
labels: labels,
datasets: [{
label: 'Unique Visitors ' + format(today, "MMMM"),
borderWidth: 1,
data: data,
backgroundColor: colors,
}]
};
/*
let loadAvg = this.state.server.load_avg;
if (Array.isArray(this.state.server.load_avg)) {
@ -125,7 +89,7 @@ export default function Overview(props) {
<StatBox color={"success"} count={stats?.groupCount}
text={L("admin.available_groups")}
icon={<Groups />}
link={"/admin/users"} />
link={"/admin/groups"} />
<StatBox color={"warning"} count={stats?.pageCount}
text={L("admin.routes_defined")}
icon={<LibraryBooks />}

5
react/shared/api.js
View File

@ -314,11 +314,6 @@ export default class API {
return this.apiCall("permission/delete", { method: method });
}
/** VisitorsAPI **/
async getVisitors(type, date) {
return this.apiCall("visitors/stats", { type: type, date: date });
}
/** LanguageAPI **/
async getLanguages() {
return this.apiCall("language/get");