Skip to content

Commit

Permalink
Item14321: Fix up some broken interwiki links
Browse files Browse the repository at this point in the history 
Update documentation and copyrights.
  • Loading branch information
@gac410
gac410 committed Feb 9, 2017
1 parent 64f0024 commit e2f1b8e
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 17 deletions.
22 changes: 11 additions & 11 deletions InterwikiPlugin/data/System/InterWikis.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1457496285" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1486602810" format="1.1" version="1"}%
%META:TOPICPARENT{name="InterwikiPlugin"}%
---+ <nop>Inter-Wiki Link Rules (or Links to other Sites)

Expand Down Expand Up @@ -36,10 +36,10 @@ Any inter-wikis you add to [[%USERSWEB%.InterWikis]] will then be available in t
| Acronym | http://www.acronymfinder.com/af-query.asp?Acronym=$page&String=exact | Look up '$page' on Acronym Finder site |
| CPAN | https://metacpan.org/module/ | CPAN perl repository |
| Dictionary | http://www.dictionary.com/cgi-bin/dict.pl?term= | Look up '$page' at Dictionary.com |
| Google | http://google.com/search?q= | Search for '$page' on Google |
| Group | http://groups.google.com/groups?hl=en&safe=off&group= | News group '$page' at Google.com |
| Google | https://google.com/search?q= | Search for '$page' on Google |
| Group | https://groups.google.com/forum/#!search/ | News group '$page' at Google.com |
| ISBN | http://www.bookfinder.com/search/?st=sr;ac=qr;isbn= | Book with ISBN $page |
| News | http://news.google.com/news?q= | Search for '$page' on Google news |
| News | https://news.google.com/news?q= | Search for '$page' on Google news |
| RFC | http://www.faqs.org/rfcs/rfc$page.html | IETF RFC #$page |

</noautolink>
Expand All @@ -49,25 +49,24 @@ Any inter-wikis you add to [[%USERSWEB%.InterWikis]] will then be available in t
<noautolink>

| *Alias:* | *URL:* | *Tooltip Text:* | *Format override:* |
| Advogato | http://www.advogato.org/ | '$page' on Advogato community site (with peer review) |
| Advogato | http://www.advogato.org/article/$page.html | '$page' on Advogato community site (with peer review) |
| C2find | http://c2.com/cgi/wiki?FindPage&value= | Search '$page' on the original 'WikiWikiWeb' site |
| DokuWiki | http://wiki.splitbrain.org/wiki: | '$page' on Doku Wiki site |
| DokuWiki | http://dokuwiki.org/ | '$page' on Doku Wiki site |
| Foswiki | https://foswiki.org/ | '$page' on foswiki.org |
| Foswikitask | https://foswiki.org/Tasks/ | '$page' on the 'Foswiki' issue tracking site |
| Foswikirev | %REV2REF{$page}% | revision $page of 'Foswiki' on Github | $url |
| FoxWiki | http://fox.wikis.com/wc.dll?Wiki~ | '$page' on Fox Wiki site |
| HammondWiki | http://www.dairiki.org/HammondWiki/index.php3? | '$page' on 'HammondWiki' site |
| HammondWiki | http://www.dairiki.org/HammondWiki/ | '$page' on 'HammondWiki' site |
| MeatBall | http://www.usemod.com/cgi-bin/mb.pl? | '$page' on 'MeatBall' site, a 'UseMod' Wiki variant |
| MoinMoin | http://moinmo.in/ | '$page' on 'MoinMoin' Wiki site |
| MoinMoin | https://moinmo.in/ | '$page' on 'MoinMoin' Wiki site |
| PPR | http://c2.com/cgi/wiki? | '$page' on the original 'PortlandPatternRepository' site |
| Squeak | http://wiki.squeak.org/squeak/ | '$page' on Squeak Smalltalk Wiki |
| TWiki | http://twiki.org/cgi-bin/view/ | '$page' on TWiki.org |
| TWikibug | http://develop.twiki.org/~twiki4/cgi-bin/view/Bugs/ | '$page' on the TWiki issue tracking site |
| TWikirev | http://develop.twiki.org/trac/changeset/ | revision $page of TWiki svn |
| UseMod | http://www.usemod.com/cgi-bin/wiki.pl? | '$page' on 'UseMod' Wiki site |
| Wiki | http://c2.com/cgi/wiki? | '$page' on the original 'WikiWikiWeb' site |
| Wikipedia | http://en.wikipedia.org/wiki/ | '$page' on 'Wikipedia' |
| ZWiki | http://joyful.com/zwiki/ | '$page' on Zope's Wiki |
| Wikipedia | https://en.wikipedia.org/wiki/ | '$page' on 'Wikipedia' |
| ZWiki | http://zwiki.org/ | '$page' on Zope's Wiki |

