From 0316cf0602eb76e6c2a4302fc5250d2ce9485d46 Mon Sep 17 00:00:00 2001
From: Kanti <git@kanti.de>
Date: Mon, 11 Aug 2014 20:26:46 +0200
Subject: [PATCH 1/3] custom Description added

---
 system/htmly.php              |  83 +++++++++++++--------------
 system/includes/functions.php | 127 +++++++++++++++++++-----------------------
 2 files changed, 96 insertions(+), 114 deletions(-)

diff --git a/system/htmly.php b/system/htmly.php
index 062b18b..f67f333 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -108,7 +108,7 @@ post('/login', function() {
     }
 });
 
-get("/:static/:sub/edit", function($static,$sub) {
+get("/:static/:sub/edit", function($static, $sub) {
 
     if (login()) {
 
@@ -120,8 +120,8 @@ get("/:static/:sub/edit", function($static,$sub) {
         }
 
         $post = $post[0];
-        
-        $page = get_static_sub_post($static,$sub);
+
+        $page = get_static_sub_post($static, $sub);
 
         if (!$page) {
             not_found();
@@ -141,22 +141,20 @@ get("/:static/:sub/edit", function($static,$sub) {
         header("location: $login");
     }
 });
-post("/:static/:sub/edit", function($static,$sub) {
+post("/:static/:sub/edit", function($static, $sub) {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
-    if(!login())
-    {
+    if (!login()) {
         $login = site_url() . 'login';
-        header("location: $login");   
+        header("location: $login");
     }
-    
+
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
     $oldfile = from($_REQUEST, 'oldfile');
     $destination = from($_GET, 'destination');
-    if($destination === null)
-    {
+    if ($destination === null) {
         $destination = $static . "/" . $sub;
     }
     if ($proper && !empty($title) && !empty($content)) {
@@ -192,7 +190,7 @@ post("/:static/:sub/edit", function($static,$sub) {
     }
 });
 
-get("/:static/:sub/delete",  function($static,$sub) {
+get("/:static/:sub/delete", function($static, $sub) {
 
     if (login()) {
 
@@ -205,7 +203,7 @@ get("/:static/:sub/delete",  function($static,$sub) {
 
         $post = $post[0];
 
-        $page = get_static_sub_post($static,$sub);
+        $page = get_static_sub_post($static, $sub);
 
         if (!$page) {
             not_found();
@@ -238,8 +236,7 @@ post("/:static/:sub/delete", function() {
 // The blog post page
 get('/:year/:month/:name', function($year, $month, $name) {
 
-    if(config("views.counter") != "true")
-    {
+    if (config("views.counter") != "true") {
         if (!login()) {
             file_cache($_SERVER['REQUEST_URI']);
         }
@@ -252,9 +249,8 @@ get('/:year/:month/:name', function($year, $month, $name) {
     if (!$current) {
         not_found();
     }
-    
-    if(config("views.counter") == "true")
-    {
+
+    if (config("views.counter") == "true") {
         add_view($current->file);
 
         if (!login()) {
@@ -283,7 +279,7 @@ get('/:year/:month/:name', function($year, $month, $name) {
     }
 
     render('post', array(
-        'head_contents' => head_contents($current->title . ' - ' . blog_title(), $description = get_description($current->body), $current->url),
+        'head_contents' => head_contents($current->title . ' - ' . blog_title(), $current->description, $current->url),
         'p' => $current,
         'authorinfo' => authorinfo($bio->title, $bio->body),
         'bodyclass' => 'inpost',
@@ -452,9 +448,11 @@ get('/author/:profile', function($profile) {
         $bio = default_profile($profile);
     }
 
+    $description = 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.';
+
     if (empty($posts) || $page < 1) {
         render('profile', array(
-            'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.', site_url() . 'author/' . $profile),
+            'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), $description, site_url() . 'author/' . $profile),
             'page' => $page,
             'posts' => null,
             'bio' => $bio->body,
@@ -467,7 +465,7 @@ get('/author/:profile', function($profile) {
     }
 
     render('profile', array(
-        'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.', site_url() . 'author/' . $profile),
+        'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), $description, site_url() . 'author/' . $profile),
         'page' => $page,
         'posts' => $posts,
         'bio' => $bio->body,
@@ -704,14 +702,13 @@ get('/:static', function($static) {
         }
         die;
     } else {
-        
-        if( config("views.counter") != "true")
-        {
+
+        if (config("views.counter") != "true") {
             if (!login()) {
                 file_cache($_SERVER['REQUEST_URI']);
             }
         }
-        
+
         $post = get_static_post($static);
 
         if (!$post) {
@@ -720,8 +717,7 @@ get('/:static', function($static) {
 
         $post = $post[0];
 
-        if(config("views.counter") == "true")
-        {
+        if (config("views.counter") == "true") {
             add_view($post->file);
             if (!login()) {
                 file_cache($_SERVER['REQUEST_URI']);
@@ -729,7 +725,7 @@ get('/:static', function($static) {
         }
 
         render('static', array(
-            'head_contents' => head_contents($post->title . ' - ' . blog_title(), $description = get_description($post->body), $post->url),
+            'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
             'bodyclass' => 'inpage',
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $post->title,
             'p' => $post,
@@ -769,12 +765,11 @@ get('/:static/edit', function($static) {
 post('/:static/edit', function() {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
-    if(!login())
-    {
+    if (!login()) {
         $login = site_url() . 'login';
-        header("location: $login");   
+        header("location: $login");
     }
-    
+
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
@@ -1238,14 +1233,13 @@ get('/:static/add', function($static) {
         config('views.root', 'system/admin/views');
 
         $post = get_static_post($static);
-        
-        if(! $post)
-        {
+
+        if (!$post) {
             not_found();
         }
-        
+
         $post = $post[0];
-        
+
         render('add-page', array(
             'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
             'bodyclass' => 'addpage',
@@ -1294,29 +1288,28 @@ post('/:static/add', function($static) {
     }
 });
 
-get('/:static/:sub', function($static,$sub) {
-    
+get('/:static/:sub', function($static, $sub) {
+
     $father_post = get_static_post($static);
     if (!$father_post) {
         not_found();
     }
-    $post = get_static_sub_post($static,$sub);
+    $post = get_static_sub_post($static, $sub);
     if (!$post) {
         not_found();
     }
     $post = $post[0];
-    
-	if(config("views.counter") == "true")
-	{
-		add_view($post->file);
-	}
+
+    if (config("views.counter") == "true") {
+        add_view($post->file);
+    }
 
     if (!login()) {
         file_cache($_SERVER['REQUEST_URI']);
     }
 
     render('static', array(
-        'head_contents' => head_contents($post->title . ' - ' . blog_title(), $description = get_description($post->body), $post->url),
+        'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
         'bodyclass' => 'inpage',
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $father_post[0]->url . '">' . $father_post[0]->title . '</a> &#187; ' . $post->title,
         'p' => $post,
diff --git a/system/includes/functions.php b/system/includes/functions.php
index ee15f08..6bf654e 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -16,7 +16,7 @@ function get_post_unsorted() {
     if (empty($_unsorted)) {
 
         $url = 'cache/index/index-unsorted.txt';
-        if(! file_exists($url)) {
+        if (!file_exists($url)) {
             rebuilt_cache('all');
         }
         $_unsorted = unserialize(file_get_contents($url));
@@ -31,7 +31,7 @@ function get_post_sorted() {
 
     if (empty($_sorted)) {
         $url = 'cache/index/index-sorted.txt';
-        if(! file_exists($url)) {
+        if (!file_exists($url)) {
             rebuilt_cache('all');
         }
         $_sorted = unserialize(file_get_contents($url));
@@ -46,7 +46,7 @@ function get_static_pages() {
 
     if (empty($_page)) {
         $url = 'cache/index/index-page.txt';
-        if(! file_exists($url)) {
+        if (!file_exists($url)) {
             rebuilt_cache('all');
         }
         $_page = unserialize(file_get_contents($url));
@@ -61,18 +61,16 @@ function get_static_sub_pages($static = null) {
 
     if (empty($_sub_page)) {
         $url = 'cache/index/index-sub-page.txt';
-        if(! file_exists($url)) {
+        if (!file_exists($url)) {
             rebuilt_cache('all');
         }
         $_sub_page = unserialize(file_get_contents($url));
     }
-    if($static != null)
-    {
+    if ($static != null) {
         $stringLen = strlen($static);
-        return array_filter($_sub_page, function($sub_page)use($static,$stringLen){
-            $x = explode("/",$sub_page);
-            if($x[count($x)-2] == $static)
-            {
+        return array_filter($_sub_page, function($sub_page)use($static, $stringLen) {
+            $x = explode("/", $sub_page);
+            if ($x[count($x) - 2] == $static) {
                 return true;
             }
             return false;
@@ -88,7 +86,7 @@ function get_author_names() {
 
     if (empty($_author)) {
         $url = 'cache/index/index-author.txt';
-        if(! file_exists($url)) {
+        if (!file_exists($url)) {
             rebuilt_cache('all');
         }
         $_author = unserialize(file_get_contents($url));
@@ -245,14 +243,15 @@ function get_posts($posts, $page = 1, $perpage = 0) {
         $content = MarkdownExtra::defaultTransform(file_get_contents($filepath));
 
         // Extract the title and body
-        $post->title = get_content_tag('t',$content,'Untitled: ' . date('l jS \of F Y', $post->date));
+        $post->title = get_content_tag('t', $content, 'Untitled: ' . date('l jS \of F Y', $post->date));
         $post->body = remove_html_comments($content);
 
-        if(config("views.counter"))
-        {
+        if (config("views.counter")) {
             $post->views = get_views($post->file);
         }
 
+        $post->description = get_content_tag("d", $content, get_description($post->body));
+
         $tmp[] = $post;
     }
 
@@ -413,9 +412,11 @@ function get_bio($author) {
                 $content = MarkdownExtra::defaultTransform(file_get_contents($v));
 
                 // Extract the title and body
-                $post->title = get_content_tag('t',$content,$author);
+                $post->title = get_content_tag('t', $content, $author);
                 $post->body = remove_html_comments($content);
 
+                $post->description = get_content_tag("d", $content, get_description($post->body));
+
                 $tmp[] = $post;
             }
         }
@@ -436,6 +437,8 @@ function default_profile($author) {
     $profile->title = $author;
     $profile->body = '<p>Just another HTMLy user.</p>';
 
+    $profile->descirption = 'Just another HTMLy user';
+
     return $tmp[] = $profile;
 }
 
@@ -466,14 +469,15 @@ function get_static_post($static) {
                 $content = MarkdownExtra::defaultTransform(file_get_contents($v));
 
                 // Extract the title and body
-                $post->title = get_content_tag('t',$content,$static);
+                $post->title = get_content_tag('t', $content, $static);
                 $post->body = remove_html_comments($content);
-                
-                if(config("views.counter"))
-                {
+
+                if (config("views.counter")) {
                     $post->views = get_views($post->file);
                 }
-                
+
+                $post->description = get_content_tag("d", $content, get_description($post->body));
+
                 $tmp[] = $post;
             }
         }
@@ -481,11 +485,12 @@ function get_static_post($static) {
 
     return $tmp;
 }
+
 // Return static page.
-function get_static_sub_post($static,$sub_static) {
+function get_static_sub_post($static, $sub_static) {
 
     $posts = get_static_sub_pages($static);
-    
+
     $tmp = array();
 
     if (!empty($posts)) {
@@ -508,11 +513,13 @@ function get_static_sub_post($static,$sub_static) {
                 $content = MarkdownExtra::defaultTransform(file_get_contents($v));
 
                 // Extract the title and body
-                $post->title = get_content_tag('t',$content,$sub_static);
+                $post->title = get_content_tag('t', $content, $sub_static);
                 $post->body = remove_html_comments($content);
-                
+
                 $post->views = get_views($post->file);
 
+                $post->description = get_content_tag("d", $content, get_description($post->body));
+
                 $tmp[] = $post;
             }
         }
@@ -1050,8 +1057,7 @@ function menu() {
     }
 }
 
-function get_title_from_file($v)
-{
+function get_title_from_file($v) {
     // Get the contents and convert it to HTML
     $content = MarkdownExtra::defaultTransform(file_get_contents($v));
 
@@ -1059,12 +1065,11 @@ function get_title_from_file($v)
     $base = str_replace($replaced, '', $v);
 
     // Extract the title and body
-    return get_content_tag('t',$content,str_replace('-', ' ', str_replace('.md', '', $base)));
+    return get_content_tag('t', $content, str_replace('-', ' ', str_replace('.md', '', $base)));
 }
 
 // Auto generate menu from static page
 function get_menu() {//aktive Link for Sub Pages ::TODO
-
     $posts = get_static_pages();
     $req = $_SERVER['REQUEST_URI'];
 
@@ -1105,29 +1110,25 @@ function get_menu() {//aktive Link for Sub Pages ::TODO
                 $active = '';
             }
             echo '<li class="' . $class . $active . '">';
-            
+
             $subPages = get_static_sub_pages(str_replace('.md', '', $base));
             echo '<a href="' . $url . '">' . ucwords($title) . '</a><br/>';
-            if(!empty($subPages))
-            {
+            if (!empty($subPages)) {
                 echo '<ul>';
-                
+
                 $iSub = 0;
                 $countSub = count($subPages);
-                foreach($subPages as $index => $sp)
-                {
+                foreach ($subPages as $index => $sp) {
                     $classSub = "item";
-                    if($iSub == 0)
-                    {
+                    if ($iSub == 0) {
                         $classSub .= " first";
                     }
-                    if($iSub == $countSub -1)
-                    {
+                    if ($iSub == $countSub - 1) {
                         $classSub .= " last";
                     }
                     $replacedSub = substr($sp, 0, strrpos($sp, '/')) . '/';
                     $baseSub = str_replace($replacedSub, '', $sp);
-                    
+
                     if ($req == site_path() . "/" . str_replace('.md', '', $base) . "/" . str_replace('.md', '', $baseSub)) {
                         $classSub .= ' active';
                     }
@@ -1644,52 +1645,40 @@ function is_csrf_proper($csrf_token) {
     return false;
 }
 
-function add_view($page)
-{
+function add_view($page) {
     $filename = "cache/count.json";
     $views = array();
-    if(file_exists($filename))
-    {
-        $views = json_decode(file_get_contents($filename),true);
+    if (file_exists($filename)) {
+        $views = json_decode(file_get_contents($filename), true);
     }
-    if(isset($views[$page]))
-    {
-        $views[$page]++;
-    }
-    else
-    {
+    if (isset($views[$page])) {
+        $views[$page] ++;
+    } else {
         $views[$page] = 1;
     }
-    file_put_contents($filename,json_encode($views));
+    file_put_contents($filename, json_encode($views));
 }
 
-function get_views($page)
-{
+function get_views($page) {
     static $_views = array();
-    
-    if(empty($_views))
-    {
+
+    if (empty($_views)) {
         $filename = "cache/count.json";
-        if(file_exists($filename))
-        {
-            $_views = json_decode(file_get_contents($filename),true);
+        if (file_exists($filename)) {
+            $_views = json_decode(file_get_contents($filename), true);
         }
     }
-    if(isset($_views[$page]))
-    {
+    if (isset($_views[$page])) {
         return $_views[$page];
     }
     return -1;
 }
 
-function get_content_tag($tag, $string, $alt = null)
-{
-    $reg = '/\<!--'.$tag.'(.+)'.$tag.'--\>/';
+function get_content_tag($tag, $string, $alt = null) {
+    $reg = '/\<!--' . $tag . '(.+)' . $tag . '--\>/';
     $ary = array();
-    if(preg_match($reg, $string, $ary))
-    {
-        if(isset($ary[1]))
-        {
+    if (preg_match($reg, $string, $ary)) {
+        if (isset($ary[1])) {
             return trim($ary[1]);
         }
     }
@@ -1699,4 +1688,4 @@ function get_content_tag($tag, $string, $alt = null)
 function remove_html_comments($content) {
     //return $content;
     return trim(preg_replace('/(\s|)<!--(.*)-->(\s|)/', '', $content));
-}
\ No newline at end of file
+}

From 4a7c57503e177997a0c833eb742751624833b1d8 Mon Sep 17 00:00:00 2001
From: Kanti <git@kanti.de>
Date: Mon, 11 Aug 2014 20:47:37 +0200
Subject: [PATCH 2/3] $_REQUEST ready

---
 system/admin/admin.php        |  47 ++++++++++++-----
 system/htmly.php              | 116 +++++++++++++++++++++++-------------------
 system/includes/functions.php |   1 -
 3 files changed, 100 insertions(+), 64 deletions(-)

diff --git a/system/admin/admin.php b/system/admin/admin.php
index 47d469d..10e32db 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -39,14 +39,18 @@ function remove_accent($str) {
 }
 
 // Edit blog posts
-function edit_post($title, $tag, $url, $content, $oldfile, $destination = null) {
-
+function edit_post($title, $tag, $url, $content, $oldfile, $destination = null, $description = null) {
     $oldurl = explode('_', $oldfile);
 
     $post_title = $title;
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
-    $post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
+    if ($description !== null) {
+        $post_description = "<!--d " . $description . " d-->";
+    } else {
+        $post_description = "";
+    }
+    $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {
@@ -85,13 +89,17 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null)
 }
 
 // Edit static page
-function edit_page($title, $url, $content, $oldfile, $destination = null) {
-
+function edit_page($title, $url, $content, $oldfile, $destination = null, $description = null) {
     $dir = substr($oldfile, 0, strrpos($oldfile, '/'));
 
     $post_title = $title;
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
-    $post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
+    if ($description !== null) {
+        $post_description = "\n<!--d " . $description . " d-->";
+    } else {
+        $post_description = '';
+    }
+    $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
 
     if (!empty($post_title) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {
@@ -119,13 +127,18 @@ function edit_page($title, $url, $content, $oldfile, $destination = null) {
 }
 
 // Add blog post
-function add_post($title, $tag, $url, $content, $user) {
+function add_post($title, $tag, $url, $content, $user, $desciption = null) {
 
     $post_date = date('Y-m-d-H-i-s');
     $post_title = $title;
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
-    $post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
+    if ($description !== null) {
+        $post_description = "<!--d " . $description . " d-->";
+    } else {
+        $post_description = "";
+    }
+    $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {
@@ -148,11 +161,16 @@ function add_post($title, $tag, $url, $content, $user) {
 }
 
 // Add static page
-function add_page($title, $url, $content) {
+function add_page($title, $url, $content, $description = null) {
 
     $post_title = $title;
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
-    $post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
+    if ($description !== null) {
+        $post_description = "<!--d " . $description . " d-->";
+    } else {
+        $post_description = "";
+    }
+    $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
 
     if (!empty($post_title) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {
@@ -175,11 +193,16 @@ function add_page($title, $url, $content) {
 }
 
 // Add static sub page
-function add_sub_page($title, $url, $content, $static) {
+function add_sub_page($title, $url, $content, $static, $description = null) {
 
     $post_title = $title;
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
-    $post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $content;
+    if ($description !== null) {
+        $post_description = "<!--d " . $description . " d-->";
+    } else {
+        $post_description = "";
+    }
+    $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
 
     if (!empty($post_title) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {
diff --git a/system/htmly.php b/system/htmly.php
index f67f333..5fca369 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -108,7 +108,7 @@ post('/login', function() {
     }
 });
 
-get("/:static/:sub/edit", function($static, $sub) {
+get("/:static/:sub/edit", function($static,$sub) {
 
     if (login()) {
 
@@ -120,8 +120,8 @@ get("/:static/:sub/edit", function($static, $sub) {
         }
 
         $post = $post[0];
-
-        $page = get_static_sub_post($static, $sub);
+        
+        $page = get_static_sub_post($static,$sub);
 
         if (!$page) {
             not_found();
@@ -141,28 +141,31 @@ get("/:static/:sub/edit", function($static, $sub) {
         header("location: $login");
     }
 });
-post("/:static/:sub/edit", function($static, $sub) {
+post("/:static/:sub/edit", function($static,$sub) {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
-    if (!login()) {
+    if(!login())
+    {
         $login = site_url() . 'login';
-        header("location: $login");
+        header("location: $login");   
     }
-
+    
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
     $oldfile = from($_REQUEST, 'oldfile');
     $destination = from($_GET, 'destination');
-    if ($destination === null) {
+    $description = from($_REQUEST, 'description');
+    if($destination === null)
+    {
         $destination = $static . "/" . $sub;
     }
     if ($proper && !empty($title) && !empty($content)) {
         if (!empty($url)) {
-            edit_page($title, $url, $content, $oldfile, $destination);
+            edit_page($title, $url, $content, $oldfile, $destination, $description);
         } else {
             $url = $title;
-            edit_page($title, $url, $content, $oldfile, $destination);
+            edit_page($title, $url, $content, $oldfile, $destination, $description);
         }
     } else {
         $message['error'] = '';
@@ -190,7 +193,7 @@ post("/:static/:sub/edit", function($static, $sub) {
     }
 });
 
-get("/:static/:sub/delete", function($static, $sub) {
+get("/:static/:sub/delete",  function($static,$sub) {
 
     if (login()) {
 
@@ -203,7 +206,7 @@ get("/:static/:sub/delete", function($static, $sub) {
 
         $post = $post[0];
 
-        $page = get_static_sub_post($static, $sub);
+        $page = get_static_sub_post($static,$sub);
 
         if (!$page) {
             not_found();
@@ -236,7 +239,8 @@ post("/:static/:sub/delete", function() {
 // The blog post page
 get('/:year/:month/:name', function($year, $month, $name) {
 
-    if (config("views.counter") != "true") {
+    if(config("views.counter") != "true")
+    {
         if (!login()) {
             file_cache($_SERVER['REQUEST_URI']);
         }
@@ -249,8 +253,9 @@ get('/:year/:month/:name', function($year, $month, $name) {
     if (!$current) {
         not_found();
     }
-
-    if (config("views.counter") == "true") {
+    
+    if(config("views.counter") == "true")
+    {
         add_view($current->file);
 
         if (!login()) {
@@ -279,7 +284,7 @@ get('/:year/:month/:name', function($year, $month, $name) {
     }
 
     render('post', array(
-        'head_contents' => head_contents($current->title . ' - ' . blog_title(), $current->description, $current->url),
+        'head_contents' => head_contents($current->title . ' - ' . blog_title(), $description = get_description($current->body), $current->url),
         'p' => $current,
         'authorinfo' => authorinfo($bio->title, $bio->body),
         'bodyclass' => 'inpost',
@@ -339,12 +344,13 @@ post('/:year/:month/:name/edit', function() {
     $content = from($_REQUEST, 'content');
     $oldfile = from($_REQUEST, 'oldfile');
     $destination = from($_GET, 'destination');
+    $description = from($_REQUEST, 'description');
     if ($proper && !empty($title) && !empty($tag) && !empty($content)) {
         if (!empty($url)) {
-            edit_post($title, $tag, $url, $content, $oldfile, $destination);
+            edit_post($title, $tag, $url, $content, $oldfile, $destination, $description);
         } else {
             $url = $title;
-            edit_post($title, $tag, $url, $content, $oldfile, $destination);
+            edit_post($title, $tag, $url, $content, $oldfile, $destination, $description);
         }
     } else {
         $message['error'] = '';
@@ -448,11 +454,9 @@ get('/author/:profile', function($profile) {
         $bio = default_profile($profile);
     }
 
-    $description = 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.';
-
     if (empty($posts) || $page < 1) {
         render('profile', array(
-            'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), $description, site_url() . 'author/' . $profile),
+            'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.', site_url() . 'author/' . $profile),
             'page' => $page,
             'posts' => null,
             'bio' => $bio->body,
@@ -465,7 +469,7 @@ get('/author/:profile', function($profile) {
     }
 
     render('profile', array(
-        'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), $description, site_url() . 'author/' . $profile),
+        'head_contents' => head_contents('Profile for:  ' . $bio->title . ' - ' . blog_title(), 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.', site_url() . 'author/' . $profile),
         'page' => $page,
         'posts' => $posts,
         'bio' => $bio->body,
@@ -501,8 +505,9 @@ post('/edit/profile', function() {
     $user = $_SESSION[config("site.url")]['user'];
     $title = from($_REQUEST, 'title');
     $content = from($_REQUEST, 'content');
+    $description = from($_REQUEST, 'description');
     if ($proper && !empty($title) && !empty($content)) {
-        edit_profile($title, $content, $user);
+        edit_profile($title, $content, $user, $description);
     } else {
         $message['error'] = '';
         if (empty($title)) {
@@ -702,13 +707,14 @@ get('/:static', function($static) {
         }
         die;
     } else {
-
-        if (config("views.counter") != "true") {
+        
+        if( config("views.counter") != "true")
+        {
             if (!login()) {
                 file_cache($_SERVER['REQUEST_URI']);
             }
         }
-
+        
         $post = get_static_post($static);
 
         if (!$post) {
@@ -717,7 +723,8 @@ get('/:static', function($static) {
 
         $post = $post[0];
 
-        if (config("views.counter") == "true") {
+        if(config("views.counter") == "true")
+        {
             add_view($post->file);
             if (!login()) {
                 file_cache($_SERVER['REQUEST_URI']);
@@ -725,7 +732,7 @@ get('/:static', function($static) {
         }
 
         render('static', array(
-            'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
+            'head_contents' => head_contents($post->title . ' - ' . blog_title(), $description = get_description($post->body), $post->url),
             'bodyclass' => 'inpage',
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $post->title,
             'p' => $post,
@@ -765,22 +772,24 @@ get('/:static/edit', function($static) {
 post('/:static/edit', function() {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
-    if (!login()) {
+    if(!login())
+    {
         $login = site_url() . 'login';
-        header("location: $login");
+        header("location: $login");   
     }
-
+    
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
     $oldfile = from($_REQUEST, 'oldfile');
     $destination = from($_GET, 'destination');
+    $description = from($_REQUEST, 'description');
     if ($proper && !empty($title) && !empty($content)) {
         if (!empty($url)) {
-            edit_page($title, $url, $content, $oldfile, $destination);
+            edit_page($title, $url, $content, $oldfile, $destination, $description);
         } else {
             $url = $title;
-            edit_page($title, $url, $content, $oldfile, $destination);
+            edit_page($title, $url, $content, $oldfile, $destination, $description);
         }
     } else {
         $message['error'] = '';
@@ -873,13 +882,14 @@ post('/add/post', function() {
     $tag = from($_REQUEST, 'tag');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
+    $description = from($_REQUEST, 'description');
     $user = $_SESSION[config("site.url")]['user'];
     if ($proper && !empty($title) && !empty($tag) && !empty($content)) {
         if (!empty($url)) {
-            add_post($title, $tag, $url, $content, $user);
+            add_post($title, $tag, $url, $content, $user, $description);
         } else {
             $url = $title;
-            add_post($title, $tag, $url, $content, $user);
+            add_post($title, $tag, $url, $content, $user, $description);
         }
     } else {
         $message['error'] = '';
@@ -935,12 +945,13 @@ post('/add/page', function() {
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
+    $description = from($_REQUEST, 'description');
     if ($proper && !empty($title) && !empty($content) && login()) {
         if (!empty($url)) {
-            add_page($title, $url, $content);
+            add_page($title, $url, $content, $description);
         } else {
             $url = $title;
-            add_page($title, $url, $content);
+            add_page($title, $url, $content, $description);
         }
     } else {
         $message['error'] = '';
@@ -1233,13 +1244,14 @@ get('/:static/add', function($static) {
         config('views.root', 'system/admin/views');
 
         $post = get_static_post($static);
-
-        if (!$post) {
+        
+        if(! $post)
+        {
             not_found();
         }
-
+        
         $post = $post[0];
-
+        
         render('add-page', array(
             'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
             'bodyclass' => 'addpage',
@@ -1257,12 +1269,13 @@ post('/:static/add', function($static) {
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
+    $description = from($_REQUEST, 'description');
     if ($proper && !empty($title) && !empty($content) && login()) {
         if (!empty($url)) {
-            add_sub_page($title, $url, $content, $static);
+            add_sub_page($title, $url, $content, $static, $description);
         } else {
             $url = $title;
-            add_sub_page($title, $url, $content, $static);
+            add_sub_page($title, $url, $content, $static, $description);
         }
     } else {
         $message['error'] = '';
@@ -1288,28 +1301,29 @@ post('/:static/add', function($static) {
     }
 });
 
-get('/:static/:sub', function($static, $sub) {
-
+get('/:static/:sub', function($static,$sub) {
+    
     $father_post = get_static_post($static);
     if (!$father_post) {
         not_found();
     }
-    $post = get_static_sub_post($static, $sub);
+    $post = get_static_sub_post($static,$sub);
     if (!$post) {
         not_found();
     }
     $post = $post[0];
-
-    if (config("views.counter") == "true") {
-        add_view($post->file);
-    }
+    
+	if(config("views.counter") == "true")
+	{
+		add_view($post->file);
+	}
 
     if (!login()) {
         file_cache($_SERVER['REQUEST_URI']);
     }
 
     render('static', array(
-        'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
+        'head_contents' => head_contents($post->title . ' - ' . blog_title(), $description = get_description($post->body), $post->url),
         'bodyclass' => 'inpage',
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $father_post[0]->url . '">' . $father_post[0]->title . '</a> &#187; ' . $post->title,
         'p' => $post,
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 6bf654e..faf7b47 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1686,6 +1686,5 @@ function get_content_tag($tag, $string, $alt = null) {
 }
 
 function remove_html_comments($content) {
-    //return $content;
     return trim(preg_replace('/(\s|)<!--(.*)-->(\s|)/', '', $content));
 }

From f81b68db2d6e47a589cc2a112bc3c76c18ebaed2 Mon Sep 17 00:00:00 2001
From: Kanti <git@kanti.de>
Date: Tue, 12 Aug 2014 06:40:04 +0200
Subject: [PATCH 3/3] Finished Feature custom meta description

---
 system/admin/admin.php                   |  8 ++--
 system/admin/views/add-page.html.php     |  5 ++-
 system/admin/views/add-post.html.php     |  3 +-
 system/admin/views/edit-page.html.php    |  2 +
 system/admin/views/edit-post.html.php    |  3 +-
 system/admin/views/edit-profile.html.php |  2 +
 system/htmly.php                         | 77 ++++++++++++++------------------
 7 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/system/admin/admin.php b/system/admin/admin.php
index 10e32db..f002a00 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -46,7 +46,7 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null,
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
-        $post_description = "<!--d " . $description . " d-->";
+        $post_description = "\n<!--d " . $description . " d-->";
     } else {
         $post_description = "";
     }
@@ -134,7 +134,7 @@ function add_post($title, $tag, $url, $content, $user, $desciption = null) {
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
-        $post_description = "<!--d " . $description . " d-->";
+        $post_description = "\n<!--d " . $description . " d-->";
     } else {
         $post_description = "";
     }
@@ -166,7 +166,7 @@ function add_page($title, $url, $content, $description = null) {
     $post_title = $title;
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
-        $post_description = "<!--d " . $description . " d-->";
+        $post_description = "\n<!--d " . $description . " d-->";
     } else {
         $post_description = "";
     }
@@ -198,7 +198,7 @@ function add_sub_page($title, $url, $content, $static, $description = null) {
     $post_title = $title;
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
-        $post_description = "<!--d " . $description . " d-->";
+        $post_description = "\n<!--d " . $description . " d-->";
     } else {
         $post_description = "";
     }
diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index 5875bee..c48f07f 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -9,8 +9,9 @@
 	<form method="POST">
 		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>
+		<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>
+		<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/>
 		<input type="hidden" name="csrf_token" value="<?php echo get_csrf()?>">
diff --git a/system/admin/views/add-post.html.php b/system/admin/views/add-post.html.php
index c0f9eae..7955a82 100644
--- a/system/admin/views/add-post.html.php
+++ b/system/admin/views/add-post.html.php
@@ -10,7 +10,8 @@
 		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>
 		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>
+		<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>
 		<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 76e4863..2ea895d 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -35,6 +35,8 @@
 	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>
+	<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>
 	<input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
diff --git a/system/admin/views/edit-post.html.php b/system/admin/views/edit-post.html.php
index 8d3762f..3b37435 100644
--- a/system/admin/views/edit-post.html.php
+++ b/system/admin/views/edit-post.html.php
@@ -48,7 +48,8 @@
 	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>
 	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>
+	<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>
 	<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-profile.html.php b/system/admin/views/edit-profile.html.php
index 1b0a611..8bda830 100644
--- a/system/admin/views/edit-profile.html.php
+++ b/system/admin/views/edit-profile.html.php
@@ -28,6 +28,8 @@
 <div class="wmd-panel">
 <form method="POST">
 	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>
+	Meta Description (optional)<br><input type="text" class="text" name="description" 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 echo $oldcontent ?></textarea><br>
 	<input type="hidden" name="csrf_token" value="<?php echo get_csrf()?>">
diff --git a/system/htmly.php b/system/htmly.php
index 5fca369..1db5edb 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -108,7 +108,7 @@ post('/login', function() {
     }
 });
 
-get("/:static/:sub/edit", function($static,$sub) {
+get("/:static/:sub/edit", function($static, $sub) {
 
     if (login()) {
 
@@ -120,8 +120,8 @@ get("/:static/:sub/edit", function($static,$sub) {
         }
 
         $post = $post[0];
-        
-        $page = get_static_sub_post($static,$sub);
+
+        $page = get_static_sub_post($static, $sub);
 
         if (!$page) {
             not_found();
@@ -141,23 +141,21 @@ get("/:static/:sub/edit", function($static,$sub) {
         header("location: $login");
     }
 });
-post("/:static/:sub/edit", function($static,$sub) {
+post("/:static/:sub/edit", function($static, $sub) {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
-    if(!login())
-    {
+    if (!login()) {
         $login = site_url() . 'login';
-        header("location: $login");   
+        header("location: $login");
     }
-    
+
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
     $oldfile = from($_REQUEST, 'oldfile');
     $destination = from($_GET, 'destination');
     $description = from($_REQUEST, 'description');
-    if($destination === null)
-    {
+    if ($destination === null) {
         $destination = $static . "/" . $sub;
     }
     if ($proper && !empty($title) && !empty($content)) {
@@ -193,7 +191,7 @@ post("/:static/:sub/edit", function($static,$sub) {
     }
 });
 
-get("/:static/:sub/delete",  function($static,$sub) {
+get("/:static/:sub/delete", function($static, $sub) {
 
     if (login()) {
 
@@ -206,7 +204,7 @@ get("/:static/:sub/delete",  function($static,$sub) {
 
         $post = $post[0];
 
-        $page = get_static_sub_post($static,$sub);
+        $page = get_static_sub_post($static, $sub);
 
         if (!$page) {
             not_found();
@@ -239,8 +237,7 @@ post("/:static/:sub/delete", function() {
 // The blog post page
 get('/:year/:month/:name', function($year, $month, $name) {
 
-    if(config("views.counter") != "true")
-    {
+    if (config("views.counter") != "true") {
         if (!login()) {
             file_cache($_SERVER['REQUEST_URI']);
         }
@@ -253,9 +250,8 @@ get('/:year/:month/:name', function($year, $month, $name) {
     if (!$current) {
         not_found();
     }
-    
-    if(config("views.counter") == "true")
-    {
+
+    if (config("views.counter") == "true") {
         add_view($current->file);
 
         if (!login()) {
@@ -284,7 +280,7 @@ get('/:year/:month/:name', function($year, $month, $name) {
     }
 
     render('post', array(
-        'head_contents' => head_contents($current->title . ' - ' . blog_title(), $description = get_description($current->body), $current->url),
+        'head_contents' => head_contents($current->title . ' - ' . blog_title(), $current->description, $current->url),
         'p' => $current,
         'authorinfo' => authorinfo($bio->title, $bio->body),
         'bodyclass' => 'inpost',
@@ -707,14 +703,13 @@ get('/:static', function($static) {
         }
         die;
     } else {
-        
-        if( config("views.counter") != "true")
-        {
+
+        if (config("views.counter") != "true") {
             if (!login()) {
                 file_cache($_SERVER['REQUEST_URI']);
             }
         }
-        
+
         $post = get_static_post($static);
 
         if (!$post) {
@@ -723,8 +718,7 @@ get('/:static', function($static) {
 
         $post = $post[0];
 
-        if(config("views.counter") == "true")
-        {
+        if (config("views.counter") == "true") {
             add_view($post->file);
             if (!login()) {
                 file_cache($_SERVER['REQUEST_URI']);
@@ -732,7 +726,7 @@ get('/:static', function($static) {
         }
 
         render('static', array(
-            'head_contents' => head_contents($post->title . ' - ' . blog_title(), $description = get_description($post->body), $post->url),
+            'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
             'bodyclass' => 'inpage',
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $post->title,
             'p' => $post,
@@ -772,12 +766,11 @@ get('/:static/edit', function($static) {
 post('/:static/edit', function() {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
-    if(!login())
-    {
+    if (!login()) {
         $login = site_url() . 'login';
-        header("location: $login");   
+        header("location: $login");
     }
-    
+
     $title = from($_REQUEST, 'title');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
@@ -1244,14 +1237,13 @@ get('/:static/add', function($static) {
         config('views.root', 'system/admin/views');
 
         $post = get_static_post($static);
-        
-        if(! $post)
-        {
+
+        if (!$post) {
             not_found();
         }
-        
+
         $post = $post[0];
-        
+
         render('add-page', array(
             'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
             'bodyclass' => 'addpage',
@@ -1301,29 +1293,28 @@ post('/:static/add', function($static) {
     }
 });
 
-get('/:static/:sub', function($static,$sub) {
-    
+get('/:static/:sub', function($static, $sub) {
+
     $father_post = get_static_post($static);
     if (!$father_post) {
         not_found();
     }
-    $post = get_static_sub_post($static,$sub);
+    $post = get_static_sub_post($static, $sub);
     if (!$post) {
         not_found();
     }
     $post = $post[0];
-    
-	if(config("views.counter") == "true")
-	{
-		add_view($post->file);
-	}
+
+    if (config("views.counter") == "true") {
+        add_view($post->file);
+    }
 
     if (!login()) {
         file_cache($_SERVER['REQUEST_URI']);
     }
 
     render('static', array(
-        'head_contents' => head_contents($post->title . ' - ' . blog_title(), $description = get_description($post->body), $post->url),
+        'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
         'bodyclass' => 'inpage',
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $father_post[0]->url . '">' . $father_post[0]->title . '</a> &#187; ' . $post->title,
         'p' => $post,