From: <var...@us...> - 2020-12-04 16:59:25
|
Revision: 10172 http://sourceforge.net/p/phpwiki/code/10172 Author: vargenau Date: 2020-12-04 16:59:21 +0000 (Fri, 04 Dec 2020) Log Message: ----------- replace "GPL-2.0+" by "GPL-2.0-or-later" (deprecated since SPDX 2.0 Modified Paths: -------------- trunk/ImageTile.php trunk/RPC2.php trunk/SOAP.php trunk/configurator.php trunk/index.php trunk/lib/ArchiveCleaner.php trunk/lib/AtomParser.php trunk/lib/BlockParser.php trunk/lib/CachedMarkup.php trunk/lib/Captcha.php trunk/lib/DbSession/ADODB.php trunk/lib/DbSession/PDO.php trunk/lib/DbSession/SQL.php trunk/lib/DbSession/dba.php trunk/lib/DbSession.php trunk/lib/DbaDatabase.php trunk/lib/DbaPartition.php trunk/lib/ErrorManager.php trunk/lib/ExternalReferrer.php trunk/lib/FileFinder.php trunk/lib/HtmlElement.php trunk/lib/HtmlParser.php trunk/lib/IniConfig.php trunk/lib/InlineParser.php trunk/lib/MailNotify.php trunk/lib/PageList.php trunk/lib/PagePerm.php trunk/lib/PageType.php trunk/lib/Request.php trunk/lib/RssParser.php trunk/lib/RssWriter.php trunk/lib/RssWriter091.php trunk/lib/RssWriter2.php trunk/lib/SemanticWeb.php trunk/lib/SpamBlocklist.php trunk/lib/Template.php trunk/lib/TextSearchQuery.php trunk/lib/Units.php trunk/lib/WikiCallback.php trunk/lib/WikiDB/ADODB.php trunk/lib/WikiDB/PDO.php trunk/lib/WikiDB/SQL.php trunk/lib/WikiDB/backend/ADODB.php trunk/lib/WikiDB/backend/ADODB_mssql.php trunk/lib/WikiDB/backend/ADODB_mssqlnative.php trunk/lib/WikiDB/backend/ADODB_mysql.php trunk/lib/WikiDB/backend/ADODB_oci8po.php trunk/lib/WikiDB/backend/ADODB_postgres7.php trunk/lib/WikiDB/backend/ADODB_sqlite.php trunk/lib/WikiDB/backend/PDO.php trunk/lib/WikiDB/backend/PDO_mysql.php trunk/lib/WikiDB/backend/PDO_oci8.php trunk/lib/WikiDB/backend/PDO_pgsql.php trunk/lib/WikiDB/backend/PearDB.php trunk/lib/WikiDB/backend/PearDB_ffpgsql.php trunk/lib/WikiDB/backend/PearDB_mysqli.php trunk/lib/WikiDB/backend/PearDB_oci8.php trunk/lib/WikiDB/backend/PearDB_pgsql.php trunk/lib/WikiDB/backend/PearDB_sqlite.php trunk/lib/WikiDB/backend/dba.php trunk/lib/WikiDB/backend/dbaBase.php trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php trunk/lib/WikiDB/backend/dumb/BackLinkIter.php trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php trunk/lib/WikiDB/backend/dumb/MostPopularIter.php trunk/lib/WikiDB/backend/dumb/MostRecentIter.php trunk/lib/WikiDB/backend/dumb/TextSearchIter.php trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php trunk/lib/WikiDB/backend/file.php trunk/lib/WikiDB/backend/flatfile.php trunk/lib/WikiDB/backend.php trunk/lib/WikiDB/dba.php trunk/lib/WikiDB/file.php trunk/lib/WikiDB/flatfile.php trunk/lib/WikiDB.php trunk/lib/WikiGroup.php trunk/lib/WikiPlugin.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/WikiUser/AdoDb.php trunk/lib/WikiUser/BogoLogin.php trunk/lib/WikiUser/Db.php trunk/lib/WikiUser/Facebook.php trunk/lib/WikiUser/File.php trunk/lib/WikiUser/Forbidden.php trunk/lib/WikiUser/FusionForge.php trunk/lib/WikiUser/HttpAuth.php trunk/lib/WikiUser/HttpAuthUpper.php trunk/lib/WikiUser/IMAP.php trunk/lib/WikiUser/LDAP.php trunk/lib/WikiUser/LdapUpper.php trunk/lib/WikiUser/OpenID.php trunk/lib/WikiUser/POP3.php trunk/lib/WikiUser/PdoDb.php trunk/lib/WikiUser/PearDb.php trunk/lib/WikiUser/PersonalPage.php trunk/lib/WikiUser/Session.php trunk/lib/WikiUser.php trunk/lib/WysiwygEdit/CKeditor.php trunk/lib/WysiwygEdit/Wikiwyg.php trunk/lib/WysiwygEdit/htmlarea2.php trunk/lib/WysiwygEdit/htmlarea3.php trunk/lib/WysiwygEdit/spaw.php trunk/lib/WysiwygEdit/tinymce.php trunk/lib/WysiwygEdit.php trunk/lib/XmlElement.php trunk/lib/XmlParser.php trunk/lib/XmlRpcClient.php trunk/lib/XmlRpcServer.php trunk/lib/config.php trunk/lib/diff.php trunk/lib/diff3.php trunk/lib/difflib.php trunk/lib/display.php trunk/lib/editpage.php trunk/lib/fortune.php trunk/lib/imagecache.php trunk/lib/install.php trunk/lib/loadsave.php trunk/lib/main.php trunk/lib/mimelib.php trunk/lib/pdf.php trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/DebugAuthInfo.php trunk/lib/plugin/DebugBackendInfo.php trunk/lib/plugin/DebugGroupInfo.php trunk/lib/plugin/DebugRetransform.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PreferencesInfo.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikiTranslation.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/text2png.php trunk/lib/prepend.php trunk/lib/purgepage.php trunk/lib/removepage.php trunk/lib/spam_babycart.php trunk/lib/stdlib.php trunk/lib/upgrade.php trunk/lib/wikilens/Buddy.php trunk/lib/wikilens/CustomPrefs.php trunk/lib/wikilens/PageListColumns.php trunk/lib/wikilens/RatingsDb.php trunk/lib/wikilens/RatingsUser.php trunk/lib/wikilens/Utils.php trunk/passencrypt.php trunk/themes/Crao/themeinfo.php trunk/themes/Hawaiian/lib/random.php trunk/themes/Hawaiian/themeinfo.php trunk/themes/MacOSX/lib/RecentChanges.php trunk/themes/MacOSX/themeinfo.php trunk/themes/MonoBook/themeinfo.php trunk/themes/Portland/lib/RecentChanges.php trunk/themes/Portland/themeinfo.php trunk/themes/Sidebar/clock.php trunk/themes/Sidebar/hyperapplet.php trunk/themes/Sidebar/hyperwiki.php trunk/themes/Sidebar/themeinfo.php trunk/themes/SpaceWiki/lib/RecentChanges.php trunk/themes/SpaceWiki/themeinfo.php trunk/themes/Wordpress/lib/RecentChanges.php trunk/themes/Wordpress/themeinfo.php trunk/themes/blog/lib/RecentChanges.php trunk/themes/blog/themeinfo.php trunk/themes/default/themeinfo.php trunk/themes/fusionforge/themeinfo.php trunk/themes/shamino_com/themeinfo.php trunk/themes/smaller/themeinfo.php trunk/themes/wikilens/themeinfo.php Modified: trunk/ImageTile.php =================================================================== --- trunk/ImageTile.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/ImageTile.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/RPC2.php =================================================================== --- trunk/RPC2.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/RPC2.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/SOAP.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/configurator.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -22,7 +22,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/index.php =================================================================== --- trunk/index.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/index.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -27,7 +27,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/ArchiveCleaner.php =================================================================== --- trunk/lib/ArchiveCleaner.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/ArchiveCleaner.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/AtomParser.php =================================================================== --- trunk/lib/AtomParser.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/AtomParser.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ /** Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/BlockParser.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ require_once 'lib/CachedMarkup.php'; Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/CachedMarkup.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/Captcha.php =================================================================== --- trunk/lib/Captcha.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/Captcha.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with This File; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/DbSession/ADODB.php =================================================================== --- trunk/lib/DbSession/ADODB.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/DbSession/ADODB.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/DbSession/PDO.php =================================================================== --- trunk/lib/DbSession/PDO.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/DbSession/PDO.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/DbSession/SQL.php =================================================================== --- trunk/lib/DbSession/SQL.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/DbSession/SQL.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/DbSession/dba.php =================================================================== --- trunk/lib/DbSession/dba.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/DbSession/dba.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/DbSession.php =================================================================== --- trunk/lib/DbSession.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/DbSession.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/DbaDatabase.php =================================================================== --- trunk/lib/DbaDatabase.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/DbaDatabase.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/DbaPartition.php =================================================================== --- trunk/lib/DbaPartition.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/DbaPartition.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/ErrorManager.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/ExternalReferrer.php =================================================================== --- trunk/lib/ExternalReferrer.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/ExternalReferrer.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/FileFinder.php =================================================================== --- trunk/lib/FileFinder.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/FileFinder.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/HtmlElement.php =================================================================== --- trunk/lib/HtmlElement.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/HtmlElement.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/HtmlParser.php =================================================================== --- trunk/lib/HtmlParser.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/HtmlParser.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/IniConfig.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/InlineParser.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/MailNotify.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/PageList.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/PagePerm.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/PageType.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/Request.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/RssParser.php =================================================================== --- trunk/lib/RssParser.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/RssParser.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -16,7 +16,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/RssWriter.php =================================================================== --- trunk/lib/RssWriter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/RssWriter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/RssWriter091.php =================================================================== --- trunk/lib/RssWriter091.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/RssWriter091.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/RssWriter2.php =================================================================== --- trunk/lib/RssWriter2.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/RssWriter2.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/SemanticWeb.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/SpamBlocklist.php =================================================================== --- trunk/lib/SpamBlocklist.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/SpamBlocklist.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * */ Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/Template.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/TextSearchQuery.php =================================================================== --- trunk/lib/TextSearchQuery.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/TextSearchQuery.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/Units.php =================================================================== --- trunk/lib/Units.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/Units.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiCallback.php =================================================================== --- trunk/lib/WikiCallback.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiCallback.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/ADODB.php =================================================================== --- trunk/lib/WikiDB/ADODB.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/ADODB.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/PDO.php =================================================================== --- trunk/lib/WikiDB/PDO.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/PDO.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/SQL.php =================================================================== --- trunk/lib/WikiDB/SQL.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/SQL.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/ADODB.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mssql.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mysql.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -16,7 +16,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PDO.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PDO_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_mysql.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PDO_mysql.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PDO_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_oci8.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PDO_oci8.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_pgsql.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PearDB.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_mysqli.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PearDB_mysqli.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -17,7 +17,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_oci8.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -17,7 +17,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dba.php =================================================================== --- trunk/lib/WikiDB/backend/dba.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dba.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dbaBase.php =================================================================== --- trunk/lib/WikiDB/backend/dbaBase.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dbaBase.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/file.php =================================================================== --- trunk/lib/WikiDB/backend/file.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/file.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend/flatfile.php =================================================================== --- trunk/lib/WikiDB/backend/flatfile.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend/flatfile.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/backend.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/dba.php =================================================================== --- trunk/lib/WikiDB/dba.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/dba.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -21,7 +21,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/file.php =================================================================== --- trunk/lib/WikiDB/file.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/file.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB/flatfile.php =================================================================== --- trunk/lib/WikiDB/flatfile.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB/flatfile.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiDB.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -21,7 +21,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiGroup.php =================================================================== --- trunk/lib/WikiGroup.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiGroup.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiPlugin.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiPluginCached.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiTheme.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/AdoDb.php =================================================================== --- trunk/lib/WikiUser/AdoDb.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/AdoDb.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/BogoLogin.php =================================================================== --- trunk/lib/WikiUser/BogoLogin.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/BogoLogin.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/Db.php =================================================================== --- trunk/lib/WikiUser/Db.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/Db.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/Facebook.php =================================================================== --- trunk/lib/WikiUser/Facebook.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/Facebook.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * * From http://developeronline.blogspot.com/2008/10/using-perl-against-facebook-part-i.html: Modified: trunk/lib/WikiUser/File.php =================================================================== --- trunk/lib/WikiUser/File.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/File.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/Forbidden.php =================================================================== --- trunk/lib/WikiUser/Forbidden.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/Forbidden.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/FusionForge.php =================================================================== --- trunk/lib/WikiUser/FusionForge.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/FusionForge.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/HttpAuth.php =================================================================== --- trunk/lib/WikiUser/HttpAuth.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/HttpAuth.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/HttpAuthUpper.php =================================================================== --- trunk/lib/WikiUser/HttpAuthUpper.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/HttpAuthUpper.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/IMAP.php =================================================================== --- trunk/lib/WikiUser/IMAP.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/IMAP.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/LDAP.php =================================================================== --- trunk/lib/WikiUser/LDAP.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/LDAP.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/LdapUpper.php =================================================================== --- trunk/lib/WikiUser/LdapUpper.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/LdapUpper.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ include_once 'lib/WikiUser/LDAP.php'; Modified: trunk/lib/WikiUser/OpenID.php =================================================================== --- trunk/lib/WikiUser/OpenID.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/OpenID.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * * This is not yet finished. We do not want to use zend extensions. Modified: trunk/lib/WikiUser/POP3.php =================================================================== --- trunk/lib/WikiUser/POP3.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/POP3.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/PdoDb.php =================================================================== --- trunk/lib/WikiUser/PdoDb.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/PdoDb.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/PearDb.php =================================================================== --- trunk/lib/WikiUser/PearDb.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/PearDb.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/PersonalPage.php =================================================================== --- trunk/lib/WikiUser/PersonalPage.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/PersonalPage.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser/Session.php =================================================================== --- trunk/lib/WikiUser/Session.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser/Session.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -18,7 +18,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2020-04-21 12:40:38 UTC (rev 10171) +++ trunk/lib/WikiUser.php 2020-12-04 16:59:21 UTC (rev 10172) @@ -20,7 +20,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ Modified: trunk/lib/WysiwygEdit/CKeditor.php =================================================================== --- trunk/lib/WysiwygEdit/CKe... [truncated message content] |