forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()

diff --git a/include/plugin.php b/include/plugin.php
index 5a4755c319bd6d06f7014b9e4bc7844523602d1a..91590e8f4d88d572fd1eb9900289c1c18b96bbc0 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -1,5 +1,7 @@
 <?php
-
+/*
+ * @file include/identity.php
+ */
 
 // install and uninstall plugin
 if (! function_exists('uninstall_plugin')){
@@ -105,7 +107,16 @@ function reload_plugins() {
 
 }}
 
-
+/*
+ * @brief check if addon is enabled
+ *
+ * @param string $plugin
+ * @return boolean
+ */
+function plugin_enabled($plugin) {
+       $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
+       return((bool)(count($r) > 0));
+}
 
 
 

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index f013c9084ff9c813ae18a91d0edf239451f890fd..f329e54457bc95b4c8ed92bd861d20a5f847862c 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -67,48 +67,48 @@ function nodeinfo_init(&$a){
 
        $nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
 
-       if (nodeinfo_plugin_enabled("appnet"))
+       if (plugin_enabled("appnet"))
                $nodeinfo["services"]["inbound"][] = "appnet";
 
-       if (nodeinfo_plugin_enabled("appnet") OR nodeinfo_plugin_enabled("buffer"))
+       if (plugin_enabled("appnet") OR plugin_enabled("buffer"))
                $nodeinfo["services"]["outbound"][] = "appnet";
 
-       if (nodeinfo_plugin_enabled("blogger"))
+       if (plugin_enabled("blogger"))
                $nodeinfo["services"]["outbound"][] = "blogger";
 
-       if (nodeinfo_plugin_enabled("dwpost"))
+       if (plugin_enabled("dwpost"))
                $nodeinfo["services"]["outbound"][] = "dreamwidth";
 
-       if (nodeinfo_plugin_enabled("fbpost") OR nodeinfo_plugin_enabled("buffer"))
+       if (plugin_enabled("fbpost") OR plugin_enabled("buffer"))
                $nodeinfo["services"]["outbound"][] = "facebook";
 
-       if (nodeinfo_plugin_enabled("statusnet")) {
+       if (plugin_enabled("statusnet")) {
                $nodeinfo["services"]["inbound"][] = "gnusocial";
                $nodeinfo["services"]["outbound"][] = "gnusocial";
        }
 
-       if (nodeinfo_plugin_enabled("gpluspost") OR nodeinfo_plugin_enabled("buffer"))
+       if (plugin_enabled("gpluspost") OR plugin_enabled("buffer"))
                $nodeinfo["services"]["outbound"][] = "google";
 
-       if (nodeinfo_plugin_enabled("ijpost"))
+       if (plugin_enabled("ijpost"))
                $nodeinfo["services"]["outbound"][] = "insanejournal";
 
-       if (nodeinfo_plugin_enabled("libertree"))
+       if (plugin_enabled("libertree"))
                $nodeinfo["services"]["outbound"][] = "libertree";
 
-       if (nodeinfo_plugin_enabled("buffer"))
+       if (plugin_enabled("buffer"))
                $nodeinfo["services"]["outbound"][] = "linkedin";
 
-       if (nodeinfo_plugin_enabled("ljpost"))
+       if (plugin_enabled("ljpost"))
                $nodeinfo["services"]["outbound"][] = "livejournal";
 
-       if (nodeinfo_plugin_enabled("buffer"))
+       if (plugin_enabled("buffer"))
                $nodeinfo["services"]["outbound"][] = "pinterest";
 
-       if (nodeinfo_plugin_enabled("posterous"))
+       if (plugin_enabled("posterous"))
                $nodeinfo["services"]["outbound"][] = "posterous";
 
-       if (nodeinfo_plugin_enabled("pumpio")) {
+       if (plugin_enabled("pumpio")) {
                $nodeinfo["services"]["inbound"][] = "pumpio";
                $nodeinfo["services"]["outbound"][] = "pumpio";
        }
@@ -118,13 +118,13 @@ function nodeinfo_init(&$a){
        if ($smtp)
                $nodeinfo["services"]["outbound"][] = "smtp";
 
-       if (nodeinfo_plugin_enabled("tumblr"))
+       if (plugin_enabled("tumblr"))
                $nodeinfo["services"]["outbound"][] = "tumblr";
 
-       if (nodeinfo_plugin_enabled("twitter") OR nodeinfo_plugin_enabled("buffer"))
+       if (plugin_enabled("twitter") OR plugin_enabled("buffer"))
                $nodeinfo["services"]["outbound"][] = "twitter";
 
-       if (nodeinfo_plugin_enabled("wppost"))
+       if (plugin_enabled("wppost"))
                $nodeinfo["services"]["outbound"][] = "wordpress";
 
        $nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"];
@@ -134,7 +134,7 @@ function nodeinfo_init(&$a){
 
        $nodeinfo["metadata"]["services"] = $nodeinfo["services"];
 
-       if (nodeinfo_plugin_enabled("twitter"))
+       if (plugin_enabled("twitter"))
                $nodeinfo["metadata"]["services"]["inbound"][] = "twitter";
 
        header('Content-type: application/json; charset=utf-8');
@@ -142,17 +142,14 @@ function nodeinfo_init(&$a){
        exit;
 }
 
-function nodeinfo_plugin_enabled($plugin) {
-       $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
-       return((bool)(count($r) > 0));
-}
+
 
 function nodeinfo_cron() {
 
        $a = get_app();
 
        // If the plugin "statistics_json" is enabled then disable it and actrivate nodeinfo.
-       if (nodeinfo_plugin_enabled("statistics_json")) {
+       if (plugin_enabled("statistics_json")) {
                set_config("system", "nodeinfo", true);
 
                $plugin = "statistics_json";

diff --git a/mod/statistics_json.php b/mod/statistics_json.php
index 9f97d6ac743f334f24f07f8665d615b11da8557b..92bd1bc1b0e730504c9fec47e5fbfc8aa5e8b07a 100644 (file)
--- a/mod/statistics_json.php
+++ b/mod/statistics_json.php
@@ -20,19 +20,19 @@ function statistics_json_init(&$a) {
                        );
 
        $statistics["services"] = array();
-       $statistics["services"]["appnet"] = nodeinfo_plugin_enabled("appnet");
-       $statistics["services"]["blogger"] = nodeinfo_plugin_enabled("blogger");
-       $statistics["services"]["buffer"] = nodeinfo_plugin_enabled("buffer");
-       $statistics["services"]["dreamwidth"] = nodeinfo_plugin_enabled("dwpost");
-       $statistics["services"]["facebook"] = nodeinfo_plugin_enabled("fbpost");
-       $statistics["services"]["gnusocial"] = nodeinfo_plugin_enabled("statusnet");
-       $statistics["services"]["googleplus"] = nodeinfo_plugin_enabled("gpluspost");
-       $statistics["services"]["libertree"] = nodeinfo_plugin_enabled("libertree");
-       $statistics["services"]["livejournal"] = nodeinfo_plugin_enabled("ljpost");
-       $statistics["services"]["pumpio"] = nodeinfo_plugin_enabled("pumpio");
-       $statistics["services"]["twitter"] = nodeinfo_plugin_enabled("twitter");
-       $statistics["services"]["tumblr"] = nodeinfo_plugin_enabled("tumblr");
-       $statistics["services"]["wordpress"] = nodeinfo_plugin_enabled("wppost");
+       $statistics["services"]["appnet"] = plugin_enabled("appnet");
+       $statistics["services"]["blogger"] = plugin_enabled("blogger");
+       $statistics["services"]["buffer"] = plugin_enabled("buffer");
+       $statistics["services"]["dreamwidth"] = plugin_enabled("dwpost");
+       $statistics["services"]["facebook"] = plugin_enabled("fbpost");
+       $statistics["services"]["gnusocial"] = plugin_enabled("statusnet");
+       $statistics["services"]["googleplus"] = plugin_enabled("gpluspost");
+       $statistics["services"]["libertree"] = plugin_enabled("libertree");
+       $statistics["services"]["livejournal"] = plugin_enabled("ljpost");
+       $statistics["services"]["pumpio"] = plugin_enabled("pumpio");
+       $statistics["services"]["twitter"] = plugin_enabled("twitter");
+       $statistics["services"]["tumblr"] = plugin_enabled("tumblr");
+       $statistics["services"]["wordpress"] = plugin_enabled("wppost");
 
        $statistics["appnet"] = $statistics["services"]["appnet"];
        $statistics["blogger"] = $statistics["services"]["blogger"];

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 1a4eb3e5acd92b198183795dfe0f73b468584f2b..6c2339f514cce7310a581e827cef932f64081d1b 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -284,49 +284,49 @@ function vier_community_info() {
 
                $r = array();
 
-               if (nodeinfo_plugin_enabled("appnet"))
+               if (plugin_enabled("appnet"))
                        $r[] = array("photo" => "images/appnet.png", "name" => "App.net");
 
-               if (nodeinfo_plugin_enabled("buffer"))
+               if (plugin_enabled("buffer"))
                        $r[] = array("photo" => "images/buffer.png", "name" => "Buffer");
 
-               if (nodeinfo_plugin_enabled("blogger"))
+               if (plugin_enabled("blogger"))
                        $r[] = array("photo" => "images/blogger.png", "name" => "Blogger");
 
-               if (nodeinfo_plugin_enabled("dwpost"))
+               if (plugin_enabled("dwpost"))
                        $r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth");
 
-               if (nodeinfo_plugin_enabled("fbpost"))
+               if (plugin_enabled("fbpost"))
                        $r[] = array("photo" => "images/facebook.png", "name" => "Facebook");
 
-               if (nodeinfo_plugin_enabled("ifttt"))
+               if (plugin_enabled("ifttt"))
                        $r[] = array("photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT");
 
-               if (nodeinfo_plugin_enabled("statusnet"))
+               if (plugin_enabled("statusnet"))
                        $r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social");
 
-               if (nodeinfo_plugin_enabled("gpluspost"))
+               if (plugin_enabled("gpluspost"))
                        $r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
 
-               //if (nodeinfo_plugin_enabled("ijpost"))
+               //if (plugin_enabled("ijpost"))
                //      $r[] = array("photo" => "images/", "name" => "");
 
-               if (nodeinfo_plugin_enabled("libertree"))
+               if (plugin_enabled("libertree"))
                        $r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
 
-               //if (nodeinfo_plugin_enabled("ljpost"))
+               //if (plugin_enabled("ljpost"))
                //      $r[] = array("photo" => "images/", "name" => "");
 
-               if (nodeinfo_plugin_enabled("pumpio"))
+               if (plugin_enabled("pumpio"))
                        $r[] = array("photo" => "images/pumpio.png", "name" => "pump.io");
 
-               if (nodeinfo_plugin_enabled("tumblr"))
+               if (plugin_enabled("tumblr"))
                        $r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr");
 
-               if (nodeinfo_plugin_enabled("twitter"))
+               if (plugin_enabled("twitter"))
                        $r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
 
-               if (nodeinfo_plugin_enabled("wppost"))
+               if (plugin_enabled("wppost"))
                        $r[] = array("photo" => "images/wordpress", "name" => "Wordpress");
 
                if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"))