diff options
| author | Nathan Lasseter <nathan@4574.co.uk> | 2014-06-09 12:47:30 +0000 |
|---|---|---|
| committer | Nathan Lasseter <nathan@4574.co.uk> | 2014-06-09 12:47:30 +0000 |
| commit | ddf5eebee1b6ce706c4d7fa78c66e1e13abc3821 (patch) | |
| tree | f5c0b6e87acab427ffcb93262d7c30a0743636b4 | |
| parent | d9c3e6cce5ae3272f52ceec4cc79afaef24b5925 (diff) | |
| -rw-r--r-- | htaccess.sample | 3 | ||||
| -rw-r--r-- | nginx.sample | 5 | ||||
| -rw-r--r-- | rss.php | 5 | ||||
| -rw-r--r-- | title.php | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/htaccess.sample b/htaccess.sample index 42b34d4..7f519d4 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -1,6 +1,7 @@ RewriteEngine on -RewriteRule ^feed$ /rss.php +RewriteRule ^feed/?$ /rss.php +RewriteRule ^posts/?$ /archives.php RewriteRule ^post/(.*)$ /viewpost.php?post=$1 <Files "dopost.php"> diff --git a/nginx.sample b/nginx.sample index f225b35..b1a33e6 100644 --- a/nginx.sample +++ b/nginx.sample @@ -7,8 +7,9 @@ server { root /var/www; - rewrite \/blog\/feed$ /blog/rss.php; - rewrite \/blog\/post\/(.*)$ /blog/viewpost.php?post=$1; + rewrite \/blog\/feed\/?$ /blog/rss.php; + rewrite \/blog\/posts\/?$ /blog/archives.php; + rewrite \/blog\/post\/(.*)$ /blog/viewpost.php?post=$1; location /dopost.php { auth_basic "Login to post"; @@ -20,14 +20,15 @@ $plusfile = preg_replace('/ /', '+', $file); $dashfile = preg_replace('/ /', '-', $file); $stat = stat("{$blogPosts}$file"); - $date = date(DATE_ATOM, $stat['mtime']); + $time = $stat['mtime']; + $date = date(DATE_ATOM, $time); $post = file_get_contents("{$blogPosts}$file"); $post = preg_replace('/\r?\n/', "<br>\n", $post); echo "\t<entry>\n"; echo "\t\t<title>$file</title>\n"; echo "\t\t<link href=\"http://{$_SERVER['SERVER_NAME']}{$blogRoot}post/{$plusfile}\" />\n"; - echo "\t\t<id>tag:{$_SERVER['SERVER_NAME']}," . date("Y-m-d") . ":{$blogRoot}{$dashfile}</id>\n"; + echo "\t\t<id>tag:{$_SERVER['SERVER_NAME']}," . date("Y-m-d", $time) . ":{$blogRoot}{$dashfile}</id>\n"; echo "\t\t<updated>$date</updated>\n"; echo "\t\t<summary type=\"html\"><![CDATA["; echo summarise($post); @@ -5,7 +5,7 @@ <h1><?php echo $blogTitle; ?></h1> <h2><?php echo $blogSubTitle; ?></h2> <a class="toplink" href="<?php echo $blogRoot; ?>">Home</a> -<a class="toplink" href="<?php echo $blogRoot; ?>archives.php">Archives</a> +<a class="toplink" href="<?php echo $blogRoot; ?>posts">Archives</a> <a class="toplink" href="<?php echo $blogRoot; ?>feed">Feed</a> <a class="toplink" href="<?php echo $blogRoot; ?>post.php">Post</a> </div> |