From 9fa8fab864e53f3db3ca3ac6c22357e7c3e9d5dc Mon Sep 17 00:00:00 2001
From: Andreas <ecc@camya.com>
Date: Mon, 24 Aug 2015 12:39:13 +0200
Subject: [PATCH] "404" and "404-search" rendered within layout!

Before this pull request, the 404 and 404-search templates where handled
as full HTML pages without the page context (layout).

With this pull request both pages are rendered inside the selected
themes layout. Additionally the 404 template now contains the "search
form" and the homepage link.

All Themes are already updated with the above changes.
---
 system/admin/views/layout.html.php |  4 +++-
 system/htmly.php                   | 16 +++++++++++-----
 system/includes/functions.php      | 16 ++++++++--------
 themes/blog/404-search.html.php    | 35 +++++++++++++++--------------------
 themes/blog/404.html.php           | 32 ++++++++++++++------------------
 themes/blog/layout.html.php        |  4 +++-
 themes/clean/404-search.html.php   | 29 ++++++++++-------------------
 themes/clean/404.html.php          | 28 ++++++++++------------------
 themes/clean/layout.html.php       |  4 +++-
 themes/default/404-search.html.php | 29 ++++++++++-------------------
 themes/default/404.html.php        | 28 ++++++++++------------------
 themes/default/css/style.css       |  7 ++++++-
 themes/default/layout.html.php     |  4 +++-
 themes/logs/404-search.html.php    | 29 ++++++++++-------------------
 themes/logs/404.html.php           | 28 ++++++++++------------------
 themes/logs/css/style.css          |  4 ++++
 themes/logs/layout.html.php        |  4 +++-
 17 files changed, 133 insertions(+), 168 deletions(-)

diff --git a/system/admin/views/layout.html.php b/system/admin/views/layout.html.php
index 4a92e17..f467c5a 100644
--- a/system/admin/views/layout.html.php
+++ b/system/admin/views/layout.html.php
@@ -4,7 +4,9 @@
     <?php echo head_contents() ?>
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
-    <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php if($canonical): ?>
+        <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php endif; ?>
     <link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
     <?php if (publisher()): ?>
