diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..14bc68c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/nbproject/private/ \ No newline at end of file diff --git a/README.md b/README.md index a4775ff..1d84e08 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Logo](https://raw.githubusercontent.com/danpros/htmly/master/system/resources/images/logo-big.png) -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. +HTMLy is an open source databaseless web publishing platform that prioritizes simplicity and speed. HTMLy can be referred to as a Flat-File Blog or Flat-File CMS, 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. @@ -49,12 +49,10 @@ HTMLy requires PHP 5.3 or greater and php-xml package. Installations ------------- -If you have an OpenSSL enabled server (usually enabled by default), use the [installer.php](https://github.com/danpros/htmly/releases/latest) and read the following [instructions](https://docs.htmly.com/basics/installations) to get started. If you don't have OpenSSL, please download the latest version, extract it, then upload the extracted files to your server. Also, make sure the installation folder is writeable by your server. +If you have an OpenSSL enabled server (usually enabled by default), use the [installer](https://github.com/Kanti/htmly-installer/releases/latest) and read the following [instructions](https://github.com/Kanti/htmly-installer/blob/master/README.md#htmly-installerphp) to get started. If you don't have OpenSSL, please download the latest version, extract it, then upload the extracted files to your server. Also, make sure the installation folder is writeable by your server. Configurations -------------- -Set written permission for the `cache` and `content` directories. - Rename `config.ini.example` inside the `config` folder to `config.ini` (or you can create a new `config/config.ini` file) then change the site settings there. Create `YourUsername.ini` inside the `config/users` folder or simply rename the `username.ini.example` file and write down your password there: @@ -131,7 +129,7 @@ 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. +Need a free server to test HTMLy? try [OpenShift](https://www.openshift.com) using the [HTMLy OpenShift QuickStart](https://github.com/danpros/htmly-openshift) for easy deployment. **Quick install:** @@ -166,8 +164,8 @@ The default category is `Uncategorized` with slug `uncategorized` and you do not -New category info etc. -```` +New category info etc. +```` The slug for the new category is `new-category` (htmly removing the file extension). And for full file directory: ```` content/username/new-category/post/file.md @@ -186,7 +184,7 @@ Here's the explanation (separated by an underscore): - `2014-01-31-12-56-40` is the published date. The date format is `yyyy-mm-dd-hh-mm-ss` - `tag1,tag2,tag3` are the tags, separated by commas - `databaseless-blogging-platform-flat-file-blog` is the URL - + For static pages, use the following format: ```` @@ -212,54 +210,54 @@ If you are writing offline, you need specify the content tags below: **Title** ```html -```` +```` **Meta description** ```html -```` +```` **Tags** This is just the tags display and for the slug is in the filename. ```html -```` +```` **Featured image** Post with featured image. ```html -```` +```` **Featured youtube video** Post with featured youtube video. ```html -```` +```` **Featured soundcloud audio** Post with featured soundcloud audio. ```html -```` +```` **Featured link** Post with featured link. ```html -```` +```` **Featured quote** Post with featured quote. ```html -```` +```` **Example** diff --git a/composer.json b/composer.json index 87e47f8..6cf7a86 100644 --- a/composer.json +++ b/composer.json @@ -1,17 +1,13 @@ { "config": { "vendor-dir": "system/vendor/", - "optimize-autoloader": true, - "platform": { - "php": "5.3" - } + "optimize-autoloader": true }, "require": { - "ircmaxell/password-compat": "1.*", - "michelf/php-markdown": "1.*", - "suin/php-rss-writer": "1.*", - "kanti/hub-updater": "0.*", - "jbroadway/urlify": "^1.0" + "ircmaxell/password-compat": "^1.0", + "michelf/php-markdown": "^1.5", + "suin/php-rss-writer": "^1.3", + "kanti/hub-updater": "^0.4.0" }, "autoload": { "files": [ @@ -19,7 +15,8 @@ "system/includes/functions.php", "system/admin/admin.php", "system/includes/session.php", - "system/includes/opml.php" + "system/includes/opml.php", + "system/plugins/urlify/URLify.php" ] } } diff --git a/composer.lock b/composer.lock index edb9988..1408446 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "4b4af0298a863441fda250d818d3fc4b", - "content-hash": "250bd035a1d26dd3e3e01e504833c798", + "hash": "5bdfc8dcf4f971b8f61fd8439dd9cbdb", + "content-hash": "e98ae62bcc711211dfb7c7c70e7fdfc7", "packages": [ { "name": "ircmaxell/password-compat", @@ -49,60 +49,6 @@ ], "time": "2014-11-20 16:49:30" }, - { - "name": "jbroadway/urlify", - "version": "1.0.8-stable", - "source": { - "type": "git", - "url": "https://github.com/jbroadway/urlify.git", - "reference": "984c991881501098eafdc41053b243237191cff8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jbroadway/urlify/zipball/984c991881501098eafdc41053b243237191cff8", - "reference": "984c991881501098eafdc41053b243237191cff8", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-0": { - "URLify": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Johnny Broadway", - "email": "johnny@johnnybroadway.com", - "homepage": "http://www.johnnybroadway.com/" - } - ], - "description": "PHP port of URLify.js from the Django project. Transliterates non-ascii characters for use in URLs.", - "homepage": "https://github.com/jbroadway/urlify", - "keywords": [ - "encode", - "iconv", - "link", - "slug", - "translit", - "transliterate", - "transliteration", - "url", - "urlify" - ], - "time": "2016-07-27 15:26:43" - }, { "name": "kanti/hub-updater", "version": "v0.4.1", @@ -200,16 +146,16 @@ }, { "name": "suin/php-rss-writer", - "version": "1.3.2", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/suin/php-rss-writer.git", - "reference": "51840d2fad4087a4bdd93fb6937aa4b324b5c94f" + "reference": "96ff59575442dbe23e15fe7ff56d0bf27486cff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/suin/php-rss-writer/zipball/51840d2fad4087a4bdd93fb6937aa4b324b5c94f", - "reference": "51840d2fad4087a4bdd93fb6937aa4b324b5c94f", + "url": "https://api.github.com/repos/suin/php-rss-writer/zipball/96ff59575442dbe23e15fe7ff56d0bf27486cff9", + "reference": "96ff59575442dbe23e15fe7ff56d0bf27486cff9", "shasum": "" }, "require": { @@ -240,7 +186,7 @@ "rss", "writer" ], - "time": "2016-03-01 12:09:17" + "time": "2015-08-21 06:24:39" } ], "packages-dev": [], @@ -250,8 +196,5 @@ "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [], - "platform-overrides": { - "php": "5.3" - } + "platform-dev": [] } diff --git a/config/config.ini b/config/config.ini index b0a38c7..03508e1 100644 --- a/config/config.ini +++ b/config/config.ini @@ -1,5 +1,5 @@ ; The URL of your blog. Include the http or https if you are using Facebook or Disqus comment. -site.url = "" +site.url = "http://localhost/htmlx" ; Your timezone timezone = "Asia/Jakarta" diff --git a/config/users/noxymon.ini b/config/users/noxymon.ini new file mode 100644 index 0000000..e620b22 --- /dev/null +++ b/config/users/noxymon.ini @@ -0,0 +1,9 @@ +;Password +password = admin +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/nbproject/project.properties b/nbproject/project.properties new file mode 100644 index 0000000..911a7b8 --- /dev/null +++ b/nbproject/project.properties @@ -0,0 +1,7 @@ +include.path=${php.global.include.path} +php.version=PHP_70 +source.encoding=UTF-8 +src.dir=. +tags.asp=false +tags.short=false +web.root=. diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 0000000..b9aec17 --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,9 @@ + + + org.netbeans.modules.php.project + + + htmly + + + diff --git a/system/admin/admin.php b/system/admin/admin.php index c97c5fe..707e1f6 100644 --- a/system/admin/admin.php +++ b/system/admin/admin.php @@ -43,7 +43,7 @@ function session($user, $pass) { $user_file = 'config/users/' . $user . '.ini'; if (!file_exists($user_file)) { - return $str = '
  • Username not found in our record.
    • '; + return $str = 'Username not found in our record.'; } $user_enc = user('encryption', $user); diff --git a/system/admin/views/edit-content.html.php b/system/admin/views/edit-content.html.php index 4c841bc..818cd37 100644 --- a/system/admin/views/edit-content.html.php +++ b/system/admin/views/edit-content.html.php @@ -95,7 +95,7 @@ if (config('permalink.type') == 'post') {
    Hour, Minute, Second
    - +

    Meta Description (optional)
    @@ -170,4 +170,4 @@ if (config('permalink.type') == 'post') {
    - + \ No newline at end of file diff --git a/system/admin/views/layout.html.old.php b/system/admin/views/layout.html.old.php new file mode 100644 index 0000000..4a49300 --- /dev/null +++ b/system/admin/views/layout.html.old.php @@ -0,0 +1,62 @@ + + + + + + <?php echo $title;?> + + + + + + + + + + + +
    + + +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    + +
    + + + \ No newline at end of file diff --git a/system/admin/views/layout.html.php b/system/admin/views/layout.html.php index 92ffc77..35f5b87 100644 --- a/system/admin/views/layout.html.php +++ b/system/admin/views/layout.html.php @@ -1,62 +1,69 @@ - - + + <?php echo $title;?> - - + + + + + + - - -
    - - -
    - -
    -