From f25844b5802e39464c69d382bacbe56e78941e2f Mon Sep 17 00:00:00 2001
From: Kanti <git@kanti.de>
Date: Mon, 25 Aug 2014 15:39:44 +0200
Subject: [PATCH 1/2] Limit the meta description to 130 (Google's length)

---
 system/admin/views/add-page.html.php  | 2 +-
 system/admin/views/add-post.html.php  | 2 +-
 system/admin/views/edit-page.html.php | 2 +-
 system/admin/views/edit-post.html.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index c48f07f..b69573c 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -10,7 +10,7 @@
 		Title <span class="required">*</span><br><input type="text" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error';}} ?>" name="title" value="<?php if (isset($postTitle)) { echo $postTitle;} ?>"/><br><br>
 		Url (optional)<br><input type="text" class="text" name="url" value="<?php if (isset($postUrl)) { echo $postUrl;} ?>"/><br>
 		<span class="help">If the url leave empty we will use the page title.</span><br><br>
-		Meta Description (optional)<br><input type="text" class="text" name="description" value="<?php if (isset($postDescription)) { echo $postDescription;} ?>"/><br>
+		Meta Description (optional)<br><input type="text" class="text" name="description" maxlength="2" value="<?php if (isset($postDescription)) { echo $postDescription;} ?>"/><br>
 		<br>
 		<div id="wmd-button-bar" class="wmd-button-bar"></div>
 		<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error';}} ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) { echo $postContent;} ?></textarea><br/>
diff --git a/system/admin/views/add-post.html.php b/system/admin/views/add-post.html.php
index 7955a82..9e80717 100644
--- a/system/admin/views/add-post.html.php
+++ b/system/admin/views/add-post.html.php
@@ -11,7 +11,7 @@
 		Tag <span class="required">*</span> <br><input type="text" class="text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error';}} ?>" name="tag" value="<?php if (isset($postTag)) { echo $postTag;} ?>"/><br><br>
 		Url (optional)<br><input type="text" class="text" name="url" value="<?php if (isset($postUrl)) { echo $postUrl;} ?>"/><br>
 		<span class="help">If the url leave empty we will use the post title.</span><br><br>
-		Meta Description (optional)<br><input type="text" class="text" name="description" value="<?php if (isset($postDescription)) { echo $postDescription;} ?>"/><br>
+		Meta Description (optional)<br><input type="text" class="text" name="description" maxlength="2" value="<?php if (isset($postDescription)) { echo $postDescription;} ?>"/><br>
 		<br><br>
 		<div id="wmd-button-bar" class="wmd-button-bar"></div>
 		<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error';}} ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) { echo $postContent;} ?></textarea><br/>
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index 2ea895d..7c7225f 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -35,7 +35,7 @@
 	Title <span class="required">*</span><br><input type="text" name="title" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error';}} ?>" value="<?php echo $oldtitle?>"/><br><br>
 	Url (optional)<br><input type="text" name="url" class="text" value="<?php echo $oldmd ?>"/><br>
 	<span class="help">If the url leave empty we will use the page title.</span><br><br>
-	Meta Description (optional)<br><input type="text" class="text" name="description" value="<?php if (isset($p->description)) { echo $p->description;} ?>"/><br>
+	Meta Description (optional)<br><input type="text" class="text" name="description" maxlength="2" value="<?php if (isset($p->description)) { echo $p->description;} ?>"/><br>
 	<br><br>
 	<div id="wmd-button-bar" class="wmd-button-bar"></div>
 	<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error';}} ?>" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea><br>
diff --git a/system/admin/views/edit-post.html.php b/system/admin/views/edit-post.html.php
index 3b37435..fb72735 100644
--- a/system/admin/views/edit-post.html.php
+++ b/system/admin/views/edit-post.html.php
@@ -49,7 +49,7 @@
 	Tag <span class="required">*</span> <br><input type="text" name="tag" class="text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error';}} ?>" value="<?php echo $oldtag?>"/><br><br>
 	Url (optional)<br><input type="text" name="url" class="text" value="<?php echo $oldmd ?>"/><br>
 	<span class="help">If the url leave empty we will use the post title.</span><br><br>
-	Meta Description (optional)<br><input type="text" class="text" name="description" value="<?php if (isset($p->description)) { echo $p->description;} ?>"/><br>
+	Meta Description (optional)<br><input type="text" class="text" name="description" maxlength="2" value="<?php if (isset($p->description)) { echo $p->description;} ?>"/><br>
 	<br><br>
 	<div id="wmd-button-bar" class="wmd-button-bar"></div>
 	<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error';}} ?>" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea><br>

From 57911a719fafd67b18cf789a49428d4c4a2736a2 Mon Sep 17 00:00:00 2001
From: Kanti <git@kanti.de>
Date: Tue, 26 Aug 2014 07:06:21 +0200
Subject: [PATCH 2/2] Password encryption error Update the password encryption
 error during the merge was lost password === user_pass

---
 system/admin/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/admin/admin.php b/system/admin/admin.php
index 0bdfb1f..f017aba 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -20,7 +20,7 @@ function session($user, $pass, $str = null) {
     $password = (strlen($user_enc) > 0 && $user_enc !== 'clear' && $user_enc !== 'none') ? hash($user_enc, $pass) : $pass;
 
     if (file_exists($user_file)) {
-        if ($pass === $user_pass) {
+        if ($password === $user_pass) {
             $_SESSION[config("site.url")]['user'] = $user;
             header('location: admin');
         } else {