handlers/handlersearch.cpp

@@ -25,10 +25,7 @@ Response HandlerSearch::handleRequest(const Request &r)
 	std::string q = r.get("q");
 	if(q.empty())
 	{
-		TemplatePage searchForm = this->templ->getPage("searchform");
-		response.setBody(searchForm.render());
-		response.setStatus(200);
-		return response;
+		return errorResponse("Missing search term", "No search term supplied");
 	}
 
 	auto pageDao = this->database->createPageDao();

sandbox/sandbox-linux.cpp

@@ -12,7 +12,6 @@
 #include <filesystem>
 #include <sys/mount.h>
 #include <sys/capability.h>
-#define HAVE_LANDLOCK 0
 #include <qssb.h>
 #include "../logger.h"
 #include "../utils.h"

template/quitesimple/general_header

@@ -13,10 +13,9 @@
     <li><a href="{qswiki:config:linkrecent}">Recent changes</a></li>
     <li><a href="{qswiki:config:linkallpages}">All pages</a></li>
     <li><a href="{qswiki:config:linkallcats}">All categories</a></li>
-    <li id="searchlink"><a href="{qswiki:config:linksearch}">Search</a></li>
     </ul>
 
     <ul id="right" class="search">
-	<li><div id="searchbar"><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" name="q" value="search here" onfocus="this.value=''"></form></div></li>
+	<li><div><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" name="q" value="search here" onfocus="this.value=''"></form></div></li>
 	</ul>
 </nav>

template/quitesimple/page_header

@@ -13,7 +13,6 @@
     <li><a href="{qswiki:config:linkrecent}">Recent changes</a></li>
     <li><a href="{qswiki:config:linkallpages}">All pages</a></li>
     <li><a href="{qswiki:config:linkallcats}">All categories</a></li>
-    <li id="searchlink"><a href="{qswiki:config:linksearch}">Search</a></li>
     </ul>
 
     <ul>
@@ -21,6 +20,6 @@
 	</ul>
 
     <ul id="right" class="search">
-	<li><div id="searchbar"><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" value="search here" onfocus="this.value=''" name="q"/></form></div></li>
+	<li><div><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" value="search here" onfocus="this.value=''" name="q"/></form></div></li>
 	</ul>
-</nav>
+</nav>

template/quitesimple/searchform

@@ -1,8 +0,0 @@
-{qswiki:include:general_header}
-<main id="content">
-<h2>Search</h2>
-
-Search content of pages:
-<form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" name="q" value="search here" onfocus="this.value=''"></form>
-</main>
-{qswiki:include:general_footer}

template/quitesimple/style.css

@@ -23,6 +23,7 @@ h1, h2, h3
 {
 	margin: 0;
 	padding: 0;
+        display: inline;
 }
 
 nav
@@ -36,7 +37,6 @@ nav
 	grid-area: nav;
 
 }
-
 nav ul
 {
 	background-color: #062463;
@@ -47,12 +47,16 @@ nav ul
 	display: flex;
 	align-items: center;
 	flex-wrap: wrap;
-}
 
+
+}
 nav li
 {
 	margin: 0;
 	padding: 0;
+
+
+
 }
 
 nav a, nav a:visited
@@ -64,6 +68,7 @@ nav a, nav a:visited
 	font-weight: bold;
 	text-align: center;
 	line-height: 100%;
+
 }
 
 nav a:hover, nav a:focus
@@ -76,6 +81,8 @@ nav a:hover, nav a:focus
 	font-weight: bold;
 }
 
+
+
 a, a:visited
 {
 	color: #062463;;
@@ -85,36 +92,40 @@ a:hover
 {
 	background-color: #062463;
 	color: white;
+
 }
 
 #content
 {
-	padding: 15px;
-	font-family: monospace;
-	font-size: 14pt;
-	flex: 1;
-	grid-area: main
+padding: 15px;
+font-family: monospace;
+font-size: 14pt;
+flex: 1;
+grid-area: main
 }
 
 #sidebar
 {
-	grid-area: side;
+grid-area: side;
+
 }
 
 #sidebar ul
 {
-	list-style-type: none;
+list-style-type: none;
+
 }
 
 #sidebar a, a:visited
 {
 	color: #062463;
+
 }
 
 #sidebar a:hover
 {
-	background-color: #062463;
-	color: white;
+   background-color: #062463;
+   color: white;
 }
 
 #content a, a:visited
@@ -124,10 +135,11 @@ a:hover
 
 #content a:hover
 {
-	background-color: #062463;
-	color: white;
-}
+   background-color: #062463;
+   color: white;
 
+
+}
 footer
 {
 	width: 100%;
@@ -148,7 +160,6 @@ footer ul
 	flex-wrap: wrap;
 	align-items: center;
 }
-
 footer li
 {
 	margin: 0;
@@ -157,12 +168,14 @@ footer li
 	line-height: 45px;
 	color: white;
 	font-weight: bold;
+	//flex: 1 1 0;
 	text-align: center;
 }
 
 footer a, a:visited
 {
 	text-decoration: none;
+
 	color: white;
 	display: inline-block;
 }
@@ -177,7 +190,7 @@ footer a:hover, ul#nav a:focus
 
 #cats
 {
-	background-color: #062463;
+background-color: #062463;
 }
 
 .letter_search_result
@@ -185,27 +198,20 @@ footer a:hover, ul#nav a:focus
 	text-decoration: underline;
 	font-weight: bold;
 }
-
 ol
 {
 	counter-reset: item;
 }
-
 .indexlink
 {
-	display: block;
+display: block;
 }
-
 .notexists
 {
 	color: red !important;
 	font-weight: bold;
 }
 
-#searchlink
-{
-	display: none;
-}
 
 @media screen and (orientation: portrait)
 {
@@ -213,23 +219,13 @@ ol
 	{
 		display: none;
 	}
-
 	#footer li:nth-child(-n+2)
 	{
 		display: none;
 	}
-
 	#footer li:nth-of-type(3)
 	{
 		text-align: center;
 		width: 100%;
 	}
-
-	#searchlink {
-		display: inline;
-	}
-
-	#searchbar {
-		display: none;
-	}
 }