Skip to content

Commit

Permalink
Item14288: Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDaum
MichaelDaum committed Jan 26, 2018
2 parents 2f7e6bb + 171eda8 commit 6a820c0
Show file tree
Hide file tree
Showing 74 changed files with 774 additions and 245 deletions.
2 changes: 2 additions & 0 deletions HomePagePlugin/test/unit/HomePagePlugin/HomePagePluginSuite.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ sub test_login {
);
$query->path_info("");
$query->header( 'Host' => 'www.home.org' );
$ENV{HTTP_HOST} = 'www.home.org';

$this->{test_topicObject}->finish() if $this->{test_topicObject};
$this->{session}->finish() if $this->{session};
Expand All @@ -105,6 +106,7 @@ sub test_view {
);
$query->path_info("");
$query->header( 'Host' => 'www.home.org' );
$ENV{HTTP_HOST} = 'www.home.org';

$this->{test_topicObject}->finish() if $this->{test_topicObject};
$this->{session}->finish() if $this->{session};
Expand Down
17 changes: 10 additions & 7 deletions ModPerlEngineContrib/lib/Foswiki/Engine/Apache.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ sub prepareConnection {
? $this->{r}->connection->remote_ip
: $this->{r}->connection->client_ip
);

# SMELL: Mod_perl should do this automatically ... see
# http://search.cpan.org/dist/Apache2-xForwardedFor/lib/Apache2/xForwardedFor.pm
if ( $Foswiki::cfg{PROXY}{UseForwardedFor}
&& defined $ENV{HTTP_X_FORWARDED_FOR} )
{
my @addrs = split /,\s?/, $ENV{HTTP_X_FORWARDED_FOR};
$req->remoteAddress( $addrs[0] );
}

if ( $INC{'Apache2/ModSSL.pm'} ) {
$req->secure( $this->{r}->connection->is_https ? 1 : 0 );
}
Expand All @@ -126,13 +136,6 @@ sub prepareHeaders {
$req->header( $header => $value );
}
$req->remoteUser( $this->{r}->user );
if ( $Foswiki::cfg{BehindProxy} ) {
if ( my $source = $req->header('X-Forwarded-For') ) {
my $ip = ( split /[, ]+/, $source )[0];
$req->remoteAddress($1)
if defined $ip and $ip =~ /^((?:\d{1,3}\.){3}\d{1,3})$/;
}
}
}

sub preparePath {
Expand Down
47 changes: 24 additions & 23 deletions TinyMCEPlugin/data/System/TinyMCEPlugin.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1513174883" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1516935577" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! !TinyMCEPlugin
<!--
Expand Down Expand Up @@ -153,10 +153,11 @@ See http://foswiki.org/Tasks/TinyMCEPlugin and http://foswiki.org/Tasks/WysiwygP

See the [[%ATTACHURLPATH%/tinymce/changelog.txt][TinyMCE Editor Change Log]] for detailed changes included in this release of the !TinyMCE Editor.

| Copyright: | &copy; 2007-2017 Crawford Currie http://c-dot.co.uk %BR%\
&copy; 2010-2017 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
| Copyright: | &copy; 2007-2018 Crawford Currie http://c-dot.co.uk %BR%\
&copy; 2010-2018 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
| | This package also includes a complete release of the !TinyMCE editor which is covered by the [[https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html][GNU Lesser General Public License, Version 2.1] |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 2.06 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,5, |
| 2.05 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,4, |
| 2.04 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,3, |
| 2.03 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,0, |
Expand Down Expand Up @@ -278,23 +279,23 @@ Many thanks to the following sponsors for supporting this work:
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions.%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="Foswiki:Support.%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1513174883" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1513174883" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1513174883" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1513174883" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1513174883" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1513174883" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1513174883" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1513174883" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1513174883" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1513174883" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1513174883" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1513174883" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1513174883" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1513174883" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1513174883" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1513174883" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1513174883" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1513174883" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1513174883" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1513174883" size="147" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1516935577" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1516935577" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1516935577" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1516935577" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1516935577" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1516935577" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1516935577" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1516935577" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1516935577" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1516935577" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1516935577" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1516935577" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1516935577" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1516935577" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1516935577" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1516935577" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1516935577" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1516935577" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1516935577" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1516935577" size="147" user="ProjectContributor" version="1"}%
6 changes: 3 additions & 3 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use warnings;

use Assert;

our $VERSION = '2.05';
our $RELEASE = '13 Dec 2017';
our $VERSION = '2.06';
our $RELEASE = '25 Jan 2018';
our $SHORTDESCRIPTION = 'Integration of the Tiny MCE WYSIWYG Editor';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -150,7 +150,7 @@ SCRIPT
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2008-2018 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
10 changes: 10 additions & 0 deletions TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Version 4.7.5 (2018-01-22)
Fixed bug with the Codesample Plugin where it wasn't possible to edit codesamples when the editor was in inline mode.
Fixed bug where focusing on the status bar broke the keyboard navigation functionality.
Fixed bug where an error would be thrown on Edge by the Table Plugin when pasting using the PowerPaste Plugin.
Fixed bug in the Table Plugin where selecting row border style from the dropdown menu in advanced row properties would throw an error.
Fixed bug with icons being rendered incorrectly on Chrome on Mac OS.
Fixed bug in the Textcolor Plugin where the font color and background color buttons wouldn't trigger an ExecCommand event.
Fixed bug in the Link Plugin where the url field wasn't forced LTR.
Fixed bug where the Nonbreaking Plugin incorrectly inserted spaces into tables.
Fixed bug with the inline theme where the toolbar wasn't repositioned on window resize.
Version 4.7.4 (2017-12-05)
Fixed bug in the Nonbreaking Plugin where the nonbreaking_force_tab setting was being ignored.
Fixed bug in the Table Plugin where changing row height incorrectly converted column widths to pixels.
Expand Down
2 changes: 1 addition & 1 deletion TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/js/tinymce/jquery.tinymce.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6a820c0

Please sign in to comment.