friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix uninstall of installed addons

This commit is contained in:
Michael 2020-03-09 23:28:37 +00:00
parent 2b5ef80912
commit 8e421f0893
4 changed files with 30 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/Core/Addon.php
View File

@ -112,37 +112,14 @@ class Addon
*/ */
public static function loadAddons() public static function loadAddons()
{ {
$installed_addons = []; $installed_addons = DBA::selectToArray('addon', ['name'], ['installed' => true]);
$r = DBA::select('addon', [], ['installed' => 1]);
if (DBA::isResult($r)) {
$installed_addons = DBA::toArray($r);
}
$addons = DI::config()->get('system', 'addon');
$addons_arr = []; $addons_arr = [];
foreach ($installed_addons as $addon) {
if ($addons) { $addons_arr[] = $addon['name'];
$addons_arr = explode(',', str_replace(' ', '', $addons));
} }
self::$addons = $addons_arr; self::$addons = $addons_arr;
$installed_arr = [];
foreach ($installed_addons as $addon) {
if (!self::isEnabled($addon['name'])) {
self::uninstall($addon['name']);
} else {
$installed_arr[] = $addon['name'];
}
}
foreach (self::$addons as $p) {
if (!in_array($p, $installed_arr)) {
self::install($p);
}
}
} }
/** /**
@ -168,8 +145,6 @@ class Addon
DBA::delete('hook', ['file' => 'addon/' . $addon . '/' . $addon . '.php']); DBA::delete('hook', ['file' => 'addon/' . $addon . '/' . $addon . '.php']);
unset(self::$addons[array_search($addon, self::$addons)]); unset(self::$addons[array_search($addon, self::$addons)]);
Addon::saveEnabledList();
} }
/** /**
@ -212,8 +187,6 @@ class Addon
self::$addons[] = $addon; self::$addons[] = $addon;
} }
Addon::saveEnabledList();
return true; return true;
} else { } else {
Logger::error("Addon {addon}: {action} failed", ['action' => 'install', 'addon' => $addon]); Logger::error("Addon {addon}: {action} failed", ['action' => 'install', 'addon' => $addon]);
@ -226,38 +199,33 @@ class Addon
*/ */
public static function reload() public static function reload()
{ {
$addons = DI::config()->get('system', 'addon'); $installed = DBA::selectToArray('addon', [], ['installed' => 1]);
if (strlen($addons)) {
$r = DBA::select('addon', [], ['installed' => 1]);
if (DBA::isResult($r)) {
$installed = DBA::toArray($r);
} else {
$installed = [];
}
$addon_list = explode(',', $addons); $addon_list = [];
foreach ($installed as $addon) {
$addon_list[] = $addon['name'];
}
foreach ($addon_list as $addon) { foreach ($addon_list as $addon) {
$addon = Strings::sanitizeFilePathItem(trim($addon)); $addon = Strings::sanitizeFilePathItem(trim($addon));
$fname = 'addon/' . $addon . '/' . $addon . '.php'; $fname = 'addon/' . $addon . '/' . $addon . '.php';
if (file_exists($fname)) { if (file_exists($fname)) {
$t = @filemtime($fname); $t = @filemtime($fname);
foreach ($installed as $i) { foreach ($installed as $i) {
if (($i['name'] == $addon) && ($i['timestamp'] != $t)) { if (($i['name'] == $addon) && ($i['timestamp'] != $t)) {
Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $i['name']]); Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $i['name']]);
@include_once($fname); @include_once($fname);
if (function_exists($addon . '_uninstall')) { if (function_exists($addon . '_uninstall')) {
$func = $addon . '_uninstall'; $func = $addon . '_uninstall';
$func(DI::app()); $func(DI::app());
}
if (function_exists($addon . '_install')) {
$func = $addon . '_install';
$func(DI::app());
}
DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
} }
if (function_exists($addon . '_install')) {
$func = $addon . '_install';
$func(DI::app());
}
DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
} }
} }
} }
@ -357,16 +325,6 @@ class Addon
return self::$addons; return self::$addons;
} }
/**
* Saves the current enabled addon list in the system.addon config key
*
* @return boolean
*/
public static function saveEnabledList()
{
return DI::config()->set('system', 'addon', implode(',', self::$addons));
}
/** /**
* Returns the list of non-hidden enabled addon names * Returns the list of non-hidden enabled addon names
* *

15
src/Model/Nodeinfo.php
View File

@ -43,20 +43,7 @@ class Nodeinfo
// If the addon 'statistics_json' is enabled then disable it and activate nodeinfo. // If the addon 'statistics_json' is enabled then disable it and activate nodeinfo.
if (Addon::isEnabled('statistics_json')) { if (Addon::isEnabled('statistics_json')) {
$config->set('system', 'nodeinfo', true); $config->set('system', 'nodeinfo', true);
Addon::uninstall('statistics_json');
$addon = 'statistics_json';
$addons = $config->get('system', 'addon');
if ($addons) {
$addons_arr = explode(',', str_replace(' ', '', $addons));
$idx = array_search($addon, $addons_arr);
if ($idx !== false) {
unset($addons_arr[$idx]);
Addon::uninstall($addon);
$config->set('system', 'addon', implode(', ', $addons_arr));
}
}
} }
if (empty($config->get('system', 'nodeinfo'))) { if (empty($config->get('system', 'nodeinfo'))) {

2
src/Module/Admin/Addons/Details.php
View File

@ -84,8 +84,6 @@ class Details extends BaseAdmin
info(DI::l10n()->t('Addon %s enabled.', $addon)); info(DI::l10n()->t('Addon %s enabled.', $addon));
} }
Addon::saveEnabledList();
DI::baseUrl()->redirect('admin/addons/' . $addon); DI::baseUrl()->redirect('admin/addons/' . $addon);
} }

21
update.php
View File

@ -92,23 +92,10 @@ function update_1191()
DI::config()->set('system', 'maintenance', 1); DI::config()->set('system', 'maintenance', 1);
if (Addon::isEnabled('forumlist')) { if (Addon::isEnabled('forumlist')) {
$addon = 'forumlist'; //delete forumlist manually from addon and hook table
$addons = DI::config()->get('system', 'addon'); // since Addon::uninstall() don't work here
$addons_arr = []; DBA::delete('addon', ['name' => 'forumlist']);
DBA::delete('hook', ['file' => 'addon/forumlist/forumlist.php']);
if ($addons) {
$addons_arr = explode(",", str_replace(" ", "", $addons));
$idx = array_search($addon, $addons_arr);
if ($idx !== false) {
unset($addons_arr[$idx]);
//delete forumlist manually from addon and hook table
// since Addon::uninstall() don't work here
q("DELETE FROM `addon` WHERE `name` = 'forumlist' ");
q("DELETE FROM `hook` WHERE `file` = 'addon/forumlist/forumlist.php' ");
DI::config()->set('system', 'addon', implode(", ", $addons_arr));
}
}
} }
// select old formlist addon entries // select old formlist addon entries