From 837d9dfe6c846183ae74528b86efb1d60be77d82 Mon Sep 17 00:00:00 2001
From: Floorb <132411956+Neetpone@users.noreply.github.com>
Date: Mon, 18 Apr 2022 13:54:01 -0400
Subject: [PATCH] Small form cleanup, re-add loader

---
 includes/common.php     | 12 ++++++------
 js/data_tables.js       |  1 +
 login.php               |  5 -----
 theme/bulma/archive.php | 28 ++++++++++++++++++++++++++--
 theme/bulma/common.php  |  4 ++--
 theme/bulma/errors.php  |  2 +-
 theme/bulma/login.php   |  6 +++---
 theme/bulma/main.php    |  2 +-
 theme/bulma/profile.php |  2 +-
 theme/bulma/view.php    |  4 ++--
 10 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/includes/common.php b/includes/common.php
index 671cd0e..e4abb93 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -242,20 +242,20 @@ $total_page_views = PageView::select('tpage')->orderBy('id', 'desc')->first()->t
 $total_unique_views = PageView::select('tvisit')->orderBy('id', 'desc')->first()->tvisit;
 
 $current_user = SessionHelper::currentUser();
-$current_ability = new AbilityHelper($current_user);
 
 function can(string $action, mixed $subject) : bool {
-    global $current_ability;
+    global $current_user;
+    static $current_ability = null;
+
+    if ($current_ability === null) {
+        $current_ability = new AbilityHelper($current_user);
+    }
 
     return $current_ability->can($action, $subject);
 }
 
-//SessionHelper::setupCsrfToken();
-
 $script_bundles = [];
 
 /* Security headers */
 header('X-Frame-Options: SAMEORIGIN');
 header('X-Content-Type-Options: nosniff');