diff --git a/system/htmly.php b/system/htmly.php
index 73e4cbb..30e52e2 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -1301,14 +1301,20 @@ get('/search/:keyword', function ($keyword) {
 
     $posts = get_keyword($keyword, $page, $perpage);
 
-    $total = keyword_count($keyword);
-
-    if (empty($posts) || $page < 1) {
-        // a non-existing page
-        render('404-search', null, false);
+    if (!$posts || $page < 1) {
+        // a non-existing page or no search result
+        render('404-search', array(
+            'title' => 'Search results not found! - ' . blog_title(),
+            'description' => '',
+            'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; No search results',
+            'canonical' => site_url() . 'search/' . strtolower($keyword),
+            'bodyclass' => 'error-404-search',
+        ));
         die;
     }
 
+    $total = keyword_count($keyword);
+
     render('main', array(
         'title' => 'Search results for: ' . tag_i18n($keyword) . ' - ' . blog_title(),
         'description' => 'Search results for: ' . tag_i18n($keyword) . ' on ' . blog_title() . '.',
diff --git a/system/includes/functions.php b/system/includes/functions.php
index c20a0c3..928f4d4 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -654,13 +654,7 @@ function get_keyword($keyword, $page, $perpage)
         }
     }
 
-    if (empty($tmp)) {
-        // a non-existing page
-        render('404-search', null, false);
-        die;
-    }
-
-    return $tmp = get_posts($tmp, $page, $perpage);
+    return ($tmp) ? get_posts($tmp, $page, $perpage) : [];
 }
 
 // Get related posts base on post tag.
@@ -1543,7 +1537,13 @@ EOF;
 function not_found()
 {
     header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
-    render('404', null, false);
+    render('404', array(
+        'title' => 'This page doesn\'t exist! - ' . blog_title(),
+        'description' => '',
+        'canonical' => false,
+        'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; 404 Not Found',
+        'bodyclass' => 'error-404',
+    ));
     die();
 }
 
diff --git a/themes/blog/404-search.html.php b/themes/blog/404-search.html.php
index 041f867..c7b1972 100644
--- a/themes/blog/404-search.html.php
+++ b/themes/blog/404-search.html.php
@@ -1,21 +1,16 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>Search results not found! - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="center message">
-    <h1>Search results not found!</h1>
-    <div class="search-404">
-        <?php echo search() ?>
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<section class="inpage post section">
+    <div class="section-inner">
+        <div class="content">
+            <div class="item">
+                <h1 class="title">Search results not found!</h1>
+                <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
+                <div class="search-404">
+                    <?php echo search() ?>
+                </div>
+            </div>
+        </div>
     </div>
-    <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
-</div>
-</body>
-</html>
\ No newline at end of file
+</section>
diff --git a/themes/blog/404.html.php b/themes/blog/404.html.php
index cf762e1..2f495ce 100644
--- a/themes/blog/404.html.php
+++ b/themes/blog/404.html.php
@@ -1,18 +1,14 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>404 Not Found - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="center message">
-    <h1>This page doesn't exist!</h1>
-    <p>Would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
-</div>
-</body>
-</html>
\ No newline at end of file
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<section class="inpage post section">
+    <div class="section-inner">
+        <div class="content">
+            <div class="item">
+                <h1 class="title">This page doesn't exist!</h1>
+                <p>Please search to find what you're looking for or visit our <a href="<?php echo site_url() ?>">homepage</a> instead.</p>
+                <?php echo search() ?>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/themes/blog/layout.html.php b/themes/blog/layout.html.php
index d2ca1b9..4b8dd74 100644
--- a/themes/blog/layout.html.php
+++ b/themes/blog/layout.html.php
@@ -6,7 +6,9 @@
     <?php echo head_contents();?>
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
-    <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php if($canonical): ?>
+        <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php endif; ?>
     <?php if (publisher()): ?>
     <link href="<?php echo publisher() ?>" rel="publisher" /><?php endif; ?>    
     <link href="//fonts.googleapis.com/css?family=Lato:300,400,300italic,400italic" rel="stylesheet" type="text/css">
diff --git a/themes/clean/404-search.html.php b/themes/clean/404-search.html.php
index 2c2485c..ce5ebff 100644
--- a/themes/clean/404-search.html.php
+++ b/themes/clean/404-search.html.php
@@ -1,21 +1,12 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>Search results not found! - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
-</head>
-<body>
-<div class="center message">
-    <h1>Search results not found!</h1>
-    <div class="search">
-        <?php echo search() ?>
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<div class="post">
+    <div class="main">
+        <h1 class="title-post">Search results not found!</h1>
+        <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
+        <div class="search-404">
+            <?php echo search() ?>
+        </div>
     </div>
-    <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
 </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/themes/clean/404.html.php b/themes/clean/404.html.php
index d0c24cd..a924680 100644
--- a/themes/clean/404.html.php
+++ b/themes/clean/404.html.php
@@ -1,18 +1,10 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>404 Not Found - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
-</head>
-<body>
-<div class="center message">
-    <h1>This page doesn't exist!</h1>
-    <p>Would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
-</div>
-</body>
-</html>
\ No newline at end of file
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<div class="post">
+    <div class="main">
+        <h1 class="title-post">This page doesn't exist!</h1>
+        <p>Please search to find what you're looking for or visit our <a href="<?php echo site_url() ?>">homepage</a> instead.</p>
+        <?php echo search() ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/themes/clean/layout.html.php b/themes/clean/layout.html.php
index 38d5377..5017490 100644
--- a/themes/clean/layout.html.php
+++ b/themes/clean/layout.html.php
@@ -4,7 +4,9 @@
     <?php echo head_contents() ?>
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
-    <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php if($canonical): ?>
+        <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php endif; ?>
     <link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
     <?php if (publisher()): ?>
diff --git a/themes/default/404-search.html.php b/themes/default/404-search.html.php
index 041f867..ce5ebff 100644
--- a/themes/default/404-search.html.php
+++ b/themes/default/404-search.html.php
@@ -1,21 +1,12 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>Search results not found! - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="center message">
-    <h1>Search results not found!</h1>
-    <div class="search-404">
-        <?php echo search() ?>
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<div class="post">
+    <div class="main">
+        <h1 class="title-post">Search results not found!</h1>
+        <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
+        <div class="search-404">
+            <?php echo search() ?>
+        </div>
     </div>
-    <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
 </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/themes/default/404.html.php b/themes/default/404.html.php
index cf762e1..a924680 100644
--- a/themes/default/404.html.php
+++ b/themes/default/404.html.php
@@ -1,18 +1,10 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>404 Not Found - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="center message">
-    <h1>This page doesn't exist!</h1>
-    <p>Would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
-</div>
-</body>
-</html>
\ No newline at end of file
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<div class="post">
+    <div class="main">
+        <h1 class="title-post">This page doesn't exist!</h1>
+        <p>Please search to find what you're looking for or visit our <a href="<?php echo site_url() ?>">homepage</a> instead.</p>
+        <?php echo search() ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index a554e0c..f02a676 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -414,6 +414,11 @@ table.post-list td a {
     float: right;
 }
 
+.error-404 .post #search-form,
+.error-404-search .post #search-form {
+    float: none;
+}
+
 .search-input {
     margin: 0;
     padding: 4px 15px;
@@ -519,7 +524,7 @@ h1.title-post a:hover, h2.title-index a:hover {
     padding-top: 0;
 }
 
-.infront .first, .inpost .post, .intag .first, .inarchive .first, .insearch .first {
+.infront .first, .inpost .post, .intag .first, .inarchive .first, .insearch .first, .error-404 .post, .error-404-search .post {
     padding-top: 0;
 }
 
diff --git a/themes/default/layout.html.php b/themes/default/layout.html.php
index 754f78a..bbb8ef8 100644
--- a/themes/default/layout.html.php
+++ b/themes/default/layout.html.php
@@ -4,7 +4,9 @@
     <?php echo head_contents() ?>
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
-    <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php if($canonical): ?>
+        <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php endif; ?>
     <link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
     <?php if (publisher()): ?>
diff --git a/themes/logs/404-search.html.php b/themes/logs/404-search.html.php
index 5d9c8cc..ce5ebff 100644
--- a/themes/logs/404-search.html.php
+++ b/themes/logs/404-search.html.php
@@ -1,21 +1,12 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>Search results not found! - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="center message">
-    <h1>Search results not found!</h1>
-    <div class="search-404">
-        <?php echo search() ?>
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<div class="post">
+    <div class="main">
+        <h1 class="title-post">Search results not found!</h1>
+        <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
+        <div class="search-404">
+            <?php echo search() ?>
+        </div>
     </div>
-    <p>Please search again, or would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
 </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/themes/logs/404.html.php b/themes/logs/404.html.php
index 2be0476..a924680 100644
--- a/themes/logs/404.html.php
+++ b/themes/logs/404.html.php
@@ -1,18 +1,10 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link href='<?php echo site_url() ?>favicon.ico' rel='icon' type='image/x-icon'/>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
-    <title>404 Not Found - <?php echo blog_title() ?></title>
-    <link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet"/>
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="center message">
-    <h1>This page doesn't exist!</h1>
-    <p>Would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
-</div>
-</body>
-</html>
\ No newline at end of file
+<?php if (!empty($breadcrumb)): ?>
+    <div class="breadcrumb"><?php echo $breadcrumb ?></div>
+<?php endif; ?>
+<div class="post">
+    <div class="main">
+        <h1 class="title-post">This page doesn't exist!</h1>
+        <p>Please search to find what you're looking for or visit our <a href="<?php echo site_url() ?>">homepage</a> instead.</p>
+        <?php echo search() ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css
index a43f21b..bb02d41 100644
--- a/themes/logs/css/style.css
+++ b/themes/logs/css/style.css
@@ -332,6 +332,10 @@ ul li, ol li {
 #search-form {
     float: right;
 }
+.error-404 .post #search-form,
+.error-404-search .post #search-form {
+    float: none;
+}
 
 .search-input {
     border: 1px solid #E5E5E5;
diff --git a/themes/logs/layout.html.php b/themes/logs/layout.html.php
index 966988c..056e6ad 100644
--- a/themes/logs/layout.html.php
+++ b/themes/logs/layout.html.php
@@ -4,7 +4,9 @@
     <?php echo head_contents() ?>
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
-    <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php if($canonical): ?>
+        <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php endif; ?>
     <link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
     <?php if (publisher()): ?>