Merge branch 'dev'

.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.

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
+* Code cleanup and refactoring #5
+
 # Flextype 0.5.0, 2018-06-03
 * Delete folders: site/data and site/accounts
 * Delete folders: site/blocks and site/cache and site/logs

README.md

@@ -1,8 +1,9 @@
 # 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 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
 
@@ -17,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.  
@@ -65,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

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);
     }
 
     /**

flextype/Flextype.php

@@ -17,6 +17,13 @@ use Symfony\Component\Yaml\Yaml;
 
 class Flextype
 {
+    /**
+     * The version of Flextype
+     *
+     * @var string
+     */
+    const VERSION = '0.6.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.
      *

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: ""