Item14288: Merge master

JQueryPlugin/data/System/JQueryPlugin.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1512791273" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1515396964" format="1.1" version="1"}%
 ---+!! %TOPIC%
 %FORMFIELD{"Description"}%
 
@@ -134,7 +134,8 @@ required for Foswiki 1.1 or later.
 |  11 Dec 2017: | (7.25) - Item14565: bundle jquery.validate js files into one <br /> \
                            Item14566: don't cache a null result in foswiki.getPreference() <br /> \
                            Item14570: add "use strict" to farbtastic's init and fix js errors <br /> \
-                           Item14573: fixed auto-height calculation of tabpane |
+                           Item14573: fixed auto-height calculation of tabpane<br/>\
+                           Item14584: jquery.wikiword changed interpretation of source parameter in a incompatible way. |
 |   8 Dec 2017: | (7.24) - Released with Foswiki 2.1.5<br />\
                            Item14518: JQueryPlugin should warn configure if an older version of jquery is selected.<br />\
                            Item14555: make build work with latest uglifyjs 3.<br />\

MailerContrib/data/System/MailerContrib.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1513094554" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1515396964" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Contribs"}%
 ---+!! Mailer Contrib
 <img src="%ATTACHURL%/logo.gif" class="foswikiRight" />
@@ -274,9 +274,10 @@ Many thanks to the following sponsors for supporting this work:
 
 |  Copyright &copy;: | 2004, Wind River Systems; 2009-2014 Foswiki Contributors |
 |  Change History: | |
-|  2.85  (8 Dec 2017) | Foswiki 2.1.5  Foswikitask:Item14554: remove link to unused wikiring.com domain.<br/>\
+|  2.85  (23 Dec 2017) | Foswiki 2.1.5  Foswikitask:Item14554: remove link to unused wikiring.com domain.<br/>\
                         Foswikitask:Item13350: Mailnotify appears to skip notification of some changes.<br/>\ 
-                        Foswikitask:Item14446: Unwritable =work_area= results in mega-spam. |
+                        Foswikitask:Item14446: Unwritable =work_area= results in mega-spam.<br/>\
+                        Foswikitask:Item14588: mailnotify fills debug log with errors about "surprising mapping" and "missing mapping". |
 |  2.84  (8 Feb 2017) | Foswiki 2.1.3  Minor file permissions changes |
 |  2.83  (15 Nov 2016) | Foswikitask:Item13936: Allow From: address of emails to be separately configured<br />\
                          Foswikitask:Item14216: mailnotify fails with "Wide character in print" |
@@ -322,5 +323,5 @@ Many thanks to the following sponsors for supporting this work:
 %META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
 %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
-%META:FILEATTACHMENT{name="logo.gif" attr="h" comment="" date="1513094554" size="11437" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1513094554" size="1343" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="logo.gif" attr="h" comment="" date="1515396964" size="11437" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1515396964" size="1343" user="ProjectContributor" version="1"}%

MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm

@@ -30,7 +30,7 @@ use Foswiki::Contrib::MailerContrib::UpData    ();
 
 # Also change Version/Release in Plugins/MailerContrib.pm
 our $VERSION          = '2.85';
-our $RELEASE          = '8 Dec 2017';
+our $RELEASE          = '23 Dec 2017';
 our $SHORTDESCRIPTION = 'Supports email notification of changes';
 
 # PROTECTED STATIC ensure the contrib is internally initialised

MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm

@@ -303,6 +303,13 @@ sub set_up {
     # OK, we should have a bunch of changes
 }
 
+sub loadExtraConfig {
+    my $this = shift;
+    $this->SUPER::loadExtraConfig(@_);
+
+    $Foswiki::cfg{WebMasterEmail} = 'admin@foswikitest.net';
+}
+
 sub checkSpecs {
     my $this = shift;
 

NatEditPlugin/data/System/NatEditPlugin.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1512407627" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1515396964" format="1.1" version="1"}%
 ---+!! Natural Edit Plugin
 %FORMFIELD{"Description"}%
 
@@ -58,6 +58,7 @@ is sufficient.
 %TABLE{columnwidths="7em" tablewidth="100%"}%
 |  Copyright ©: | 2007-2017 Michael Daum http://michaeldaumconsulting.com |
 |  Change History: | |
+|  18 Dec 2017 | Foswikitask:Item14586: fixed height computation of natedit textarea |
 |  04 Dec 2017 | Foswikitask:Item13835: enable !TopicTitle field when feature available |
 |  04 May 2017 | Foswikitask:Item14388: NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs.<br/>
                  Foswikitask:Item14404: NatEdit Save and Continue action fails on mod_perl systems. |
@@ -185,4 +186,4 @@ is sufficient.
 %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
 %META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
-%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1512407627" size="64487" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1515396964" size="64487" user="ProjectContributor" version="1"}%

NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js

