X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=plugins%2Freadityourself%2Freadityourself.php;h=961c5bda0c2f79347e9e69e63d4eedfde776c6cb;hb=7fde6de1212323418401c15efba06026c704ca87;hp=ee7579c0810e7fc54b775eb3dc866827f7a93cac;hpb=e760840feaf7eff6b3aae86545ff45231b9e3592;p=github%2Fshaarli%2FShaarli.git diff --git a/plugins/readityourself/readityourself.php b/plugins/readityourself/readityourself.php index ee7579c0..961c5bda 100644 --- a/plugins/readityourself/readityourself.php +++ b/plugins/readityourself/readityourself.php @@ -8,34 +8,42 @@ // it seems kinda dead. // Not tested. -// don't raise unnecessary warnings -if (is_file(PluginManager::$PLUGINS_PATH . '/readityourself/config.php')) { - include PluginManager::$PLUGINS_PATH . '/readityourself/config.php'; -} - -if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) { - $GLOBALS['plugins']['errors'][] = 'Wallabag plugin error: '. - 'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '. - 'in "plugins/wallabag/config.php" or in your Shaarli config.php file.'; +/** + * Init function, return an error if the server is not set. + * + * @param $conf ConfigManager instance. + * + * @return array Eventual error. + */ +function readityourself_init($conf) +{ + $riyUrl = $conf->get('plugins.READITYOUSELF_URL'); + if (empty($riyUrl)) { + $error = 'Readityourself plugin error: '. + 'Please define the "READITYOUSELF_URL" setting in the plugin administration page.'; + return array($error); + } } /** * Add readityourself icon to link_plugin when rendering linklist. * - * @param mixed $data - linklist data. + * @param mixed $data Linklist data. + * @param ConfigManager $conf Configuration Manager instance. * * @return mixed - linklist data with readityourself plugin. */ -function hook_readityourself_render_linklist($data) +function hook_readityourself_render_linklist($data, $conf) { - if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) { + $riyUrl = $conf->get('plugins.READITYOUSELF_URL'); + if (empty($riyUrl)) { return $data; } $readityourself_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/readityourself/readityourself.html'); foreach ($data['links'] as &$value) { - $readityourself = sprintf($readityourself_html, $GLOBALS['plugins']['READITYOUSELF_URL'], $value['url'], PluginManager::$PLUGINS_PATH); + $readityourself = sprintf($readityourself_html, $riyUrl, $value['url'], PluginManager::$PLUGINS_PATH); $value['link_plugin'][] = $readityourself; }