From e82faca5219eccf1b59b1356e8436f1f0c6dd9d2 Mon Sep 17 00:00:00 2001
From: themohooks <81331307+themohooks@users.noreply.github.com>
Date: Fri, 21 Feb 2025 00:31:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B0=D1=82=D1=87=20=D0=BD=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=80=20=D0=BE=D0=B4=D0=B8=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Images/Contests/SendPretend.php           | 15 ++++++++++++---
 views/pages/Admin/Contests.php                    | 10 ++++++----
 views/pages/Contests/VotingSendPretend.php        |  4 +++-
 views/pages/Contests/VotingWaiting.php            |  3 ++-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/Api/Images/Contests/SendPretend.php b/app/Controllers/Api/Images/Contests/SendPretend.php
index 466dda2..e944374 100644
--- a/app/Controllers/Api/Images/Contests/SendPretend.php
+++ b/app/Controllers/Api/Images/Contests/SendPretend.php
@@ -12,11 +12,20 @@ class SendPretend
 {
     public function __construct()
     {
-        if (DB::query('SELECT contest_id FROM photos WHERE user_id=:uid', array(':uid' => Auth::userid()))[0]['contest_id'] != $_POST['cid']) {
-            DB::query('UPDATE photos SET on_contest=1, contest_id=:id WHERE id=:idd', array(':id' => $_POST['cid'], ':idd' => $_POST['photo_id']));
+        if (isset($_POST['cid'])) {
+            if (DB::query('SELECT contest_id FROM photos WHERE user_id=:uid', array(':uid' => Auth::userid()))[0]['contest_id'] != $_POST['cid']) {
+                DB::query('UPDATE photos SET on_contest=1, contest_id=:id WHERE id=:idd', array(':id' => $_POST['cid'], ':idd' => $_POST['photo_id']));
+                echo json_encode(
+                    array(
+                        'errorcode' => 0,
+                        'error' => 0
+                    )
+                );
+            }
+        } else {
             echo json_encode(
                 array(
-                    'errorcode' => 0,
+                    'errorcode' => 1,
                     'error' => 0
                 )
             );
diff --git a/views/pages/Admin/Contests.php b/views/pages/Admin/Contests.php
index 2476a67..35c2c4d 100644
--- a/views/pages/Admin/Contests.php
+++ b/views/pages/Admin/Contests.php
@@ -129,10 +129,12 @@ if (!$task->isTaskExists("ExecContests", "php ".$_SERVER['DOCUMENT_ROOT'].$task-
                     <div class="mb-3">
                         <label for="exampleFormControlTextarea1" class="form-label">Тематика</label>
                         <select name="themeid" class="form-select" aria-label="Default select example">
-                            <option selected>Open this select menu</option>
-                            <option value="1">One</option>
-                            <option value="2">Two</option>
-                            <option value="3">Three</option>
+                            <?php
+                            $themes = DB::query('SELECT * FROM contests_themes');
+                            foreach ($themes as $t) {
+                                echo '<option value="'.$t['id'].'">'.$t['title'].'</option>';
+                            }
+                            ?>
                         </select>
                     </div>
                     <div class="row">
diff --git a/views/pages/Contests/VotingSendPretend.php b/views/pages/Contests/VotingSendPretend.php
index f6211e5..36da071 100644
--- a/views/pages/Contests/VotingSendPretend.php
+++ b/views/pages/Contests/VotingSendPretend.php
@@ -116,7 +116,7 @@ function convertUnixToRussianDateTime($unixTime)
                                             $photos = DB::query('SELECT * FROM photos WHERE user_id=:uid AND on_contest=0', array(':uid' => Auth::userid()));
                                             foreach ($photos as $p) {
                                                 $content = json_decode($p['content'], true);
-                                                if ($content['video'] === null) {
+                                                if (($content['video'] === null || $content['type'] === 'image') && $p['moderated'] === 1) {
                                                     echo '<option photourl="/api/photo/compress?url=' . $p['photourl'] . '" value="' . $p['id'] . '">[ID: ' . $p['id'] . '] ' . $p['place'] . '</option>';
                                                 }
                                             }
@@ -153,6 +153,8 @@ function convertUnixToRussianDateTime($unixTime)
                     var jsonData = JSON.parse(response);
                     if (jsonData.errorcode === 0) {
                         alert('Фотография успешно отправлена на претенденты на Фотоконкурс');
+                    } else {
+                        alert('Пожалуйста, выберите Фотоконкурс на который вы хотите отправить фотографию!');
                     }
                     
                 }
diff --git a/views/pages/Contests/VotingWaiting.php b/views/pages/Contests/VotingWaiting.php
index 21afccf..76ef056 100644
--- a/views/pages/Contests/VotingWaiting.php
+++ b/views/pages/Contests/VotingWaiting.php
@@ -38,6 +38,7 @@ WHERE p.on_contest = 1 AND p.contest_id = :id
 GROUP BY p.id
 ORDER BY rates_count DESC;
 ', array(':id'=>$contest['id']));
+var_dump($photos_contest);
                         foreach ($photos_contest as $pc) {
 							$user = new User($pc['user_id']);
 							if (VoteContest::photo(Auth::userid(), $pc['id'], $contest['id']) === 1) {
@@ -64,7 +65,7 @@ ORDER BY rates_count DESC;
 									</td>
 									<td class="pb_photo" id="p2072294"><a href="/photo/'.$pc['id'].'" target="_blank" class="prw"><img class="f" src="/api/photo/compress?url='.$pc['photourl'].'" alt="597 КБ" style="display: inline;">
 											<div class="hpshade">
-												<div class="eye-icon">'.DB::query('SELECT COUNT(*) FROM photos_views WHERE photo_id=:id', array(':id'=>$p['id']))[0]['COUNT(*)'].'</div>
+												<div class="eye-icon">'.DB::query('SELECT COUNT(*) FROM photos_views WHERE photo_id=:id', array(':id'=>$pc['id']))[0]['COUNT(*)'].'</div>
 											</div>
 										</a></td>
 									<td class="pb_descr">