From 0d7e5d2fe277ad5a65cf6eb6d471b4a7bafe0f8b Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 8 Jun 2018 02:31:26 +0300 Subject: [PATCH 1/8] Improve .htaccess --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 1e7bc8fe..066687ca 100755 --- a/.htaccess +++ b/.htaccess @@ -49,13 +49,13 @@ RewriteRule ^(\.git|flextype)/(.*) error [F] # Block access to specific file types for these system folders RewriteRule ^(flextype|vendor)/(.*)\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|sh|bat)$ error [F] # Block access to specific file types for these user folders -RewriteRule ^(site)/(.*)\.(txt|md|html|yaml|yml|php|pl|py|cgi|sh|bat)$ error [F] +RewriteRule ^(site)/(.*)\.(txt|html|yaml|php|pl|py|cgi|sh|bat)$ error [F] # Block all direct access to .html files: RewriteRule \.html$ error [F] # Block all direct access to files and folders beginning with a dot RewriteRule (^|/)\.(?!well-known) - [F] # Block access to specific files in the root folder -RewriteRule ^(LICENSE\.md|composer\.lock|composer\.json|\.htaccess)$ error [F] +RewriteRule ^(LICENSE\.txt|composer\.lock|composer\.json|\.htaccess)$ error [F] ## End - Security ## Begin - Rewrite rules for SEO improvements. From 9b390385c04bddb30730ddbdd3f54e10b647894c Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 8 Jun 2018 23:42:15 +0300 Subject: [PATCH 2/8] Config: updates --- site/config/site.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/config/site.yaml b/site/config/site.yaml index 506ecd85..c6297180 100755 --- a/site/config/site.yaml +++ b/site/config/site.yaml @@ -4,7 +4,7 @@ title: "Flextype" description: "The Best Open Source Flat-File Content Management System" -keywords: "flextype, php, cms, flat-file cms, flat cms, flatfile cms, markdown" +keywords: "flextype, php, cms, flat-file cms, flat cms, flatfile cms, html" robots: "index, follow" author: email: "" From a4377f4d911c1c4db64c52dfc66dbd258bea079e Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 9 Jun 2018 00:04:22 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=A1hangelog=20Updates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ad13968..7e59b587 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Flextype 0.6.0, 2018-06-09 +* Content: Markdown(Parsedown) parser removed! From now we are using plain HTML + Shortcodes +* Theme Simple: Cross-site scripting Vulnerabilities fixes +* Improving main .htaccess + + # Flextype 0.5.0, 2018-06-03 * Delete folders: site/data and site/accounts * Delete folders: site/blocks and site/cache and site/logs From fdc322993809b76156de62f8a8a2da866ec621a3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 9 Jun 2018 13:36:44 +0300 Subject: [PATCH 4/8] Code cleanup and refactoring #5 --- CHANGELOG.md | 2 +- flextype/Content.php | 19 +++++++++---------- flextype/Flextype.php | 14 +++++++------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e59b587..60223e19 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ * Content: Markdown(Parsedown) parser removed! From now we are using plain HTML + Shortcodes * Theme Simple: Cross-site scripting Vulnerabilities fixes * Improving main .htaccess - +* Code cleanup and refactoring #5 # Flextype 0.5.0, 2018-06-03 * Delete folders: site/data and site/accounts diff --git a/flextype/Content.php b/flextype/Content.php index fa8772c4..b3596718 100755 --- a/flextype/Content.php +++ b/flextype/Content.php @@ -20,7 +20,7 @@ use Thunder\Shortcode\Shortcode\ShortcodeInterface; class Content { /** - * An instance of the Cache class + * An instance of the Content class * * @var object * @access protected @@ -110,8 +110,8 @@ class Content * Content::updateCurrentPage('title', 'New page title'); * * @access public - * @param string $path Array path - * @param mixed $value Value to set + * @param string $path Array path + * @param mixed $value Value to set * @return void */ public static function updateCurrentPage(string $path, $value) : void @@ -190,11 +190,11 @@ class Content * $pages = Content::getPages('projects'); * * @access public - * @param string $url Page url - * @param bool $raw Raw or not raw content - * @param string $order_by Order type - * @param int $offset Offset - * @param int $length Length + * @param string $url Page url + * @param bool $raw Raw or not raw content + * @param string $order_by Order type + * @param int $offset Offset + * @param int $length Length * @return array */ public static function getPages(string $url = '', bool $raw = false, string $order_by = 'date', string $order_type = 'DESC', int $offset = null, int $length = null) : array @@ -376,8 +376,7 @@ class Content */ public static function processContent(string $content) : string { - $content = Content::processShortcodes($content); - return $content; + return Content::processShortcodes($content); } /** diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 9b212d2e..9249d9e3 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -17,6 +17,13 @@ use Symfony\Component\Yaml\Yaml; class Flextype { + /** + * The version of Flextype + * + * @var string + */ + const VERSION = '0.5.0'; + /** * An instance of the Flextype class * @@ -35,13 +42,6 @@ class Flextype // Nothing here. } - /** - * The version of Flextype - * - * @var string - */ - const VERSION = '0.5.0'; - /** * Constructor. * From df95292697389d36520f972898c103cd8a87dd4e Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 9 Jun 2018 16:55:41 +0300 Subject: [PATCH 5/8] Readme Updates --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 51458a9f..c187f355 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ![Version](https://img.shields.io/badge/version-0.5.0-brightgreen.svg?style=flat-square) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square) -Flextype is next generation of Legendary Monstra Engine it is also Open Source, fast and flexible file-based Content Management System. That's Easy to install, upgrade and use. Flextype provides amazing API's for plugins, themes and core developers! Content in Flextype is just a simple files written with markdown syntax in pages folder. You simply create markdown files in the pages folder and that becomes a page. +Flextype is Open Source, fast and flexible file-based Content Management System. +That's Easy to install, upgrade and use. Flextype provides amazing API's for plugins, themes and core developers! ## FEATURES From 4992a1d345aa0d92d937f775b6acea1dfe31591d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 9 Jun 2018 16:56:13 +0300 Subject: [PATCH 6/8] Readme Updates --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c187f355..0373f80c 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![Version](https://img.shields.io/badge/version-0.5.0-brightgreen.svg?style=flat-square) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square) -Flextype is Open Source, fast and flexible file-based Content Management System. +Flextype is Open Source, fast and flexible file-based Content Management System. That's Easy to install, upgrade and use. Flextype provides amazing API's for plugins, themes and core developers! ## FEATURES From c60aa90074b1d08215a3e0750b313b8979f66cf6 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 9 Jun 2018 16:59:25 +0300 Subject: [PATCH 7/8] Readme Updates --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0373f80c..1e21ef85 100755 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ No database required, flat files only! #### Flexible Flextype provides amazing API for plugins, themes and core developers! -#### Markdown Syntax -Use your favorite editor to write your content with plain Markdown syntax. +#### Easy editing +Use your favorite editor to write your content with plain HTML and Flextype Shortcodes. #### Dynamic Content Types The flat-file nature of Flextype lets you define custom fields for any of your pages. From 0d35aeafc836a915ea505988333786c9e2b3f7ef Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 9 Jun 2018 17:04:19 +0300 Subject: [PATCH 8/8] Flextype 0.6.0 --- README.md | 4 ++-- flextype/Flextype.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1e21ef85..5e7088be 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Flextype -![Version](https://img.shields.io/badge/version-0.5.0-brightgreen.svg?style=flat-square) +![Version](https://img.shields.io/badge/version-0.6.0-brightgreen.svg?style=flat-square) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square) Flextype is Open Source, fast and flexible file-based Content Management System. @@ -66,7 +66,7 @@ Flextype is open source, community driven project, and maintained by community! ## NO LIMITS -With Flextype you can create any project you whant. +With Flextype you can create any project you want. * Business site * Landing page diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 9249d9e3..7da7b260 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -22,7 +22,7 @@ class Flextype * * @var string */ - const VERSION = '0.5.0'; + const VERSION = '0.6.0'; /** * An instance of the Flextype class