From 2efc146a7e0f2c8daa1108b1c009fc9fdb8630e6 Mon Sep 17 00:00:00 2001
From: themohooks <81331307+themohooks@users.noreply.github.com>
Date: Thu, 18 Jul 2024 16:13:50 +0300
Subject: [PATCH] fixes

---
 .gitignore                                    |  3 +-
 .../Api/Admin/Images/SetVisibility.php        |  2 +-
 app/Core/Routes.php                           |  2 +-
 views/components/AdminSidebar.php             |  4 +--
 views/pages/Admin/Index.php                   |  9 ++++++
 views/pages/Admin/Photo.php                   | 28 ++++++++++++++++++-
 views/pages/Rules.php                         |  2 +-
 7 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1650713..08507e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ ngallery.yaml
 ngallery.yaml
 /views/pages/t.php
 views/pages/t.php
-rules.txt
\ No newline at end of file
+rules.txt
+rules.txt
diff --git a/app/Controllers/Api/Admin/Images/SetVisibility.php b/app/Controllers/Api/Admin/Images/SetVisibility.php
index 4bc2cfd..30cc3e3 100644
--- a/app/Controllers/Api/Admin/Images/SetVisibility.php
+++ b/app/Controllers/Api/Admin/Images/SetVisibility.php
@@ -12,7 +12,7 @@ class SetVisibility
 {
     public function __construct()
     {
-        DB::query('UPDATE photos SET moderated=:mod WHERE id=:id', array(':id'=>$_GET['id'], ':mod'=>$_GET['mod']));
+        DB::query('UPDATE photos SET moderated=:mod, timeupload=:time WHERE id=:id', array(':id'=>$_GET['id'], ':mod'=>$_GET['mod'], ':time'=>time()));
         header('Location: ' . $_SERVER['HTTP_REFERER']);
     }
 }
\ No newline at end of file
diff --git a/app/Core/Routes.php b/app/Core/Routes.php
index 6573208..8e283a5 100644
--- a/app/Core/Routes.php
+++ b/app/Core/Routes.php
@@ -42,7 +42,7 @@ class Routes
             Router::get('/api/photo/comment/rate', 'ApiController@photocommentvote');
             if ($user->i('admin') > 0) {
                 Router::any('/admin', 'AdminController@index');
-                Router::any('/api/admin/images/setvisibility', 'AdminController@adminsetvis');
+                Router::any('/api/admin/images/setvisibility', 'ApiController@adminsetvis');
             }
             Router::get('/logout', 'MainController@logout');
             Router::get('/404', 'ExceptionRegister@notfound');
diff --git a/views/components/AdminSidebar.php b/views/components/AdminSidebar.php
index a70fa73..1c0a61c 100644
--- a/views/components/AdminSidebar.php
+++ b/views/components/AdminSidebar.php
@@ -5,12 +5,12 @@ use \App\Core\Page;
 
 <ul class="list-unstyled fw-normal pb-1 small">
 
-    <li><a style="font-size: 17.2px; margin-bottom: 15px; color: <?php if (!Page::exists('Settings/' . $_GET['type']) || !isset($_GET['type'])) { ?> #3862eb <?php } else { ?> #aca8a9 <?php } ?> !important; font-weight: 500;" href="/settings" class="d-inline-flex align-items-center rounded active text-black" aria-current="page">
+    <li><a style="font-size: 17.2px; margin-bottom: 15px; color: <?php if (!Page::exists('Admin/' . $_GET['type']) || !isset($_GET['type'])) { ?> #3862eb <?php } else { ?> #aca8a9 <?php } ?> !important; font-weight: 500;" href="/admin" class="d-inline-flex align-items-center rounded active text-black" aria-current="page">
             <div style="border-left:3px solid #ffffff00; margin-left: -25px; margin-right: 20px; height:20px; border-radius: 500px;"></div>
 
 
 
