ConfigManager no longer uses singleton pattern

[github/shaarli/Shaarli.git] / plugins / readityourself / readityourself.php

diff --git a/plugins/readityourself/readityourself.php b/plugins/readityourself/readityourself.php
index ee7579c0810e7fc54b775eb3dc866827f7a93cac..9ca73e01098ea08aaadfab52432797be86442428 100644 (file)
--- a/plugins/readityourself/readityourself.php
+++ b/plugins/readityourself/readityourself.php
@@ -8,15 +8,12 @@
 // 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.';
+$conf = ConfigManager::getInstance();
+$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.';
 }
 
 /**
@@ -28,14 +25,16 @@ if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) {
  */
 function hook_readityourself_render_linklist($data)
 {
-    if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) {
+    $conf = ConfigManager::getInstance();
+    $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;
     }