From 4c305903e5ab4f98aa8b828c7166652a9df1c26c Mon Sep 17 00:00:00 2001
From: Daniel Neto <me@danielneto.com>
Date: Tue, 11 Feb 2025 11:09:02 -0300
Subject: [PATCH] Improve search form

---
 plugin/YouPHPFlix2/view/modeFlixBody.php     |  3 ++-
 plugin/YouPHPFlix2/view/modeFlixCategory.php |  3 ++-
 view/include/navbarSearch.php                | 21 +++++++++-----------
 view/js/navbarLogged.js                      | 18 +++++------------
 view/js/script.js                            |  5 +++++
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/plugin/YouPHPFlix2/view/modeFlixBody.php b/plugin/YouPHPFlix2/view/modeFlixBody.php
index a63ebbc8c587..2b9b6ad7ebfd 100644
--- a/plugin/YouPHPFlix2/view/modeFlixBody.php
+++ b/plugin/YouPHPFlix2/view/modeFlixBody.php
@@ -482,6 +482,7 @@
     <?php
     }
     if ($obj->Categories) {
+        $videoFound = true; // it will be decided inside the infinity scroll
         $url = "{$global['webSiteRootURL']}plugin/YouPHPFlix2/view/modeFlixCategory.php";
         if (!empty($_REQUEST['catName'])) {
             $url = addQueryStringParameter($url, 'catName', $_REQUEST['catName']);
@@ -505,7 +506,7 @@
                 <i class="fas fa-spinner fa-pulse text-muted"></i>
             </div>
         </div>
-        <script src="<?php echo getCDN(); ?>node_modules/infinite-scroll/dist/infinite-scroll.pkgd.min.js" type="text/javascript"></script>
+        <script src="<?php echo getURL('node_modules/infinite-scroll/dist/infinite-scroll.pkgd.min.js'); ?>" type="text/javascript"></script>
         <script>
             $(document).ready(function() {
                 $container = $('#categoriesContainer').infiniteScroll({
diff --git a/plugin/YouPHPFlix2/view/modeFlixCategory.php b/plugin/YouPHPFlix2/view/modeFlixCategory.php
index 09c18ac6be44..0686f439933c 100644
--- a/plugin/YouPHPFlix2/view/modeFlixCategory.php
+++ b/plugin/YouPHPFlix2/view/modeFlixCategory.php
@@ -135,6 +135,7 @@
     }
     TimeLogEnd($timeLog, __LINE__);
     if (empty($videosCounter)) {
+        include_once __DIR__.'/notFoundHTML.php';
         echo "</div>";
         return false;
     }
@@ -165,4 +166,4 @@
 ObjectYPT::setCache($cacheName, $cache);
 
 echo str_replace('{serie_uid}', uniqid(), $cache);
-?>
\ No newline at end of file
+?>
diff --git a/view/include/navbarSearch.php b/view/include/navbarSearch.php
index ac5ceb9854a9..8ddd20f027b1 100644
--- a/view/include/navbarSearch.php
+++ b/view/include/navbarSearch.php
@@ -2,24 +2,20 @@
     <div class="navbar-header">
 
         <div class="navbar-header">
-            <button type="button" class="visible-xs navbar-toggle btn btn-default navbar-btn faa-parent animated-hover animate__animated animate__bounceIn" data-toggle="collapse" data-target="#mysearch" style="padding: 6px 12px;">
+            <button type="button" class="visible-xs navbar-toggle btn btn-default navbar-btn faa-parent animated-hover" data-toggle="collapse" data-target="#mysearch" style="padding: 6px 12px;">
                 <span class="fa fa-search faa-shake"></span>
             </button>
         </div>
         <div class="input-group" id="mysearch">
             <form class="navbar-form form-inline input-group" role="search" id="searchForm" method="get" action="<?php echo $global['webSiteRootURL']; ?>">
                 <span class="input-group-prepend">
-                    <button type="button" id="filterButton" 
-                            class="btn btn-default navbar-btn dropdown-toggle faa-parent animated-hover animate__animated animate__bounceIn" 
+                    <button type="button" id="filterButton"
+                            class="btn btn-default navbar-btn dropdown-toggle"
                             data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="fas fa-sliders-h"></i>
                     </button>
                 </span>
-                <input class="form-control globalsearchfield" type="text" value="<?php
-                if (!empty($_GET['search'])) {
-                    echo htmlentities($_GET['search']);
-                }
-                ?>" name="search" placeholder="<?php echo __("Search"); ?>" id="searchFormInput">
+                <input class="form-control globalsearchfield" type="text" name="search" placeholder="<?php echo __("Search"); ?>" id="searchFormInput">
                 <span class="input-group-append">
                     <button class="btn btn-default btn-outline-secondary border-right-0 border py-2 faa-parent animated-hover" type="submit" id="buttonSearch" data-toggle="collapse" data-target="#mysearch">
                         <i class="fas fa-search faa-shake notLoadingIcon"></i>
@@ -42,7 +38,7 @@ class="btn btn-default navbar-btn dropdown-toggle faa-parent animated-hover anim
     var searchSelectedTagVal = '';
     var searchSelectedCategory = '';
     var searchSelectedTag = '';
-    
+
     function updateSearchSelectedValues() {
         searchTotalSelectedSearchIn = $('#search-tab .form-check-input:checked').length;
         searchSelectedCategoryVal = $('#filter-tab .form-check-input:checked').val();
@@ -50,12 +46,13 @@ function updateSearchSelectedValues() {
         searchSelectedCategory = $('#filter-tab .form-check-input:checked').parent().find('.form-check-label').html();
         searchSelectedTag = $('#filter-tags-tab .form-check-input:checked').parent().find('.form-check-label').html();
     }
-    
+
     $(document).ready(function () {
         $('#filterButton').click(function () {
             $('#filterDropdown').toggleClass('show');
         });
         setSearchFilterIcon();
+        $("#searchFormInput").val(getSearchParam("search"));
     });
     function setSearchFilterIcon() {
         updateSearchSelectedValues();
@@ -71,5 +68,5 @@ function setSearchFilterIcon() {
             $('#filterButton').addClass('active');
         }
     }
-    
-</script>
\ No newline at end of file
+
+</script>
diff --git a/view/js/navbarLogged.js b/view/js/navbarLogged.js
index 175512b06966..4167b7dbbe30 100644
--- a/view/js/navbarLogged.js
+++ b/view/js/navbarLogged.js
@@ -71,7 +71,8 @@ $(document).ready(function () {
     $("#buttonSearch").click(function (event) {
         event.stopPropagation();
         if (isSearchOpen()) {
-            closeSearchMenu();
+            modal.showPleaseWait();
+            //closeSearchMenu();
         } else {
             openSearchMenu();
         }
@@ -109,7 +110,6 @@ $(document).ready(function () {
             $(selector).attr('aria-expanded', 'false');
 
             $("#mysearch").css({ display: '' });
-            $("#mysearch").removeClass('animate__bounceOutUp');
         }
     });
 });
@@ -149,26 +149,18 @@ async function openRightMenu() {
     }
     var selector = '#buttonMyNavbar svg';
     $(selector).addClass('active');
-    $("#myNavbar").removeClass('animate__bounceOutRight');
     $("#myNavbar").show();
-    $("#myNavbar").addClass('animate__animated animate__bounceInRight');
 }
 
 async function closeSearchMenu() {
-    $("#mysearch").removeClass('animate__bounceInDown');
-    $("#mysearch").addClass('animate__bounceOutUp');
-    setTimeout(function () {
-        $("#mysearch").hide();
-    }, 500);
+    $("#mysearch").hide();
 }
 async function openSearchMenu() {
     if (isScreeWidthCollapseSize()) {
         closeLeftMenu();
         closeRightMenu();
     }
-    $("#mysearch").removeClass('animate__bounceOutUp');
     $("#mysearch").show();
-    $("#mysearch").addClass('animate__animated animate__bounceInDown');
 }
 
 async function seachFormPlayURL(url) {
@@ -200,7 +192,7 @@ async function seachFormPlayURL(url) {
 }
 
 function isSearchOpen() {
-    return $('#mysearch').hasClass('animate__bounceInDown');
+    return $("#mysearch").is(":visible");
 }
 function isMyNMavbarOpen() {
     return $('#myNavbar').hasClass('animate__bounceInRight');
@@ -319,4 +311,4 @@ $(document).ready(function () {
     setTimeout(function () {
         flickityReload();
     }, 5000);
-});
\ No newline at end of file
+});
diff --git a/view/js/script.js b/view/js/script.js
index 55aa219ad651..6721b110bbd9 100644
--- a/view/js/script.js
+++ b/view/js/script.js
@@ -86,6 +86,7 @@ if (window.navigator.standalone || window.matchMedia('(display-mode: standalone)
     document.body.classList.add('pwa');
 }
 
+
 var queryString = window.location.search;
 var urlParams = new URLSearchParams(queryString);
 
@@ -93,6 +94,10 @@ if (urlParams.has('debug')) {
     isDebuging = false;
 }
 
+function getSearchParam(param) {
+    return urlParams.get(param) || "";
+}
+
 function forwardToIframe(data) {
     var iframe = document.getElementById('avideoModalIframe'); // Get the iframe by ID
     if (iframe && iframe.contentWindow) {