X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FWikiHashtagsPlugin.php;h=0c5649aa45cf5dad291210ee022a46d168d2e77d;hb=1ccfb5d9d34128005bc10d89e3ed56ff0e643969;hp=4d386e19860184f9299d4e25c5159a6a34a5f45c;hpb=311e471c146b4ba6c17dec34246e5a1c832bb92b;p=quix0rs-gnu-social.git

diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php
index 4d386e1986..0c5649aa45 100644
--- a/plugins/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtagsPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Plugin to show WikiHashtags content in the sidebar
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Plugin
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -37,10 +37,10 @@ define('WIKIHASHTAGSPLUGIN_VERSION', '0.1');
  * Plugin to use WikiHashtags
  *
  * @category Plugin
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Event
  */
@@ -54,41 +54,41 @@ class WikiHashtagsPlugin extends Plugin
 
     function onStartShowSections($action)
     {
-        common_debug('WikiHashtags: got called');
         $name = $action->trimmed('action');
 
         if ($name == 'tag') {
-            common_debug('WikiHashtags: called by tag');
 
             $taginput = $action->trimmed('tag');
             $tag = common_canonical_tag($taginput);
 
             if (!empty($tag)) {
-                common_debug('WikiHashtags: have a tag: ' . $tag);
 
                 $url = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=render',
                                urlencode($tag));
                 $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
                                    urlencode($tag));
 
-                common_debug('WikiHashtags: have an url: ' . $url);
-
                 $context = stream_context_create(array('http' => array('method' => "GET",
                                                                        'header' =>
                                                                        "User-Agent: " . $this->userAgent())));
                 $html = @file_get_contents($url, false, $context);
 
-                common_debug('WikiHashtags: results are: ' . $html);
-
                 $action->elementStart('div', array('id' => 'wikihashtags', 'class' => 'section'));
 
-                $action->element('h2', null, _('WikiHashtags'));
-
                 if (!empty($html)) {
-                    $action->element('style', null, 'span.editsection { display: none }');
+                    $action->element('style', null,
+                                     "span.editsection { display: none }\n".
+                                     "table.toc { display: none }");
                     $action->raw($html);
-                    $action->element('a', array('href' => $editurl),
+                    $action->elementStart('p');
+                    $action->element('a', array('href' => $editurl,
+                                                'title' => sprintf(_('Edit the article for #%s on WikiHashtags'), $tag)),
                                      _('Edit'));
+                    $action->element('a', array('href' => 'http://www.gnu.org/copyleft/fdl.html',
+                                                'title' => _('Shared under the terms of the GNU Free Documentation License'),
+                                                'rel' => 'license'),
+                                     'GNU FDL');
+                    $action->elementEnd('p');
                 } else {
                     $action->element('a', array('href' => $editurl),
                                      sprintf(_('Start the article for #%s on WikiHashtags'), $tag));
@@ -104,6 +104,6 @@ class WikiHashtagsPlugin extends Plugin
     function userAgent()
     {
         return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION .
-          ' Laconica/' . LACONICA_VERSION;
+          ' StatusNet/' . STATUSNET_VERSION;
     }
 }