1 files changed, 22 insertions, 16 deletions

diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php
index 0d6fc66d..641e4cc2 100644
--- a/plugins/wallabag/wallabag.php
+++ b/plugins/wallabag/wallabag.php
@@ -6,34 +6,40 @@
 
 require_once 'WallabagInstance.php';
 
-// don't raise unnecessary warnings
-if (is_file(PluginManager::$PLUGINS_PATH . '/wallabag/config.php')) {
-    include PluginManager::$PLUGINS_PATH . '/wallabag/config.php';
-}
-
-if (empty($GLOBALS['plugins']['WALLABAG_URL'])) {
-    $GLOBALS['plugin_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 wallabag_init($conf)
+{
+    $wallabagUrl = $conf->get('plugins.WALLABAG_URL');
+    if (empty($wallabagUrl)) {
+        $error = 'Wallabag plugin error: '.
+            'Please define the "WALLABAG_URL" setting in the plugin administration page.';
+        return array($error);
+    }
 }
 
 /**
  * Add wallabag 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 wallabag plugin.
  */
-function hook_wallabag_render_linklist($data)
+function hook_wallabag_render_linklist($data, $conf)
 {
-    if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) {
+    $wallabagUrl = $conf->get('plugins.WALLABAG_URL');
+    if (empty($wallabagUrl)) {
         return $data;
     }
 
-    $version = isset($GLOBALS['plugins']['WALLABAG_VERSION'])
-        ? $GLOBALS['plugins']['WALLABAG_VERSION']
-        : '';
-    $wallabagInstance = new WallabagInstance($GLOBALS['plugins']['WALLABAG_URL'], $version);
+    $version = $conf->get('plugins.WALLABAG_VERSION');
+    $wallabagInstance = new WallabagInstance($wallabagUrl, $version);
 
     $wallabagHtml = file_get_contents(PluginManager::$PLUGINS_PATH . '/wallabag/wallabag.html');