From d72473fd512a63c2831b943834fae3efba3896b8 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 6 Oct 2018 01:13:29 +0200
Subject: [PATCH 1/2] moving boot::check_addons to Friendica\Core\Addon::check
And extending Addon from BaseObject because of self::getApp()
---
boot.php | 56 -----------------------------------
index.php | 2 +-
src/Core/Addon.php | 74 +++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 67 insertions(+), 65 deletions(-)
diff --git a/boot.php b/boot.php
index b5c916698..b1d5b593f 100644
--- a/boot.php
+++ b/boot.php
@@ -673,62 +673,6 @@ function run_update_function($x, $prefix)
}
}
-/**
- * @brief Synchronise addons:
- *
- * system.addon contains a comma-separated list of names
- * of addons which are used on this system.
- * Go through the database list of already installed addons, and if we have
- * an entry, but it isn't in the config list, call the uninstall procedure
- * and mark it uninstalled in the database (for now we'll remove it).
- * Then go through the config list and if we have a addon that isn't installed,
- * call the install procedure and add it to the database.
- *
- * @param object $a App
- */
-function check_addons(App $a)
-{
- $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
- if (DBA::isResult($r)) {
- $installed = $r;
- } else {
- $installed = [];
- }
-
- $addons = Config::get('system', 'addon');
- $addons_arr = [];
-
- if ($addons) {
- $addons_arr = explode(',', str_replace(' ', '', $addons));
- }
-
- $a->addons = $addons_arr;
-
- $installed_arr = [];
-
- if (count($installed)) {
- foreach ($installed as $i) {
- if (!in_array($i['name'], $addons_arr)) {
- Addon::uninstall($i['name']);
- } else {
- $installed_arr[] = $i['name'];
- }
- }
- }
-
- if (count($addons_arr)) {
- foreach ($addons_arr as $p) {
- if (!in_array($p, $installed_arr)) {
- Addon::install($p);
- }
- }
- }
-
- Addon::loadHooks();
-
- return;
-}
-
/**
* @brief Used to end the current process, after saving session state.
* @deprecated
diff --git a/index.php b/index.php
index bccdebe7b..1a3e21351 100644
--- a/index.php
+++ b/index.php
@@ -172,7 +172,7 @@ if ($a->isInstallMode() && $a->module!="view") {
} else {
check_url($a);
check_db(false);
- check_addons($a);
+ Addon::check();
}
Nav::setSelected('nothing');
diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 4c20c96ad..aa3a403f9 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -5,6 +5,7 @@
namespace Friendica\Core;
use Friendica\App;
+use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'include/dba.php';
@@ -12,8 +13,65 @@ require_once 'include/dba.php';
/**
* Some functions to handle addons
*/
-class Addon
+class Addon extends BaseObject
{
+ /**
+ * @brief Synchronise addons:
+ *
+ * system.addon contains a comma-separated list of names
+ * of addons which are used on this system.
+ * Go through the database list of already installed addons, and if we have
+ * an entry, but it isn't in the config list, call the uninstall procedure
+ * and mark it uninstalled in the database (for now we'll remove it).
+ * Then go through the config list and if we have a addon that isn't installed,
+ * call the install procedure and add it to the database.
+ *
+ */
+ public static function check()
+ {
+ $a = self::getApp();
+
+ $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
+ if (DBA::isResult($r)) {
+ $installed = $r;
+ } else {
+ $installed = [];
+ }
+
+ $addons = Config::get('system', 'addon');
+ $addons_arr = [];
+
+ if ($addons) {
+ $addons_arr = explode(',', str_replace(' ', '', $addons));
+ }
+
+ $a->addons = $addons_arr;
+
+ $installed_arr = [];
+
+ if (count($installed)) {
+ foreach ($installed as $i) {
+ if (!in_array($i['name'], $addons_arr)) {
+ self::uninstall($i['name']);
+ } else {
+ $installed_arr[] = $i['name'];
+ }
+ }
+ }
+
+ if (count($addons_arr)) {
+ foreach ($addons_arr as $p) {
+ if (!in_array($p, $installed_arr)) {
+ self::install($p);
+ }
+ }
+ }
+
+ self::loadHooks();
+
+ return;
+ }
+
/**
* @brief uninstalls an addon.
*
@@ -139,7 +197,7 @@ class Addon
*/
public static function registerHook($hook, $file, $function, $priority = 0)
{
- $file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+ $file = str_replace(self::getApp()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
$exists = DBA::exists('hook', $condition);
@@ -162,7 +220,7 @@ class Addon
*/
public static function unregisterHook($hook, $file, $function)
{
- $relative_file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+ $relative_file = str_replace(self::getApp()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
// This here is only needed for fixing a problem that existed on the develop branch
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
@@ -178,7 +236,7 @@ class Addon
*/
public static function loadHooks()
{
- $a = get_app();
+ $a = self::getApp();
$a->hooks = [];
$r = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
@@ -201,7 +259,7 @@ class Addon
*/
public static function forkHooks($priority, $name, $data = null)
{
- $a = get_app();
+ $a = self::getApp();
if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
foreach ($a->hooks[$name] as $hook) {
@@ -221,7 +279,7 @@ class Addon
*/
public static function callHooks($name, &$data = null)
{
- $a = get_app();
+ $a = self::getApp();
if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
foreach ($a->hooks[$name] as $hook) {
@@ -262,7 +320,7 @@ class Addon
*/
public static function isApp($name)
{
- $a = get_app();
+ $a = self::getApp();
if (is_array($a->hooks) && (array_key_exists('app_menu', $a->hooks))) {
foreach ($a->hooks['app_menu'] as $hook) {
@@ -293,7 +351,7 @@ class Addon
*/
public static function getInfo($addon)
{
- $a = get_app();
+ $a = self::getApp();
$info = [
'name' => $addon,
From eb1a2572249e7257ebe8e814657f42702571df24 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 6 Oct 2018 01:21:05 +0200
Subject: [PATCH 2/2] Used new select function
---
src/Core/Addon.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index aa3a403f9..d5a7a6f1b 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -31,9 +31,9 @@ class Addon extends BaseObject
{
$a = self::getApp();
- $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
+ $r = DBA::select('addon', [], ['installed' => 1]);
if (DBA::isResult($r)) {
- $installed = $r;
+ $installed = DBA::toArray($r);
} else {
$installed = [];
}