X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FAddon.php;h=357c02bcb6bd1b34734240c42a508b8c35004053;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=2ec46b71c1835b2792841c4d418a1c2e03ac5ff6;hpb=c1f99c70b1c7d62120723f3b142e843ba25ab338;p=friendica.git diff --git a/src/Core/Addon.php b/src/Core/Addon.php index 2ec46b71c1..357c02bcb6 100644 --- a/src/Core/Addon.php +++ b/src/Core/Addon.php @@ -1,18 +1,35 @@ . + * */ namespace Friendica\Core; -use Friendica\BaseObject; use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Model\Contact; use Friendica\Util\Strings; /** * Some functions to handle addons */ -class Addon extends BaseObject +class Addon { /** * The addon sub-directory @@ -45,7 +62,7 @@ class Addon extends BaseObject list($tmp, $addon) = array_map('trim', explode('/', $file)); $info = self::getInfo($addon); - if (Config::get('system', 'show_unsupported_addons') + if (DI::config()->get('system', 'show_unsupported_addons') || strtolower($info['status']) != 'unsupported' || self::isEnabled($addon) ) { @@ -83,7 +100,7 @@ class Addon extends BaseObject /** - * @brief Synchronize addons: + * Synchronize addons: * * system.addon contains a comma-separated list of names * of addons which are used on this system. @@ -96,41 +113,12 @@ class Addon extends BaseObject */ public static function loadAddons() { - $installed_addons = []; - - $r = DBA::select('addon', [], ['installed' => 1]); - if (DBA::isResult($r)) { - $installed_addons = DBA::toArray($r); - } - - $addons = Config::get('system', 'addon'); - $addons_arr = []; - - if ($addons) { - $addons_arr = explode(',', str_replace(' ', '', $addons)); - } - - 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); - } - } + $installed_addons = DBA::selectToArray('addon', ['name'], ['installed' => true]); + self::$addons = array_column($installed_addons, 'name'); } /** - * @brief uninstalls an addon. + * uninstalls an addon. * * @param string $addon name of the addon * @return void @@ -149,15 +137,13 @@ class Addon extends BaseObject $func(); } - DBA::delete('hook', ['file' => 'addon/' . $addon . '/' . $addon . '.php']); + Hook::delete(['file' => 'addon/' . $addon . '/' . $addon . '.php']); unset(self::$addons[array_search($addon, self::$addons)]); - - Addon::saveEnabledList(); } /** - * @brief installs an addon. + * installs an addon. * * @param string $addon name of the addon * @return bool @@ -167,42 +153,34 @@ class Addon extends BaseObject { $addon = Strings::sanitizeFilePathItem($addon); + $addon_file_path = 'addon/' . $addon . '/' . $addon . '.php'; + // silently fail if addon was removed of if $addon is funky - if (!file_exists('addon/' . $addon . '/' . $addon . '.php')) { + if (!file_exists($addon_file_path)) { return false; } Logger::notice("Addon {addon}: {action}", ['action' => 'install', 'addon' => $addon]); - $t = @filemtime('addon/' . $addon . '/' . $addon . '.php'); - @include_once('addon/' . $addon . '/' . $addon . '.php'); + $t = @filemtime($addon_file_path); + @include_once($addon_file_path); if (function_exists($addon . '_install')) { $func = $addon . '_install'; - $func(self::getApp()); - - $addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0); - - DBA::insert('addon', ['name' => $addon, 'installed' => true, - 'timestamp' => $t, 'plugin_admin' => $addon_admin]); - - // we can add the following with the previous SQL - // once most site tables have been updated. - // This way the system won't fall over dead during the update. - - if (file_exists('addon/' . $addon . '/.hidden')) { - DBA::update('addon', ['hidden' => true], ['name' => $addon]); - } - - if (!self::isEnabled($addon)) { - self::$addons[] = $addon; - } - - Addon::saveEnabledList(); + $func(DI::app()); + } - return true; - } else { - Logger::error("Addon {addon}: {action} failed", ['action' => 'install', 'addon' => $addon]); - return false; + DBA::insert('addon', [ + 'name' => $addon, + 'installed' => true, + 'timestamp' => $t, + 'plugin_admin' => function_exists($addon . '_addon_admin'), + 'hidden' => file_exists('addon/' . $addon . '/.hidden') + ]); + + if (!self::isEnabled($addon)) { + self::$addons[] = $addon; } + + return true; } /** @@ -210,46 +188,25 @@ class Addon extends BaseObject */ public static function reload() { - $addons = Config::get('system', 'addon'); - if (strlen($addons)) { - $r = DBA::select('addon', [], ['installed' => 1]); - if (DBA::isResult($r)) { - $installed = DBA::toArray($r); - } else { - $installed = []; + $addons = DBA::selectToArray('addon', [], ['installed' => true]); + + foreach ($addons as $addon) { + $addonname = Strings::sanitizeFilePathItem(trim($addon['name'])); + $addon_file_path = 'addon/' . $addonname . '/' . $addonname . '.php'; + if (file_exists($addon_file_path) && $addon['timestamp'] == filemtime($addon_file_path)) { + // Addon unmodified, skipping + continue; } - $addon_list = explode(',', $addons); + Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]); - foreach ($addon_list as $addon) { - $addon = Strings::sanitizeFilePathItem(trim($addon)); - $fname = 'addon/' . $addon . '/' . $addon . '.php'; - if (file_exists($fname)) { - $t = @filemtime($fname); - foreach ($installed as $i) { - if (($i['name'] == $addon) && ($i['timestamp'] != $t)) { - - Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $i['name']]); - @include_once($fname); - - if (function_exists($addon . '_uninstall')) { - $func = $addon . '_uninstall'; - $func(self::getApp()); - } - if (function_exists($addon . '_install')) { - $func = $addon . '_install'; - $func(self::getApp()); - } - DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]); - } - } - } - } + self::uninstall($addon['name']); + self::install($addon['name']); } } /** - * @brief Parse addon comment in search of addon infos. + * Parse addon comment in search of addon infos. * * like * \code @@ -267,8 +224,6 @@ class Addon extends BaseObject */ public static function getInfo($addon) { - $a = self::getApp(); - $addon = Strings::sanitizeFilePathItem($addon); $info = [ @@ -284,9 +239,9 @@ class Addon extends BaseObject return $info; } - $stamp1 = microtime(true); + DI::profiler()->startRecording('file'); $f = file_get_contents("addon/$addon/$addon.php"); - $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack()); + DI::profiler()->stopRecording(); $r = preg_match("|/\*.*\*/|msU", $f, $m); @@ -305,6 +260,12 @@ class Addon extends BaseObject if ($type == "author" || $type == "maintainer") { $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); if ($r) { + if (!empty($m[2]) && empty(parse_url($m[2], PHP_URL_SCHEME))) { + $contact = Contact::getByURL($m[2], false); + if (!empty($contact['url'])) { + $m[2] = $contact['url']; + } + } $info[$type][] = ['name' => $m[1], 'link' => $m[2]]; } else { $info[$type][] = ['name' => $v]; @@ -341,16 +302,6 @@ class Addon extends BaseObject return self::$addons; } - /** - * Saves the current enabled addon list in the system.addon config key - * - * @return boolean - */ - public static function saveEnabledList() - { - return Config::set('system', 'addon', implode(',', self::$addons)); - } - /** * Returns the list of non-hidden enabled addon names * @@ -369,51 +320,4 @@ class Addon extends BaseObject return $visible_addons; } - - /** - * Shim of Hook::register left for backward compatibility purpose. - * - * @see Hook::register - * @deprecated since version 2018.12 - * @param string $hook the name of the hook - * @param string $file the name of the file that hooks into - * @param string $function the name of the function that the hook will call - * @param int $priority A priority (defaults to 0) - * @return mixed|bool - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ - public static function registerHook($hook, $file, $function, $priority = 0) - { - return Hook::register($hook, $file, $function, $priority); - } - - /** - * Shim of Hook::unregister left for backward compatibility purpose. - * - * @see Hook::unregister - * @deprecated since version 2018.12 - * @param string $hook the name of the hook - * @param string $file the name of the file that hooks into - * @param string $function the name of the function that the hook called - * @return boolean - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ - public static function unregisterHook($hook, $file, $function) - { - return Hook::unregister($hook, $file, $function); - } - - /** - * Shim of Hook::callAll left for backward-compatibility purpose. - * - * @see Hook::callAll - * @deprecated since version 2018.12 - * @param string $name of the hook to call - * @param string|array &$data to transmit to the callback handler - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ - public static function callHooks($name, &$data = null) - { - Hook::callAll($name, $data); - } }