From d7f3f67b2fd43f4cf6136044f7cb774ef54f73d9 Mon Sep 17 00:00:00 2001
From: floppy0 <31189947+floppy0@users.noreply.github.com>
Date: Wed, 27 Dec 2017 14:19:28 +0100
Subject: [PATCH] Class name instead of name

---
 bl-kernel/admin/views/dashboard.php |  8 ++++----
 bl-kernel/functions.php             | 20 +++++++++-----------
 bl-kernel/helpers/theme.class.php   |  6 +++---
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php
index bc4e2ba6..49162c4a 100644
--- a/bl-kernel/admin/views/dashboard.php
+++ b/bl-kernel/admin/views/dashboard.php
@@ -66,7 +66,7 @@
 		<ul class="uk-list uk-list-line">
 		<?php
 			// Print New version if the plugin Version is installed
-			if (pluginEnabled('Version')) {
+			if (pluginEnabled('pluginVersion')) {
 				if ($plugins['all']['pluginVersion']->newVersion()) {
 					echo '<li>';
 					echo '<b>'.$L->g('New version available').'</b>';
@@ -98,8 +98,8 @@
 
 	<div class="uk-width-1-3">
 
-		<?php if (pluginEnabled('SimpleStats')) {
-			$SimpleStats = getPlugin('SimpleStats');
+		<?php if (pluginEnabled('pluginSimpleStats')) {
+			$SimpleStats = getPlugin('pluginSimpleStats');
 			echo '<div class="uk-panel">';
 			echo '<h4 class="panel-title">'.$SimpleStats->getValue('label').'</h4>';
 			echo $SimpleStats->dashboard();
@@ -169,4 +169,4 @@
 
 	</div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php
index b51da622..cde4ea92 100644
--- a/bl-kernel/functions.php
+++ b/bl-kernel/functions.php
@@ -263,25 +263,23 @@ function buildAllpages($publishedPages=true, $staticPages=true, $draftPages=true
 	return $tmp;
 }
 
-function getPlugin($pluginName) {
+// Returns the plugin Object if is enabled and installed, FALSE otherwise
+function getPlugin($pluginClassName) {
 	global $plugins;
 
-	if (pluginEnabled($pluginName)) {
-		$pluginClass = 'plugin'.Text::firstCharUp($pluginName);
-		return $plugins['all'][$pluginClass];
+	if (pluginEnabled($pluginClassName)) {
+		return $plugins['all'][$pluginClassName];
 	}
 	return false;
 }
 
-// Returns TRUE if the plugin is enabled, FALSE otherwise
-function pluginEnabled($pluginName) {
+// Returns TRUE if the plugin is enabled and installed, FALSE otherwise
+function pluginEnabled($pluginClassName) {
 	global $plugins;
 
-	$pluginClass = 'plugin'.Text::firstCharUp($pluginName);
-	if( isset($plugins['all'][$pluginClass]) ) {
-		return $plugins['all'][$pluginClass]->installed();
+	if (isset($plugins['all'][$pluginClassName])) {
+		return $plugins['all'][$pluginClassName]->installed();
 	}
-
 	return false;
 }
 
@@ -778,4 +776,4 @@ function activateTheme($themeDirectory) {
 		return true;
 	}
 	return false;
-}
\ No newline at end of file
+}
diff --git a/bl-kernel/helpers/theme.class.php b/bl-kernel/helpers/theme.class.php
index 46f73f79..159177f8 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('RSS')) {
+		if (pluginEnabled('pluginRSS')) {
 			return DOMAIN_BASE.'rss.xml';
 		}
 		return false;
@@ -36,7 +36,7 @@ class Theme {
 
 	public static function sitemapUrl()
 	{
-		if (pluginEnabled('Sitemap')) {
+		if (pluginEnabled('pluginSitemap')) {
 			return DOMAIN_BASE.'sitemap.xml';
 		}
 		return false;
@@ -183,4 +183,4 @@ class Theme {
 	}
 }
 
-?>
\ No newline at end of file
+?>