Merge pull request #570 from ArthurHoaro/config-manager

Introduce a configuration manager

2 files changed, 9 insertions, 15 deletions

diff --git a/plugins/readityourself/config.php.dist b/plugins/readityourself/config.php.dist
deleted file mode 100644
index d6b5cb85..00000000
--- a/plugins/readityourself/config.php.dist
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$GLOBALS['plugins']['READITYOUSELF_URL'] = 'http://someurl.com';
\ No newline at end of file
diff --git a/plugins/readityourself/readityourself.php b/plugins/readityourself/readityourself.php
index c8df4c4f..4bfcf501 100644
--- a/plugins/readityourself/readityourself.php
+++ b/plugins/readityourself/readityourself.php
@@ -8,34 +8,31 @@
 // 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 (empty($GLOBALS['plugins']['READITYOUSELF_URL'])) {
+$riyUrl = $conf->get('plugins.READITYOUSELF_URL');
+if (empty($riyUrl)) {
     $GLOBALS['plugin_errors'][] = 'Readityourself plugin error: '.
-        'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '.
-        'in "plugins/readityourself/config.php" or in your Shaarli config.php file.';
+        'Please define the "READITYOUSELF_URL" setting in the plugin administration page.';
 }
 
 /**
  * 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;
     }