From 12fe760cd02ac06a5139f55141c87619ccd4457c Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Tue, 16 Aug 2016 14:59:13 +0200 Subject: [PATCH 1/7] Changed nearly all modules from GPLv2 to GPLv3 There were some modules that did not offer "or (at your option) any later version" in their license and these had to be left alone. This should solve the incorrect FSF address issue #4 on GitHub. --- modules/404handler.pl | 7 ++----- modules/admin.pl | 7 ++----- modules/age.pl | 7 ++----- modules/aggregate.pl | 7 ++----- modules/agree-disagree.pl | 7 ++----- modules/all.pl | 7 ++----- modules/antispam.pl | 7 ++----- modules/archive.pl | 7 ++----- modules/autolock.pl | 13 ++++++------- modules/backlinkage.pl | 7 ++----- modules/blockquote.pl | 7 ++----- modules/calendar.pl | 7 ++----- modules/canonical.pl | 7 ++----- modules/cart.pl | 10 ++-------- modules/checkbox.pl | 7 ++----- modules/clustermap.pl | 7 ++----- modules/commentcount.pl | 7 ++----- modules/compilation.pl | 7 ++----- modules/context.pl | 2 +- modules/crumbs.pl | 7 ++----- modules/csv.pl | 7 ++----- modules/despam.pl | 7 ++----- modules/doubleclick.pl | 7 ++----- modules/download.pl | 7 ++----- modules/dynlogo.pl | 7 ++----- modules/edit-assist.pl | 7 ++----- modules/faq.pl | 7 ++----- modules/fckeditor.pl | 7 ++----- modules/flickrgallery.pl | 7 ++----- modules/google-search.pl | 7 ++----- modules/grep.pl | 7 ++----- modules/header-and-footer-templates.pl | 7 ++----- modules/headers.pl | 7 ++----- modules/headlines.pl | 7 ++----- modules/hiddenpages.pl | 7 ++----- modules/html-template.pl | 7 ++----- modules/html-uploads.pl | 7 ++----- modules/htmllinks.pl | 7 ++----- modules/image.pl | 7 ++----- modules/index.pl | 7 ++----- modules/irc.pl | 7 ++----- modules/lang.pl | 7 ++----- modules/linebreaks.pl | 7 ++----- modules/links.pl | 7 ++----- modules/linktagmap.pl | 12 ++---------- modules/listtags.pl | 7 ++----- modules/live-templates.pl | 7 ++----- modules/login.pl | 7 ++----- modules/logout.pl | 13 ++++++------- modules/moin.pl | 7 ++----- modules/nearlink-create.pl | 7 ++----- modules/no-question-mark.pl | 7 ++----- modules/not-found-handler.pl | 7 ++----- modules/numbered-list.pl | 2 +- modules/olocalmap.pl | 7 ++----- modules/open-proxy.pl | 7 ++----- modules/orphans.pl | 16 +++++++--------- modules/page-trail.pl | 7 ++----- modules/page-type.pl | 7 ++----- modules/paragraph-link.pl | 7 ++----- modules/partial-journal.pl | 7 ++----- modules/pingback-server.pl | 14 ++------------ modules/plainsite.pl | 7 ++----- modules/publish.pl | 7 ++----- modules/referrer-rss.pl | 7 ++----- modules/relation.pl | 7 ++----- modules/sabifoo.pl | 7 ++----- modules/search-list.pl | 7 ++----- modules/search-shortcut.pl | 7 ++----- modules/searchtags.pl | 7 ++----- modules/setext.pl | 7 ++----- modules/show-comments.pl | 7 ++----- modules/signature.pl | 7 ++----- modules/simple-rules.pl | 7 ++----- modules/sitemap-index.pl | 7 ++----- modules/small.pl | 7 ++----- modules/smarttitles.pl | 13 ++++++------- modules/smiley-dir.pl | 7 ++----- modules/static-hybrid.pl | 9 +++------ modules/subscriberc.pl | 7 ++----- modules/sync.pl | 7 ++----- modules/tables-in-lists.pl | 7 ++----- modules/tables.pl | 7 ++----- modules/tagmap.pl | 7 ++----- modules/templates.pl | 7 ++----- modules/throttle.pl | 7 ++----- modules/toc-headers.pl | 10 ++-------- modules/today.pl | 7 ++----- modules/translations.pl | 7 ++----- modules/wanted.pl | 7 ++----- modules/weblog-1.pl | 7 ++----- modules/weblog-tracking.pl | 7 ++----- modules/wordstem.pl | 9 ++------- modules/xfn.pl | 7 ++----- 94 files changed, 204 insertions(+), 493 deletions(-) diff --git a/modules/404handler.pl b/modules/404handler.pl index 70697158..ae6a01e6 100755 --- a/modules/404handler.pl +++ b/modules/404handler.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . package OddMuse; diff --git a/modules/admin.pl b/modules/admin.pl index 0f99185f..04e547a3 100644 --- a/modules/admin.pl +++ b/modules/admin.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/age.pl b/modules/age.pl index 191f9a3b..a099fb09 100644 --- a/modules/age.pl +++ b/modules/age.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/aggregate.pl b/modules/aggregate.pl index fcdd3f4f..6515842a 100644 --- a/modules/aggregate.pl +++ b/modules/aggregate.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/agree-disagree.pl b/modules/agree-disagree.pl index 17c3ac9b..01a4c2aa 100644 --- a/modules/agree-disagree.pl +++ b/modules/agree-disagree.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/all.pl b/modules/all.pl index 0e620c85..b7df96cc 100644 --- a/modules/all.pl +++ b/modules/all.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/antispam.pl b/modules/antispam.pl index a8f4c00b..8fdb01a5 100644 --- a/modules/antispam.pl +++ b/modules/antispam.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/archive.pl b/modules/archive.pl index fadefba6..8e12490f 100644 --- a/modules/archive.pl +++ b/modules/archive.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/autolock.pl b/modules/autolock.pl index 3bc64438..47ff18e8 100644 --- a/modules/autolock.pl +++ b/modules/autolock.pl @@ -206,18 +206,17 @@ except where noted. Copyleft 2008 by B.w.Curry . -This file is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. -This file is distributed in the hope that it will be useful, +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this file; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . =cut diff --git a/modules/backlinkage.pl b/modules/backlinkage.pl index 292536bf..f65e0557 100644 --- a/modules/backlinkage.pl +++ b/modules/backlinkage.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # Grab MLDBM at http://search.cpan.org/dist/MLDBM/lib/MLDBM.pm # ie: http://search.cpan.org/CPAN/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz diff --git a/modules/blockquote.pl b/modules/blockquote.pl index 6b4fbe51..e0cb565c 100644 --- a/modules/blockquote.pl +++ b/modules/blockquote.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/calendar.pl b/modules/calendar.pl index 39222c0c..214971c3 100644 --- a/modules/calendar.pl +++ b/modules/calendar.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/canonical.pl b/modules/canonical.pl index b6fab82e..fe8445d7 100644 --- a/modules/canonical.pl +++ b/modules/canonical.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/cart.pl b/modules/cart.pl index 5622f713..253f4991 100644 --- a/modules/cart.pl +++ b/modules/cart.pl @@ -2,7 +2,7 @@ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,13 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -use strict; -use v5.10; -use utf8; +# along with this program. If not, see . AddModuleDescription('cart.pl', 'Cart Extension'); diff --git a/modules/checkbox.pl b/modules/checkbox.pl index afe0babb..18ab1417 100644 --- a/modules/checkbox.pl +++ b/modules/checkbox.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/clustermap.pl b/modules/clustermap.pl index c195afc1..ae804e14 100644 --- a/modules/clustermap.pl +++ b/modules/clustermap.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/commentcount.pl b/modules/commentcount.pl index 546603fa..7b32defa 100644 --- a/modules/commentcount.pl +++ b/modules/commentcount.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/compilation.pl b/modules/compilation.pl index ee29e2ab..6473fab5 100644 --- a/modules/compilation.pl +++ b/modules/compilation.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/context.pl b/modules/context.pl index bde86d62..711dfe4f 100644 --- a/modules/context.pl +++ b/modules/context.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/modules/crumbs.pl b/modules/crumbs.pl index 5e57b5c4..3ff11b4c 100644 --- a/modules/crumbs.pl +++ b/modules/crumbs.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/csv.pl b/modules/csv.pl index 610f877d..a2d01ef4 100644 --- a/modules/csv.pl +++ b/modules/csv.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/despam.pl b/modules/despam.pl index d7a35fdb..aa37dc7f 100644 --- a/modules/despam.pl +++ b/modules/despam.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/doubleclick.pl b/modules/doubleclick.pl index b6cfa351..1544281b 100644 --- a/modules/doubleclick.pl +++ b/modules/doubleclick.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # This module offers the user the additional possibility to # edit a page by double-clicking on it. The user must have diff --git a/modules/download.pl b/modules/download.pl index 2b009a46..0908c369 100644 --- a/modules/download.pl +++ b/modules/download.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/dynlogo.pl b/modules/dynlogo.pl index 9dc94919..fe6f9988 100644 --- a/modules/dynlogo.pl +++ b/modules/dynlogo.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # Makes the wiki logo depend on the current date. # diff --git a/modules/edit-assist.pl b/modules/edit-assist.pl index 6cc2e81b..4a3817f5 100644 --- a/modules/edit-assist.pl +++ b/modules/edit-assist.pl @@ -1,6 +1,6 @@ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -9,10 +9,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/faq.pl b/modules/faq.pl index 58824003..263831ee 100644 --- a/modules/faq.pl +++ b/modules/faq.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # This module creates a list of all questions on the page, e.g. # for a faq. It does so by recognizing all lines that begin with diff --git a/modules/fckeditor.pl b/modules/fckeditor.pl index d031545f..94a45e4f 100644 --- a/modules/fckeditor.pl +++ b/modules/fckeditor.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA, +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/flickrgallery.pl b/modules/flickrgallery.pl index 0c369373..7d59fb82 100644 --- a/modules/flickrgallery.pl +++ b/modules/flickrgallery.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/google-search.pl b/modules/google-search.pl index f84ecdea..13b4fc8c 100644 --- a/modules/google-search.pl +++ b/modules/google-search.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/grep.pl b/modules/grep.pl index 23c1d0b8..0522cd81 100644 --- a/modules/grep.pl +++ b/modules/grep.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/header-and-footer-templates.pl b/modules/header-and-footer-templates.pl index 99693e97..c55aa669 100644 --- a/modules/header-and-footer-templates.pl +++ b/modules/header-and-footer-templates.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/headers.pl b/modules/headers.pl index 240ec7bc..6abcc73d 100644 --- a/modules/headers.pl +++ b/modules/headers.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/headlines.pl b/modules/headlines.pl index e89ee174..c53a6065 100644 --- a/modules/headlines.pl +++ b/modules/headlines.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/hiddenpages.pl b/modules/hiddenpages.pl index dc806b13..2b9aa1bb 100644 --- a/modules/hiddenpages.pl +++ b/modules/hiddenpages.pl @@ -5,7 +5,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -14,10 +14,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # This module offers the possibility to restrict viewing of "hidden" # pages to only editors or admins. The restriction may be based diff --git a/modules/html-template.pl b/modules/html-template.pl index 1edcb92e..272b66d7 100644 --- a/modules/html-template.pl +++ b/modules/html-template.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/html-uploads.pl b/modules/html-uploads.pl index d3985c54..d6594540 100644 --- a/modules/html-uploads.pl +++ b/modules/html-uploads.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/htmllinks.pl b/modules/htmllinks.pl index 7daffb73..4ae45508 100644 --- a/modules/htmllinks.pl +++ b/modules/htmllinks.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/image.pl b/modules/image.pl index da489895..2acffb8f 100644 --- a/modules/image.pl +++ b/modules/image.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/index.pl b/modules/index.pl index 69bea373..3c24a5d7 100644 --- a/modules/index.pl +++ b/modules/index.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/irc.pl b/modules/irc.pl index b4330c0d..a5260377 100644 --- a/modules/irc.pl +++ b/modules/irc.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/lang.pl b/modules/lang.pl index 8cd433d3..b8366472 100644 --- a/modules/lang.pl +++ b/modules/lang.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # In your CSS file, use something like this, for example: diff --git a/modules/linebreaks.pl b/modules/linebreaks.pl index f7ce8053..a394028d 100644 --- a/modules/linebreaks.pl +++ b/modules/linebreaks.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/links.pl b/modules/links.pl index f2dd4401..f19a883e 100644 --- a/modules/links.pl +++ b/modules/links.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/linktagmap.pl b/modules/linktagmap.pl index be211360..abe93583 100644 --- a/modules/linktagmap.pl +++ b/modules/linktagmap.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,15 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# Based on code of tagmap.pl module by Fletcher T. Penney -# and searchtags.pl module by Brock Wilcox -use strict; -use v5.10; +# along with this program. If not, see . AddModuleDescription('linktagmap.pl', 'LinkTagMap Module'); diff --git a/modules/listtags.pl b/modules/listtags.pl index bb7a7e20..46e0fb0f 100644 --- a/modules/listtags.pl +++ b/modules/listtags.pl @@ -2,7 +2,7 @@ # Copyright (C) 2008 Weakish Jiang # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/live-templates.pl b/modules/live-templates.pl index 048a34cd..a813ce4b 100644 --- a/modules/live-templates.pl +++ b/modules/live-templates.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/login.pl b/modules/login.pl index cd868ab0..da76ada3 100644 --- a/modules/login.pl +++ b/modules/login.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/logout.pl b/modules/logout.pl index 9d1bc3a6..31ee840f 100644 --- a/modules/logout.pl +++ b/modules/logout.pl @@ -266,18 +266,17 @@ except where noted. Copyleft 2008 by B.w.Curry . -This file is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. -This file is distributed in the hope that it will be useful, +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this file; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . =cut diff --git a/modules/moin.pl b/modules/moin.pl index 8f3e2ba3..2f50f26a 100644 --- a/modules/moin.pl +++ b/modules/moin.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/nearlink-create.pl b/modules/nearlink-create.pl index 57bcbc43..f0c834f0 100644 --- a/modules/nearlink-create.pl +++ b/modules/nearlink-create.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/no-question-mark.pl b/modules/no-question-mark.pl index 009d3f91..c39cece0 100644 --- a/modules/no-question-mark.pl +++ b/modules/no-question-mark.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/not-found-handler.pl b/modules/not-found-handler.pl index b10b8b67..11ee7e97 100644 --- a/modules/not-found-handler.pl +++ b/modules/not-found-handler.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/numbered-list.pl b/modules/numbered-list.pl index ba394196..7aa93a36 100644 --- a/modules/numbered-list.pl +++ b/modules/numbered-list.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/modules/olocalmap.pl b/modules/olocalmap.pl index a192f81d..86730ecd 100644 --- a/modules/olocalmap.pl +++ b/modules/olocalmap.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # This module adds an action and a link in the UserGotoBar to build # a Local Site Map starting from the current page. The map is a sort diff --git a/modules/open-proxy.pl b/modules/open-proxy.pl index f6a95665..5648fd2b 100644 --- a/modules/open-proxy.pl +++ b/modules/open-proxy.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/orphans.pl b/modules/orphans.pl index 349db014..e58dccc2 100644 --- a/modules/orphans.pl +++ b/modules/orphans.pl @@ -4,20 +4,18 @@ # Author: Jorgen Schaefer -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. - +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . # This module will show ALL orphaned pages, even whole orphaned # subgraphs on this wiki. diff --git a/modules/page-trail.pl b/modules/page-trail.pl index 1cbbace0..7cb7b773 100644 --- a/modules/page-trail.pl +++ b/modules/page-trail.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/page-type.pl b/modules/page-type.pl index b4fc4e94..ebfc476c 100644 --- a/modules/page-type.pl +++ b/modules/page-type.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/paragraph-link.pl b/modules/paragraph-link.pl index d6a4ee62..f61b1d85 100644 --- a/modules/paragraph-link.pl +++ b/modules/paragraph-link.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/partial-journal.pl b/modules/partial-journal.pl index 031b061d..c4c1a0c8 100644 --- a/modules/partial-journal.pl +++ b/modules/partial-journal.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/pingback-server.pl b/modules/pingback-server.pl index 4d5fb5d4..dd6b8d3f 100644 --- a/modules/pingback-server.pl +++ b/modules/pingback-server.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,17 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# History / Notes -# 2004.03.19 -# - Created -# - Works! -# - Tried to get rid of LWP but failed :( -# - We have to capture the script before CGI.pm starts to get STDIN +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/plainsite.pl b/modules/plainsite.pl index 35b67d0e..08ff6147 100644 --- a/modules/plainsite.pl +++ b/modules/plainsite.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/publish.pl b/modules/publish.pl index db28a8c4..bf7ad131 100644 --- a/modules/publish.pl +++ b/modules/publish.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/referrer-rss.pl b/modules/referrer-rss.pl index e6a47ed3..422f2994 100644 --- a/modules/referrer-rss.pl +++ b/modules/referrer-rss.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # TODO referers and refeRrers diff --git a/modules/relation.pl b/modules/relation.pl index 667c826b..d6e50ae1 100644 --- a/modules/relation.pl +++ b/modules/relation.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/sabifoo.pl b/modules/sabifoo.pl index 6ab059df..e31007a8 100644 --- a/modules/sabifoo.pl +++ b/modules/sabifoo.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/search-list.pl b/modules/search-list.pl index e70a27a7..bc4d068e 100644 --- a/modules/search-list.pl +++ b/modules/search-list.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/search-shortcut.pl b/modules/search-shortcut.pl index 5e349086..bf6e968e 100644 --- a/modules/search-shortcut.pl +++ b/modules/search-shortcut.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/searchtags.pl b/modules/searchtags.pl index f940447c..721da9f4 100644 --- a/modules/searchtags.pl +++ b/modules/searchtags.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/setext.pl b/modules/setext.pl index 794900e2..c142c1c0 100644 --- a/modules/setext.pl +++ b/modules/setext.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/show-comments.pl b/modules/show-comments.pl index 77034143..ca4da29a 100644 --- a/modules/show-comments.pl +++ b/modules/show-comments.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # Includes comment pages in journal collections. diff --git a/modules/signature.pl b/modules/signature.pl index 8193a30a..cdbeb56c 100644 --- a/modules/signature.pl +++ b/modules/signature.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/simple-rules.pl b/modules/simple-rules.pl index e7af4b05..89dc4278 100644 --- a/modules/simple-rules.pl +++ b/modules/simple-rules.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/sitemap-index.pl b/modules/sitemap-index.pl index 5ae60331..6ee1f001 100644 --- a/modules/sitemap-index.pl +++ b/modules/sitemap-index.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # Create a plain text listing of all pages in your wiki diff --git a/modules/small.pl b/modules/small.pl index 13a77de9..095dd252 100644 --- a/modules/small.pl +++ b/modules/small.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/smarttitles.pl b/modules/smarttitles.pl index f2b07847..ff878f7f 100644 --- a/modules/smarttitles.pl +++ b/modules/smarttitles.pl @@ -179,18 +179,17 @@ Copyright 2014-2015 Alex-Daniel Jakimenko Copyleft 2008 by B.w.Curry . Copyright 2006 by Charles Mauch . -This file is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. -This file is distributed in the hope that it will be useful, +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this file; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . =cut diff --git a/modules/smiley-dir.pl b/modules/smiley-dir.pl index 20bf22c5..98f41825 100644 --- a/modules/smiley-dir.pl +++ b/modules/smiley-dir.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/static-hybrid.pl b/modules/static-hybrid.pl index c31a0cb9..f52f177c 100644 --- a/modules/static-hybrid.pl +++ b/modules/static-hybrid.pl @@ -3,19 +3,16 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/subscriberc.pl b/modules/subscriberc.pl index 76209173..c6db57cb 100644 --- a/modules/subscriberc.pl +++ b/modules/subscriberc.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/sync.pl b/modules/sync.pl index 100e4ef7..aa5ca00c 100644 --- a/modules/sync.pl +++ b/modules/sync.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/tables-in-lists.pl b/modules/tables-in-lists.pl index 2fa268a8..073c9274 100644 --- a/modules/tables-in-lists.pl +++ b/modules/tables-in-lists.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/tables.pl b/modules/tables.pl index 167ff8cb..6b9b3471 100644 --- a/modules/tables.pl +++ b/modules/tables.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/tagmap.pl b/modules/tagmap.pl index 674829ad..2856ebcb 100644 --- a/modules/tagmap.pl +++ b/modules/tagmap.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/templates.pl b/modules/templates.pl index 942ee01d..6199123c 100644 --- a/modules/templates.pl +++ b/modules/templates.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/throttle.pl b/modules/throttle.pl index 91f92653..c089c56a 100644 --- a/modules/throttle.pl +++ b/modules/throttle.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # Limits the number of parallel Oddmuse instances to # $InstanceThrottleLimit by keeping track of the process ids in diff --git a/modules/toc-headers.pl b/modules/toc-headers.pl index 63de6b62..1559d2ab 100644 --- a/modules/toc-headers.pl +++ b/modules/toc-headers.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,13 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# This is a simplified mix of headers.pl and toc.pl to work together. -# It is based on headers.pl 1.12 and toc.pl 1.30. +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/today.pl b/modules/today.pl index 98486d0b..79172146 100644 --- a/modules/today.pl +++ b/modules/today.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/translations.pl b/modules/translations.pl index 1214ca50..16b982ec 100644 --- a/modules/translations.pl +++ b/modules/translations.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/wanted.pl b/modules/wanted.pl index 462796c2..5fd60ce5 100644 --- a/modules/wanted.pl +++ b/modules/wanted.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/weblog-1.pl b/modules/weblog-1.pl index e2db35dd..840f0636 100644 --- a/modules/weblog-1.pl +++ b/modules/weblog-1.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/weblog-tracking.pl b/modules/weblog-tracking.pl index 7bc09279..47b22cfa 100644 --- a/modules/weblog-tracking.pl +++ b/modules/weblog-tracking.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # Weblog Tracker Notification Extension diff --git a/modules/wordstem.pl b/modules/wordstem.pl index 1986faa8..cb770f05 100644 --- a/modules/wordstem.pl +++ b/modules/wordstem.pl @@ -1,6 +1,6 @@ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -9,12 +9,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# Porter stemming algorithm code copied verbatim from http://www.tartarus.org/~martin/PorterStemmer/ +# along with this program. If not, see . use strict; use v5.10; diff --git a/modules/xfn.pl b/modules/xfn.pl index d6b88489..2b763569 100644 --- a/modules/xfn.pl +++ b/modules/xfn.pl @@ -6,7 +6,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -15,10 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use v5.10; From d2db3d849e3e904a4fe7cd8075a2e08985d8c37c Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Tue, 16 Aug 2016 16:43:21 +0200 Subject: [PATCH 2/7] Fixed erroneous edits from previous commit The keyboard macro did not deal kindly with two files... This should address comments by @m4z for the incorrect FSF address issue #4 on GitHub. --- modules/cart.pl | 4 ++++ modules/linktagmap.pl | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/cart.pl b/modules/cart.pl index 253f4991..bdf86e55 100644 --- a/modules/cart.pl +++ b/modules/cart.pl @@ -13,6 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +use strict; +use v5.10; +use utf8; + AddModuleDescription('cart.pl', 'Cart Extension'); our ($q, %Action, $UserGotoBar, $CookieName); diff --git a/modules/linktagmap.pl b/modules/linktagmap.pl index abe93583..cacc7b87 100644 --- a/modules/linktagmap.pl +++ b/modules/linktagmap.pl @@ -13,6 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +use strict; +use v5.10; + AddModuleDescription('linktagmap.pl', 'LinkTagMap Module'); our (%Action, %Page, $OpenPageName, $ModuleDir, @MyRules, $ScriptName); From e5adfc3bb99524b9ef5739e276a109099e3ce075 Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Tue, 16 Aug 2016 17:44:40 +0200 Subject: [PATCH 3/7] README.creole: indicate ownership Typo fixed and a chown command added as suggested by @mx4 in GitHub issue #5. --- README.creole | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.creole b/README.creole index f15eca61..923e9709 100644 --- a/README.creole +++ b/README.creole @@ -23,12 +23,21 @@ usermod -a -G sudo alex Now you can login as {{{alex}}} and do everything else using {{{sudo}}}. You need to copy wiki.pl into your cgi-bin directory, and you need to -make the script executable. +make the script executable. You might also have to change its owner to +an appropriate user on your system. {{{ sudo wget -O /usr/lib/cgi-bin/wiki.pl \ http://git.savannah.gnu.org/cgit/oddmuse.git/plain/wiki.pl sudo chmod +x /usr/lib/cgi-bin/wiki.pl +sudo chown www-data.www-data /usr/lib/cgi-bin/wiki.pl +}}} + +If you're on SUSE, the user might not be {{{www-data}}} but +{{{wwwrun}}} without appropriate group: + +{{{ +sudo chown wwwrun.root /usr/lib/cgi-bin/wiki.pl }}} You should be able to test it right now! Visit @@ -119,7 +128,7 @@ The default site is configured in sudo a2ensite default }}} -This file also lists the directories we've used in out instructions +This file also lists the directories we've used in our instructions above. {{{ From 24377a8cb9db9b242cad660e857c22321fc3c1f6 Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Tue, 16 Aug 2016 18:01:26 +0200 Subject: [PATCH 4/7] Changed nearly remaining code from GPLv2 to GPLv3 There were some files that did not offer "or (at your option) any later version" in their license and these had to be left alone. This should solve the incorrect FSF address issue #4 on GitHub. --- contrib/localnames-server.pl | 7 ++---- modules/near-links/moin-search.pl | 7 ++---- modules/near-links/phpwiki-search.pl | 7 ++---- modules/near-links/usemod-search.pl | 7 ++---- modules/translations/national-days-de.pl | 7 ++---- modules/translations/national-days.pl | 7 ++---- scripts/action-list | 10 +++----- scripts/avg-age | 7 ++---- scripts/changelog-to-rss | 7 ++---- scripts/cli/wikiadd | 16 ++++++------ scripts/cli/wikiappend | 9 +++---- scripts/cli/wikicopy | 9 +++---- scripts/cli/wikiupload | 16 ++++++------ scripts/contributors | 10 +++----- scripts/graph.pl | 10 +++----- scripts/latin-1.pl | 7 ++---- scripts/leech-detector | 9 ++----- scripts/merge-banned-lists | 7 ++---- scripts/merge-list | 9 ++----- scripts/orphaned.pl | 9 +++---- scripts/simplify.pl | 7 ++---- scripts/svn-wiki.pl | 7 ++---- scripts/traffic | 9 ++----- scripts/utf-8.pl | 7 ++---- scripts/wanted.pl | 9 +++---- stuff/wikiimg | 16 ++++++------ t/aggregate.t | 7 ++---- t/bbcode.t | 7 ++---- t/calendar.t | 7 ++---- t/clusters.t | 7 ++---- t/config-page.t | 7 ++---- t/conflict.t | 7 ++---- t/crumbs.t | 7 ++---- t/despam.t | 7 ++---- t/edit.t | 7 ++---- t/google-search.t | 7 ++---- t/history.t | 7 ++---- t/hr.t | 7 ++---- t/include.t | 7 ++---- t/irc.t | 7 ++---- t/journal2.t | 7 ++---- t/languages.t | 7 ++---- t/link-all.t | 7 ++---- t/localnames.t | 7 ++---- t/lock-expiration.t | 7 ++---- t/lock-on-creation.t | 7 ++---- t/lock.t | 7 ++---- t/moin.t | 7 ++---- t/pagenames.t | 7 ++---- t/setext.t | 7 ++---- t/subscriberc.t | 7 ++---- t/summary.t | 31 +++++++++++------------- t/tables.t | 7 ++---- t/usemod-1.0.4.pl | 7 ++---- t/usemod-options.t | 7 ++---- 55 files changed, 146 insertions(+), 313 deletions(-) diff --git a/contrib/localnames-server.pl b/contrib/localnames-server.pl index 9831bc69..ea05baf8 100644 --- a/contrib/localnames-server.pl +++ b/contrib/localnames-server.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/near-links/moin-search.pl b/modules/near-links/moin-search.pl index d89f3d83..5ea9de4e 100755 --- a/modules/near-links/moin-search.pl +++ b/modules/near-links/moin-search.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/near-links/phpwiki-search.pl b/modules/near-links/phpwiki-search.pl index ac84cd8a..b5fe0c1c 100755 --- a/modules/near-links/phpwiki-search.pl +++ b/modules/near-links/phpwiki-search.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/near-links/usemod-search.pl b/modules/near-links/usemod-search.pl index b8b27898..53dd8885 100755 --- a/modules/near-links/usemod-search.pl +++ b/modules/near-links/usemod-search.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/modules/translations/national-days-de.pl b/modules/translations/national-days-de.pl index a5b4a7f1..f4390803 100644 --- a/modules/translations/national-days-de.pl +++ b/modules/translations/national-days-de.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # Die Daten stammen von der deutschen Ausgabe des Monde Diplomatique. # Falls der Wiki nur Deutsch ist, kann man diese Datei einfach als diff --git a/modules/translations/national-days.pl b/modules/translations/national-days.pl index 011e8df2..6b2094f1 100644 --- a/modules/translations/national-days.pl +++ b/modules/translations/national-days.pl @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use utf8; use strict; diff --git a/scripts/action-list b/scripts/action-list index 9fb8bfb7..e1080355 100644 --- a/scripts/action-list +++ b/scripts/action-list @@ -3,19 +3,17 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . + use Time::ParseDate; while () { m/^(\S+) \S+ \S+ \[(.*?)\] "(.*?)" (\d+)/ or die "Cannot parse:\n$_"; diff --git a/scripts/avg-age b/scripts/avg-age index 8475f698..2d3021bb 100644 --- a/scripts/avg-age +++ b/scripts/avg-age @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . my $PageDir = 'page'; my $Now = time; diff --git a/scripts/changelog-to-rss b/scripts/changelog-to-rss index e6adba9e..6d735997 100755 --- a/scripts/changelog-to-rss +++ b/scripts/changelog-to-rss @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/cli/wikiadd b/scripts/cli/wikiadd index 655ad39b..dcd45dce 100755 --- a/scripts/cli/wikiadd +++ b/scripts/cli/wikiadd @@ -4,20 +4,18 @@ # Copyright (C) 2004 Jorgen Schaefer # Copyright (C) 2004 Alex Schroeder # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . import httplib, urllib, re, urlparse, sys, getopt from time import time diff --git a/scripts/cli/wikiappend b/scripts/cli/wikiappend index 3a3c95fe..bbe4f504 100755 --- a/scripts/cli/wikiappend +++ b/scripts/cli/wikiappend @@ -5,19 +5,16 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use strict; use Getopt::Std; diff --git a/scripts/cli/wikicopy b/scripts/cli/wikicopy index 35a5baa3..2b743c23 100755 --- a/scripts/cli/wikicopy +++ b/scripts/cli/wikicopy @@ -4,19 +4,16 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require LWP; use Getopt::Std; diff --git a/scripts/cli/wikiupload b/scripts/cli/wikiupload index 5af16ab0..c336c0f5 100755 --- a/scripts/cli/wikiupload +++ b/scripts/cli/wikiupload @@ -4,20 +4,18 @@ # Copyright (C) 2004 Jorgen Schaefer # Copyright (C) 2005 Alex Schroeder # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . # $Id: wikiupload,v 1.8 2010/02/08 13:40:59 as Exp $ diff --git a/scripts/contributors b/scripts/contributors index af0226ff..4df2c2ea 100644 --- a/scripts/contributors +++ b/scripts/contributors @@ -3,19 +3,17 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . + my $FS = "\x1e"; my %Total = (); my %Month = (); diff --git a/scripts/graph.pl b/scripts/graph.pl index 49a9309f..a3566ce7 100755 --- a/scripts/graph.pl +++ b/scripts/graph.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,12 +12,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# +# along with this program. If not, see . + # Usage: perl graph.pl URL StartPage depth breadth stop-regexp # All arguments are optional. # diff --git a/scripts/latin-1.pl b/scripts/latin-1.pl index 9980dc6f..5cb80d64 100755 --- a/scripts/latin-1.pl +++ b/scripts/latin-1.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/leech-detector b/scripts/leech-detector index b4cce0a5..1ab03dcc 100755 --- a/scripts/leech-detector +++ b/scripts/leech-detector @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -13,12 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# $Id: leech-detector,v 1.1 2004/07/09 06:39:32 as Exp $

