5389 Commits

Author SHA1 Message Date
Thomas Hochstein
b9037fb158 Release 2.3.4
Signed-off-by: Thomas Hochstein <thh@inter.net>
2.3.4
2020-03-25 16:58:28 +01:00
Thomas Hochstein
2b0f489e39 Release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 16:56:40 +01:00
Thomas Hochstein
a2d7383c79 Fix typo (ML renaming code).
Fixes 2ccb43a271a41eba90fba1bacc46965f8323437f

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 16:23:54 +01:00
Thomas Hochstein
c7c6a08c10 Wordwrap overly long words in comments via CSS.
Very long words may overflow the dashboard_widget
boundary on backend start page otherwise.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 15:37:42 +01:00
Thomas Hochstein
b0971b67e9 Fix RCE vulnerability on Windows.
Steps to reproduce:

1) Upload a PHP script to the Media Libray,
   naming it "test" (or any other name
   without extension).
2) Rename it to "exploit.php." (trailing dot!)

On Linux, the file will be renamed to
"exploit.php..", which is safe and
cannot be exploited.

On Windows though, the file will be
renemad to "exploit.php" and is then
remotely executable by calling it
from "/uploads/exploit.php".

Thanks to Junyu Zhang <rgdz.eye@gmail.com>
for spotting this!

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 15:05:05 +01:00
Thomas Hochstein
b22d51fbc0 Add missing active content check for renaming.
After fixing the other ML file renaming bugs,
it was now possible to rename a file without
extension into a file that *does* have an
extension - so we need to check against
active content.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 15:05:05 +01:00
Thomas Hochstein
3d4e6b8f65 Add NEWS entry for ML rename fixes.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 15:05:05 +01:00
Thomas Hochstein
364dda8595 Fix for "disappearing" media files after renaming.
The renaming code added a dot '.' to the
filename on disk even if the file hat no
extension. Therefore, the file name on disk was
different from the name in the database,
triggering the database purging code on the
next ML display.

(serendipity_displayImageList() will delete
files from the database that don't exist
any longer on disk.)

This code won't add spurious dots for
empty extensions, keeping disk and
database in sync.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 15:05:05 +01:00
Thomas Hochstein
0562dc0ca6 ML: Add error message when renaming fails.
Completing 1ed4b9e7eca2a0c371582a454c232c

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 15:05:05 +01:00
Thomas Hochstein
9155a7b8a4 Add plugin source to list of plugins.
* plugin_api.inc.php:
  - Add static list of bundled plugins.
  - Add function to check if plugin is
    bundled.
* plugins.inc.php:
  - Set source of plugin
    (Spartacus, bundled or local).
* plugins.inc.tpl:
  - Display plugin source.
* Add language constants.

Add link to Spartacus for all plugins,
don't skip installed plugins.

Add author to details of installed plugins.

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-25 15:05:05 +01:00
Thomas Hochstein
cb7819b4d9 "$cachedtype" was set twice.
"$cachedtype" is saved anayway before returning;
no need to set it here.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-24 16:13:47 +01:00
Thomas Hochstein
a5f28d3eb0 Escape plugin author name in pluginlist.
Don't show HTML from author name field.

Cherry-picked from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-23 17:51:36 +01:00
Thomas Hochstein
d4b1f7cd35 After release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-22 09:54:34 +01:00
Thomas Hochstein
a32bcadd75 Release 2.3.3
Signed-off-by: Thomas Hochstein <thh@inter.net>
2.3.3
2020-03-22 09:49:51 +01:00
Thomas Hochstein
25931b33c7 Release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-22 09:45:21 +01:00
Thomas Hochstein
c9a7a44334 Fix typo.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-21 23:42:51 +01:00
Thomas Hochstein
d319b9677b Sort NEWS file.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-21 23:13:08 +01:00
Thomas Hochstein
1632a172f3 Set empty limit to "" in serendipity_fetchEntries.
If $limit is empty(), no limit is set, so we can
set the LIMIT statement to "" to achieve the same.

But an empty() $limit can be "0", so the
generated SQL statement could end with "0"
instead of the LIMIT statement. We catch this
with forcing an empty() $limit to "".

