From 708eb9be6f680a033b79d630a25504c05ae593d6 Mon Sep 17 00:00:00 2001
From: Floorb <132411956+Neetpone@users.noreply.github.com>
Date: Fri, 12 May 2023 02:06:31 -0400
Subject: [PATCH] fix: some admin pages implementation
---
includes/Models/AdminLog.php | 7 ++
includes/functions.php | 19 +++
package.json | 3 +-
phpcs.xml | 21 ++++
psalm.xml | 16 +++
{admin => public/admin}/admin.php | 7 --
{admin => public/admin}/common.php | 2 +-
{admin => public/admin}/configuration.php | 24 +---
.../admin}/css/bootstrap-checkbox.min.css | 0
.../admin}/css/bootstrap-select.min.css | 0
{admin => public/admin}/css/bootstrap.css | 0
{admin => public/admin}/css/bootstrap.min.css | 0
.../admin}/css/datatables.min.css | 0
.../admin}/css/font-awesome.min.css | 0
.../admin}/css/fonts/FontAwesome.otf | Bin
.../admin}/css/fonts/fontawesome-webfont.eot | Bin
.../admin}/css/fonts/fontawesome-webfont.svg | 0
.../admin}/css/fonts/fontawesome-webfont.ttf | Bin
.../admin}/css/fonts/fontawesome-webfont.woff | Bin
.../css/fonts/fontawesome-webfont.woff2 | Bin
{admin => public/admin}/css/index.php | 0
{admin => public/admin}/css/paste.css | 0
{admin => public/admin}/css/responsive.css | 0
{admin => public/admin}/css/style.css | 0
{admin => public/admin}/css/style.min.css | 0
{admin => public/admin}/dashboard.php | 109 ++++++------------
{admin => public/admin}/favicon.ico | Bin
{admin => public/admin}/index.php | 4 +-
{admin => public/admin}/ipbans.php | 7 --
{admin => public/admin}/menu.php | 3 -
{admin => public/admin}/pastes.php | 16 ---
{admin => public/admin}/reports.php | 35 ------
{admin => public/admin}/stats.php | 7 --
{admin => public/admin}/users.php | 87 +++-----------
theme/bulma/report.php | 15 ---
vendor/composer/InstalledVersions.php | 17 ++-
vendor/composer/installed.php | 4 +-
37 files changed, 134 insertions(+), 269 deletions(-)
create mode 100644 phpcs.xml
create mode 100644 psalm.xml
rename {admin => public/admin}/admin.php (93%)
rename {admin => public/admin}/common.php (94%)
rename {admin => public/admin}/configuration.php (96%)
rename {admin => public/admin}/css/bootstrap-checkbox.min.css (100%)
rename {admin => public/admin}/css/bootstrap-select.min.css (100%)
rename {admin => public/admin}/css/bootstrap.css (100%)
rename {admin => public/admin}/css/bootstrap.min.css (100%)
rename {admin => public/admin}/css/datatables.min.css (100%)
rename {admin => public/admin}/css/font-awesome.min.css (100%)
rename {admin => public/admin}/css/fonts/FontAwesome.otf (100%)
rename {admin => public/admin}/css/fonts/fontawesome-webfont.eot (100%)
rename {admin => public/admin}/css/fonts/fontawesome-webfont.svg (100%)
rename {admin => public/admin}/css/fonts/fontawesome-webfont.ttf (100%)
rename {admin => public/admin}/css/fonts/fontawesome-webfont.woff (100%)
rename {admin => public/admin}/css/fonts/fontawesome-webfont.woff2 (100%)
rename {admin => public/admin}/css/index.php (100%)
rename {admin => public/admin}/css/paste.css (100%)
rename {admin => public/admin}/css/responsive.css (100%)
rename {admin => public/admin}/css/style.css (100%)
rename {admin => public/admin}/css/style.min.css (100%)
rename {admin => public/admin}/dashboard.php (68%)
rename {admin => public/admin}/favicon.ico (100%)
rename {admin => public/admin}/index.php (93%)
rename {admin => public/admin}/ipbans.php (96%)
rename {admin => public/admin}/menu.php (91%)
rename {admin => public/admin}/pastes.php (92%)
rename {admin => public/admin}/reports.php (91%)
rename {admin => public/admin}/stats.php (96%)
rename {admin => public/admin}/users.php (64%)
delete mode 100644 theme/bulma/report.php
diff --git a/includes/Models/AdminLog.php b/includes/Models/AdminLog.php
index f4dbee1..f50f797 100644
--- a/includes/Models/AdminLog.php
+++ b/includes/Models/AdminLog.php
@@ -7,6 +7,13 @@ class AdminLog extends Model {
public const ACTION_LOGIN = 0;
public const ACTION_FAIL_LOGIN = 1;
public const ACTION_EDIT_CONFIG = 2;
+
+ public const ACTION_NAMES = [
+ 'Login',
+ 'Failed Login',
+ 'Edit Config'
+ ];
+
protected $table = 'admin_logs';
protected $fillable = ['user_id', 'action', 'ip', 'time'];
diff --git a/includes/functions.php b/includes/functions.php
index f1d62b0..e00b8ef 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -309,4 +309,23 @@ function pp_filename_escape(string $filename, string $extension) : string {
}
return $filename . $extension;
+}
+
+function pp_setup_pagination() : array {
+ $per_page = 20;
+ $current_page = 0;
+
+ if (!empty($_GET['page'])) {
+ $current_page = max(0, intval($_GET['page']));
+ }
+
+ if (!empty($_GET['per_page'])) {
+ $per_page = max(1, min(100, intval($_GET['per_page'])));
+ }
+
+ return [$per_page, $current_page];
+}
+
+function pp_output_paginator(int $per_page, int $current_page) : void {
+
}
\ No newline at end of file
diff --git a/package.json b/package.json
index 9970dc1..70a9356 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
"license": "MIT",
"dependencies": {
"@rollup/plugin-commonjs": "^24.0.1",
- "@rollup/plugin-node-resolve": "^15.0.1",
- "zxcvbn": "^4.4.2"
+ "@rollup/plugin-node-resolve": "^15.0.1"
}
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..3947f27
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,21 @@
+