Item14380: Merge branch 'master' into Item14380

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce_dev"]
+	path = TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce_dev
+	url = https://github.com/tinymce/tinymce.git

AutoViewTemplatePlugin/lib/Foswiki/Plugins/AutoViewTemplatePlugin/build.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Example build class. Copy this file to the equivalent place in your
 # plugin or contrib and edit.
@@ -17,6 +17,9 @@
 # -v Be verbose
 #
 
+use strict;
+use warnings;
+
 # Standard preamble
 BEGIN {
     unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} );
@@ -46,7 +49,7 @@ sub target_build {
 package main;
 
 # Create the build object
-$build = new BuildBuild();
+my $build = new BuildBuild();
 
 # Build the target on the command line, or the default target
 $build->build( $build->{target} );

BehaviourContrib/lib/Foswiki/Contrib/BehaviourContrib/build.pl

@@ -1,8 +1,9 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Build for BehaviourContrib
 #
 use strict;
+use warnings;
 
 BEGIN {
     foreach my $pc ( split( /:/, $ENV{FOSWIKI_LIBS} ) ) {

BuildContrib/build.pl

@@ -1,4 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
+use strict;
+use warnings;
+
 unless ( scalar(@ARGV) ) {
     print <<DOC;
 Build an extension

BuildContrib/data/System/BuildContrib.txt

@@ -1,7 +1,7 @@
-%META:TOPICINFO{author="ProjectContributor" date="1443532867" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1512466074" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Contribs"}%
 ---+!! Foswiki Developer Environment
-<a href="http://wikiring.com" class="foswikiRight"><img src="%ATTACHURLPATH% \logo.gif" title="WikiRing: Professional Wiki Innovation and Support" /></a>
+<img src="%ATTACHURLPATH%/logo.gif" alt="WikiRing" class="foswikiRight" />
 %FORMFIELD{"Description"}%
 
 
@@ -651,13 +651,14 @@ You are strongly recommended to use this Contrib to help split your code develop
 %$INSTALL_INSTRUCTIONS%
 
 ---++ Info
-Another great Foswiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH% \wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - __Working together to improve your wiki experience__!
+
+Another great Foswiki extension from the <img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="WikiRing" /> *WikiRing* - working together to improve your wiki experience!
 
 See the repository for full change history.
 
 
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1443532867" size="1343" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="logo.gif" attr="" comment="logo" date="1443532867" size="14169" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1512466074" size="1343" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="logo.gif" attr="" comment="logo" date="1512466074" size="14169" user="ProjectContributor" version="1"}%
 %META:FORM{name="PackageForm"}%
 %META:FIELD{name="Author" title="Author" value="[[http://c-dot.co.uk][Crawford Currie]]"}%
 %META:FIELD{name="Copyright" title="Copyright" value="Foswiki Contributors 2004-2015, All Rights Reserved"}%

BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm

@@ -1,8 +1,8 @@
 package Foswiki::Contrib::BuildContrib;
 use strict;
 
-our $VERSION = '1.90';
-our $RELEASE = '25 Sep 2015';
+our $VERSION = '1.91';
+our $RELEASE = '12 Dec 2017';
 
 our $SHORTDESCRIPTION =
 'Automates build and packaging process, including installer generation, for extension modules.';

BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/compress.pm

@@ -347,14 +347,12 @@ sub _uglifyjs {
     my $lcall = $ENV{'LC_ALL'};
     my $cmd;
 
-    $cmd = "uglifyjs $from";
+    $cmd = "uglifyjs -m -c -- $from";
 
     unless ( $this->{-n} ) {
-        $cmd .= " -o $to";
+        $cmd .= " > $to";
     }
 
-    $cmd .= ' -b beautify=false,ascii-only=true ';
-
     warn "$cmd\n";
     my $out = `$cmd`;
     $ENV{'LC_ALL'} = $lcall;

BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/dependencies.pm

@@ -16,6 +16,7 @@
 package Foswiki::Contrib::Build;
 
 use strict;
+use warnings;
 use B::PerlReq;
 
 =begin TML

BuildContrib/lib/Foswiki/Contrib/BuildContrib/build.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Example build class. Copy this file to the equivalent place in your
 # plugin or contrib and edit.
@@ -16,6 +16,10 @@
 # -n Don't actually do anything, just print commands
 # -v Be verbose
 # Standard preamble
+
+use strict;
+use warnings;
+
 BEGIN {
     unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} );
 }
@@ -44,7 +48,7 @@ sub target_build {
 package main;
 
 # Create the build object
-$build = new BuildBuild();
+my $build = new BuildBuild();
 
 # Build the target on the command line, or the default target
 $build->build( $build->{target} );

CommentPlugin/data/System/CommentPlugin.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1485009132" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1516632401" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Plugins"}%
 ---+!! Comment Plugin
 
@@ -276,9 +276,12 @@ This plugin has been significantly changed from the =10 April 2011= version ship
    * The plugin no longer processes %COMMENT macros during save.  If you have developed any forms using the [[%SANDBOXWEB%.CommentPluginExamples#NoForm][=noform= and =templatetopic= examples]] they must be revised.
 
 ---++ Info
-Another great extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - working together to improve your wiki experience!
+
+Another great Foswiki extension from the <img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="WikiRing" /> *WikiRing* - working together to improve your wiki experience!
 
 |  Change History: | |
+|  2.93 (22 Jan 2018) | Foswikitask:Item14554: remove link to unused wikiring.com domain.<br/>\
+                        Foswikitask:Item14605: Unescaped brace in Regular Expression,   Perl 5.27.8. |
 |  2.92 (21 Jan 2017) | Foswikitask:Item14009: Comment plugin does not properly identify location to insert comment when specified as an anchor. |
 |  2.91 (08 Apr 2016) | Foswikitask:Item14022: Update Foswiki.org links to https. Released with Foswiki 2.1.1. |
 |  2.9 (03 Feb 2016) | Foswikitask:Item13854: Set ALLOWTOPICVIEW = "*" on Comment Template.  *Requires compatibility patch on Foswiki 1.x or Foswiki 1.1.10.* |
@@ -333,8 +336,8 @@ Another great extension from the <a style="text-decoration:none" href="http://wi
 %META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
 %META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/CommentPlugin"}%
 %META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/CommentPlugin"}%
-%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1485009132" size="70" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1485009132" size="1931" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1485009132" size="60" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1485009132" size="5134" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1485009132" size="1343" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1516632401" size="70" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1516632401" size="1931" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1516632401" size="60" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1516632401" size="5134" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1516632401" size="1343" user="ProjectContributor" version="1"}%

CommentPlugin/data/System/CommentPluginTemplate.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1447730097" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1493698648" format="1.1" version="1"}%
 %META:TOPICPARENT{name="CommentPlugin"}%
 
 ---+!! Templates for CommentPlugin
@@ -48,7 +48,7 @@ Generic prompt box used by other templates
 
 Short comment, signed and dated
 <verbatim>
-%TMPL:DEF{outputoneliner}%   * %URLPARAM{"comment" encode="$encodeguest"}% -- %WIKIUSERNAME% - %GMTIME{"$day $month $year"}%%TMPL:END%
+%TMPL:DEF{outputoneliner}%   * %CREATE:URLPARAM{"comment" encode="$encodeguest"}% -- %CREATE:WIKIUSERNAME% - %CREATE:GMTIME{"$day $month $year"}%%TMPL:END%
 </verbatim>
 
 %ICON{"hand"}% See rendered template [[%SANDBOXWEB%.CommentPluginExamples#Default][Default]]
@@ -112,7 +112,7 @@ Bullet item added immediately before anchor. The input field width is passed wit
 %TMPL:DEF{PROMPT:bulletabove}%<input class="foswikiInputField" name="bullet_above_item" id="bullet_above_item" type="text" size="%inputsize|40%" value="%URLPARAM{"bullet_above_item"}%" />&nbsp;<input %DISABLED% type="button" value="%button|Add item%" class="foswikiButton %TMPL:P{ajax}%" />%TMPL:END%
 </verbatim>
 <verbatim>
-%TMPL:DEF{OUTPUT:bulletabove}%   * %URLPARAM{"bullet_above_item" encode="$encodeguest"}%%POS:BEFORE%
+%TMPL:DEF{OUTPUT:bulletabove}%   * %CREATE:URLPARAM{"bullet_above_item" encode="$encodeguest"}%%POS:BEFORE%
 %TMPL:END%
 </verbatim>
 
@@ -129,9 +129,9 @@ Wiki thread mode comment, signed and dated
 <verbatim>
 %TMPL:DEF{OUTPUT:threadmode}%%POS:BEFORE%
 
-%URLPARAM{"comment" encode="$encodeguest"}%
+%CREATE:URLPARAM{"comment" encode="$encodeguest"}%
 
--- %WIKIUSERNAME% - %DATE%
+-- %CREATE:WIKIUSERNAME% - %CREATE:DATE%
 %TMPL:END%
 </verbatim>
 
@@ -148,7 +148,7 @@ Comments, signed and dated, added recurse after comment box.
 </verbatim>
 <verbatim>
 %TMPL:DEF{OUTPUT:belowthreadmode}%%POS:AFTER%
----++++ %WIKIUSERNAME% - %SERVERTIME%
+---++++ %CREATE:WIKIUSERNAME% - %CREATE:SERVERTIME%
 
 %URLPARAM{"comment" encode="$encodeguest"}%
 
@@ -182,7 +182,7 @@ anchor/location/COMMENT
 %TMPL:DEF{PROMPT:tableprepend}%%TMPL:P{promptbox}%%TMPL:END%
 </verbatim>
 <verbatim>
-%TMPL:DEF{OUTPUT:tableprepend}%%POS:AFTER%| %URLPARAM{"comment" newline="<br />" encode="$encodeguest"}% | %WIKIUSERNAME% | %SERVERTIME% |
+%TMPL:DEF{OUTPUT:tableprepend}%%POS:AFTER%| %CREATE:URLPARAM{"comment" newline="<br />" encode="$encodeguest"}% | %CREATE:WIKIUSERNAME% | %CREATE:SERVERTIME% |
 %TMPL:END%
 </verbatim>
 
@@ -197,7 +197,7 @@ Comments, signed and dated, added at end of table above the anchor/location/COMM
 %TMPL:DEF{PROMPT:tableappend}%%TMPL:P{promptbox}%%TMPL:END%
 </verbatim>
 <verbatim>
-%TMPL:DEF{OUTPUT:tableappend}%%POS:BEFORE%| %URLPARAM{"comment" newline="<br />" encode="$encodeguest"}% | %WIKIUSERNAME% | %SERVERTIME% |
+%TMPL:DEF{OUTPUT:tableappend}%%POS:BEFORE%| %CREATE:URLPARAM{"comment" newline="<br />" encode="$encodeguest"}% | %CREATE:WIKIUSERNAME% | %CREATE:SERVERTIME% |
 %TMPL:END%
 </verbatim>
 
@@ -234,7 +234,7 @@ Action added to action table directly above comment box
 %TMPL:END%
 </verbatim>
 <verbatim>
-%TMPL:DEF{OUTPUT:action}%%POS:BEFORE%%AC%NOP%TION{who="%URLPARAM{"action_who" encode="$encodeguest"}%" due="%URLPARAM{"action_due" encode="$encodeguest"}%"}% %URLPARAM{"action_comment" encode="$encodeguest"}%<br />- Created by %WIKIUSERNAME%, %SERVERTIME%%ENDACTION%
+%TMPL:DEF{OUTPUT:action}%%POS:BEFORE%%AC%NOP%TION{who="%CREATE:URLPARAM{"action_who" encode="$encodeguest"}%" due="%CREATE:URLPARAM{"action_due" encode="$encodeguest"}%"}% %CREATE:URLPARAM{"action_comment" encode="$encodeguest"}%<br />- Created by %CREATE:WIKIUSERNAME%, %CREATE:SERVERTIME%%ENDACTION%
 %TMPL:END%
 </verbatim>
 
@@ -254,7 +254,7 @@ Tablerows adding on end
 %TMPL:END%
 </verbatim>
 <verbatim>
-%TMPL:DEF{OUTPUT:table}%%POS:BEFORE%| %URLPARAM{"comment_date" encode="$encodeguest"}% | %WIKIUSERNAME% | %URLPARAM{"comment_city" encode="$encodeguest"}% |
+%TMPL:DEF{OUTPUT:table}%%POS:BEFORE%| %CREATE:URLPARAM{"comment_date" encode="$encodeguest"}% | %CREATE:WIKIUSERNAME% | %CREATE:URLPARAM{"comment_city" encode="$encodeguest"}% |
 %TMPL:END%
 </verbatim>
 
@@ -275,8 +275,8 @@ Talk using TOC adding on end
 </verbatim>
 <verbatim>
 %TMPL:DEF{OUTPUT:toctalk}%
-%POS:BEFORE%---++++ %SERVERTIME% %WIKIUSERNAME%: %URLPARAM{"comment_summary" encode="$encodeguest"}%
-%POS:BEFORE%%URLPARAM{"toctalk_comment_text" encode="$encodeguest"}%
+%POS:BEFORE%---++++ %CREATE:SERVERTIME% %CREATE:WIKIUSERNAME%: %CREATE:URLPARAM{"comment_summary" encode="$encodeguest"}%
+%POS:BEFORE%%CREATE:URLPARAM{"toctalk_comment_text" encode="$encodeguest"}%
 %POS:BEFORE%
 %TMPL:END%
 </verbatim>
@@ -298,7 +298,7 @@ Create a list of annotated bookmarks
 %TMPL:END%
 </verbatim>
 <verbatim>
-%TMPL:DEF{OUTPUT:bookmark}%%POS:BEFORE%   * [[%URLPARAM{"comment_url" encode="entity"}%][%URLPARAM{"comment_link" encode="entity"}%]] %IF{" '%URLPARAM{"bookmark_comment_text" encode="entity"}%' = '' " then="" else="- "}%%URLPARAM{"bookmark_comment_text" encode="entity"}%
+%TMPL:DEF{OUTPUT:bookmark}%%POS:BEFORE%   * [[%CREATE:URLPARAM{"comment_url" encode="entity"}%][%CREATE:URLPARAM{"comment_link" encode="entity"}%]] %IF{" '%CREATE:URLPARAM{"bookmark_comment_text" encode="entity"}%' = '' " then="" else="- "}%CREATE:%URLPARAM{"bookmark_comment_text" encode="entity"}%
 %TMPL:END%
 </verbatim>
 

CommentPlugin/lib/Foswiki/Plugins/CommentPlugin.pm

@@ -13,8 +13,8 @@ use Foswiki::Func    ();
 use Foswiki::Plugins ();
 
 # Please use major.minor
-our $VERSION = '2.92';
-our $RELEASE = '21 Jan 2017';
+our $VERSION = '2.93';
+our $RELEASE = '22 Jan 2018';
 our $SHORTDESCRIPTION =
   'Quickly post comments to a page without an edit/save cycle';
 our $NO_PREFS_IN_TOPIC = 1;

CommentPlugin/lib/Foswiki/Plugins/CommentPlugin/Comment.pm

@@ -342,7 +342,7 @@ sub comment {
                 # Position relative to index'th comment
                 my $idx = 0;
                 unless (
-                    $text =~ s((%COMMENT({.*?})?%.*\n))
+                    $text =~ s((%COMMENT(\{.*?\})?%.*\n))
                           (&_nth($1,\$idx,$position,$index,$output))eg
                   )
                 {
@@ -360,7 +360,7 @@ sub comment {
 
         # remove the index'th comment box
         my $idx = 0;
-        $text =~ s/(%COMMENT({.*?})?%)/_remove_nth($1,\$idx,$remove)/eg;
+        $text =~ s/(%COMMENT(\{.*?\})?%)/_remove_nth($1,\$idx,$remove)/eg;
     }
 
     return ( $meta, $text, $position, $output );

CommentPlugin/lib/Foswiki/Plugins/CommentPlugin/build.pl

@@ -1,6 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 use strict;
+use warnings;
 
 BEGIN {
     foreach my $pc ( split( /:/, $ENV{FOSWIKI_LIBS} ) ) {