</noautolink>

Expand All @@ -79,3 +78,4 @@ Any inter-wikis you add to [[%USERSWEB%.InterWikis]] will then be available in t
<!--
%JQREQUIRE{"chili"}%
-->
%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="*"}%
11 changes: 8 additions & 3 deletions InterwikiPlugin/data/System/InterwikiPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1460168492" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1486602810" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Interwiki Plugin
<!--
Expand Down Expand Up @@ -29,12 +29,16 @@ Add and edit aliases in %SYSTEMWEB%.InterWikis.%STARTSECTION{"aliasformat"}%
* any external links.
* Hint: Escape =='WikiWords'== and =='$page'==.
* If the link format override is provided, it overrides the =INTERWIKIPLUGIN_INTERLINKFORMAT= for just that entry.

<div class="foswikiHelp">%H% Note that Interwiki links do not properly resolve
when part of an INCLUDEd topic.</div>

<div class="foswikiHelp">%H% For Foswiki and TWiki sites, both the *web* and the *topic* have to be specified: ==<nop>Foswiki:Webname/<nop>SomePage==
Foswiki:Extensions/InterwikiPlugin or Foswiki:Extensions.InterwikiPlugin
</div>

<div class="foswikiHelp">
%H% For links with paranthesis you will need to write as ==[<nop>[Wikipedia:Fork_(software_development)]]==, or quoted, as ==<nop>Wikipedia:'Fork_(software_development)'== as we assume that the closing paranthesis is not part of the link. For example, Wikipedia:'Fork_(software_development)' .
%H% For links with paranthesis you will need to write as ==[<nop>[Wikipedia:Fork_(software_development)]]==, or quoted, as ==<nop>Wikipedia:'Fork_(software_development)'== as we assume that the closing paranthesis is not part of the link.
</div>
%ENDSECTION{"aliasformat"}%

Expand Down Expand Up @@ -63,6 +67,7 @@ The =INTERWIKIPLUGIN_INTERLINKFORMAT= supports a number of formatting tokens:%ST
---++ Plugin Info

| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 8 Feb 2071: (1.24) | Foswikitask:Item14321: Fix some stale default Interwiki links. |
| 8 Apr 2016: (1.23) | Foswikitask:Item14022: Change foswiki.org links to https. |
| 14 Jun 2014: (1.22) | Foswikitask:Item13287: Foswikitask:Item13387: Regular expression enhancements, better UTF-8 support. |
| 03 Oct 2014: (1.21) | Foswikitask:Item13045: Add per-link override of INTERLINKFORMAT |
Expand Down Expand Up @@ -103,7 +108,7 @@ The =INTERWIKIPLUGIN_INTERLINKFORMAT= supports a number of formatting tokens:%ST