Fixes #636.
(No matter that this shouldn't even happen.)

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-21 18:08:40 +01:00
Thomas Hochstein
95c71c36c9 [plugin_comments] Fix wordwrap at wound boundaries.
Add ChangeLog.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-21 16:18:15 +01:00
Thomas Hochstein
9709592b7c Escape version string in update notifier.
Fixes #674.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 19:11:23 +01:00
Thomas Hochstein
307f1c3dad Prevent renaming ML object into existing file.
When renaming objects in the Media Library,
s9y didn't check if a file with the same
name already exists, resulting in a file
name collision deleting both files from
the database _and_ from disk.

Add a check to avoid that.

An error message would be nice, too, but
that may be added later on.

Tested on s9y-stable test instance.

Cherry-picked from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 17:56:29 +01:00
surrim
1f31fd19c3 Changed parameters order for implode().
Thanks to @surrim.

Cherry-picked from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:55:22 +01:00
surrim
67aea1b623 Fix serendipity_killPath().
Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:53:37 +01:00
onli
d462580606 Fix trackback deletion from frontend, invalid referrer error
Was missing the token.

For context see https://board.s9y.org/viewtopic.php?f=10&t=24633

Cherry-picked from master branch.
2020-03-20 16:49:14 +01:00
Lothar Serra Mari
6accc81ad6 Don't allow requesting an archive page that doesn't exist
Cherry picked from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:46:50 +01:00
Stephan Brunker
3bf067c6ea functions_routing.php: set action to empty when serving JS
genpage is called but no action given -
the default page was generated at every call.

Cherry-picked from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:45:11 +01:00
onli
ac81762eaa Make use of the video tag for videos in the ML.
Cherry-picked from master branch.
2020-03-20 16:42:11 +01:00
onli
5934de7a4e Fix links in ML not going to item when no image.
Cherry-picked from master branch.
2020-03-20 16:29:48 +01:00
onli
89351eb77b Fix: Remember where you stored images last
Fixes #652.

Cherry-picked from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:26:26 +01:00
Garvin Hicking
a45c545ee3 [TASK] Uses single-asset insertion when only one asset has been selected to be inserted
See #651.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:23:43 +01:00
Thomas Hochstein
d319ad16f1 Add "lower/upper roman" ordered list styles.
Add NEWS entry, bump version number.

Fixes #647.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:23:26 +01:00
Thomas Hochstein
66494fdbe3 Force positive values for fetchLimits.
The number of entries shown on the title
page and in the feed has to be at least "1",
as s9y can't cope with "0" or negative
values (and it shouldn't).

May be related to #636.

Backported from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-03-20 16:23:05 +01:00
Garvin Hicking
cad25673cf [TASK] Adds ability to make plugins change the multi-media insertion gallery HTML 2019-12-03 15:54:24 +01:00
Garvin Hicking
4daa718362 [TASK] backport to 2.3 2019-12-03 15:52:05 +01:00
Garvin Hicking
a1677ff0eb [TASK] Backport to 2.3.3 2019-12-03 14:27:01 +01:00
Garvin Hicking
15bc67ce8d [TASK] Updates serendipity_event_mailer: Prepend body option, force sending mails, fixed striptag label 2019-12-03 14:26:43 +01:00
Thomas Hochstein
d7b4e93292 After release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-16 09:49:27 +02:00
Thomas Hochstein
26c7f9af75 Release 2.3.2.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2.3.2
2019-10-16 09:43:59 +02:00
Thomas Hochstein
4b1641b5bf Release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-16 09:39:47 +02:00
Garvin Hicking
2ea886396b [BUGFIX] Fixes missing referenced variable when $_GET['serendipity'] is not an array
refs #642
refs #653
2019-10-15 22:34:58 +02:00
Hanno
4a8616214f Avoid undefined index notices.
See #642.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:28:53 +02:00
Thomas Hochstein
5f8744e414 Assume uninitialized constant PLUGIN_LINK_SPARTACUS.
Fixes #638.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:09:08 +02:00
Thomas Hochstein
a2ad0bd9b5 Fix mangling of auto-generated mails.
s9y will encode the body of its auto-generated
mails as quoted-printable when imap_8bit() is
available. imap_8bit() will use "\r\n" as
linebreaks as mandated for SMTP transfer.
The result will be transmitted via PHP's
mail() function, using direct SMTP on
Windows and piping it to a MTA on Unix.

Most MTAs will cope just fine with those
linebreaks, while qmail will not; it will
replace all "\n" linebreaks with "\r\n",
so we get "\r\r\n" in our case. We can't
"fix" qmail (as its maintainer, if there
even is one, does not consider this
behaviour wrong), but we can replace the
line endings we get from imap_8bit().

The fix does work with qmail and Exim and
should work with sendmail and Postfix and
other MTAs, too. It may break sending
mail on Windows (i.e. lose all linebreaks),
but I think that's acceptable, as we'll
have more qmail installation than Windows
servers out there.

A workaround could be to set
serendipity['forceBase64']=true in
serendipity_config_local.inc.php, but I'd
prefer this fix.

Fixes #644.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:59 +02:00
onli
d36895b321 Document rotating images and figcaption fix.
Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:53 +02:00
onli
f55c17ee4f Fix: rotate image did not rotate all thumbnails.
Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:48 +02:00
onli
38a7a3f60b Fix: Stop ckeditor from removing figures and figcaptions.
Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:44 +02:00
Garvin Hicking
2b9616276f [TASK] Prevents PHP warnings with type differences on $_REQUEST['serendipity'].
refs #642

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:36 +02:00
Hanno
f26a306026 Escape category images to avoid backend XSS.
Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:28 +02:00
Matthias Mees
f30de8449f Fix sidebar not displayed in BS4 theme.
Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:08 +02:00
Matthias Mees
ae0077f836 Fix typo in Skeleton theme.
Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:08:03 +02:00