X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=plugins%2Fwallabag%2Fwallabag.php;h=4726d9369fab4ef8dd9ef0bada8e323a626d3aac;hb=eeea1c3daa87f133c57c96fa17ed26b02c392636;hp=024a3d2bd1f5adee9fe6d8d7dc7fba23e58d05cf;hpb=89dfc37b0aeb865bc7298836b615e2ac5b6406ce;p=github%2Fshaarli%2FShaarli.git

diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php
index 024a3d2b..4726d936 100644
--- a/plugins/wallabag/wallabag.php
+++ b/plugins/wallabag/wallabag.php
@@ -4,13 +4,12 @@
  * Plugin Wallabag.
  */
 
-// don't raise unnecessary warnings
-if (is_file(PluginManager::$PLUGINS_PATH . '/wallabag/config.php')) {
-    include PluginManager::$PLUGINS_PATH . '/wallabag/config.php';
-}
+require_once 'WallabagInstance.php';
 
-if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) {
-    $GLOBALS['plugins']['errors'][] = 'Wallabag plugin error: '.
+$conf = ConfigManager::getInstance();
+$wallabagUrl = $conf->get('plugins.WALLABAG_URL');
+if (empty($wallabagUrl)) {
+    $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '.
         'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '.
         'in "plugins/wallabag/config.php" or in your Shaarli config.php file.';
 }
@@ -24,16 +23,27 @@ if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) {
  */
 function hook_wallabag_render_linklist($data)
 {
-    if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) {
+    $conf = ConfigManager::getInstance();
+    $wallabagUrl = $conf->get('plugins.WALLABAG_URL');
+    if (empty($wallabagUrl)) {
         return $data;
     }
 
-    $wallabag_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/wallabag/wallabag.html');
+    $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;
 }
+