keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()

Browse source
This commit is contained in:
rabuzarus 2015-11-11 21:31:26 +01:00
parent dac6f39f41
commit 215205d376
4 changed files with 61 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/plugin.php
View file

@ -1,5 +1,7 @@
<?php <?php
/*
* @file include/identity.php
*/
// install and uninstall plugin // install and uninstall plugin
if (! function_exists('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));
}

43
mod/nodeinfo.php
View file

@ -67,48 +67,48 @@ function nodeinfo_init(&$a){
$nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]); $nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
if (nodeinfo_plugin_enabled("appnet")) if (plugin_enabled("appnet"))
$nodeinfo["services"]["inbound"][] = "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"; $nodeinfo["services"]["outbound"][] = "appnet";
if (nodeinfo_plugin_enabled("blogger")) if (plugin_enabled("blogger"))
$nodeinfo["services"]["outbound"][] = "blogger"; $nodeinfo["services"]["outbound"][] = "blogger";
if (nodeinfo_plugin_enabled("dwpost")) if (plugin_enabled("dwpost"))
$nodeinfo["services"]["outbound"][] = "dreamwidth"; $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"; $nodeinfo["services"]["outbound"][] = "facebook";
if (nodeinfo_plugin_enabled("statusnet")) { if (plugin_enabled("statusnet")) {
$nodeinfo["services"]["inbound"][] = "gnusocial"; $nodeinfo["services"]["inbound"][] = "gnusocial";
$nodeinfo["services"]["outbound"][] = "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"; $nodeinfo["services"]["outbound"][] = "google";
if (nodeinfo_plugin_enabled("ijpost")) if (plugin_enabled("ijpost"))
$nodeinfo["services"]["outbound"][] = "insanejournal"; $nodeinfo["services"]["outbound"][] = "insanejournal";
if (nodeinfo_plugin_enabled("libertree")) if (plugin_enabled("libertree"))
$nodeinfo["services"]["outbound"][] = "libertree"; $nodeinfo["services"]["outbound"][] = "libertree";
if (nodeinfo_plugin_enabled("buffer")) if (plugin_enabled("buffer"))
$nodeinfo["services"]["outbound"][] = "linkedin"; $nodeinfo["services"]["outbound"][] = "linkedin";
if (nodeinfo_plugin_enabled("ljpost")) if (plugin_enabled("ljpost"))
$nodeinfo["services"]["outbound"][] = "livejournal"; $nodeinfo["services"]["outbound"][] = "livejournal";
if (nodeinfo_plugin_enabled("buffer")) if (plugin_enabled("buffer"))
$nodeinfo["services"]["outbound"][] = "pinterest"; $nodeinfo["services"]["outbound"][] = "pinterest";
if (nodeinfo_plugin_enabled("posterous")) if (plugin_enabled("posterous"))
$nodeinfo["services"]["outbound"][] = "posterous"; $nodeinfo["services"]["outbound"][] = "posterous";
if (nodeinfo_plugin_enabled("pumpio")) { if (plugin_enabled("pumpio")) {
$nodeinfo["services"]["inbound"][] = "pumpio"; $nodeinfo["services"]["inbound"][] = "pumpio";
$nodeinfo["services"]["outbound"][] = "pumpio"; $nodeinfo["services"]["outbound"][] = "pumpio";
} }
@ -118,13 +118,13 @@ function nodeinfo_init(&$a){
if ($smtp) if ($smtp)
$nodeinfo["services"]["outbound"][] = "smtp"; $nodeinfo["services"]["outbound"][] = "smtp";
if (nodeinfo_plugin_enabled("tumblr")) if (plugin_enabled("tumblr"))
$nodeinfo["services"]["outbound"][] = "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"; $nodeinfo["services"]["outbound"][] = "twitter";
if (nodeinfo_plugin_enabled("wppost")) if (plugin_enabled("wppost"))
$nodeinfo["services"]["outbound"][] = "wordpress"; $nodeinfo["services"]["outbound"][] = "wordpress";
$nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"]; $nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"];
@ -134,7 +134,7 @@ function nodeinfo_init(&$a){
$nodeinfo["metadata"]["services"] = $nodeinfo["services"]; $nodeinfo["metadata"]["services"] = $nodeinfo["services"];
if (nodeinfo_plugin_enabled("twitter")) if (plugin_enabled("twitter"))
$nodeinfo["metadata"]["services"]["inbound"][] = "twitter"; $nodeinfo["metadata"]["services"]["inbound"][] = "twitter";
header('Content-type: application/json; charset=utf-8'); header('Content-type: application/json; charset=utf-8');
@ -142,17 +142,14 @@ function nodeinfo_init(&$a){
exit; 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() { function nodeinfo_cron() {
$a = get_app(); $a = get_app();
// If the plugin "statistics_json" is enabled then disable it and actrivate nodeinfo. // 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); set_config("system", "nodeinfo", true);
$plugin = "statistics_json"; $plugin = "statistics_json";

26
mod/statistics_json.php
View file

@ -20,19 +20,19 @@ function statistics_json_init(&$a) {
); );
$statistics["services"] = array(); $statistics["services"] = array();
$statistics["services"]["appnet"] = nodeinfo_plugin_enabled("appnet"); $statistics["services"]["appnet"] = plugin_enabled("appnet");
$statistics["services"]["blogger"] = nodeinfo_plugin_enabled("blogger"); $statistics["services"]["blogger"] = plugin_enabled("blogger");
$statistics["services"]["buffer"] = nodeinfo_plugin_enabled("buffer"); $statistics["services"]["buffer"] = plugin_enabled("buffer");
$statistics["services"]["dreamwidth"] = nodeinfo_plugin_enabled("dwpost"); $statistics["services"]["dreamwidth"] = plugin_enabled("dwpost");
$statistics["services"]["facebook"] = nodeinfo_plugin_enabled("fbpost"); $statistics["services"]["facebook"] = plugin_enabled("fbpost");
$statistics["services"]["gnusocial"] = nodeinfo_plugin_enabled("statusnet"); $statistics["services"]["gnusocial"] = plugin_enabled("statusnet");
$statistics["services"]["googleplus"] = nodeinfo_plugin_enabled("gpluspost"); $statistics["services"]["googleplus"] = plugin_enabled("gpluspost");
$statistics["services"]["libertree"] = nodeinfo_plugin_enabled("libertree"); $statistics["services"]["libertree"] = plugin_enabled("libertree");
$statistics["services"]["livejournal"] = nodeinfo_plugin_enabled("ljpost"); $statistics["services"]["livejournal"] = plugin_enabled("ljpost");
$statistics["services"]["pumpio"] = nodeinfo_plugin_enabled("pumpio"); $statistics["services"]["pumpio"] = plugin_enabled("pumpio");
$statistics["services"]["twitter"] = nodeinfo_plugin_enabled("twitter"); $statistics["services"]["twitter"] = plugin_enabled("twitter");
$statistics["services"]["tumblr"] = nodeinfo_plugin_enabled("tumblr"); $statistics["services"]["tumblr"] = plugin_enabled("tumblr");
$statistics["services"]["wordpress"] = nodeinfo_plugin_enabled("wppost"); $statistics["services"]["wordpress"] = plugin_enabled("wppost");
$statistics["appnet"] = $statistics["services"]["appnet"]; $statistics["appnet"] = $statistics["services"]["appnet"];
$statistics["blogger"] = $statistics["services"]["blogger"]; $statistics["blogger"] = $statistics["services"]["blogger"];

30
view/theme/vier/theme.php
View file

@ -284,49 +284,49 @@ function vier_community_info() {
$r = array(); $r = array();
if (nodeinfo_plugin_enabled("appnet")) if (plugin_enabled("appnet"))
$r[] = array("photo" => "images/appnet.png", "name" => "App.net"); $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"); $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"); $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"); $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"); $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"); $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"); $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+"); $r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
//if (nodeinfo_plugin_enabled("ijpost")) //if (plugin_enabled("ijpost"))
// $r[] = array("photo" => "images/", "name" => ""); // $r[] = array("photo" => "images/", "name" => "");
if (nodeinfo_plugin_enabled("libertree")) if (plugin_enabled("libertree"))
$r[] = array("photo" => "images/libertree.png", "name" => "Libertree"); $r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
//if (nodeinfo_plugin_enabled("ljpost")) //if (plugin_enabled("ljpost"))
// $r[] = array("photo" => "images/", "name" => ""); // $r[] = array("photo" => "images/", "name" => "");
if (nodeinfo_plugin_enabled("pumpio")) if (plugin_enabled("pumpio"))
$r[] = array("photo" => "images/pumpio.png", "name" => "pump.io"); $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"); $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"); $r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
if (nodeinfo_plugin_enabled("wppost")) if (plugin_enabled("wppost"))
$r[] = array("photo" => "images/wordpress", "name" => "Wordpress"); $r[] = array("photo" => "images/wordpress", "name" => "Wordpress");
if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"))