From 3f20a0e96389718242cb7b017d90465c6d526a07 Mon Sep 17 00:00:00 2001
From: themohooks <81331307+themohooks@users.noreply.github.com>
Date: Tue, 9 Jul 2024 00:00:18 +0300
Subject: [PATCH] fix bugs

---
 app/Models/Comment.php              | 2 +-
 views/pages/Photo.php               | 7 ++++++-
 views/pages/Profile/UploadPhoto.php | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Models/Comment.php b/app/Models/Comment.php
index 827ae9e..98f9158 100644
--- a/app/Models/Comment.php
+++ b/app/Models/Comment.php
@@ -40,7 +40,7 @@ class Comment {
                                 <div class="comment-votes-block">
                                     <div class="wvote" wid="'.$this->c['id'].'">
                                     <a href="#" vote="1" class="w-btn s2"><span>+</span></a>
-                                        <div class="w-rating '.$commclass.'">'.$symb.Vote::countcommrates($this->c['id'], -1).'</div>
+                                        <div class="w-rating '.$commclass.' active">'.$symb.Vote::countcommrates($this->c['id'], -1).'</div>
                                         <div class="w-rating-ext">
                                             <div><span class="pro">+'.Vote::countcommrates($this->c['id'], 1).'</span> / <span class="con">'.Vote::countcommrates($this->c['id'], 0).'</span></div>
                                         </div>
diff --git a/views/pages/Photo.php b/views/pages/Photo.php
index c75b787..022f5c6 100644
--- a/views/pages/Photo.php
+++ b/views/pages/Photo.php
@@ -196,9 +196,12 @@ if ($photo->i('id') !== null) {
 
 
                 </td>
+              
                 <td id="pp-main-col">
                     <div id="pp-item-vdata">
-
+                    <?php
+                if ($photo->content('type') != 'none') {
+                    ?>
                         <div class="p0" id="pp-item-exif">
                             <h4 class="pp-item-header">Параметры съёмки</h4>
                             <div class="pp-item-body">
@@ -227,6 +230,7 @@ if ($photo->i('id') !== null) {
                                 </table>
                             </div>
                         </div>
+                        <?php } ?>
                         <?php
                         if ($photo->content('lat') != null && $photo->content('lng') != null) { ?>
                         <div class="p0" id="pp-item-exif">
@@ -331,6 +335,7 @@ marker.bindPopup("<b>Выбранная точка</b>").openPopup();
                             window.location.replace(jsonData.twofaurl);
                         }, 1000);
                     } else if (jsonData.errorcode == "0") {
+                        $('#wtext').val('');
                         Notify.noty('success', 'Комментарий отправлен!');
                         //$("#result").html("<div class='alert alert-successnew container mt-5' role='alert'>Успешный вход!</div>");
                         $.ajax({
diff --git a/views/pages/Profile/UploadPhoto.php b/views/pages/Profile/UploadPhoto.php
index 0d9e595..b346b6b 100644
--- a/views/pages/Profile/UploadPhoto.php
+++ b/views/pages/Profile/UploadPhoto.php
@@ -852,7 +852,7 @@ $user = new User(Auth::userid());
             var percent = $('.percent');
             var status = $('#status');
             var continuepost = 0;
-
+            $('#submitbtn').prop("disabled", true);
 
 
 
@@ -891,6 +891,7 @@ $user = new User(Auth::userid());
                         Notify.noty('danger', escapeHtml(err.message));
                         $("#r").html('<button type="submit" id="register" name="loginaccount" class="btn btn-block btn-primary py-2 ripple-handler mt-1 mb-3">Опубликовать<span class="ripple-mask"><span class="ripple" style=""></span></span></button>');
                         scrollProgressBarWidth(0);
+                        $('#submitbtn').prop("disabled", false);
                     }
 
                     if (jsonData.errorcode == "1") {
@@ -901,6 +902,7 @@ $user = new User(Auth::userid());
                         //$("#prgrsg").html('<div id="prgrs" class="progress-bar progress-bar-striped progress-bar-animated bg-danger" role="progressbar" aria-valuenow="0" aria-valuemin="100" aria-valuemax="100" style="width: 100%">100%</div>');
                         Notify.noty('danger', 'В посте нет контента!');
                         scrollProgressBarWidth(0);
+                        $('#submitbtn').prop("disabled", false);
 
                     } else if (jsonData.errorcode == "101") {
                         $("#r").html('<button type="submit" id="register" name="loginaccount" class="btn btn-block btn-primary py-2 ripple-handler mt-1 mb-3">Опубликовать<span class="ripple-mask"><span class="ripple" style=""></span></span></button>');
@@ -909,6 +911,7 @@ $user = new User(Auth::userid());
                         $("#prgrsg").html('');
                         //$("#prgrsg").html('<div id="prgrs" class="progress-bar progress-bar-striped progress-bar-animated bg-danger" role="progressbar" aria-valuenow="0" aria-valuemin="100" aria-valuemax="100" style="width: 100%">100%</div>');
                         Notify.noty('danger', 'В посте больше 10 медиафайлов');
+                        $('#submitbtn').prop("disabled", false);
                         scrollProgressBarWidth(0);
                     } else if (jsonData.errorcode == "0") {
                         Notify.noty('success', 'Успешная публикация!');
@@ -945,6 +948,7 @@ $user = new User(Auth::userid());
                         //$("#prgrsg").html('<div id="prgrs" class="progress-bar progress-bar-striped progress-bar-animated bg-danger" role="progressbar" aria-valuenow="0" aria-valuemin="100" aria-valuemax="100" style="width: 100%">100%</div>');
                         Notify.noty('danger', 'Неизвестная ошибка');
                         scrollProgressBarWidth(0);
+                        $('#submitbtn').prop("disabled", false);
                     }
                 },
                 error: function(xhr, status, error) {
@@ -954,6 +958,7 @@ $user = new User(Auth::userid());
                     //$("#prgrsg").html('<div id="prgrs" class="progress-bar progress-bar-striped progress-bar-animated bg-danger" role="progressbar" aria-valuenow="0" aria-valuemin="100" aria-valuemax="100" style="width: 100%">100%</div>');
                     Notify.noty('danger', 'Не удалось опубликовать пост');
                     scrollProgressBarWidth(0);
+                    $('#submitbtn').prop("disabled", false);
                 },
                 cache: false,
                 contentType: false,