%META:FORM{name="PackageForm"}%
%META:FIELD{name="Release" title="Release" value="%$RELEASE%"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2001-2007, Andrea Sterbini, Peter Thoeny ([[http://www.twiki.net/][TWIKI.NET]]), 2007-2015 %SYSTEMWEB%.ProjectContributor"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2001-2007, Andrea Sterbini, Peter Thoeny ([[http://www.twiki.net/][TWIKI.NET]]), 2007-2017 %SYSTEMWEB%.ProjectContributor"}%
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Author" title="Author" value="Foswiki:%USERSWEB%.AndreaSterbini, TWiki:Main.PeterThoeny"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/InterwikiPlugin"}%
Expand Down
6 changes: 3 additions & 3 deletions InterwikiPlugin/lib/Foswiki/Plugins/InterwikiPlugin.pm
View file
Expand Up @@ -26,8 +26,8 @@ use warnings;
use Foswiki::Func (); # The plugins API
use Foswiki::Plugins (); # For the API version

our $VERSION = '1.23';
our $RELEASE = '1.23';
our $VERSION = '1.24';
our $RELEASE = '8 Feb 2017';
our $NO_PREFS_IN_TOPIC = 1;
our $SHORTDESCRIPTION =
'Link !ExternalSite:Page text to external sites based on aliases defined in a rules topic';
Expand Down Expand Up @@ -198,7 +198,7 @@ sub _trimWhitespace {
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2016 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
52 changes: 52 additions & 0 deletions core/data/TestCases/TestCaseInterWikiLinkCheck.txt
View file
@@ -0,0 +1,52 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1486602810" format="1.1" version="1"}%
%META:TOPICPARENT{name="WebHome"}%
---+!! %TOPIC%

Description: A manual test case for invalid or outdated links.

* [[Wikipedia:Fork_(software_development)]] - Bracketed link
* Wikipedia:'Fork_(software_development)' - Quoted link

Each of the below examples should go to the corresponding site, and not
redirect from http to https.

---+++ General Inter-Site Links

<noautolink>

| *Alias:* | *URL:* | *Tooltip Text:* | *Test Example* |
| Acronym | http://www.acronymfinder.com/af-query.asp?Acronym=$page&String=exact | Look up '$page' on Acronym Finder site | Acronym:ASAP |
| CPAN | https://metacpan.org/module/ | CPAN perl repository | CPAN:LWP |
| Dictionary | http://www.dictionary.com/cgi-bin/dict.pl?term= | Look up '$page' at Dictionary.com | Dictionary:awesome |
| Google | http://google.com/search?q= | Search for '$page' on Google | Google:foswiki |
| Group | https://groups.google.com/forum/#!search/ | News group '$page' at Google.com | Group:perl.perl5.porters |
| ISBN | http://www.bookfinder.com/search/?st=sr;ac=qr;isbn= | Book with ISBN $page | ISBN:978-0-06-123858-1 |
| News | http://news.google.com/news?q= | Search for '$page' on Google news | News:Environment |
| RFC | http://www.faqs.org/rfcs/rfc$page.html | IETF RFC #$page | RFC:1925 |
</noautolink>

---+++ Inter-Wiki Links

<noautolink>

| *Alias:* | *URL:* | *Tooltip Text:* | *Format override:* | *Test Example* |
| Advogato | http://www.advogato.org/article/$page.html | '$page' on Advogato community site (with peer review) | | Advogato:1103 |
| C2find | http://c2.com/cgi/wiki?FindPage&value= | Search '$page' on the original 'WikiWikiWeb' site | | C2find:wiki |
| DokuWiki | http://dokuwiki.org/ | '$page' on Doku Wiki site | | DokuWiki:changes |
| Foswiki | https://foswiki.org/ | '$page' on foswiki.org | | Foswiki:Download |
| Foswikitask | https://foswiki.org/Tasks/ | '$page' on the 'Foswiki' issue tracking site | | Foswikitask:Item12345 |
| Foswikirev | %REV2REF{$page}% | revision $page of 'Foswiki' on Github | $url | Foswikirev:12345 |
| FoxWiki | http://fox.wikis.com/wc.dll?Wiki~ | '$page' on Fox Wiki site | | FoxWiki:VFP |
| HammondWiki | http://www.dairiki.org/HammondWiki/ | '$page' on 'HammondWiki' site | | HammondWiki:RecentChanges |
| MeatBall | http://www.usemod.com/cgi-bin/mb.pl? | '$page' on 'MeatBall' site, a 'UseMod' Wiki variant | | MeatBall:MeatballForWikipedians |
| MoinMoin | https://moinmo.in/ | '$page' on 'MoinMoin' Wiki site | | MoinMoin:DesktopEdition |
| PPR | http://c2.com/cgi/wiki? | '$page' on the original 'PortlandPatternRepository' site | | PPR:PeopleProjectsAndPatterns |
| Squeak | http://wiki.squeak.org/squeak/ | '$page' on Squeak Smalltalk Wiki | | Squeak:30 |
| TWiki | http://twiki.org/cgi-bin/view/ | '$page' on TWiki.org | | TWiki:Support |
| TWikibug | http://develop.twiki.org/~twiki4/cgi-bin/view/Bugs/ | '$page' on the TWiki issue tracking site | | TWikibug:Item1234 |
| TWikirev | http://develop.twiki.org/trac/changeset/ | revision $page of TWiki svn | | TWikirev:14234 |
| UseMod | http://www.usemod.com/cgi-bin/wiki.pl? | '$page' on 'UseMod' Wiki site | | UseMod:SiteList |
| Wiki | http://c2.com/cgi/wiki? | '$page' on the original 'WikiWikiWeb' site | | Wiki:WikiSquatting |
| Wikipedia | https://en.wikipedia.org/wiki/ | '$page' on 'Wikipedia' | | Wikipedia:Foswiki |
| ZWiki | http://zwiki.org/ | '$page' on Zope's Wiki | | ZWiki:PageHierarchy |
</noautolink>

0 comments on commit e2f1b8e

Please sign in to comment.