5335 Commits

Author SHA1 Message Date
Garvin Hicking
7e6027ebf9 Adds 'vagrant' to gitignore for local development.
Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:07:01 +02:00
Eike Rathke
7ce5408609 With MySQL use cast(okey as unsigned) instead of cast(okey as integer)
The autologin ("Save information") functionality in 2.3.1 is broken since

    commit 52a41b37d554da11acc932eeec44c5fb1414a492
    CommitDate: Fri Mar 23 18:01:32 2018 +0100

	Rework autologin to use a token approach

Although a cookie serendipity[author_autologintoken] with correct
expiration (one month) which random data content is present as value
in the serendipity_options table with name autologin_Username and
correct timestamp as okey and that is found with manually executing
the SQL statement

  SELECT name, value, okey FROM serendipity_options WHERE name = 'autologin_Username' AND okey > 1565801743 LIMIT 1

like done in include/functions_config.inc.php
serendipity_checkAutologin(), the login is forgotten after 30 minutes
or so. That was not the case with 2.1.5 where the login was valid for
weeks.

Of

    if (stristr($serendipity['dbType'], 'sqlite')) {
        $cast = "okey";
    } else {
        // Adds explicits casting for mysql, postgresql and others.
        $cast = "cast(okey as integer)";
    }

from which $cast then is used in the SQL statement instead of a plain
okey; when doing that manually with

  SELECT name, value, okey FROM serendipity_options WHERE name = 'autologin_Username' AND cast(okey as integer) > 1565801743 LIMIT 1

it produces the MySQL error

  #1064 - You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'integer) > 1565801743 LIMIT 1' at line 1

This also with $serendipity['dbType'] = 'mysqli' for the above code.

Indeed, cast(okey as integer) is invalid in MySQL and should be
cast(okey as unsigned) instead which then also works manually, see
https://stackoverflow.com/a/12127022 and
https://dev.mysql.com/doc/refman/5.7/en/cast-functions.html#function_cast

Same in serendipity_issueAutologin().

Changing those two places accordingly resolves the autologin not
persistent problem.

Additionally, inspecting the serendipity_options table revealed loads
of old serendipity[author_authorinformation] cookie information that
was never deleted in serendipity_issueAutologin() with the

  OR (okey LIKE 'l_%' AND $cast < " . (time() - 1814400) . ")")

expression producing a MySQL error. This has to be done manually
once as also 2.3.1 will not delete it anymore.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-10-13 18:06:50 +02:00
Thomas Hochstein
e2c0c82aeb Revert "Fix pagination for "stable archives" in themes."
This reverts commit 4e662bf17c420cc997c39c9501cfe0df509d9a09
in parts.

With this - now reverted - commit, the prev/next
arrows in pagination were swapped because they
were the wrong way around. Unfortunately, later on,
the root cause was fixes by "unswapping" the prev/next
links in core, so now the pagination arrows were
... eh ... wrongly swapped. So this commit has to
be reverted.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-24 08:58:59 +02:00
Thomas Hochstein
40113925b6 After release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-21 07:34:37 +02:00
Thomas Hochstein
a3a2b51848 Release 2.3.1
Signed-off-by: Thomas Hochstein <thh@inter.net>
2.3.1
2019-08-21 07:29:51 +02:00
Thomas Hochstein
f944eb4cd3 Release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-21 07:25:34 +02:00
Thomas Hochstein
2e5e601ea2 Fix ML mass delete, enhance i18n.
* Fix media library (mass) delete.

* I18n for multimove.
  + Add MEDIA_DIRECTORY_MOVE.
  + Change German translation of "Move" to
    "Verschieben".

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-17 13:57:54 +02:00
Thomas Hochstein
1bc7c4bd0f [event_spamblock] Don't overwrite "moderate" flag.
Unconditionally setting $serendipity['csuccess']
to 'true' will override a "moderate" flag set by
another (spamblock) plugin.

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-17 13:57:54 +02:00
Thomas Hochstein
4e662bf17c Fix pagination and links for "stable archives".
* Fix core pagination for "stable archives".

  The current page will always be the current page,
  regardless of archive sorting order. Page 76 of
  86 pages will remain page 76, even if the archive
  sorting is changed; it won't become page 10.

* Fix pagination for "stable archives" in themes.

  Timeline and Bulletproof have pagination.
  Both need to swap the prev/next links for
  stable archives, as the sorting order has
  been reversed.

* Fix prev/next page links for stable archives.

  We shouldn't swap prev/next links for archive
  pages. With stable archives, the title page is
  the last page of the archive, not the first, so
  all other pages are "previos", and we should
  display it like that.

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-17 01:02:38 +02:00
Thomas Hochstein
cd3464be70 Add i18n and German translations.
* "PLUGIN_ALL_UPDATED" was hardcoded.
* Add some missing German translation
  and fix some others.
* Add new constants to other languages
  via addlang.sh
* Remove wrongly added constants from
  plugin_lang.php

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-17 00:59:33 +02:00
Thomas Hochstein
b88f789655 Add Spartacus links to plugin lists.
Quite some information is missing from
the list of installed plugins; and the
list of installable plugins has some
more information, but not everything
that is present on Spartacus, i.e.
the last modification date.

So let's add a link to the plugin entry
on Spartacus (in the chosen language
version).

