Merge branch 'master' into Item14288

foswiki · Mar 27, 2017 · fd9adbe · fd9adbe
2 parents 8586ff9 + a1c0f9d
commit fd9adbe
Show file tree

Hide file tree

Showing 64 changed files with 103 additions and 7,814 deletions.
diff --git a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Table.pm b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Table.pm
@@ -396,7 +396,7 @@ sub render {
 
             push(
                 @out,
-                Foswiki::Render::html( 'a', { name => "erp_$this->{id}" } )
+                Foswiki::Render::html( 'a', { name => "erp_${id}" } )
                   . Foswiki::Render::html( 'a',
                     { href => $url, title => $title }, $button )
                   . '<br />'
@@ -429,7 +429,7 @@ sub render {
                 erp_active_row => -2,
                 erp_unchanged  => 1,
                 erp_action     => 'addRow',
-                '#'            => 'erp_' . $this->{id}
+                '#'            => "erp_${id}"
             );
 
             # Full table disabled, but not row

diff --git a/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt b/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1490124221" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1490401384" format="1.1" version="1"}%
 ---+!! <nop>FastCGI Engine Contrib
 %$SHORTDESCRIPTION%
 
@@ -144,6 +144,8 @@ server {
     error_log   /var/log/nginx/foswiki-error.log;
     #error_log   /var/log/nginx/foswiki-error.log debug;
 
+    client_max_body_size 10M;   # Set to maximum attachment size, See also ATTACHFILESIZELIMIT
+
     location = / {
         root $foswiki_root;
     rewrite .* /Main/WebHome;
@@ -153,7 +155,7 @@ server {
         allow all;
     }
 
-    location /bin/ {
+    location ~ ^/bin/ {
            gzip off;
            #fastcgi_pass             unix:/var/run/nginx/foswiki.sock;
            fastcgi_pass             127.0.0.1:9000;

diff --git a/FastCGIEngineContrib/tools/foswiki.defaults b/FastCGIEngineContrib/tools/foswiki.defaults
@@ -1,6 +1,6 @@
 FOSWIKI_ROOT=/home/www-data/foswiki/core
 FOSWIKI_FCGI=foswiki.fcgi
-FOSWIKI_BIND=127.0.0.1:9001
+FOSWIKI_BIND=127.0.0.1:9000
 FOSWIKI_CHILDREN=3
 FOSWIKI_MAX_REQUESTS=-1
 FOSWIKI_MAX_SIZE=200000

diff --git a/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm b/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm
@@ -3123,10 +3123,10 @@ BLAH
 GLUED
         html => <<'ARGH'
 <div class="WYSIWYG_WARNING foswikiBroadcastMessage">
-*Conversion to HTML for WYSIWYG editing is disabled because of the topic
-content.*<p></p>This is why the conversion is disabled:
+<strong>Conversion to HTML for WYSIWYG editing is disabled because of the topic
+content.</strong><p></p>This is why the conversion is disabled:
 &lt;verbatim&gt; inside &lt;literal&gt;<p></p>
-(This message will be removed automatically)<nop></div><div class="WYSIWYG_PROTECTED">&#60;literal&#62;&#60;font&nbsp;color=&#34;blue&#34;&#62;&nbsp;*|B|*&#60;verbatim&#62;%H%&#60;/verbatim&#62;&nbsp;&#60;/font&#62;&#60;/literal&#62;<br /></div>
+(This message will be removed automatically)</div><div class="WYSIWYG_PROTECTED">&#60;literal&#62;&#60;font&nbsp;color=&#34;blue&#34;&#62;&nbsp;*|B|*&#60;verbatim&#62;%H%&#60;/verbatim&#62;&nbsp;&#60;/font&#62;&#60;/literal&#62;<br /></div>
 ARGH
     },
     {
@@ -3137,10 +3137,10 @@ ARGH
 GLUED
         html => <<'ARGH'
 <div class="WYSIWYG_WARNING foswikiBroadcastMessage">
-*Conversion to HTML for WYSIWYG editing is disabled because of the topic
-content.*<p></p>This is why the conversion is disabled:
+<strong>Conversion to HTML for WYSIWYG editing is disabled because of the topic
+content.</strong><p></p>This is why the conversion is disabled:
 &lt;sticky&gt; inside &lt;literal&gt;<p></p>
-(This message will be removed automatically)<nop></div><div class="WYSIWYG_PROTECTED">&#60;literal&#62;&#60;sticky&#62;&#60;font&nbsp;color=&#34;blue&#34;&#62;&nbsp;*|B|*&nbsp;&#60;/font&#62;&#60;/sticky/&#62;&#60;/literal&#62;<br /></div>
+(This message will be removed automatically)</div><div class="WYSIWYG_PROTECTED">&#60;literal&#62;&#60;sticky&#62;&#60;font&nbsp;color=&#34;blue&#34;&#62;&nbsp;*|B|*&nbsp;&#60;/font&#62;&#60;/sticky/&#62;&#60;/literal&#62;<br /></div>
 ARGH
     },
     {

diff --git a/core/data/System/CommandAndCGIScripts.txt b/core/data/System/CommandAndCGIScripts.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1489457633" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1490435890" format="1.1" version="1"}%
 %META:TOPICPARENT{name="DeveloperDocumentationCategory"}%
 %STARTINCLUDE%
 ---+ CGI and Command Line Scripts
@@ -646,6 +646,12 @@ it's recommended to use the fully canonical form: =%<nop>SCRIPTURLPATH{"viewfile
 ---++ Tool Scripts
 Details on command line scripts located in the =tools= directory.
 
+---+++ =bulk_copy.pl=
+Script for bulk copying of topics, complete with histories, between
+any two local Foswiki installations.
+
+Run the script without parameters to get detailed help.
+
 ---+++ =configure=
 This is a fully functional command line interface to the Foswiki configuration.  It is able to set and check configuration values, and to run wizards.
 
@@ -664,12 +670,45 @@ Note: if you need to pass in international characters, it needs to be run with t
 
 For full help, run =tools/configure -help=.
 
+---+++ =convertTopicSettings.pl=
+
+Convert inline topic settings into META settings.
+
+This tool should be run after a Foswiki site is upgraded from 1.x to
+Foswiki 2.0 or newer.  It can also be used on a Foswik 1.1.x
+installation if the PatchItem12849Contrib is installed.
+
+Run the script without parameters for detailed help.
+
 ---+++ =dependencies=
 Generates a report of missing or all dependencies.  This report is also available to administrators at [[%SYSTEMWEB%.PerlDependencyReport]]
 
    $ =tools/dependencies=: Generates a report on the missing dependencies
    $ =tools/dependencies -all=: Generates a report on all dependencies, installed or missing, along with information on the installation location.
 
+---+++ =extender.pl=
+
+Command-line extension installer, not designed to be run stand-alone, but as part of a *_installer shipped with an extension.
+
+---+++ =extension_installer=
+This script will download and install, or remove an extension.
+
+For more details, execute it from the Foswiki root directory with the =usage= parameter:
+<verbatim>
+./tools/extension_installer usage
+</verbatim>
+This script is a generic version of the =_installer= script shipped with each extension.
+
+There are a number of different ways to install an extension (e.g. _SomeExtension_). In decreasing order of complexity:
+   * Download the _SomeExtension_ package (.zip or .tgz), unpack it in the Foswiki root, manually correct permissions and run the =<i>SomeExtension</i>_installer= script (shipped with <i>SomeExtension</i>) from the Foswiki root directory
+   * Download the _SomeExtension_ package, unpack it in the Foswiki root, manually correct permissions and run the =configure= web interface to complete installation.
+   * Run =tools/extension_installer= _SomeExtension_ from the Foswiki root.
+   * Use the =configure= web interface to install _SomeExtension_ (recommended)
+
+---+++ =fix_file_permissions.sh=
+
+UNIX shell script to correct file permissions on a Foswiki install. It should be run from the root of the installation.
+
 ---+++ =geturl.pl=
 This is a very simple script to get the content of a web site, either using GET or POST. It is marked as _deprecated_ and might be removed in a future release. Its functions are covered by the standard =wget= and =curl= commands, which have the added advantage of performing authentication..
    * Usage:    =geturl.pl &lt;host&gt; &lt;path&gt; [&lt;port&gt; [&lt;header&gt;]]=
@@ -678,8 +717,32 @@ This is a very simple script to get the content of a web site, either using GET
    * Example:  =geturl.pl POST some.domain /bin/statistics?webs=%SANDBOXWEB%=
    * Will post: =http://some.domain/bin/statistics?webs=%SANDBOXWEB%= triggering a statistics run
 
+---+++ =lighttpd.pl=
+
+Run Foswiki with the lighttpd web server.
+
+Options:
+   *        -f --fastcgi                 Use FastCGI instead of plain CGI
+   *         -h --help                    Displays this help and exits
+   *        -p PORT, --port PORT         Runs the server in the given port.
+                                     (default: 8080)
+   *        -s /path/to/lighttpd ,
+   *        --server /path/to/lighttpd   Location to lighttpd if not on path
+                                     (default: lighttpd)
+If lighttpd is not found on the default path, provide the complete path
+to the server eg.
+        =lighttpd.pl --fastcgi --server /usr/sbin/lighttpd=
+
 ---+++ =rewriteshebang.pl=
-Simple script to rewrite the =#!/usr/bin/perl= [[http://en.wikipedia.org/wiki/Shebang_%28Unix%29][shebang]] lines specific to your local Perl installation. It will rewrite the first line of all your cgi scripts so they use a different shebang line. Use it if your perl is in a non-standard location, or you want to use a different interpreter (such as 'speedy').
+
+Simple Perl script to rewrite the =#!/usr/bin/perl= [[http://en.wikipedia.org/wiki/Shebang_%28Unix%29][shebang]] lines specific to your local Perl installation. It will rewrite the first line of all your cgi scripts so they use a different shebang line. Use it if your perl is in a non-standard location, or you want to use a different interpreter.
+
+Run it without parameters for usage information.
+
+---+++ =save-pending-checkins=
+
+On some sites, Foswiki may not be the only tool that writes files in the data
+directory. For example, external jobs may write =.txt= files without checking them in. This results in =.txt= files that have a more recent timestamp than the corresponding version control file - this is called a 'pending checkin'. Pending checkins are dangerous, as they confuse Foswiki's version control systems. This tool will traverse all webs in your install locating files with pending checkins, and checking them in.
 
 ---+++ =tick_foswiki.pl=
 This script executes a number of non-essential regular administration tasks that will help keep your site healthy and happy, such as removing expired sessions and lease files.
@@ -691,18 +754,6 @@ It is intended to be run as a cron job or a scheduled task once a week. Example
 
 Extensions, such as the MailerContrib, also install tool scripts. Check the documentation of the extension for details.
 
----+++ =extension_installer=
-This script will download and install, or remove an extension.
-
-For more details, execute it from the Foswiki root directory with the =usage= parameter:
-<verbatim>
-./tools/extension_installer usage
-</verbatim>
-Note that this script is a generic version of the =_installer= script shipped with each extension.  There are 3 ways to install a script using these scripts:
-   * Download =SomePlugin_installer= and execute it from the Foswiki root directory
-   * run =./tools/extension_installer !SomePlugin= - the extension will be downloaded and installed
-   * Use the configure web interface to the Extensions Installer.
-
 ---
 *%MAKETEXT{"Related topics:"}%* AdminDocumentationCategory, DeveloperDocumentationCategory
 <!-- %JQREQUIRE{"chili"}% -->
diff --git a/core/data/System/DataForms.txt b/core/data/System/DataForms.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1489206078" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1490388848" format="1.1" version="1"}%
 %META:TOPICPARENT{name="UserDocumentationCategory"}%
 %STARTINCLUDE%
 ---+!! Data Forms
@@ -120,10 +120,14 @@ The name of the form field.
    * A very few field names are reserved. If you try to use one of these names, Foswiki will automatically append an underscore to the name when the form is used. But do *not* use the field name ==undefined== (or any variant of that name, such as !UnDefined), as that name is reserved for use in search queries.
    * You can space out the title of the field, and it will still find the topic e.g. =Aeroplane Manufacturers= is equivalent to =AeroplaneManufacturers=.
    * If a =label= field has no name, it will *not* be shown when the form is *viewed*, only when it is *edited*.
-   * Field names can in theory include any text, but you should stick to alphanumeric characters. If you want to use a non-wikiname for a =select=, =checkbox= or =radio= field, and want to get the values from another topic, you can use =[<nop>[...]]= double bracket links. This notation can also be used when referencing another topic to obtain field values, but a name other than the topic name is required as the name of the field.
-   * If you want the Field name to include embedded spaces, use the format =[<nop>[FieldName][Descriptive human-friendly Field Name]]=.
-   * Leading and trailing spaces do not matter.
-
+   * Field names can in theory include any text, but you should stick to alphanumeric characters.
+      * Leading and trailing spaces do not matter.
+      * The field name used for a =select=, =checkbox= or =radio= field, can also be a topic-name used to fetch values from that topic.
+      * You can use =[<nop>[...]]= double bracket links to link to a topic/field name that is not a wiki word.
+      * You can also use square bracket links in the form of =[<nop>[topicname][field name]]= to use a field name other than the topic name. ie. =[<nop>[ComputerManufacturers][Made by]]=
+      : (In this example, the topic =ComputerManufacturers= is used to fetch values for the =Madeby= field.)
+      * Spaces will be stripped from the field name. ie: =Made by= becomes =Madeby=.
+      * Releases prior to Foswiki 2.0 also stripped characters other than A-Z, a-z, 0-9 and _.  So a field named =F&uuml;hler= would be stored as =Fhler=. The same field name on Foswiki 2.0 is stored as =F&uuml;hler=. (See [[System.UpgradeGuide#DataForms_Applications]] for more information.}
 
 #TypeTable
 ---++++ Type

diff --git a/core/tools/README b/core/tools/README
diff --git a/core/tools/addpod.pl b/core/tools/addpod.pl