use Friendica\Database\DBA;
use Friendica\DI;
+use Friendica\Model\Contact;
use Friendica\Util\Strings;
/**
{
$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(DI::app());
foreach ($addons as $addon) {
$addonname = Strings::sanitizeFilePathItem(trim($addon['name']));
- $fname = 'addon/' . $addonname . '/' . $addonname . '.php';
- $t = @filemtime($fname);
- if (!file_exists($fname) || ($addon['timestamp'] == $t)) {
+ $addon_file_path = 'addon/' . $addonname . '/' . $addonname . '.php';
+ if (file_exists($addon_file_path) && $addon['timestamp'] == filemtime($addon_file_path)) {
+ // Addon unmodified, skipping
continue;
}
Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]);
- self::uninstall($fname);
- self::install($fname);
+ self::uninstall($addon['name']);
+ self::install($addon['name']);
}
}
return $info;
}
- $stamp1 = microtime(true);
+ DI::profiler()->startRecording('file');
$f = file_get_contents("addon/$addon/$addon.php");
- DI::profiler()->saveTimestamp($stamp1, "file");
+ DI::profiler()->stopRecording();
$r = preg_match("|/\*.*\*/|msU", $f, $m);
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];