@@ -1210,15 +1210,21 @@ $.NatEditor.prototype.fixHeight = function() {
     bottomBar = self.form.find(".natEditBottomBar"),
     newHeight;
 
+  // find elem, child of this
+  while (elem && elem.length && elem.parent().attr("id") != self.id) {
+    elem = elem.parent();
+  }
+
   if (!elem || !elem.length) {
     return;
   }
 
   newHeight = 
     (bottomBar.length ? bottomBar.position().top : $(window).height() || window.innerHeight) // bottom position: if there is a bottomBar, take this, otherwise use the window's geometry
     - elem.position().top // editor's top position
-    - (elem.outerHeight(true) - elem.outerHeight()) // editor's padding
-    - (self.container.outerHeight(true) - self.container.outerHeight()); // container's padding
+    - (elem.outerHeight(true) - elem.height()) // elem's padding
+    - ((self.container.is(".ui-natedit-fullscreen"))?0:(self.container.outerHeight(true) - self.container.height())) // container's padding
+  ;
 
   if (self.opts.minHeight && newHeight < self.opts.minHeight) {
     newHeight = self.opts.minHeight;

NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css

@@ -280,6 +280,9 @@ table.mceToolbar {
 #topic_tbl, #topic_ifr {
   width:100% !important; 
 }
+.ui-natedit .mce-container {
+  box-sizing:border-box;
+}
 
 /* pattern skin tweaks */
 .patternEditPage #patternMainContents {

NatEditPlugin/templates/edit.natedit.tmpl

@@ -67,7 +67,7 @@
 %TMPL:P{"help"}%
 %TMPL:END%
 
-%TMPL:DEF{"tabpane"}%%TABPANE{automaxexpand="on" animate="on" select="%URLPARAM{"natedittab" default="%TMPL:P{"selectedtab"}%"}%"}%
+%TMPL:DEF{"tabpane"}%%TABPANE{class="plain" automaxexpand="on" animate="on" select="%URLPARAM{"natedittab" default="%TMPL:P{"selectedtab"}%"}%"}%
 %TMPL:P{"tabs"}%%ENDTABPANE%%TMPL:END%
 
 %TMPL:DEF{"tabs"}%%TMPL:P{"firsttab"}%%TMPL:P{"formfields"}%%TMPL:P{"settingstab"}%%TMPL:P{"permissionstab"}%%TMPL:P{"helptab"}%%TMPL:END%

UnitTestContrib/test/unit/AccessControlTests.pm

@@ -1016,8 +1016,8 @@ THIS
         my ($status) = $text =~ m/^Status: (\d+)\r?$/m;
         $this->assert_not_null( $status,
             "Request did not return a Status header" );
-        $this->assert_equals( 401, $status,
-            "Request should have returned a 401, not a $status" );
+        $this->assert_equals( 200, $status,
+            "Request should have returned a 200, not a $status" );
 
         # Extract what we've been redirected to
         my ($formAction) =

UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm

@@ -789,8 +789,8 @@ THIS
     # Check we got a 401
     my ($status) = $text =~ m/^Status: (\d+)\r?$/m;
     $this->assert_not_null( $status, "Request did not return a Status header" );
-    $this->assert_equals( 401, $status,
-        "Request should have returned a 401, not a $status" );
+    $this->assert_equals( 200, $status,
+        "Request should have returned a 200, not a $status" );
 
     # Extract what we've been redirected to
     my ($formAction) =

UnitTestContrib/test/unit/RegisterTests.pm

@@ -185,6 +185,7 @@ sub loadExtraConfig {
     $Foswiki::cfg{Register}{EmailFilter}      = '';
     $Foswiki::cfg{Register}{NeedVerification} = 0;
     $Foswiki::cfg{Register}{NeedApproval}     = 0;
+    $Foswiki::cfg{WebMasterEmail}             = 'admin@foswikitest.net';
 }
 
 sub tear_down {

core/data/System/ReleaseHistory.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1513393570" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1515396964" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 %STARTINCLUDE%
 <noautolink>
@@ -8,9 +8,9 @@
 The complete timeline of Foswiki Releases. Foswiki was forked from TWiki 4.2.4 and released with significant improvments as Foswiki 1.0 in January 2009.  Since then there have been 31 releases, with 2 major versions and 2 minor versions. 
 
 %TOC%
----++ Foswiki Release 2.1.5-Beta1 - 16 Dec 2017
+---++ Foswiki Release 2.1.5-Beta2 - 18 Dec 2017
 
-Foswiki 2.1.5-Beta1 was built on 16 Dec 2017. It is a release that contains 35 fixes and 5 enhancements.
+Foswiki 2.1.5-Beta2 was built on 16 Dec 2017. It is a release that contains 38 fixes and 5 enhancements.
 
 ---++ Foswiki Release 2.1.4 - 31 May 2017
 

core/data/System/ReleaseNotes02x01.txt

@@ -1,6 +1,6 @@
-%META:TOPICINFO{author="ProjectContributor" date="1513438812" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1515396964" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
----+!! Foswiki Release 2.1.5-Beta1
+---+!! Foswiki Release 2.1.5-Beta2
 
 %TWISTY{showlink="Table of Contents..." hidelink="hide TOC"}%
 %TOC%
@@ -56,7 +56,7 @@ Foswiki is released under the GNU General Public License.
    * Foswiki 2.1.2 was built on 02 May 2016. It is a release that contains 1 fix.
    * Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
    * Foswiki 2.1.4 was built on 31 May 2017. It is a release that contains 31 fixes.
-   * Foswiki 2.1.5-Beta1 was built on 16 Dec 2017. It is a release that contains 35 fixes and 5 enhancements.
+   * Foswiki 2.1.5-RC was built on xx Dec 2017. It is a release that contains 39 fixes and 5 enhancements.
 
 
 ---++ Pre-installed Extensions
@@ -92,12 +92,15 @@ function correctly without this zone.   No changes are required unless you
 have replaced the =foswiki.tmpl= or =foswiki.pattern.tmpl= with a local
 version.
 
----+++ Cnange in HTTP status return for authentication failures.
+---+++ Change in HTTP status return for authentication failures.
 
 The fix for Foswikitask:Item14445 changes the HTTP status return for authentiation errors from =401 - Unauthorized= to =200 - OK=
 when returning the Template Login screen. The 401 status is not valid unless it returns a WWW-Authentication challenge that can be processed by the
 _agent_. This is only valid when using HTTP authentication. The REST and JSONRPC actions will still return a 401, so that it can be handled by javascript.
 
+*Note:* This change requires a corresponding fix for the !LdapContrib.  If you use the !LdapContrib, you should not apply this release until an update of
+!LdapContrib is available.
+
 ---+++ Running Foswiki on a Windows based web server
 
 This release fixes a critical error that prevented Foswiki from being installed on Windows.  Foswiki mistakenly used a reserved filename for 
@@ -539,6 +542,7 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item11491][Item11491]] | FCGI has de facto file upload limit - add note in documentation for fix. |
 | [[%BUGS%/Item12495][Item12495]] | In form fields of type "select", space after a value and before the delimiting comma makes the value selectable and it saves but will reset on next edit. |
 | [[%BUGS%/Item13350][Item13350]] | Document why Mailnotify appears to skip notification of some changes. |
+| [[%BUGS%/Item13380][Item13380]] | Remove the Web/Topic from the login URL to prevent flooding the browser password cache. |
 | [[%BUGS%/Item13835][Item13835]] | Title Field in Natedit gone, even when used. |
 | [[%BUGS%/Item14395][Item14395]] | InterwikiPlugin failure to check result from readTopic causes error. |
 | [[%BUGS%/Item14415][Item14415]] | TopicUserMapping places non-ASCII users in wrong position in WikiUsersTopic. |
@@ -571,6 +575,9 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item14566][Item14566]] | Don't cache a null result in foswiki.getPreference(). |
 | [[%BUGS%/Item14573][Item14573]] | Fix auto-height calculation of tabpane. |
 | [[%BUGS%/Item14574][Item14574]] | HTML cellspacing attribute has no effect. |
