diff --git a/README.md b/README.md index c1deada..2e16a48 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Features - Auto Update - Post Draft - i18n +- Menu builder Requirements ------------ @@ -267,11 +268,6 @@ Paragraph 1 Paragraph 2 etc. ``` -Credit ------- -* [Martin Angelov](http://tutorialzine.com) -* [Xiaoying Riley](http://themes.3rdwavemedia.com) - Contribute ---------- 1. Fork and edit diff --git a/config/config.ini.example b/config/config.ini.example index d96cc2f..ac90b0a 100644 --- a/config/config.ini.example +++ b/config/config.ini.example @@ -49,6 +49,9 @@ google.wmt.id = "" ; Google analytics google.analytics.id = "" +; Google gtag analytics +google.gtag.id = "" + ; Google reCaptcha ; https://www.google.com/recaptcha/admin. Options "false" and "true" diff --git a/system/admin/views/config-custom.html.php b/system/admin/views/config-custom.html.php new file mode 100644 index 0000000..ac78161 --- /dev/null +++ b/system/admin/views/config-custom.html.php @@ -0,0 +1,47 @@ +

Your Custom Settings

+
+

hint: Use Ctrl/CMD + F to search for your config key or value.

+

pro tips: You can creating custom config key and print out your config key value anywhere in your template.

+

<?php echo config('your.key'); ?>

+
+ + + + + + + "hallo", + ); + if (file_exists($config_file)) { + $array = parse_ini_file($config_file, true); + } + function valueMaker($value) + { + if (is_string($value)) + return htmlspecialchars($value); + + if ($value === true) + return "true"; + if ($value === false) + return "false"; + + if ($value == false) + return "0"; + return (string)$value; + } + $configList = json_decode(file_get_contents('content/data/configList.json', true)); + foreach ($array as $key => $value) { + if (!in_array($key, $configList)) { + echo ''; + echo ''; + echo ''; + echo ''; + } + } + ?> +
+ +
diff --git a/system/admin/views/config-metatags.html.php b/system/admin/views/config-metatags.html.php new file mode 100644 index 0000000..c369231 --- /dev/null +++ b/system/admin/views/config-metatags.html.php @@ -0,0 +1,56 @@ + +

Metatags

+

+
+ +
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+ +
+
+
+

Sitemap

+
+

Valid values range from 0.0 to 1.0. See https://www.sitemaps.org/protocol.html

+ $value) {?> + +
+ +
+ +
+
+ + +
+
+ +
+
+
diff --git a/system/admin/views/config-performance.html.php b/system/admin/views/config-performance.html.php new file mode 100644 index 0000000..d21c014 --- /dev/null +++ b/system/admin/views/config-performance.html.php @@ -0,0 +1,95 @@ +

Performance

+

+
+ +
+ +
+ +
+
+
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+

Github pre-release

+
+
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+
+ +
+
+
diff --git a/system/admin/views/config-reading.html.php b/system/admin/views/config-reading.html.php new file mode 100644 index 0000000..62a8044 --- /dev/null +++ b/system/admin/views/config-reading.html.php @@ -0,0 +1,120 @@ +

Reading Settings

+

+
+ +
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+ +
+
+
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+

Posts index settings

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+

RSS settings

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
diff --git a/system/admin/views/config-widget.html.php b/system/admin/views/config-widget.html.php new file mode 100644 index 0000000..b2c9edb --- /dev/null +++ b/system/admin/views/config-widget.html.php @@ -0,0 +1,146 @@ +

Widget Settings

+

+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+ +
+
+
+

Comments

+
+

To using Disqus or Facebook comment you need to provide Disqus shortname or Facebook App ID.

+
+ +
+
+
+ checked> + +
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+

Recaptcha

+
+

Get one here https://www.google.com/recaptcha/admin +

+ +
+
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+

Google Analytics

+
+
+ +
+ +
+
+
+ +
+ + This is legacy code. Usually new created analyics using gtag.js +
+
+
+ +
+ + For google-site-verification meta +
+
+
+
+ +
+
+
diff --git a/system/admin/views/config.html.php b/system/admin/views/config.html.php index 313fdcb..02b8d2f 100644 --- a/system/admin/views/config.html.php +++ b/system/admin/views/config.html.php @@ -1,48 +1,117 @@ -

Your Settings

-
-

hint: Use Ctrl/CMD⌘ + F to search for your config key or value.

-

pro tips: You can creating custom config key and print out your config key value anywhere in your template.

-

<?php echo config('your.key'); ?>

-
+

General Settings

+

- - -

- - - - - - "hallo", - ); - if (file_exists($config_file)) { - $array = parse_ini_file($config_file, true); - } - function valueMaker($value) - { - if (is_string($value)) - return htmlspecialchars($value); - - if ($value === true) - return "true"; - if ($value === false) - return "false"; - - if ($value == false) - return "0"; - return (string)$value; - } - - foreach ($array as $key => $value) { - echo ''; - echo ''; - echo ''; - echo ''; - } - ?> -
- -
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + In a few words, explain what this blog is about. +
+
+
+ +
+ + In one paragraph, tell us more about your blog. +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ format("Y-m-d H:i:s");?> + +
+
+
+ checked> + +
+
+ checked> + +
+
+ checked> + +
+
+ checked> + +
+
+ checked> + +
+
+ checked> + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+ \ No newline at end of file diff --git a/system/admin/views/layout.html.php b/system/admin/views/layout.html.php index 86b6596..22750be 100644 --- a/system/admin/views/layout.html.php +++ b/system/admin/views/layout.html.php @@ -103,7 +103,6 @@ -
  • @@ -118,6 +117,31 @@

    Config
    • +
  • + +

    Reading

    +     +
    • +
  • + +

    Widget

    +     +
    • +
  • + +

    Metatags

    +     +
    • +
  • + +

    Performance

    +     +
    • +
  • + +

    Custom

    +     +

  • Menus

    diff --git a/system/htmly.php b/system/htmly.php index f484613..c303fc0 100644 --- a/system/htmly.php +++ b/system/htmly.php @@ -1295,6 +1295,346 @@ post('/admin/config', function () { die; }); +// Show Config page +get('/admin/config/custom', function () { + + $user = $_SESSION[config("site.url")]['user']; + $role = user('role', $user); + + if (login()) { + config('views.root', 'system/admin/views'); + if ($role === 'admin') { + render('config-custom', array( + 'title' => 'Config - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'admin-config', + 'breadcrumb' => '    ' . config('breadcrumb.home') . ' » Config' + )); + } else { + render('denied', array( + 'title' => 'Config page - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'denied', + 'breadcrumb' => '', + )); + } + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Submitted Config page data +post('/admin/config/custom', function () { + + error_reporting(E_ALL); + ini_set("display_errors", 1); + + $proper = is_csrf_proper(from($_REQUEST, 'csrf_token')); + if (login() && $proper) { + $newKey = from($_REQUEST, 'newKey'); + $newValue = from($_REQUEST, 'newValue'); + + $new_config = array(); + $new_Keys = array(); + if (!empty($newKey)) { + $new_Keys[$newKey] = $newValue; + } + foreach ($_POST as $name => $value) { + if (substr($name, 0, 8) == "-config-") { + $name = str_replace("_", ".", substr($name, 8)); + $new_config[$name] = $value; + } + } + save_config($new_config, $new_Keys); + $login = site_url() . 'admin/config/custom'; + header("location: $login"); + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Show Config page +get('/admin/config/reading', function () { + + $user = $_SESSION[config("site.url")]['user']; + $role = user('role', $user); + + if (login()) { + config('views.root', 'system/admin/views'); + if ($role === 'admin') { + render('config-reading', array( + 'title' => 'Config - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'admin-config', + 'breadcrumb' => '' . config('breadcrumb.home') . ' » Config' + )); + } else { + render('denied', array( + 'title' => 'Config page - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'denied', + 'breadcrumb' => '', + )); + } + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Submitted Config page data +post('/admin/config/reading', function () { + + error_reporting(E_ALL); + ini_set("display_errors", 1); + + $proper = is_csrf_proper(from($_REQUEST, 'csrf_token')); + if (login() && $proper) { + $newKey = from($_REQUEST, 'newKey'); + $newValue = from($_REQUEST, 'newValue'); + + $new_config = array(); + $new_Keys = array(); + if (!empty($newKey)) { + $new_Keys[$newKey] = $newValue; + } + foreach ($_POST as $name => $value) { + if (substr($name, 0, 8) == "-config-") { + $name = str_replace("_", ".", substr($name, 8)); + $new_config[$name] = $value; + } + } + save_config($new_config, $new_Keys); + $login = site_url() . 'admin/config/reading'; + header("location: $login"); + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Show Config page +get('/admin/config/widget', function () { + + $user = $_SESSION[config("site.url")]['user']; + $role = user('role', $user); + + if (login()) { + config('views.root', 'system/admin/views'); + if ($role === 'admin') { + render('config-widget', array( + 'title' => 'Config - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'admin-config', + 'breadcrumb' => '' . config('breadcrumb.home') . ' » Config' + )); + } else { + render('denied', array( + 'title' => 'Config page - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'denied', + 'breadcrumb' => '', + )); + } + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Submitted Config page data +post('/admin/config/widget', function () { + + error_reporting(E_ALL); + ini_set("display_errors", 1); + + $proper = is_csrf_proper(from($_REQUEST, 'csrf_token')); + if (login() && $proper) { + $newKey = from($_REQUEST, 'newKey'); + $newValue = from($_REQUEST, 'newValue'); + + $new_config = array(); + $new_Keys = array(); + if (!empty($newKey)) { + $new_Keys[$newKey] = $newValue; + } + foreach ($_POST as $name => $value) { + if (substr($name, 0, 8) == "-config-") { + $name = str_replace("_", ".", substr($name, 8)); + $new_config[$name] = $value; + } + } + save_config($new_config, $new_Keys); + $login = site_url() . 'admin/config/widget'; + header("location: $login"); + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Show Config page +get('/admin/config/metatags', function () { + + $user = $_SESSION[config("site.url")]['user']; + $role = user('role', $user); + + if (login()) { + config('views.root', 'system/admin/views'); + if ($role === 'admin') { + render('config-metatags', array( + 'title' => 'Config - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'admin-config', + 'breadcrumb' => '' . config('breadcrumb.home') . ' » Config' + )); + } else { + render('denied', array( + 'title' => 'Config page - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'denied', + 'breadcrumb' => '', + )); + } + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Submitted Config page data +post('/admin/config/metatags', function () { + + error_reporting(E_ALL); + ini_set("display_errors", 1); + + $proper = is_csrf_proper(from($_REQUEST, 'csrf_token')); + if (login() && $proper) { + $newKey = from($_REQUEST, 'newKey'); + $newValue = from($_REQUEST, 'newValue'); + + $new_config = array(); + $new_Keys = array(); + if (!empty($newKey)) { + $new_Keys[$newKey] = $newValue; + } + foreach ($_POST as $name => $value) { + if (substr($name, 0, 8) == "-config-") { + $name = str_replace("_", ".", substr($name, 8)); + $new_config[$name] = $value; + } + } + save_config($new_config, $new_Keys); + $login = site_url() . 'admin/config/metatags'; + header("location: $login"); + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Show Config page +get('/admin/config/performance', function () { + + $user = $_SESSION[config("site.url")]['user']; + $role = user('role', $user); + + if (login()) { + config('views.root', 'system/admin/views'); + if ($role === 'admin') { + render('config-performance', array( + 'title' => 'Config - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'admin-config', + 'breadcrumb' => '' . config('breadcrumb.home') . ' » Config' + )); + } else { + render('denied', array( + 'title' => 'Config page - ' . blog_title(), + 'description' => strip_tags(blog_description()), + 'canonical' => site_url(), + 'type' => 'is_admin-config', + 'is_admin' => true, + 'bodyclass' => 'denied', + 'breadcrumb' => '', + )); + } + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + +// Submitted Config page data +post('/admin/config/performance', function () { + + error_reporting(E_ALL); + ini_set("display_errors", 1); + + $proper = is_csrf_proper(from($_REQUEST, 'csrf_token')); + if (login() && $proper) { + $newKey = from($_REQUEST, 'newKey'); + $newValue = from($_REQUEST, 'newValue'); + + $new_config = array(); + $new_Keys = array(); + if (!empty($newKey)) { + $new_Keys[$newKey] = $newValue; + } + foreach ($_POST as $name => $value) { + if (substr($name, 0, 8) == "-config-") { + $name = str_replace("_", ".", substr($name, 8)); + $new_config[$name] = $value; + } + } + save_config($new_config, $new_Keys); + $login = site_url() . 'admin/config/performance'; + header("location: $login"); + } else { + $login = site_url() . 'login'; + header("location: $login"); + } + die; +}); + // Show Backup page get('/admin/backup', function () { if (login()) { @@ -1425,7 +1765,7 @@ post('/admin/menu', function () { if (login()) { $json = from($_REQUEST, 'json'); - file_put_contents('content/data/menu.json', json_encode($json)); + file_put_contents('content/data/menu.json', json_encode($json, JSON_UNESCAPED_UNICODE)); } }); diff --git a/system/includes/functions.php b/system/includes/functions.php index 101717d..491205c 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -1950,27 +1950,36 @@ function publisher() } // Google Analytics -function analytics($analyticsDir = null) +function analytics() { $analytics = config('google.analytics.id'); - if ($analyticsDir === null) { - $analyticsDir = '//www.google-analytics.com/analytics.js'; - } else { - $analyticsDir = site_url() . 'themes/' . $analyticsDir . 'analytics.js'; - } + $gtag = config('google.gtag.id'); $script = << (function (i,s,o,g,r,a,m) {i['GoogleAnalyticsObject']=r;i[r]=i[r]||function () { (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','{$analyticsDir}','ga'); + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '{$analytics}', 'auto'); ga('send', 'pageview'); EOF; - if (!empty($analytics)) { - return $script; - } + $gtagScript = << + + +EOF; + if (!empty($gtag)) { + return $gtagScript; + } elseif (!empty($analytics)) { + return $script; + } } function slashUrl($url) { @@ -2936,7 +2945,7 @@ function add_view($page) } else { $views[$page] = 1; } - file_put_contents($filename, json_encode($views)); + file_put_contents($filename, json_encode($views, JSON_UNESCAPED_UNICODE)); } // Get the page views count