From 85834834903435c5fbb07b26bf36a27337f7a6af Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Tue, 28 Sep 2021 20:24:02 +0330
Subject: [PATCH] fixes for search page (exact search bug fix + w3 validator
 passing)

---
 GanjooRazor/Pages/Search.cshtml    | 2 +-
 GanjooRazor/Pages/Search.cshtml.cs | 9 +++++----
 GanjooRazor/appsettings.json       | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/GanjooRazor/Pages/Search.cshtml b/GanjooRazor/Pages/Search.cshtml
index 942b06e6..980fb0cf 100644
--- a/GanjooRazor/Pages/Search.cshtml
+++ b/GanjooRazor/Pages/Search.cshtml
@@ -162,7 +162,7 @@
                             </p>
                         </div>
 
-                        <img src="@($"{GanjooRazor.APIRoot.InternetUrl}{poem.Category.Poet.ImageUrl}")" alt=@($"{poem.Category.Poet.Name}") />
+                        <img src="@($"{GanjooRazor.APIRoot.InternetUrl}{poem.Category.Poet.ImageUrl}")" alt="@($"{poem.Category.Poet.Name}")" />
 
                         <div class="spacer">&nbsp;</div>
                     </div>
diff --git a/GanjooRazor/Pages/Search.cshtml.cs b/GanjooRazor/Pages/Search.cshtml.cs
index cedda461..b67fbbb7 100644
--- a/GanjooRazor/Pages/Search.cshtml.cs
+++ b/GanjooRazor/Pages/Search.cshtml.cs
@@ -246,7 +246,7 @@ namespace GanjooRazor.Pages
                         {
                             catQuery = $"&cat={Request.Query["cat"]}";
                         }
-                        PagingToolsHtml = GeneratePagingBarHtml(paginationMetadata, $"/search?s={Query}&author={PoetId}{catQuery}");
+                        PagingToolsHtml = GeneratePagingBarHtml(paginationMetadata, $"/search?s={WebUtility.UrlEncode(Query)}&amp;author={PoetId}{catQuery}");
                     }
                 }
 
@@ -262,11 +262,12 @@ namespace GanjooRazor.Pages
         {
             string htmlText = "<p style=\"text-align: center;\">";
 
+
             if (paginationMetadata != null && paginationMetadata.totalPages > 1)
             {
                 if (paginationMetadata.currentPage > 3)
                 {
-                    htmlText += $"[<a href=\"{routeStartWithQueryStrings}&page=1\">صفحهٔ اول</a>] …";
+                    htmlText += $"[<a href=\"{routeStartWithQueryStrings.Replace("\"", "%22")}&amp;page=1\">صفحهٔ اول</a>] …";
                 }
                 for (int i = (paginationMetadata.currentPage - 2); i <= (paginationMetadata.currentPage + 2); i++)
                 {
@@ -279,14 +280,14 @@ namespace GanjooRazor.Pages
                         }
                         else
                         {
-                            htmlText += $"<a href=\"{routeStartWithQueryStrings}&page={i}\">{i.ToPersianNumbers()}</a>";
+                            htmlText += $"<a href=\"{routeStartWithQueryStrings.Replace("\"", "%22")}&amp;page={i}\">{i.ToPersianNumbers()}</a>";
                         }
                         htmlText += "] ";
                     }
                 }
                 if (paginationMetadata.totalPages > (paginationMetadata.currentPage + 2))
                 {
-                    htmlText += $"… [<a href=\"{routeStartWithQueryStrings}&page={paginationMetadata.totalPages}\">صفحهٔ آخر</a>]";
+                    htmlText += $"… [<a href=\"{routeStartWithQueryStrings.Replace("\"", "%22")}&amp;page={paginationMetadata.totalPages}\">صفحهٔ آخر</a>]";
                 }
             }
 
diff --git a/GanjooRazor/appsettings.json b/GanjooRazor/appsettings.json
index 367a6d76..42b4065f 100644
--- a/GanjooRazor/appsettings.json
+++ b/GanjooRazor/appsettings.json
@@ -8,8 +8,8 @@
   },
   "AllowedHosts": "*",
   "GoogleAnalyticsCode": "",
-  "APIRoot": "http://localhost:3439",
-  "GlobalAPIRoot": "http://localhost:3439",
+  "APIRoot": "https://ganjgah.ir",
+  "GlobalAPIRoot": "https://ganjgah.ir",
   "SiteUrl": "http://localhost:33081",
   "ReadOnlyMode": "False"
 }