From 5085bf24353d8adfbfb492c1c3d93711f06b987a Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Sun, 9 Jun 2013 23:28:47 +0200
Subject: [PATCH 1/2] Don't pick up guest users when logging in

---
 public_html/classes/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/classes/user.php b/public_html/classes/user.php
index 4b72e81..bbdf9a5 100644
--- a/public_html/classes/user.php
+++ b/public_html/classes/user.php
@@ -122,7 +122,7 @@ class User extends CPHPDatabaseRecordClass
 	
 	public static function FindByUsername($username)
 	{
-		return self::CreateFromQuery("SELECT * FROM users WHERE `Username` = :Username", array(':Username' => $username), 0, true);
+		return self::CreateFromQuery("SELECT * FROM users WHERE `Username` = :Username AND `Guest` = 0", array(':Username' => $username), 0, true);
 	}
 	
 	public function MarkCurrentItemDone()

From c42e78bfbefd244bf3d5b6cee717b79bb9287704 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Sun, 9 Jun 2013 23:59:03 +0200
Subject: [PATCH 2/2] Add sidebar stuff

---
 public_html/static/style.css   | 10 ++++++++
 public_html/templates/list.tpl | 42 +++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/public_html/static/style.css b/public_html/static/style.css
index a6b2498..1ba5dcc 100644
--- a/public_html/static/style.css
+++ b/public_html/static/style.css
@@ -159,6 +159,16 @@ ul.tasks .task .type.must, .type-marker.must
 	color: #2F2F2F;
 }
 
+.no-header
+{
+	padding-top: 27px;
+}
+
+.sidebar
+{
+	font-size: 14px;
+}
+
 /* From HTML Kickstart */
 .clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}
 .clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0}
diff --git a/public_html/templates/list.tpl b/public_html/templates/list.tpl
index 5596178..1d65fce 100644
--- a/public_html/templates/list.tpl
+++ b/public_html/templates/list.tpl
@@ -56,7 +56,7 @@
 				</div>
 			</div>
 			
-			<div class="pure-u-1">
+			<div class="pure-u-5-8">
 				<div class="stuff">
 					<h2>Your other tasks...</h2>
 					<ul class="tasks">
@@ -86,6 +86,46 @@
 					</ul>
 				</div>
 			</div>
+			<div class="pure-u-3-8">
+				<div class="stuff no-header sidebar">
+					<p>
+						<strong>Confused?</strong> Don't be! It's quite simple.
+					</p>
+					<p>
+						Add a new task with the form on your left. If it's something you <em>have</em> to do - for example,
+						a chore or some kind of work - select the <strong>MUST</strong> type. 
+					</p>
+					<p>
+						If it's something you <em>want</em> to do - say, a hobby project or generally something non-urgent 
+						that you want to do soon - select the <strong>WANT</strong> type.
+					</p>
+					<p>
+						The app will assign you a new task every time you finish one. To balance between work and play, it'll
+						alternate between <strong>MUST</strong> and <strong>WANT</strong> tasks. 
+					</p>
+					<p>
+						If you get a <strong>WANT</strong> assignment and you don't like it, you can swap it for another random 
+						one - but you can't skip the <strong>MUST</strong> assignments!
+					</p>
+					<p>
+						<strong>Questions?</strong> E-mail me at <a href="mailto:todo@cryto.net">todo@cryto.net</a> or add me on 
+						XMPP: joepie91@neko.im.
+					</p>
+					<p>
+						<strong>Donations are very much appreciated.</strong> This is a free service, without ads, data mining,
+						or any other kind of forced 'monetization'. As I only write open-source code, my income is very limited 
+						and even small voluntary donations are tremendously helpful.
+					</p>
+					<p>
+						You can <a href="http://cryto.net/~joepie91/donate.html">make a voluntary donation</a> via Bitcoin, PayPal 
+						or Flattr. You can also <a href="http://cryto.net/~joepie91">click to learn more</a> about what kind of 
+						things I work on.
+					</p>
+					<p>
+						The source code can be found <a href="http://github.com/joepie91/todo">here</a>.
+					</p>
+				</div>
+			</div>
 		</div>
 		<div id="modal_login" class="modal">
 			<form class="pure-form pure-form-aligned" method="post" action="/login">