' +# along with this program. If not, see . use Time::ParseDate; while () { diff --git a/scripts/merge-banned-lists b/scripts/merge-banned-lists index ddcb0fb9..ef919cbb 100644 --- a/scripts/merge-banned-lists +++ b/scripts/merge-banned-lists @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -13,10 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . # This program copies the banned list from A to B, removing comments # from A and keeping comments from B, and adding a date to entries diff --git a/scripts/merge-list b/scripts/merge-list index c471c42e..716ce47b 100755 --- a/scripts/merge-list +++ b/scripts/merge-list @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -13,12 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA - -# $Id: merge-list,v 1.2 2004/07/09 06:40:56 as Exp $

' +# along with this program. If not, see . use strict; use LWP::UserAgent; diff --git a/scripts/orphaned.pl b/scripts/orphaned.pl index 4f1bee37..545f406d 100755 --- a/scripts/orphaned.pl +++ b/scripts/orphaned.pl @@ -4,19 +4,16 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/simplify.pl b/scripts/simplify.pl index 0e99fe94..849d1650 100755 --- a/scripts/simplify.pl +++ b/scripts/simplify.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/svn-wiki.pl b/scripts/svn-wiki.pl index da0e1be0..148cea76 100755 --- a/scripts/svn-wiki.pl +++ b/scripts/svn-wiki.pl @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -13,10 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . sub ParseData { my $data = shift; diff --git a/scripts/traffic b/scripts/traffic index 03506ab5..a54ffca2 100755 --- a/scripts/traffic +++ b/scripts/traffic @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -13,12 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA -# -# $Id: traffic,v 1.2 2006/09/01 11:14:34 as Exp $