Fixes #471.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-17 00:58:32 +02:00
Thomas Hochstein
19fe3715bd Add changes to NEWS.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-11 13:46:34 +02:00
Thomas Hochstein
2d4285bd52 Fix typo / unify PHP and smarty variable names.
"requirement_failures" from PHP is saved in
"requirements_failues" - "requirements" as
in plural, and with a typo. That doesn't make
sense. Let's use "requirement_failures"
everywhere.

Backported from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-11 03:01:18 +02:00
Thomas Hochstein
71331f5e07 Wording changes for plugin version display.
"Version" should be capitalized in German -
and anywhere at the start of a sentence or
line.

Furthermore, "UPGRADE_TO_VERSION" is not
the current version ("aktuelle version"),
but the version one could upgrade to.

Backported from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-11 03:01:18 +02:00
Thomas Hochstein
90b35f7933 ML delete file: add "?" to conformation question.
Backported from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-11 00:46:04 +02:00
Thomas Hochstein
15f0be45a2 [event_spartacus] Don't cache wrong plugin list.
Declaring $pluginlist as static will cache the
database query results and always return the same
list of plugins - no matter which type is queried
(sidebar or event).

This cache must be busted if another type of
plugins is queried.

Backported from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-11 00:45:39 +02:00
Thomas Hochstein
0240816507 2.3.x in the 2.3 branch is now our stable line.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-10 12:23:46 +02:00
Thomas Hochstein
4169484361 Release 2.3.0
Signed-off-by: Thomas Hochstein <thh@inter.net>
2.3.0
2019-08-10 12:11:27 +02:00
Thomas Hochstein
aed19e6be3 Release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-10 12:08:32 +02:00
Thomas Hochstein
0d7094582f Patch HTTP_Request2 to fix PHP 7.4 issue.
Applying the patch from
https://pear.php.net/bugs/bug.php?id=23839&edit=12&patch=remove-obsolete-magic-quotes-function&revision=1564911457

Fixes #615

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-10 11:42:57 +02:00
Thomas Hochstein
32f1a958bf Add data from 2.1.6 release.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-09 22:20:07 +02:00
onli
60e975ee27 Fix: Don't show "Array" string under update notification 2019-08-03 21:11:53 +02:00
Thomas Hochstein
e27e3e98c7 After release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-03 20:16:24 +02:00
Thomas Hochstein
2b3663b7f2 Release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2.3-rc1
2019-08-03 19:56:12 +02:00
Thomas Hochstein
f418bcbd75 Prepare release: 2.3-rc1.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-03 19:41:11 +02:00
Thomas Hochstein
b90448a71d Update news.
623b2f8879f81 and ba6ccb3dbb9a8 added.

Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-08-03 19:38:38 +02:00
onli
6cab32aa5a document spamblock change #614, bump version 2019-07-29 17:29:16 +02:00
Hanno
a9153e1a2b Remove curly braces array syntax, avoids warning in PHP 7.4. 2019-07-29 17:29:45 +02:00
onli
ba6ccb3dbb Make $entry available for templates (fix #610) 2019-07-03 17:51:36 +02:00
Matthias Mees
623b2f8879 Fix preview iframe in bulletproof, thx pixel32 2019-06-30 19:30:55 +02:00
Thomas Hochstein
5e36b3d56f Update NEWS and RELEASE (2.1.5).
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-05-01 19:49:37 +02:00
onli
983ed4e2cb prevent error in upgrader when $sqlfiles is NULL 2019-04-28 23:27:58 +02:00
Thomas Hochstein
e19222597b After release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-04-27 19:44:42 +02:00
Thomas Hochstein
ff2e85e14d Release preparations.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2.3-beta1
2019-04-27 19:13:57 +02:00
onli
5345c065f6
Update NEWS 2019-04-27 18:55:07 +02:00
onli
07bfc8e98f
Update RELEASE 2019-04-27 18:38:17 +02:00
Matthias Mees
1deffbca75
Create CONTRIBUTING.md 2019-04-27 18:36:23 +02:00
Matthias Mees
0f36e361a0 Sync LICENSE versions 2019-04-27 18:33:48 +02:00
Matthias Mees
085ce82751
Merge pull request #604 from s9y/add-license-1
Create license file for GitHub
2019-04-27 18:31:44 +02:00
Matthias Mees
74bc407b7a
Create license file for GitHub 2019-04-27 18:31:25 +02:00
Matthias Mees
3f25d99a3e
Merge pull request #603 from s9y/add-code-of-conduct-1
Add code of conduct to core repository
2019-04-27 18:28:29 +02:00
Matthias Mees
ae28f55062
Add code of conduct to core repository 2019-04-27 18:28:04 +02:00
onli
9715f28615 document stable archive default 2019-04-27 18:14:58 +02:00
onli
46c408c19b Make stablearchive default 2019-04-27 18:13:16 +02:00
Mario Hommel
76fdc3af55
Update NEWS 2019-04-27 17:14:26 +02:00
Mario Hommel
c3fce509c0 Fix smarty reference in timeline theme. 2019-04-27 17:08:39 +02:00
Thomas Hochstein
ac2575bd5b Add maintenance mode localization to NEWS.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-04-27 15:42:44 +02:00
Mario Hommel
e9f0fb2315 Merge branch 'master' of github.com:s9y/Serendipity 2019-04-27 15:35:30 +02:00
Mario Hommel
9b688f00f9 Fix PHP 7.2 compatibility for Theme Clean-Blog 2019-04-27 15:34:26 +02:00
Thomas Hochstein
2c0c337a6d Translate maintenance mode to German.
Signed-off-by: Thomas Hochstein <thh@inter.net>
2019-04-27 15:30:10 +02:00