* *
* *\endcode
- * @param string $plugin the name of the plugin
- * @return array with the plugin information
+ * @param string $addon the name of the addon
+ * @return array with the addon information
*/
- function get_plugin_info($plugin) {
+ public static function getInfo($addon) {
$a = get_app();
$info=[
- 'name' => $plugin,
+ 'name' => $addon,
'description' => "",
'author' => [],
'version' => "",
'status' => ""
];
- if (!is_file("addon/$plugin/$plugin.php")) return $info;
+ if (!is_file("addon/$addon/$addon.php")) {
+ return $info;
+ }
$stamp1 = microtime(true);
- $f = file_get_contents("addon/$plugin/$plugin.php");
+ $f = file_get_contents("addon/$addon/$addon.php");
$a->save_timestamp($stamp1, "file");
$r = preg_match("|/\*.*\*/|msU", $f, $m);
@@ -293,7 +308,6 @@ class Addon
}
}
-
}
return $info;
}
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 478f01a96..893b1bccc 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -4,6 +4,7 @@
*/
namespace Friendica\Core;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM;
@@ -1030,7 +1031,7 @@ class Worker
$arr = ['args' => $args, 'run_cmd' => true];
- call_hooks("proc_run", $arr);
+ Addon::callHooks("proc_run", $arr);
if (!$arr['run_cmd'] || !count($args)) {
return true;
}
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 2f3328a24..2778e8a5d 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -5,6 +5,7 @@
namespace Friendica\Model;
use Friendica\BaseObject;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
@@ -559,7 +560,7 @@ class Contact extends BaseObject
$args = ['contact' => $contact, 'menu' => &$menu];
- call_hooks('contact_photo_menu', $args);
+ Addon::callHooks('contact_photo_menu', $args);
$menucondensed = [];
@@ -1146,7 +1147,7 @@ class Contact extends BaseObject
$arr = ['url' => $url, 'contact' => []];
- call_hooks('follow', $arr);
+ Addon::callHooks('follow', $arr);
if (x($arr['contact'], 'name')) {
$ret = $arr['contact'];
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index b47a53c9e..cd925780b 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -8,6 +8,7 @@ namespace Friendica\Model;
use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\ForumManager;
+use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
@@ -286,7 +287,7 @@ class Profile
$profile['network_name'] = '';
}
- call_hooks('profile_sidebar_enter', $profile);
+ Addon::callHooks('profile_sidebar_enter', $profile);
// don't show connect link to yourself
@@ -520,7 +521,7 @@ class Profile
$arr = ['profile' => &$profile, 'entry' => &$o];
- call_hooks('profile_sidebar', $arr);
+ Addon::callHooks('profile_sidebar', $arr);
return $o;
}
@@ -939,7 +940,7 @@ class Profile
}
$arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $tab, 'tabs' => $tabs];
- call_hooks('profile_tabs', $arr);
+ Addon::callHooks('profile_tabs', $arr);
$tpl = get_markup_template('common_tabs.tpl');
@@ -976,7 +977,7 @@ class Profile
Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
$arr = ['zrl' => $my_url, 'url' => $a->cmd];
- call_hooks('zrl_init', $arr);
+ Addon::callHooks('zrl_init', $arr);
}
}
diff --git a/src/Model/User.php b/src/Model/User.php
index 2ba0f05bd..57f1d0ab2 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -7,6 +7,7 @@
namespace Friendica\Model;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
@@ -433,7 +434,7 @@ class User
}
}
- call_hooks('register_account', $uid);
+ Addon::callHooks('register_account', $uid);
$return['user'] = $user;
return $return;
@@ -532,7 +533,7 @@ class User
$user = dba::selectFirst('user', [], ['uid' => $uid]);
- call_hooks('remove_user', $user);
+ Addon::callHooks('remove_user', $user);
// save username (actually the nickname as it is guaranteed
// unique), so it cannot be re-registered in the future.
diff --git a/src/Module/Login.php b/src/Module/Login.php
index 941510576..1da7a7417 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -3,6 +3,7 @@
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\User;
@@ -92,7 +93,7 @@ class Login extends BaseModule
* Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
* and later plugins should not interfere with an earlier one that succeeded.
*/
- call_hooks('authenticate', $addon_auth);
+ Addon::callHooks('authenticate', $addon_auth);
if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {
$record = $addon_auth['user_record'];
@@ -299,7 +300,7 @@ class Login extends BaseModule
]
);
- call_hooks('login_hook', $o);
+ Addon::callHooks('login_hook', $o);
return $o;
}
diff --git a/src/Module/Logout.php b/src/Module/Logout.php
index 0c8a617b2..366f000a8 100644
--- a/src/Module/Logout.php
+++ b/src/Module/Logout.php
@@ -3,10 +3,10 @@
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\Core\Addon;
require_once 'boot.php';
require_once 'include/pgettext.php';
-require_once 'include/plugin.php';
require_once 'include/security.php';
/**
@@ -21,7 +21,7 @@ class Logout extends BaseModule
*/
public static function init()
{
- call_hooks("logging_out");
+ Addon::callHooks("logging_out");
nuke_session();
info(t('Logged out.') . EOL);
goaway(self::getApp()->get_baseurl());
diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php
index 64ae3374a..93e17a704 100644
--- a/src/Network/FKOAuth1.php
+++ b/src/Network/FKOAuth1.php
@@ -5,6 +5,7 @@
namespace Friendica\Network;
use Friendica\App;
+use Friendica\Core\Addon;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
@@ -72,6 +73,6 @@ class FKOAuth1 extends OAuthServer
dba::update('user', ['login_date' => datetime_convert()], ['uid' => $_SESSION['uid']]);
- call_hooks('logged_in', $a->user);
+ Addon::callHooks('logged_in', $a->user);
}
}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index a3d6818fc..7136df553 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -7,6 +7,7 @@ namespace Friendica\Object;
use Friendica\BaseObject;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
+use Friendica\Core\Addon;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
@@ -214,7 +215,7 @@ class Post extends BaseObject
}
$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
- call_hooks('render_location', $locate);
+ Addon::callHooks('render_location', $locate);
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
// process action responses - e.g. like/dislike/attend/agree/whatever
@@ -405,7 +406,7 @@ class Post extends BaseObject
];
$arr = ['item' => $item, 'output' => $tmp_item];
- call_hooks('display_item', $arr);
+ Addon::callHooks('display_item', $arr);
$result = $arr['output'];
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 0d92d598c..08f2c4d07 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -10,6 +10,7 @@ namespace Friendica\Protocol;
use Friendica\App;
use Friendica\Content\OEmbed;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Core\Worker;
@@ -269,12 +270,12 @@ class DFRN
$root = self::addHeader($doc, $owner, $author, $alternatelink, true);
/// @TODO This hook can't work anymore
- // call_hooks('atom_feed', $atom);
+ // Addon::callHooks('atom_feed', $atom);
if (!DBM::is_result($items) || $onlyheader) {
$atom = trim($doc->saveXML());
- call_hooks('atom_feed_end', $atom);
+ Addon::callHooks('atom_feed_end', $atom);
return $atom;
}
@@ -303,7 +304,7 @@ class DFRN
$atom = trim($doc->saveXML());
- call_hooks('atom_feed_end', $atom);
+ Addon::callHooks('atom_feed_end', $atom);
return $atom;
}
diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index ba65296f5..7d35e5441 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -4,6 +4,7 @@
*/
namespace Friendica\Util;
+use Friendica\Core\Addon;
use Friendica\Core\PConfig;
use Friendica\Protocol\Email;
@@ -30,7 +31,7 @@ class Emailer
*/
public static function send($params)
{
- call_hooks('emailer_send_prepare', $params);
+ Addon::callHooks('emailer_send_prepare', $params);
$email_textonly = false;
if (x($params, "uid")) {
@@ -79,7 +80,7 @@ class Emailer
'headers' => $messageHeader
];
//echo ""; var_dump($hookdata); killme();
- call_hooks("emailer_send", $hookdata);
+ Addon::callHooks("emailer_send", $hookdata);
$res = mail(
$hookdata['to'], // send to address
$hookdata['subject'], // subject
diff --git a/src/Util/Map.php b/src/Util/Map.php
index 9aabb9db9..e736ca719 100644
--- a/src/Util/Map.php
+++ b/src/Util/Map.php
@@ -4,6 +4,8 @@
*/
namespace Friendica\Util;
+use Friendica\Core\Addon;
+
/**
* Leaflet Map related functions
*/
@@ -12,13 +14,13 @@ class Map {
$coord = trim($coord);
$coord = str_replace([',','/',' '],[' ',' ',' '],$coord);
$arr = ['lat' => trim(substr($coord,0,strpos($coord,' '))), 'lon' => trim(substr($coord,strpos($coord,' ')+1)), 'html' => ''];
- call_hooks('generate_map',$arr);
+ Addon::callHooks('generate_map',$arr);
return ($arr['html']) ? $arr['html'] : $coord;
}
public static function byLocation($location) {
$arr = ['location' => $location, 'html' => ''];
- call_hooks('generate_named_map',$arr);
+ Addon::callHooks('generate_named_map',$arr);
return ($arr['html']) ? $arr['html'] : $location;
}
}
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index bca512702..b03fcd982 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -6,6 +6,7 @@
namespace Friendica\Util;
use Friendica\Content\OEmbed;
+use Friendica\Core\Addon;
use Friendica\Object\Image;
use Friendica\Util\XML;
@@ -425,7 +426,7 @@ class ParseUrl
logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG);
- call_hooks("getsiteinfo", $siteinfo);
+ Addon::callHooks("getsiteinfo", $siteinfo);
return($siteinfo);
}
diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index e9019216f..2c855d569 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -4,6 +4,7 @@
*/
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
@@ -138,7 +139,7 @@ Class Cron {
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
- reload_plugins();
+ Addon::reload();
$d = datetime_convert();
diff --git a/src/Worker/CronHooks.php b/src/Worker/CronHooks.php
index fed65b229..ed1675031 100644
--- a/src/Worker/CronHooks.php
+++ b/src/Worker/CronHooks.php
@@ -5,6 +5,7 @@
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
@@ -18,7 +19,7 @@ Class CronHooks {
foreach ($a->hooks["cron"] as $single_hook) {
if ($single_hook[1] == $hook) {
logger("Calling cron hook '" . $hook . "'", LOGGER_DEBUG);
- call_single_hook($a, $hook, $single_hook);
+ Addon::callSingleHook($a, $hook, $single_hook);
}
}
return;
diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php
index b29978cea..e38f9eeee 100644
--- a/src/Worker/Directory.php
+++ b/src/Worker/Directory.php
@@ -6,6 +6,7 @@
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
@@ -27,7 +28,7 @@ class Directory {
$arr = ['url' => $url];
- call_hooks('globaldir_update', $arr);
+ Addon::callHooks('globaldir_update', $arr);
logger('Updating directory: ' . $arr['url'], LOGGER_DEBUG);
if (strlen($arr['url'])) {
diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 039ae44db..6b853bde7 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -6,6 +6,7 @@
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
@@ -20,7 +21,7 @@ class Expire {
require_once 'include/datetime.php';
require_once 'include/items.php';
- load_hooks();
+ Addon::loadHooks();
if ($param == 'delete') {
logger('Delete expired items', LOGGER_DEBUG);
@@ -50,7 +51,7 @@ class Expire {
foreach ($a->hooks["expire"] as $hook) {
if ($hook[1] == $hook_name) {
logger("Calling expire hook '" . $hook[1] . "'", LOGGER_DEBUG);
- call_single_hook($a, $hook_name, $hook, $data);
+ Addon::callSingleHook($a, $hook_name, $hook, $data);
}
}
return;
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index d69627d11..f28b8c68a 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -4,6 +4,7 @@
*/
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
@@ -553,10 +554,10 @@ class Notifier {
logger('notifier: calling hooks', LOGGER_DEBUG);
if ($normal_mode) {
- call_hooks('notifier_normal',$target_item);
+ Addon::callHooks('notifier_normal',$target_item);
}
- call_hooks('notifier_end',$target_item);
+ Addon::callHooks('notifier_end',$target_item);
return;
}
diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 96c9fed31..daa8fcb5c 100644
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -4,6 +4,7 @@
*/
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
@@ -55,7 +56,7 @@ class Queue
*/
$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
- call_hooks('queue_predeliver', $r);
+ Addon::callHooks('queue_predeliver', $r);
if (DBM::is_result($r)) {
foreach ($r as $q_item) {
@@ -159,7 +160,7 @@ class Queue
default:
$params = ['owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false];
- call_hooks('queue_deliver', $params);
+ Addon::callHooks('queue_deliver', $params);
if ($params['result']) {
QueueModel::removeItem($q_item['id']);
diff --git a/update.php b/update.php
index bf6eee9d7..0dc3398ec 100644
--- a/update.php
+++ b/update.php
@@ -1,5 +1,6 @@
"images/appnet.png", "name" => "App.net"];
}
- if (plugin_enabled("buffer")) {
+ if (Addon::isEnabled("buffer")) {
$r[] = ["photo" => "images/buffer.png", "name" => "Buffer"];
}
- if (plugin_enabled("blogger")) {
+ if (Addon::isEnabled("blogger")) {
$r[] = ["photo" => "images/blogger.png", "name" => "Blogger"];
}
- if (plugin_enabled("dwpost")) {
+ if (Addon::isEnabled("dwpost")) {
$r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"];
}
- if (plugin_enabled("fbpost")) {
+ if (Addon::isEnabled("fbpost")) {
$r[] = ["photo" => "images/facebook.png", "name" => "Facebook"];
}
- if (plugin_enabled("ifttt")) {
+ if (Addon::isEnabled("ifttt")) {
$r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"];
}
- if (plugin_enabled("statusnet")) {
+ if (Addon::isEnabled("statusnet")) {
$r[] = ["photo" => "images/gnusocial.png", "name" => "GNU Social"];
}
- if (plugin_enabled("gpluspost")) {
+ if (Addon::isEnabled("gpluspost")) {
$r[] = ["photo" => "images/googleplus.png", "name" => "Google+"];
}
/// @TODO old-lost code (and below)?
- //if (plugin_enabled("ijpost")) {
+ //if (Addon::isEnabled("ijpost")) {
// $r[] = array("photo" => "images/", "name" => "");
//}
- if (plugin_enabled("libertree")) {
+ if (Addon::isEnabled("libertree")) {
$r[] = ["photo" => "images/libertree.png", "name" => "Libertree"];
}
- //if (plugin_enabled("ljpost")) {
+ //if (Addon::isEnabled("ljpost")) {
// $r[] = array("photo" => "images/", "name" => "");
//}
- if (plugin_enabled("pumpio")) {
+ if (Addon::isEnabled("pumpio")) {
$r[] = ["photo" => "images/pumpio.png", "name" => "pump.io"];
}
- if (plugin_enabled("tumblr")) {
+ if (Addon::isEnabled("tumblr")) {
$r[] = ["photo" => "images/tumblr.png", "name" => "Tumblr"];
}
- if (plugin_enabled("twitter")) {
+ if (Addon::isEnabled("twitter")) {
$r[] = ["photo" => "images/twitter.png", "name" => "Twitter"];
}
- if (plugin_enabled("wppost")) {
+ if (Addon::isEnabled("wppost")) {
$r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
}