-            <svg style="margin-right: 10px; margin-left: -12px; margin-bottom: -5px;" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="<?php if (!Page::exists('Settings/' . $_GET['type']) || !isset($_GET['type'])) { ?> #3862eb <?php } else { ?> #aca8a9 <?php } ?>">
+            <svg style="margin-right: 10px; margin-left: -12px; margin-bottom: -5px;" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="<?php if (!Page::exists('Admin/' . $_GET['type']) || !isset($_GET['type'])) { ?> #3862eb <?php } else { ?> #aca8a9 <?php } ?>">
                 <g>
                     <path d="M0,0h24v24H0V0z" fill="none" />
                 </g>
diff --git a/views/pages/Admin/Index.php b/views/pages/Admin/Index.php
index 213cc2c..f8f2c83 100644
--- a/views/pages/Admin/Index.php
+++ b/views/pages/Admin/Index.php
@@ -1,5 +1,14 @@
 <?php
 use App\Services\{Router, Auth};
+
+$user = new \App\Models\User(Auth::userid());
+
+if (!isset($_GET['type']) || $_GET['type'] != 'Photo') {
+    if ($user->i('admin') === 2) {
+        header('Location: ?type=Photo');
+    }
+}
+
 ?>
 <!DOCTYPE html>
 <html lang="ru">
diff --git a/views/pages/Admin/Photo.php b/views/pages/Admin/Photo.php
index e51954d..ee75093 100644
--- a/views/pages/Admin/Photo.php
+++ b/views/pages/Admin/Photo.php
@@ -8,6 +8,32 @@ use \App\Models\User;
 
 
 <tr>
+    <style>
+    #sbmt {
+        display: inline-block;
+    box-sizing: border-box;
+    vertical-align: middle;
+    cursor: pointer;
+    position: relative;
+    padding: 2px 15px 3px;
+    height: auto;
+    text-align: center;
+    font-family: var(--narrow-font);
+    font-size: 17px;
+    font-weight: bold;
+    color: var(--theme-fg-color);
+    background-color: #777;
+    background-color: var(--theme-bg-color);
+    transition: none;
+    border: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    border-radius: 0;
+    -webkit-border-radius: 0;
+    }
+    </style>
                 <td class="main">
                     <h1>Журнал</h1>
                     <script src="/js/diff.js"></script>
@@ -57,7 +83,7 @@ use \App\Models\User;
                                     <td class="c">
                                    ';
                                    if ($p['moderated'] === 0) {
-                                    echo ' <div class="cmt-submit"><input type="submit" value="Принять" id="sbmt"></div><div style="font-size: 11px;"><input style="background-color:red !important; margin-top: 15px;" type="submit" value="Отклонить" id="sbmt"></div>';
+                                    echo ' <div class="cmt-submit"><a href="/api/admin/images/setvisibility?id='.$p['id'].'&mod=1" id="sbmt">Принять</a></div><div style="font-size: 11px;"><a href="/api/admin/images/setvisibility?id='.$p['id'].'&mod=1" style="background-color:red !important; margin-top: 15px;" type="submit" id="sbmt">Отклонить</a></div>';
                                    }
                                    echo '
                                     </td>';
diff --git a/views/pages/Rules.php b/views/pages/Rules.php
index 0f9d677..9069d93 100644
--- a/views/pages/Rules.php
+++ b/views/pages/Rules.php
@@ -25,7 +25,7 @@ use \App\Models\User;
 
                     <?php
                     $myfile = fopen($_SERVER['DOCUMENT_ROOT'].'/rules.txt', "r") or die("Unable to open file!");
-                    echo fread($myfile,filesize($_SERVER['DOCUMENT_ROOT'].'/rules.txt'));
+                    echo nl2br(fread($myfile,filesize($_SERVER['DOCUMENT_ROOT'].'/rules.txt')));
                     fclose($myfile);
                     ?>
                 </div>