-
-//ob_start();
diff --git a/js/data_tables.js b/js/data_tables.js
index 9f88b0c..25ab3e6 100644
--- a/js/data_tables.js
+++ b/js/data_tables.js
@@ -147,6 +147,7 @@ class DataTable {
     _loadEntries() {
         new Promise(this.ajaxCallback)
             .then(data => {
+                this.element.classList.remove('hidden');
                 this.unfilteredData = data.data;
                 this._updateFilter(this.options.preFilter);
             });
diff --git a/login.php b/login.php
index 337e8cc..7a00cf6 100644
--- a/login.php
+++ b/login.php
@@ -7,11 +7,6 @@ use PonePaste\Helpers\SessionHelper;
 use PonePaste\Models\User;
 use PonePaste\Models\UserSession;
 
-// Current Date & User IP
-$date = date('jS F Y');
-$ip = $_SERVER['REMOTE_ADDR'];
-
-
 // Check if already logged in
 if ($current_user !== null) {
     header("Location: ./");
diff --git a/theme/bulma/archive.php b/theme/bulma/archive.php
index 6a2bb2d..c33f5ba 100644
--- a/theme/bulma/archive.php
+++ b/theme/bulma/archive.php
@@ -25,6 +25,29 @@
         padding-left: 0.25rem;
         content: '▲';
     }
+
+    .hidden {
+        display: none;
+        visibility: hidden;
+        opacity: 0;
+    }
+
+    table.hidden + .loading_container {
+        position: absolute;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        width: 100%;
+        height: 100vh;
+        z-index: 99999999;
+        background-image: url('/img/loader<?= random_int(1, 3) ?>.gif'); /* your icon gif file path */
+        background-repeat: no-repeat;
+        background-color: #FFF;
+        background-position: center;
+    }
+
+
 </style>
 
 <main class="bd-main">
@@ -55,7 +78,7 @@
                     </select>
                     &nbsp;per page
                 </div>
-                <table id="archive" class="table is-fullwidth is-hoverable">
+                <table id="archive" class="table is-fullwidth is-hoverable hidden">
                     <thead>
                     <tr class="paginator__sort">
                         <th data-sort-field="title">Title</th>
@@ -64,7 +87,6 @@
                     </tr>
                     </thead>
                     <tbody>
-<!--                        <i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Loading...</span>-->
                     <!-- Filled by DataTables -->
                     </tbody>
                     <tfoot>
@@ -75,6 +97,8 @@
                     </tr>
                     </tfoot>
                 </table>
+                <div class="loading_container">
+                </div>
 
                 <div class="paginator"></div>
             </div>
diff --git a/theme/bulma/common.php b/theme/bulma/common.php
index 2ce6f91..89bc393 100644
--- a/theme/bulma/common.php
+++ b/theme/bulma/common.php
@@ -145,7 +145,7 @@ $flashes = getFlashes();
         </header>
         <div id="logid" class="content-tab">
             <section class="modal-card-body">
-                <form method="POST" action="../login.php">
+                <form method="POST" action="/login">
                     <div class="field">
                         <label class="label">Username</label>
                         <div class="control has-icons-left has-icons-right">
@@ -181,7 +181,7 @@ $flashes = getFlashes();
         </div>
         <div id="regid" class="content-tab" style="display:none">
             <section class="modal-card-body">
-                <form method="POST" action="../login.php?register">
+                <form method="POST" action="/register">
                     <div class="field">
                         <label class="label">Username</label>
                         <div class="control has-icons-left has-icons-right">
diff --git a/theme/bulma/errors.php b/theme/bulma/errors.php
index daab53c..c5cd6bd 100644
--- a/theme/bulma/errors.php
+++ b/theme/bulma/errors.php
@@ -7,7 +7,7 @@
                     <p class="help is-danger subtitle is-6"><?= pp_html_escape($error) ?></p>
                     <?php if ($password_required): ?>
                         <h1 class="title is-5">This paste is password-protected.</h1>
-                        <form action="" method="post">
+                        <form method="post">
                             <div class="field has-addons">
                                 <div class="control">
                                     <input type="hidden" name="id" value="<?= $paste_id; ?>"/>
diff --git a/theme/bulma/login.php b/theme/bulma/login.php
index 85e364b..9674530 100644
--- a/theme/bulma/login.php
+++ b/theme/bulma/login.php
@@ -24,7 +24,7 @@
                 // Login page
                 if (isset($_GET['login'])) {
                     ?>
-                    <form action="../login.php?login" method="post">
+                    <form action="/login" method="post">
                         <div class="columns">
                             <div class="column">
                                 <h1 class="title is-4">Login</h1>
@@ -69,7 +69,7 @@
                     <?php // Registration page
                 } elseif (isset($_GET['registeraccount'])) {
                     ?>
-                    <form action="../login.php?registeraccount" method="post">
+                    <form action="/register" method="post">
                         <div class="columns">
                             <div class="column">
                                 <h1 class="title is-4">Register</h1>
@@ -126,7 +126,7 @@
                     <?php // Forgot password
                 } elseif (isset($_GET['forgotpassw'])) {
                     ?>
-                    <form action="../login.php?forgotpassw" method="post">
+                    <form action="/forgot" method="post">
                         <div class="columns">
                             <div class="column">
                                 <h1 class="title is-4">Forgot Password</h1>
diff --git a/theme/bulma/main.php b/theme/bulma/main.php
index dae9cc0..4ca2936 100644
--- a/theme/bulma/main.php
+++ b/theme/bulma/main.php
@@ -131,7 +131,7 @@
                 <h1 class="subtitle is-4">
                     New Paste
                 </h1>
-                <form name="mainForm" action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST">
+                <form method="POST">
                     <nav class="level">
                         <div class="level-left">
                             <!-- Title -->
diff --git a/theme/bulma/profile.php b/theme/bulma/profile.php
index fbe6362..25e4e6a 100644
--- a/theme/bulma/profile.php
+++ b/theme/bulma/profile.php
@@ -22,7 +22,7 @@
                 ?>
                 <hr>
                 <h1 class="title is-5">My Profile</h1>
-                <form action="<?= $_SERVER['PHP_SELF']; ?>" method="post">
+                <form method="post">
                     <div class="columns">
                         <div class="column">
                             <div class="field">
diff --git a/theme/bulma/view.php b/theme/bulma/view.php
index b15d7c4..bcc772b 100644
--- a/theme/bulma/view.php
+++ b/theme/bulma/view.php
@@ -135,7 +135,7 @@ $selectedloader = "$bg[$i]"; // set variable equal to which random filename was
                             <div class="">
                                 <div class="panel-tools">
                                     <?php if ($current_user !== null): ?>
-                                        <form action="" method="POST" class="form--inline">
+                                        <form method="POST" class="form--inline">
                                             <?php if (isset($csrf_token)): ?>
                                                 <input type="hidden" name="csrf_token" value="<?= $csrf_token ?>" />
                                             <?php endif; ?>
@@ -228,7 +228,7 @@ $selectedloader = "$bg[$i]"; // set variable equal to which random filename was
                     <!-- Paste Panel -->
                     <hr>
                     <h1 class="title is-6 mx-1">Edit Paste</h1>
-                    <form class="form-horizontal" name="mainForm" action="index.php" method="POST">
+                    <form class="form-horizontal" action="/" method="POST">
                         <nav class="level">
                             <div class="level-left">
                                 <!-- Title -->