X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FWikiHashtagsPlugin.php;h=c6c976b8f46849cd79150d1c8d19295857475aa0;hb=9f36c1000136a99f2b96033abcec90d54da4a4f1;hp=72217cc8310e6109f2a529b4183244d6c3306af5;hpb=bfc66cfe1923c8610f693d4309b7b09764ca4dcb;p=quix0rs-gnu-social.git

diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php
index 72217cc831..c6c976b8f4 100644
--- a/plugins/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtagsPlugin.php
@@ -27,12 +27,10 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('WIKIHASHTAGSPLUGIN_VERSION', '0.1');
-
 /**
  * Plugin to use WikiHashtags
  *
@@ -47,6 +45,8 @@ define('WIKIHASHTAGSPLUGIN_VERSION', '0.1');
 
 class WikiHashtagsPlugin extends Plugin
 {
+    const VERSION = '0.1';
+
     function __construct($code=null)
     {
         parent::__construct();
@@ -68,14 +68,13 @@ class WikiHashtagsPlugin extends Plugin
                 $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
                                    urlencode($tag));
 
-                $context = stream_context_create(array('http' => array('method' => "GET",
-                                                                       'header' =>
-                                                                       "User-Agent: " . $this->userAgent())));
-                $html = @file_get_contents($url, false, $context);
+                $request = HTTPClient::start();
+                $response = $request->get($url);
+                $html = $response->getBody();
 
                 $action->elementStart('div', array('id' => 'wikihashtags', 'class' => 'section'));
 
-                if (!empty($html)) {
+                if ($response->isOk() && !empty($html)) {
                     $action->element('style', null,
                                      "span.editsection { display: none }\n".
                                      "table.toc { display: none }");
@@ -101,9 +100,14 @@ class WikiHashtagsPlugin extends Plugin
         return true;
     }
 
-    function userAgent()
+    function onPluginVersion(&$versions)
     {
-        return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION .
-          ' StatusNet/' . LACONICA_VERSION;
+        $versions[] = array('name' => 'WikiHashtags',
+                            'version' => self::VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:WikiHashtags',
+                            'rawdescription' =>
+                            _m('Gets hashtag descriptions from <a href="http://hashtags.wikia.com/">WikiHashtags</a>.'));
+        return true;
     }
 }