diff --git a/README.md b/README.md index a4775ff..e4121f4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ HTMLy is an open source Databaseless Blogging Platform or Flat-File Blog prioritizes simplicity and speed written in PHP. HTMLy can be referred to as Flat-File CMS either since it will also manage your content. -You do not need to use a VPS to run HTMLy, shared hosting or even [free hosting](https://github.com/danpros/htmly#openshift) should work as long as the host supports at least PHP 5.3. +You do not need to use a VPS to run HTMLy, shared hosting or even free hosting should work as long as the host supports at least PHP 5.3. Demo ---- @@ -42,6 +42,7 @@ Features - File Caching - Auto Update - Post Draft +- i18n Requirements ------------ @@ -129,15 +130,6 @@ server { } ```` -OpenShift ---------- -Need a free server to test HTMLy? try [OpenShift](https://www.openshift.com) using the [HTMLy OpenShift QuickStart](https://hub.openshift.com/quickstarts/219-htmly) for easy deployment. - -**Quick install:** - -[![Click to install OpenShift](http://launch-shifter.rhcloud.com/launch/light/Click to install.svg)](https://hub.openshift.com/quickstarts/deploy/219-htmly) - - Making a secure password ---------------------- Passwords can be stored in `username.ini` (where "username" is the user's username) in either plaintext, encryption algorithms supported by php `hash` or bcrypt (recommended). To generate a bcrypt encrypted password: @@ -287,14 +279,7 @@ Contribute Contributors ---------- -- [danpros](https://github.com/danpros) - [Weblog](http://www.danpros.com) -- [Kanti](https://github.com/Kanti) - [Weblog](https://kanti.de) -- [fahmi182](https://github.com/fahmi182) - [Weblog](http://ifahmi.com) -- [fanningert](https://github.com/fanningert) - [Weblog](http://thomas.fanninger.at) -- [BlackCodec](https://github.com/BlackCodec) -- [mlncn](https://github.com/mlncn) -- [Tea23](https://github.com/Tea23) -- [greenphp](https://github.com/greenphp) +- [HTMLy Contributors](https://github.com/danpros/htmly/graphs/contributors) Copyright / License ------------------- diff --git a/cache/installedVersion.json b/cache/installedVersion.json index 1d351af..f654bf8 100644 --- a/cache/installedVersion.json +++ b/cache/installedVersion.json @@ -1,4 +1,4 @@ { "id": 782014, - "tag_name": "v2.7.4" + "tag_name": "v2.7.5" } diff --git a/config/config.ini b/config/config.ini deleted file mode 100644 index 2e5ac0a..0000000 --- a/config/config.ini +++ /dev/null @@ -1,147 +0,0 @@ -; The URL of your blog. Include the http or https if you are using Facebook or Disqus comment. -site.url = "" - -; Your timezone -timezone = "Asia/Jakarta" - -; Your language ("en" for English, "de" for German, "pl" for Polish) -language = "en" - -; Blog info -blog.title = "HTMLy" -blog.tagline = "Just another HTMLy blog" -blog.description = "Proudly powered by HTMLy, a databaseless blogging platform." -blog.copyright = "(c) Your name." - -; Set permalink type. "default" using /year/month/title. "post" using /post/title -permalink.type = "default" - -; Make the frontpage static. Options "false" and "true" -static.frontpage = "false" - -; Show the /blog url as the blog homepage. Options "false" and "true" -blog.enable = "false" - -; Social account -social.twitter = "https://twitter.com" -social.facebook = "https://www.facebook.com" -social.google = "https://plus.google.com" -social.tumblr = "http://www.tumblr.com" - -; Custom menu link. -; See example below: -; "Google->http://www.google.com|Wikipedia->http://www.wikipedia.org". -blog.menu = "" - -; Breadcrumb home text. Useful when installed on subfolder. -breadcrumb.home = "Home" - -; Comment system. Choose "facebook", "disqus", or "disable". -comment.system = "disable" - -; Facebook comments -fb.appid = "" -fb.num = "5" -fb.color = "light" - -; Disqus comments -disqus.shortname = "" - -; Google Web Master Tool ID verification -google.wmt.id = "" - -; Google+ publisher -google.publisher = "" - -; Google analytics -google.analytics.id = "" - -; Google reCaptcha -; https://www.google.com/recaptcha/admin. Options "false" and "true" - -google.reCaptcha = "false" -google.reCaptcha.public = "" -google.reCaptcha.private = "" - -; Pagination, RSS, and JSON -posts.perpage = "10" -category.perpage = "10" -tag.perpage = "10" -archive.perpage = "10" -search.perpage = "10" -profile.perpage = "10" -type.perpage = "10" -json.count = "10" - -; Category info -category.info = "true" - -; Related posts -related.count = "3" - -; Recent posts -recent.count = "5" - -; Popular posts -popular.count = "5" - -; Author info on blog post. Set "true" or "false". -author.info = "true" - -; Teaser type: set "trimmed" or "full". -teaser.type = "full" - -; Read more link text for "full" teaser type -read.more = "Read more" - -; Teaser character count -teaser.char = "200" - -; Description character count -description.char = "150" - -; RSS feed count -rss.count = "10" - -; RSS feed description length. If left empty we will use full page. -rss.char = "200" - -; Enable image thumbnail on teaser, the options is "true" and "false". If set to "true", you can specify the default thumbnail also. -img.thumbnail = "false" -default.thumbnail = "" - -; Enable views Counter, the options is "true" and "false". If set to "true", you can see the Counts in Admin page and popular posts. -views.counter = "false" - -; Sitemap priorities between "0.0" and "1.0". Set "false" to disable a sitemap for the given type. (See /sitemap.xml) -sitemap.priority.base = "1.0" -sitemap.priority.post = "0.5" -sitemap.priority.static = "0.5" -sitemap.priority.category = "0.5" -sitemap.priority.tag = "0.5" -sitemap.priority.archiveDay = "0.5" -sitemap.priority.archiveMonth = "0.5" -sitemap.priority.archiveYear = "0.5" -sitemap.priority.author = "0.5" -sitemap.priority.type = "0.5" - -; Also install pre-release -prerelease = "false" - -; Cache expiration in hour. Eg. "6", "12". Default 6 hours. -cache.expiration = "6" - -; Switch on and off the file cache for development purposes. Options "false" and "true" -cache.off = "false" - -; Switch on and off the page generation time. Options "false" and "true" -generation.time = "false" - -; Switch on and off the cache timestamp. Options "false" and "true" -cache.timestamp = "false" - -; Set the theme here -views.root = "themes/twentysixteen" - -; Framework config. No need to edit. -views.layout = "layout" diff --git a/config/config.ini.example b/config/config.ini.example index e179170..0161ec6 100644 --- a/config/config.ini.example +++ b/config/config.ini.example @@ -4,6 +4,9 @@ site.url = "" ; Your timezone timezone = "Asia/Jakarta" +; Time format. See: https://www.php.net/manual/en/function.date.php +time.format = "d F Y" + ; Your language (currently only "en" for English or "de" for German) language = "en" @@ -25,7 +28,6 @@ blog.enable = "false" ; Social account social.twitter = "https://twitter.com" social.facebook = "https://www.facebook.com" -social.google = "https://plus.google.com" social.tumblr = "http://www.tumblr.com" ; Custom menu link. diff --git a/config/users/kanti.ini b/config/users/kanti.ini deleted file mode 100644 index ace040f..0000000 --- a/config/users/kanti.ini +++ /dev/null @@ -1,9 +0,0 @@ -;Password -password = yourpassword -encryption = clear -; encryption: not set, leave blank or set to clear or none to use plain text password for the user, -; else set to encryption algoritm supported by hash function of php to use the selected -; encryption - -;Role -role = admin diff --git a/humans.txt b/humans.txt index 5131e78..f218d93 100644 --- a/humans.txt +++ b/humans.txt @@ -2,28 +2,23 @@ Owner: danpros Github: https://github.com/danpros Weblog: http://www.danpros.com -Location: Indonesia Contributor: Kanti Github: https://github.com/Kanti Weblog: https://kanti.de -Location: Stuttgart - Germany Contributor: fahmi182 Github: https://github.com/fahmi182 Weblog: http://ifahmi.com -Location: Jakarta Contributor: fanningert Github: https://github.com/fanningert -Location: Vienna Contributor: BlackCodec Github: https://github.com/BlackCodec Contributor: mlncn Github: https://github.com/mlncn -Location: Natick, Massachusetts, USA Contributor: Tea23 Github: https://github.com/Tea23 @@ -31,6 +26,30 @@ Github: https://github.com/Tea23 Contributor: greenphp Github: https://github.com/greenphp +Contributor: brh55 +Github: https://github.com/brh55 + +Contributor: ecc +Github: https://github.com/ecc + +Contributor: bluebirch +Github: https://github.com/bluebirch + +Contributor: EBethus +Github: https://github.com/EBethus + +Contributor: nikkolai14 +Github: https://github.com/nikkolai14 + +Contributor: RalfZim +Github: https://github.com/RalfZim + +Contributor: NightPurrer +Github: https://github.com/NightPurrer + +Contributor: EtherialNL +Github: https://github.com/EtherialNL + /* THANKS */ Name: Martin Angelov (http://tutorialzine.com) Name: Xiaoying Riley (http://themes.3rdwavemedia.com) diff --git a/system/admin/admin.php b/system/admin/admin.php index 5378543..8afcb56 100644 --- a/system/admin/admin.php +++ b/system/admin/admin.php @@ -695,7 +695,7 @@ function get_user_posts() $i++; echo ''; echo '' . $p->title . ''; - echo '' . date('d F Y', $p->date) . ''; + echo '' . format_date($p->date) . ''; if (config("views.counter") == "true") echo '' . $p->views . ''; echo '' . $p->tag . ''; diff --git a/system/admin/views/backup.html.php b/system/admin/views/backup.html.php index 0d2f001..bf4d4d4 100644 --- a/system/admin/views/backup.html.php +++ b/system/admin/views/backup.html.php @@ -1,7 +1,7 @@ file; diff --git a/system/admin/views/delete-page.html.php b/system/admin/views/delete-page.html.php index ca4305b..b109908 100644 --- a/system/admin/views/delete-page.html.php +++ b/system/admin/views/delete-page.html.php @@ -1,6 +1,6 @@ file; diff --git a/system/admin/views/delete-post.html.php b/system/admin/views/delete-post.html.php index be502d4..11507c0 100644 --- a/system/admin/views/delete-post.html.php +++ b/system/admin/views/delete-post.html.php @@ -1,6 +1,6 @@ file; $oldurl = explode('_', $url); diff --git a/system/admin/views/edit-content.html.php b/system/admin/views/edit-content.html.php index 201bc6a..39ee212 100644 --- a/system/admin/views/edit-content.html.php +++ b/system/admin/views/edit-content.html.php @@ -30,7 +30,7 @@ if (empty($oldtag)) { $oldmd = str_replace('.md', '', $oldurl[2]); if (isset($_GET['destination'])) { - $destination = $_GET['destination']; + $destination = _h($_GET['destination']); } else { $destination = 'admin'; } diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php index 68359a8..fde8ca1 100644 --- a/system/admin/views/edit-page.html.php +++ b/system/admin/views/edit-page.html.php @@ -41,7 +41,7 @@ if ($type == 'is_frontpage') { $oldcontent = remove_html_comments($content); if (isset($_GET['destination'])) { - $destination = $_GET['destination']; + $destination = _h($_GET['destination']); } else { $destination = 'admin'; } diff --git a/system/admin/views/popular-posts.html.php b/system/admin/views/popular-posts.html.php index 1206aa1..1265928 100644 --- a/system/admin/views/popular-posts.html.php +++ b/system/admin/views/popular-posts.html.php @@ -24,7 +24,7 @@ ?> title ?> - date) ?> + date) ?> views ?> author ?> diff --git a/system/admin/views/posts-list.html.php b/system/admin/views/posts-list.html.php index 71ffcdc..52f6cd4 100644 --- a/system/admin/views/posts-list.html.php +++ b/system/admin/views/posts-list.html.php @@ -24,7 +24,7 @@ ?> title ?> - date) ?> + date) ?> views ?> author ?> diff --git a/system/admin/views/user-draft.html.php b/system/admin/views/user-draft.html.php index c91eadc..e24d2b5 100644 --- a/system/admin/views/user-draft.html.php +++ b/system/admin/views/user-draft.html.php @@ -22,7 +22,7 @@ ?> title ?> - date) ?> + date) ?> tag) ?> diff --git a/system/admin/views/user-posts.html.php b/system/admin/views/user-posts.html.php index f386397..7a0a2d3 100644 --- a/system/admin/views/user-posts.html.php +++ b/system/admin/views/user-posts.html.php @@ -25,7 +25,7 @@ ?> title ?> - date) ?> + date) ?> views ?> diff --git a/system/htmly.php b/system/htmly.php index 777a7f7..764b7a7 100644 --- a/system/htmly.php +++ b/system/htmly.php @@ -17,7 +17,7 @@ if (config('timezone')) { get('/index', function () { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -186,7 +186,7 @@ post('/login', function () { get('/author/:name', function ($name) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -394,10 +394,10 @@ get('/front/edit', function () { } }); -// Show the "Add post" page +// Show the "Add content" page get('/add/content', function () { - $req = $_GET['type']; + $req = _h($_GET['type']); $type = 'is_' . $req; @@ -412,7 +412,7 @@ get('/add/content', function () { 'type' => $type, 'is_admin' => true, 'bodyclass' => 'add-content', - 'breadcrumb' => '' . config('breadcrumb.home') . ' » Add post' + 'breadcrumb' => '' . config('breadcrumb.home') . ' » Add content' )); } else { $login = site_url() . 'login'; @@ -794,7 +794,7 @@ get('/add/category', function () { 'type' => 'is_category', 'is_admin' => true, 'bodyclass' => 'add-category', - 'breadcrumb' => '' . config('breadcrumb.home') . ' » Add page' + 'breadcrumb' => '' . config('breadcrumb.home') . ' » Add category' )); } else { $login = site_url() . 'login'; @@ -841,7 +841,7 @@ post('/add/category', function () { 'type' => 'is_category', 'is_admin' => true, 'bodyclass' => 'add-category', - 'breadcrumb' => '' . config('breadcrumb.home') . ' » Add page' + 'breadcrumb' => '' . config('breadcrumb.home') . ' » Add category' )); } }); @@ -1401,7 +1401,7 @@ get('/admin/categories', function () { get('/category/:category', function ($category) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -1597,7 +1597,7 @@ post('/category/:category/delete', function () { get('/type/:type', function ($type) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -1666,7 +1666,7 @@ get('/type/:type', function ($type) { get('/tag/:tag', function ($tag) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -1731,7 +1731,7 @@ get('/tag/:tag', function ($tag) { get('/archive/:req', function ($req) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -1806,7 +1806,7 @@ get('/archive/:req', function ($req) { get('/search/:keyword', function ($keyword) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -1904,7 +1904,7 @@ get('/feed/opml', function () { get('/post/:name', function ($name) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -1973,7 +1973,7 @@ get('/post/:name', function ($name) { } if (config('blog.enable') === 'true') { - $blog = ' Blog » '; + $blog = '
  • Blog
    • » '; } else { $blog = ''; } @@ -2010,7 +2010,7 @@ get('/post/:name', function ($name) { 'p' => $current, 'author' => $author, 'bodyclass' => 'in-post category-' . $current->ct . ' type-' . $current->type, - 'breadcrumb' => '' . config('breadcrumb.home') . ' » '. $blog . '' . $current->categoryb . '' . ' » ' . $current->title, + 'breadcrumb' => '
    1. ' . config('breadcrumb.home') . '
      2. » '. $blog . '
    2. ' . $current->categoryb . '
      3. ' . ' » ' . $current->title . '
    ', 'prev' => has_prev($prev), 'next' => has_next($next), 'type' => $var, @@ -2062,7 +2062,7 @@ get('/post/:name/edit', function ($name) { 'type' => $type, 'is_admin' => true, 'bodyclass' => 'edit-post', - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } else { render('denied', array( @@ -2072,7 +2072,7 @@ get('/post/:name/edit', function ($name) { 'p' => $current, 'bodyclass' => 'denied', 'is_admin' => true, - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } } else { @@ -2254,7 +2254,7 @@ get('/post/:name/delete', function ($name) { 'p' => $current, 'is_admin' => true, 'bodyclass' => 'delete-post', - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } else { render('denied', array( @@ -2264,7 +2264,7 @@ get('/post/:name/delete', function ($name) { 'p' => $current, 'is_admin' => true, 'bodyclass' => 'delete-post', - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } } else { @@ -2288,7 +2288,7 @@ post('/post/:name/delete', function () { get('/:static', function ($static) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -2683,7 +2683,7 @@ post('/:static/delete', function () { get('/:static/:sub', function ($static, $sub) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -2890,7 +2890,7 @@ post('/:static/:sub/delete', function () { get('/:year/:month/:name', function ($year, $month, $name) { if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -2957,7 +2957,7 @@ get('/:year/:month/:name', function ($year, $month, $name) { } if (config('blog.enable') === 'true') { - $blog = ' Blog » '; + $blog = '
  • Blog
    • » '; } else { $blog = ''; } @@ -2994,7 +2994,7 @@ get('/:year/:month/:name', function ($year, $month, $name) { 'p' => $current, 'author' => $author, 'bodyclass' => 'in-post category-' . $current->ct . ' type-' . $current->type, - 'breadcrumb' => '' . config('breadcrumb.home') . ' » '. $blog . '' . $current->categoryb . '' . ' » ' . $current->title, + 'breadcrumb' => '
    1. ' . config('breadcrumb.home') . '
      2. » '. $blog . '
    2. ' . $current->categoryb . '
      3. ' . ' » ' . $current->title . '
    ', 'prev' => has_prev($prev), 'next' => has_next($next), 'type' => $var, @@ -3046,7 +3046,7 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) { 'type' => $type, 'bodyclass' => 'edit-post', 'is_admin' => true, - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } else { render('denied', array( @@ -3056,7 +3056,7 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) { 'p' => $current, 'bodyclass' => 'denied', 'is_admin' => true, - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } } else { @@ -3238,7 +3238,7 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) { 'p' => $current, 'bodyclass' => 'delete-post', 'is_admin' => true, - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } else { render('denied', array( @@ -3248,7 +3248,7 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) { 'p' => $current, 'bodyclass' => 'delete-post', 'is_admin' => true, - 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title + 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $current->tagb . ' » ' . $current->title )); } } else { diff --git a/system/includes/dispatch.php b/system/includes/dispatch.php index 18606c3..ad22398 100644 --- a/system/includes/dispatch.php +++ b/system/includes/dispatch.php @@ -366,7 +366,7 @@ function render($view, $locals = null, $layout = null) ob_start(); require $layout; } - if (!$login) { + if (!$login && $view != '404') { if (!file_exists($cachefile)) { if (config('cache.timestamp') == 'true') { echo "\n" . ''; diff --git a/system/includes/functions.php b/system/includes/functions.php index a74df82..45f2e0f 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -268,13 +268,13 @@ function get_posts($posts, $page = 1, $perpage = 0) if($str[count($str) - 3] == 'uncategorized') { $category = default_category(); $post->category = '' . $category->title . ''; - $post->categoryb = '' . $category->title . ''; + $post->categoryb = '' . $category->title . ''; } else { foreach ($catC as $k => $v) { if ($v['0'] === $str[count($str) - 3]) { $post->category = '' . $v['1'] . ''; - $post->categoryb = '' . $v['1'] . ''; + $post->categoryb = '' . $v['1'] . ''; } } @@ -343,7 +343,7 @@ function get_posts($posts, $page = 1, $perpage = 0) foreach ($tag as $a) { $url[] = ''; - $bc[] = '' . $a[0] . ''; + $bc[] = '' . $a[0] . ''; } $post->tag = implode(' ', $url); @@ -1816,7 +1816,6 @@ function social($imgDir = null) { $twitter = config('social.twitter'); $facebook = config('social.facebook'); - $google = config('social.google'); $tumblr = config('social.tumblr'); $rss = site_url() . 'feed/rss'; @@ -1832,10 +1831,6 @@ function social($imgDir = null) echo 'Facebook'; } - if (!empty($google)) { - echo 'Google+'; - } - if (!empty($tumblr)) { echo 'Tumblr'; } @@ -2164,7 +2159,7 @@ EOF; EOF; } if (isset($_GET['search'])) { - $search = $_GET['search']; + $search = _h($_GET['search']); $url = site_url() . 'search/' . remove_accent($search); header("Location: $url"); } @@ -3212,7 +3207,7 @@ function get_language() $langID = config('language'); $langFile = 'lang/'. $langID . '.ini'; - $local = strtolower($langID); + $local = $langID; // Settings for the language if (!isset($langID) || config('language') === 'en') { diff --git a/themes/blog/layout.html.php b/themes/blog/layout.html.php index ad7a2a9..cd9f1ef 100644 --- a/themes/blog/layout.html.php +++ b/themes/blog/layout.html.php @@ -26,7 +26,7 @@

    diff --git a/themes/clean/css/style.css b/themes/clean/css/style.css index b3c3f2a..f9ceb3f 100644 --- a/themes/clean/css/style.css +++ b/themes/clean/css/style.css @@ -211,16 +211,16 @@ h6 { text-decoration: none; } -.infront .post, .intag .post, .inarchive .post, .insearch .post, .inprofile .post { +.in-front .post, .in-tag .post, .in-archive .post, .in-search .post, .in-profile .post { border-bottom: 1px solid #dfdfdf; padding: 30px 0 10px 0; } -.infront .post.first { +.in-front .post.first { padding-top: 50px; } -.intag .post.first, .inarchive .post.first, .insearch .post.first, .inprofile .post.first { +.in-tag .post.first, .in-archive .post.first, .in-search .post.first, .in-profile .post.first { padding-top: 0px; } @@ -831,7 +831,7 @@ aside .copyright p { padding-top: 0px; } - .infront .post, .intag .post, .inarchive .post, .insearch .post { + .in-front .post, .in-tag .post, .in-archive .post, .in-search .post { padding: 30px 0 20px 0; } diff --git a/themes/clean/layout.html.php b/themes/clean/layout.html.php index c098f5b..7509864 100644 --- a/themes/clean/layout.html.php +++ b/themes/clean/layout.html.php @@ -35,7 +35,16 @@

    -

    Tags

    +
    +

    Tags

    + + +
    diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php index 54430b9..ab4edb6 100644 --- a/themes/clean/main.html.php +++ b/themes/clean/main.html.php @@ -29,7 +29,7 @@

    title ?>

    - - Posted in + - Posted in category ?> by - diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php index fd5966a..3f7cb39 100644 --- a/themes/clean/post.html.php +++ b/themes/clean/post.html.php @@ -11,7 +11,7 @@

    title ?>

    - + - Posted in category ?> by - @@ -54,8 +54,6 @@ href="https://twitter.com/share?url=url ?>&text=title ?>">Twitter - Google+
    diff --git a/themes/clean/profile.html.php b/themes/clean/profile.html.php index 3bab8e0..3b9f400 100644 --- a/themes/clean/profile.html.php +++ b/themes/clean/profile.html.php @@ -22,7 +22,7 @@ $i++; ?>
  • title ?> on - date) ?> - Posted in tag ?> + date) ?> - Posted in tag ?>
    • diff --git a/themes/default/layout.html.php b/themes/default/layout.html.php index 754f78a..ea9f88a 100644 --- a/themes/default/layout.html.php +++ b/themes/default/layout.html.php @@ -62,7 +62,16 @@

    Archive

    -

    Tags

    +
    +

    Tags

    + +
      + $count):?> +
    • ()
      • + = 5) break;?> + +
    +

    Follow

    diff --git a/themes/default/main.html.php b/themes/default/main.html.php index f4aa4c5..1301607 100644 --- a/themes/default/main.html.php +++ b/themes/default/main.html.php @@ -29,7 +29,7 @@

    title ?>

    - - Posted in + - Posted in category ?> by - diff --git a/themes/default/post.html.php b/themes/default/post.html.php index 53dbaac..6df5c30 100644 --- a/themes/default/post.html.php +++ b/themes/default/post.html.php @@ -11,7 +11,7 @@

    title ?>

    - + - Posted in category ?> by - @@ -52,7 +52,6 @@

    Share this post

    - Google+
    diff --git a/themes/default/profile.html.php b/themes/default/profile.html.php index 0ccd54d..0e7611e 100644 --- a/themes/default/profile.html.php +++ b/themes/default/profile.html.php @@ -22,7 +22,7 @@ $i++; ?>
  • title ?> on - date) ?> - Posted in tag ?> + date) ?> - Posted in tag ?>
    • diff --git a/themes/logs/layout.html.php b/themes/logs/layout.html.php index 775a351..270a8e3 100644 --- a/themes/logs/layout.html.php +++ b/themes/logs/layout.html.php @@ -80,7 +80,13 @@

    Tags

    - + +
      + $count):?> +
    • ()
      • + = 5) break;?> + +
    diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php index 1cadfaf..aaa5947 100644 --- a/themes/logs/main.html.php +++ b/themes/logs/main.html.php @@ -29,7 +29,7 @@

    title ?>

    - - Posted in + - Posted in category ?> by - diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php index 30f2180..35ff851 100644 --- a/themes/logs/post.html.php +++ b/themes/logs/post.html.php @@ -11,7 +11,7 @@

    title ?>

    - + - Posted in category ?> by - @@ -54,8 +54,6 @@ href="https://twitter.com/share?url=url ?>&text=title ?>">Twitter - Google+
    diff --git a/themes/logs/profile.html.php b/themes/logs/profile.html.php index 62b98fe..bfa291a 100644 --- a/themes/logs/profile.html.php +++ b/themes/logs/profile.html.php @@ -22,7 +22,7 @@ $i++; ?>
  • title ?> on - date) ?> - Posted in tag ?> + date) ?> - Posted in tag ?>
    • diff --git a/themes/twentyfifteen/css/style.css b/themes/twentyfifteen/css/style.css index 874c962..a98104b 100644 --- a/themes/twentyfifteen/css/style.css +++ b/themes/twentyfifteen/css/style.css @@ -880,7 +880,7 @@ a:focus { content: "\f516"; } -.social-navigation a[href$="/feed/"]:before { +.social-navigation a[href$="/feed/rss"]:before { content: "\f413"; } @@ -2092,6 +2092,12 @@ a.post-thumbnail:focus { margin-bottom: 0; } +.entry-content figcaption, +.entry-summary figcaption { + font-style: italic; + text-align: center; + padding-bottom: .5em; +} /** * 12.2 Post Formats diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php index 4960f6c..98125e5 100644 --- a/themes/twentyfifteen/layout.html.php +++ b/themes/twentyfifteen/layout.html.php @@ -19,7 +19,7 @@
    - + diff --git a/themes/twentyfifteen/post.html.php b/themes/twentyfifteen/post.html.php index a1b437c..ad21739 100644 --- a/themes/twentyfifteen/post.html.php +++ b/themes/twentyfifteen/post.html.php @@ -48,7 +48,7 @@