From 5f47ad7c13c435a242e0343a7d0703852ca511e3 Mon Sep 17 00:00:00 2001 From: Anaggh S Date: Thu, 16 Aug 2018 15:09:37 +0530 Subject: [PATCH 1/4] Comment RewriteBase --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 407df643..cefe7dbe 100644 --- a/.htaccess +++ b/.htaccess @@ -6,7 +6,7 @@ AddDefaultCharset UTF-8 RewriteEngine on # Base directory -RewriteBase / +#RewriteBase / # Deny direct access to .txt files RewriteRule ^bl-content/(.*)\.txt$ - [R=404,L] @@ -15,4 +15,4 @@ RewriteRule ^bl-content/(.*)\.txt$ - [R=404,L] RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^(.*) index.php [PT,L] - \ No newline at end of file + From db4327d69c0f5e996194ae68835f529217ecbf6d Mon Sep 17 00:00:00 2001 From: Anaggh S Date: Thu, 16 Aug 2018 15:16:27 +0530 Subject: [PATCH 2/4] Return correct string readingTime --- bl-kernel/pagex.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bl-kernel/pagex.class.php b/bl-kernel/pagex.class.php index 965bb620..168c365d 100644 --- a/bl-kernel/pagex.class.php +++ b/bl-kernel/pagex.class.php @@ -496,7 +496,7 @@ class Page { $average = $words / 200; $minutes = round($average); - if ($minutes>0) { + if ($minutes>1) { return $minutes.' '.$L->get('minutes'); } From bfd75a5ae82ba2f6cb02e3cf9bdcd0c89d5d8be5 Mon Sep 17 00:00:00 2001 From: Anaggh S Date: Thu, 16 Aug 2018 15:26:36 +0530 Subject: [PATCH 3/4] Add instagram svg from simpleicons --- bl-themes/alternative/img/instagram.svg | 1 + bl-themes/blogx/img/instagram.svg | 1 + 2 files changed, 2 insertions(+) create mode 100644 bl-themes/alternative/img/instagram.svg create mode 100644 bl-themes/blogx/img/instagram.svg diff --git a/bl-themes/alternative/img/instagram.svg b/bl-themes/alternative/img/instagram.svg new file mode 100644 index 00000000..10b83fe9 --- /dev/null +++ b/bl-themes/alternative/img/instagram.svg @@ -0,0 +1 @@ +Instagram icon diff --git a/bl-themes/blogx/img/instagram.svg b/bl-themes/blogx/img/instagram.svg new file mode 100644 index 00000000..10b83fe9 --- /dev/null +++ b/bl-themes/blogx/img/instagram.svg @@ -0,0 +1 @@ +Instagram icon From df5fd34ddeac6be485cdec747c7e166e2a7ff855 Mon Sep 17 00:00:00 2001 From: Anaggh S Date: Thu, 16 Aug 2018 17:49:21 +0530 Subject: [PATCH 4/4] Remove invalid span, plugin fixes --- bl-kernel/admin/themes/booty/html/navbar.php | 2 +- bl-kernel/helpers/theme.class.php | 4 +-- bl-plugins/links/plugin.php | 35 +++++++++++--------- bl-plugins/sitemap/plugin.php | 8 +++-- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/bl-kernel/admin/themes/booty/html/navbar.php b/bl-kernel/admin/themes/booty/html/navbar.php index cd0521fd..7ab7cd6d 100644 --- a/bl-kernel/admin/themes/booty/html/navbar.php +++ b/bl-kernel/admin/themes/booty/html/navbar.php @@ -12,7 +12,7 @@ p('New content') ?>
  • - p('Content') ?> + p('Content') ?>
  • p('Categories') ?> diff --git a/bl-kernel/helpers/theme.class.php b/bl-kernel/helpers/theme.class.php index 60bf1099..f994f788 100644 --- a/bl-kernel/helpers/theme.class.php +++ b/bl-kernel/helpers/theme.class.php @@ -28,7 +28,7 @@ class Theme { public static function rssUrl() { - if (pluginEnabled('pluginRSS')) { + if (pluginActivated('pluginRSS')) { return DOMAIN_BASE.'rss.xml'; } return false; @@ -36,7 +36,7 @@ class Theme { public static function sitemapUrl() { - if (pluginEnabled('pluginSitemap')) { + if (pluginActivated('pluginSitemap')) { return DOMAIN_BASE.'sitemap.xml'; } return false; diff --git a/bl-plugins/links/plugin.php b/bl-plugins/links/plugin.php index 4ab7cef3..252b745d 100644 --- a/bl-plugins/links/plugin.php +++ b/bl-plugins/links/plugin.php @@ -64,55 +64,58 @@ class pluginLinks extends Plugin { { global $L; - $html = '
    '; + $html = ''; + + $html .= '
    '; $html .= ''; - $html .= ''; + $html .= ''; $html .= ''.$L->get('This title is almost always used in the sidebar of the site').''; $html .= '
    '; $html .= '
    '; - $html .= ''; + $html .= ''; $html .= '
    '; // New link, when the user click on save button this call the method post() // and the new link is added to the database - $html .= ''.$L->get('Add a new link').''; + $html .= '

    '.$L->get('Add a new link').'

    '; $html .= '
    '; $html .= ''; - $html .= ''; + $html .= ''; $html .= '
    '; $html .= '
    '; $html .= ''; - $html .= ''; + $html .= ''; $html .= '
    '; $html .= '
    '; - $html .= ''; + $html .= ''; $html .= '
    '; - $html .= ''.$L->get('Links').''; - // Get the JSON DB, getValue() with the option unsanitized HTML code $jsondb = $this->getValue('jsondb', $unsanitized=false); $links = json_decode($jsondb, true); + + $html .= !empty($links) ? '

    '.$L->get('Links').'

    ' : ''; + foreach($links as $name=>$url) { - $html .= '
    '; + $html .= '
    '; $html .= ''; - $html .= ''; + $html .= ''; $html .= '
    '; $html .= '
    '; $html .= ''; - $html .= ''; + $html .= ''; $html .= '
    '; $html .= '
    '; - $html .= ''; + $html .= ''; $html .= '
    '; - - $html .= '
    '; } return $html; @@ -150,4 +153,4 @@ class pluginLinks extends Plugin { return $html; } -} \ No newline at end of file +} diff --git a/bl-plugins/sitemap/plugin.php b/bl-plugins/sitemap/plugin.php index 691dc57e..0f1067a9 100644 --- a/bl-plugins/sitemap/plugin.php +++ b/bl-plugins/sitemap/plugin.php @@ -12,7 +12,11 @@ class pluginSitemap extends Plugin { { global $L; - $html = '
    '; + $html = ''; + + $html .= '
    '; $html .= ''; $html .= ''.Theme::sitemapUrl().''; $html .= '
    '; @@ -114,4 +118,4 @@ class pluginSitemap extends Plugin { exit(0); } } -} \ No newline at end of file +}