' +# along with this program. If not, see . while () { # 304 responses have - as bytes diff --git a/scripts/utf-8.pl b/scripts/utf-8.pl index 48d0911c..e26ac375 100755 --- a/scripts/utf-8.pl +++ b/scripts/utf-8.pl @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/scripts/wanted.pl b/scripts/wanted.pl index f7f9cf60..94f306ee 100755 --- a/scripts/wanted.pl +++ b/scripts/wanted.pl @@ -4,19 +4,16 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . use CGI qw/:standard/; use CGI::Carp qw(fatalsToBrowser); diff --git a/stuff/wikiimg b/stuff/wikiimg index e1037aa4..a0bf27cd 100755 --- a/stuff/wikiimg +++ b/stuff/wikiimg @@ -3,20 +3,18 @@ # # Copyright (C) 2006 Alex Schroeder # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . if [ -z "$2" ]; then echo Usage: diff --git a/t/aggregate.t b/t/aggregate.t index 846f5cb7..9acefdf6 100644 --- a/t/aggregate.t +++ b/t/aggregate.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/bbcode.t b/t/bbcode.t index 05daa2b7..646415dc 100644 --- a/t/bbcode.t +++ b/t/bbcode.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/calendar.t b/t/calendar.t index 0acc633b..743300fe 100644 --- a/t/calendar.t +++ b/t/calendar.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/clusters.t b/t/clusters.t index 145e07c7..45e2e8a8 100644 --- a/t/clusters.t +++ b/t/clusters.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/config-page.t b/t/config-page.t index 606f3371..b301877c 100644 --- a/t/config-page.t +++ b/t/config-page.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/conflict.t b/t/conflict.t index 85cea2dd..bd535f35 100644 --- a/t/conflict.t +++ b/t/conflict.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/crumbs.t b/t/crumbs.t index 3e23b516..08c083aa 100644 --- a/t/crumbs.t +++ b/t/crumbs.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/despam.t b/t/despam.t index c447705f..96b454fe 100644 --- a/t/despam.t +++ b/t/despam.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/edit.t b/t/edit.t index 06fffb6e..c228ed55 100644 --- a/t/edit.t +++ b/t/edit.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/google-search.t b/t/google-search.t index 3ea533f2..dc0840f6 100644 --- a/t/google-search.t +++ b/t/google-search.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/history.t b/t/history.t index ea3c962c..742d1585 100644 --- a/t/history.t +++ b/t/history.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/hr.t b/t/hr.t index cbd45f02..ca634c8f 100644 --- a/t/hr.t +++ b/t/hr.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/include.t b/t/include.t index d392ac76..e0f2404b 100644 --- a/t/include.t +++ b/t/include.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/irc.t b/t/irc.t index c224b971..21359c63 100644 --- a/t/irc.t +++ b/t/irc.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/journal2.t b/t/journal2.t index 0e8a4fbf..c472e1e5 100644 --- a/t/journal2.t +++ b/t/journal2.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/languages.t b/t/languages.t index 89456d33..4e19150e 100644 --- a/t/languages.t +++ b/t/languages.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/link-all.t b/t/link-all.t index 5a28e57e..69165530 100644 --- a/t/link-all.t +++ b/t/link-all.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/localnames.t b/t/localnames.t index 2dec3066..3deda92b 100644 --- a/t/localnames.t +++ b/t/localnames.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/lock-expiration.t b/t/lock-expiration.t index 9ebfcd4f..ca0b72a4 100644 --- a/t/lock-expiration.t +++ b/t/lock-expiration.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/lock-on-creation.t b/t/lock-on-creation.t index 97b3cf36..9b6bda08 100644 --- a/t/lock-on-creation.t +++ b/t/lock-on-creation.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/lock.t b/t/lock.t index b75412df..c2004fa0 100644 --- a/t/lock.t +++ b/t/lock.t @@ -3,7 +3,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -12,10 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/moin.t b/t/moin.t index c5b8c4ce..38a687e8 100644 --- a/t/moin.t +++ b/t/moin.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/pagenames.t b/t/pagenames.t index c233394a..9f622cde 100644 --- a/t/pagenames.t +++ b/t/pagenames.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/setext.t b/t/setext.t index 8ab195b0..b652a78e 100644 --- a/t/setext.t +++ b/t/setext.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/subscriberc.t b/t/subscriberc.t index 90f12adf..0ea9e9ba 100644 --- a/t/subscriberc.t +++ b/t/subscriberc.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/summary.t b/t/summary.t index db4fefc5..414b38d2 100644 --- a/t/summary.t +++ b/t/summary.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; @@ -22,18 +19,18 @@ use Test::More tests => 11; update_page('link', 'some [http://example.com content]'); update_page('long', q{This program is >>free<< software; -you can redistribute it and/or modify it under the -terms of the GNU General Public License as published -by the Free Software Foundation; either version 2 of -the License, or (at your option) any later version.}); -test_page(get_page('action=rc raw=1'), - 'description: some content', - "software; you", - "the terms", - "is >>free<< software", - "Public License as \\. \\. \\.\n"); -test_page(get_page('action=rss'), - "is &gt;&gt;free&lt;&lt; software"); +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # second edit doesn't automatically set a summary update_page('link', 'fnord'); diff --git a/t/tables.t b/t/tables.t index 9c3401bb..10a507c2 100644 --- a/t/tables.t +++ b/t/tables.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; diff --git a/t/usemod-1.0.4.pl b/t/usemod-1.0.4.pl index 254e1dd6..235deb67 100644 --- a/t/usemod-1.0.4.pl +++ b/t/usemod-1.0.4.pl @@ -12,7 +12,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -21,10 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . package UseModWiki; use strict; diff --git a/t/usemod-options.t b/t/usemod-options.t index 2845300e..47a518eb 100644 --- a/t/usemod-options.t +++ b/t/usemod-options.t @@ -2,7 +2,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -11,10 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc. -# 59 Temple Place, Suite 330 -# Boston, MA 02111-1307 USA +# along with this program. If not, see . require 't/test.pl'; package OddMuse; From ff0dbf3fd45270df69180a8bb19c0e6b4f1dbc8f Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Tue, 16 Aug 2016 18:08:34 +0200 Subject: [PATCH 5/7] Fixed another one that had slipped through the cracks Emacs keyboard macros, oops! --- t/summary.t | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/t/summary.t b/t/summary.t index 414b38d2..af54f5ee 100644 --- a/t/summary.t +++ b/t/summary.t @@ -19,18 +19,18 @@ use Test::More tests => 11; update_page('link', 'some [http://example.com content]'); update_page('long', q{This program is >>free<< software; -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +you can redistribute it and/or modify it under the +terms of the GNU General Public License as published +by the Free Software Foundation; either version 2 of +the License, or (at your option) any later version.}); +test_page(get_page('action=rc raw=1'), + 'description: some content', + "software; you", + "the terms", + "is >>free<< software", + "Public License as \\. \\. \\.\n"); +test_page(get_page('action=rss'), + "is &gt;&gt;free&lt;&lt; software"); # second edit doesn't automatically set a summary update_page('link', 'fnord'); From 47c9d5a1b71f28c74a3045bee9bc71e00681fc11 Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Fri, 19 Aug 2016 13:09:44 +0200 Subject: [PATCH 6/7] Removed old $Id$ line --- scripts/cli/wikiupload | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/cli/wikiupload b/scripts/cli/wikiupload index c336c0f5..d87f77ba 100755 --- a/scripts/cli/wikiupload +++ b/scripts/cli/wikiupload @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# $Id: wikiupload,v 1.8 2010/02/08 13:40:59 as Exp $ - import mimetypes, httplib, urllib, re, urlparse, sys, getopt from time import time From 10c024b9a38561dbc55a03eecc06b9a19269c4fb Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Fri, 19 Aug 2016 14:33:55 +0200 Subject: [PATCH 7/7] ban-contributors.t: commented last test The last test has been failing for Alexine and we have contacted the maintainer of the Net::Whois::Parser package. Until we hear back, I'm going to skip this test. --- t/ban-contributors.t | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/t/ban-contributors.t b/t/ban-contributors.t index 65b39049..ae6e21fc 100644 --- a/t/ban-contributors.t +++ b/t/ban-contributors.t @@ -14,7 +14,7 @@ require 't/test.pl'; package OddMuse; -use Test::More tests => 28; +use Test::More; add_module('ban-contributors.pl'); @@ -69,6 +69,13 @@ test_page(get_page("action=ban id=Test"), quotemeta('^46\.101\.([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-7])')); test_page(get_page('action=ban id=Test regexp="^46\.101\.([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-7])" range="[46.101.0.0 - 46.101.127.255]" recent_edit=on pwd=foo'), 'Location: http://localhost/wiki.pl/BannedHosts'); -test_page(get_page('BannedHosts'), - quotemeta('^46\.101\.([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-7]) # ' - . CalcDay($Now) . ' [46.101.0.0 - 46.101.127.255] Test')); + +SKIP: { + skip "Net::Whois::Parser doesn't always return the same result", 1; + test_page(get_page('BannedHosts'), + quotemeta('^46\.101\.([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-7]) # ' + . CalcDay($Now) + . ' [46.101.0.0 - 46.101.127.255] Test')); +} + +done_testing();