+| [[%BUGS%/Item14584][Item14584]] | jquery.wikiword changed interpretation of source parameter in a incompatible way. |
+| [[%BUGS%/Item14586][Item14586]] | Blinking scrollbar in natedit caused by incorrect window height. |
+| [[%BUGS%/Item14588][Item14588]] | mailnotify fills debug log with errors about "surprising mapping" and "missing mapping". |
 
 ---+++ Enhancements
 

core/lib/Foswiki/LoginManager/TemplateLogin.pm

@@ -93,6 +93,18 @@ sub forceAuthentication {
         my $query    = $session->{request};
         my $response = $session->{response};
 
+        # SMELL: This breaks some applications such as MS Excel. Return
+        # A 200 instead of a 401.
+        #   Respond with a 401 with an appropriate WWW-Authenticate
+        #   that won't be snatched by the browser, but can be used
+        #   by JS to generate login info.
+        $response->header(
+            -status => 200,
+
+            #-WWW_Authenticate => 'FoswikiBasic realm="'
+            #  . ( $Foswiki::cfg{AuthRealm} || "" ) . '"'
+        );
+
         $query->param(
             -name  => 'foswiki_origin',
             -value => _packRequest($session)
@@ -119,7 +131,7 @@ sub loginUrl {
     my $session = $this->{session};
     my $topic   = $session->{topicName};
     my $web     = $session->{webName};
-    return $session->getScriptUrl( 0, 'login', $web, $topic,
+    return $session->getScriptUrl( 0, 'login', undef, undef,
         foswiki_origin => _packRequest($session) );
 }
 

core/templates/settings.tmpl

@@ -22,7 +22,7 @@
 
 
 %TMPL:DEF{"help"}%
-   * %POPUPWINDOW{"%SYSTEMWEB%.PreferencesSettings" label="%MAKETEXT{"Get help on setting topic preferences"}%"}%%JQREQUIRE{"popupwindow"}%
+   * %POPUPWINDOW{"%SYSTEMWEB%.PreferenceSettings" label="%MAKETEXT{"Get help on setting topic preferences"}%"}%%JQREQUIRE{"popupwindow"}%
    * %MAKETEXT{"Each preference has the syntax"}% <br />
      %MAKETEXT{"~[multiple of 3 spaces~] * ~[space~] Set ~[space~] VARIABLENAME ~[space~] = ~[value~]"}%
 %TMPL:END%