X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=plugins%2Fwallabag%2Fwallabag.php;h=ec09c8a14d03dc89e2865efb794756d5ee199102;hb=51def0d84955c7a951bd091eb5eeb3fce9deabd4;hp=db8151c9587260191a9c1cd1fe85fc959ed539cd;hpb=263d1f649574083be4b8826a57688a85d48d4d15;p=github%2Fshaarli%2FShaarli.git

diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php
index db8151c9..ec09c8a1 100644
--- a/plugins/wallabag/wallabag.php
+++ b/plugins/wallabag/wallabag.php
@@ -1,31 +1,47 @@
 <?php
 
-// don't raise unnecessary warnings
-if (is_file(PluginManager::$PLUGINS_PATH . '/wallabag/config.php')) {
-    include PluginManager::$PLUGINS_PATH . '/wallabag/config.php';
-}
+/**
+ * Plugin Wallabag.
+ */
 
-if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) {
-    header('Content-Type: text/plain; charset=utf-8');
-    echo 'Wallabag plugin error: '. PHP_EOL;
-    echo '  Please copy "plugins/wallabag/config.php.dist" to config.php and configure your Wallabag URL.'. PHP_EOL;
-    echo '  You can also define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" in your global Shaarli config.php file.';
-    exit;
+require_once 'WallabagInstance.php';
+
+$wallabagUrl = $conf->get('plugins.WALLABAG_URL');
+if (empty($wallabagUrl)) {
+    $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '.
+        'Please define the "WALLABAG_URL" setting in the plugin administration page.';
 }
 
 /**
  * Add wallabag icon to link_plugin when rendering linklist.
  *
- * @param $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) {
-    $wallabag_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/wallabag/wallabag.html');
+function hook_wallabag_render_linklist($data, $conf)
+{
+    $wallabagUrl = $conf->get('plugins.WALLABAG_URL');
+    if (empty($wallabagUrl)) {
+        return $data;
+    }
+
+    $version = $conf->get('plugins.WALLABAG_VERSION');
+    $wallabagInstance = new WallabagInstance($wallabagUrl, $version);
+
+    $wallabagHtml = file_get_contents(PluginManager::$PLUGINS_PATH . '/wallabag/wallabag.html');
 
     foreach ($data['links'] as &$value) {
-        $wallabag = sprintf($wallabag_html, $GLOBALS['plugins']['WALLABAG_URL'], $value['url'], PluginManager::$PLUGINS_PATH);
+        $wallabag = sprintf(
+            $wallabagHtml,
+            $wallabagInstance->getWallabagUrl(),
+            urlencode($value['url']),
+            PluginManager::$PLUGINS_PATH
+        );
         $value['link_plugin'][] = $wallabag;
     }
 
     return $data;
 }
+