From a5d0a3f9ef85c0707ae3211bb85be89c1ac829f1 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Mon, 18 Nov 2013 14:00:54 +0100
Subject: [PATCH] HTML validation

---
 lib/chibi-core                     | 2 +-
 src/Controllers/PostController.php | 4 ++--
 src/Controllers/TagController.php  | 2 +-
 src/Views/index-index.phtml        | 8 ++++----
 src/Views/layout-normal.phtml      | 2 +-
 src/Views/user-settings.phtml      | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/chibi-core b/lib/chibi-core
index bf824e78..5008621b 160000
--- a/lib/chibi-core
+++ b/lib/chibi-core
@@ -1 +1 @@
-Subproject commit bf824e781c520a85a82394622a5fefd5c178379f
+Subproject commit 5008621b75431073ca8dd6537a112c9f95436e54
diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
index bfadf93b..f9521066 100644
--- a/src/Controllers/PostController.php
+++ b/src/Controllers/PostController.php
@@ -80,12 +80,12 @@ class PostController
 			$this->context->transport->searchQuery = $formQuery;
 			if (strpos($formQuery, '/') !== false)
 				throw new SimpleException('Search query contains invalid characters');
-			$url = \Chibi\UrlHelper::route('post', 'list', ['source' => $source, 'additionalInfo' => $additionalInfo, 'query' => urlencode($formQuery)]);
+			$url = \Chibi\UrlHelper::route('post', 'list', ['source' => $source, 'additionalInfo' => $additionalInfo, 'query' => $formQuery]);
 			\Chibi\UrlHelper::forward($url);
 			return;
 		}
 
-		$query = trim(urldecode($query));
+		$query = trim($query);
 		$page = intval($page);
 		$postsPerPage = intval($this->config->browsing->postsPerPage);
 		$this->context->subTitle = 'posts';
diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php
index 9f0f4f86..ab0458c1 100644
--- a/src/Controllers/TagController.php
+++ b/src/Controllers/TagController.php
@@ -126,7 +126,7 @@ class TagController
 				$suppliedQuery = ' ';
 			$suppliedTag = InputHelper::get('tag');
 			$suppliedTag = Model_Tag::validateTag($suppliedTag);
-			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('post', 'list', ['source' => 'mass-tag', 'query' => urlencode($suppliedQuery), 'additionalInfo' => $suppliedTag]));
+			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('post', 'list', ['source' => 'mass-tag', 'query' => $suppliedQuery, 'additionalInfo' => $suppliedTag]));
 		}
 	}
 }
diff --git a/src/Views/index-index.phtml b/src/Views/index-index.phtml
index 754746ba..205af2bf 100644
--- a/src/Views/index-index.phtml
+++ b/src/Views/index-index.phtml
@@ -13,7 +13,7 @@
 	</div>
 
 	<div class="footer">
-		<span class="left">
+		<div class="left">
 			Tags:&nbsp;
 			<ul class="tags">
 			<?php foreach ($this->context->featuredPost->sharedTag as $tag): ?>
@@ -24,9 +24,9 @@
 				</li>
 			<?php endforeach ?>
 			</ul>
-		</span>
+		</div>
 
-		<span class="right">
+		<div class="right">
 			Featured&#32;
 			<?php if ($this->context->featuredPostUser): ?>
 				by <a href="<?php echo \Chibi\UrlHelper::route('user', 'view', ['name' => $this->context->featuredPostUser->name]) ?>"><?php echo $this->context->featuredPostUser->name ?></a>,&#32;
@@ -39,7 +39,7 @@
 			<?php else: ?>
 				<?php printf('%d days ago', $x) ?>
 			<?php endif ?>
-		</span>
+		</div>
 
 		<div class="clear"></div>
 	</div>
diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml
index 55349003..4e259005 100644
--- a/src/Views/layout-normal.phtml
+++ b/src/Views/layout-normal.phtml
@@ -103,7 +103,7 @@
 				<?php endif ?>
 				<span><a href="<?php echo SZURU_LINK ?>">szurubooru v<?php echo SZURU_VERSION ?></a></span>
 				<?php if (PrivilegesHelper::confirm(Privilege::ListLogs)): ?>
-					<span><a href="<?php echo \Chibi\UrlHelper::route('log', 'list') ?>">Logs</span>
+					<span><a href="<?php echo \Chibi\UrlHelper::route('log', 'list') ?>">Logs</a></span>
 				<?php endif ?>
 			</div>
 		</footer>
diff --git a/src/Views/user-settings.phtml b/src/Views/user-settings.phtml
index 4f1fd1b9..77f571f3 100644
--- a/src/Views/user-settings.phtml
+++ b/src/Views/user-settings.phtml
@@ -1,6 +1,6 @@
 <form action="<?php echo \Chibi\UrlHelper::route('user', 'settings', ['name' => $this->context->transport->user->name]) ?>" method="post" class="settings aligned">
 	<div class="safety">
-		<label class="left" for="name">Safety:</label>
+		<label class="left">Safety:</label>
 		<div class="input-wrapper">
 			<?php foreach (PostSafety::getAll() as $safety): ?>
 				<?php if (PrivilegesHelper::confirm(Privilege::ListPosts, PostSafety::toString($safety))): ?>
@@ -12,10 +12,10 @@
 	</div>
 
 	<div class="endless-scrolling">
-		<label class="left" for="name">Endless scrolling:</label>
+		<label class="left" for="endless-scrolling">Endless scrolling:</label>
 		<div class="input-wrapper">
 			<label>
-				<input type="checkbox" name="endless-scrolling" <?php if ($this->context->transport->user->hasEnabledEndlessScrolling()) echo ' checked="checked"' ?>/>
+				<input type="checkbox" id="endless-scrolling" name="endless-scrolling" <?php if ($this->context->transport->user->hasEnabledEndlessScrolling()) echo ' checked="checked"' ?>/>
 				Enabled
 			</label>
 		</div>