pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
php-dotclear: Update to 2.18.1
Module Name: pkgsrc-wip
Committed By: Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By: frederic
Date: Wed Jun 23 20:48:52 2021 +0000
Changeset: f667d37f147a02c8a5bc914865ac17618ba4cbe0
Modified Files:
php-dotclear/Makefile
php-dotclear/PLIST
php-dotclear/distinfo
php-dotclear/files/apache24.conf
php-dotclear/files/nginx.conf
php-dotclear/options.mk
php-dotclear/patches/patch-admin_install_index.php
php-dotclear/patches/patch-admin_install_wizard.php
php-dotclear/patches/patch-inc_config.php.in
php-dotclear/patches/patch-inc_core_class.dc.core.php
php-dotclear/patches/patch-inc_prepend.php
Added Files:
php-dotclear/files/initdb-mysql.sh
php-dotclear/files/initdb-pgsql.sh
php-dotclear/files/lighttpd.conf
php-dotclear/files/php-fpm.conf
php-dotclear/patches/patch-inc_load__plugin__file.php
Removed Files:
php-dotclear/files/apache22.conf
php-dotclear/files/init-mysql.sh
php-dotclear/files/init-pgsql.sh
Log Message:
php-dotclear: Update to 2.18.1
pkgsrc changes:
---------------
* Remove option for webserver: a web application should not be dependent from a
webserver. Instead provide configuration example files for various of them.
* Fix patches to move the configuration file to PKG_SYSCONFDIR.
* Fix patches to move public files, cache files and additional plugins to
directories relative to VARBASE. Therefore no file are written by the PHP
interpreter in PREFIX/share/dotclear.
upstream changes:
-----------------
Dotclear 2.18.1 - 2021-02-13
===========================================================
* Fix: Adjust top and bottom border of textarea when dcLegacyEditor toolbar is set in bottom
* Fix: Add missing support for webp and svg image format for <tpl:EntryFirstImage>
* Fix: Switch from programmed to published status for an entry causes error notice
* Enforce robustness of workspaces/namespaces (settings/blog parameters) methods
Dotclear 2.18 - 2020-11-13
===========================================================
* IP is now displayed in backend only for admins
* Add footnote feature to CKEditor
* HTML format is now default syntax for new users/blogs
* Add cancel button (if relevant) to media manager
* Lib: Update CKEditor to 4.15.1
* Lib: Update Codemirror from 5.55.0 to 5.58.2
* 🐛 → Various bugs, a11y concerns and typos fixed
* 🌼 → Some locales and cosmetic adjustments
* 📣 Warning: Next major release (2.19) will require PHP 7.3+
Dotclear 2.17.2 - 2020-08-17
===========================================================
* Fix: Cope with Safari which does not handle addEventListener method on MediaQueryList object (dark/light OS preference).
* Fix: Separate CSS background and background-color as some CSS rendering engine (Safari) does not cope with all in same declaration.
* i18n: Updated translations for occitan.
Dotclear 2.17.1 - 2020-08-15
===========================================================
* Fix: revert optional password fields (post/page) to text field to avoid unexpected behavior with Chrome
Dotclear 2.17 - 2020-08-13
===========================================================
* 🐘 PHP 5.6+ is required, PHP 7.4 compliance
* 🛡 Security: Password is now needed to export blog settings and contents (full/simple)
* Themes can now be cloned
* New helper button (show/hide) for password fields
* Enhancement of filter/sort usage for lists (posts, comments, …)
* 3rd automatic theme for backend theme (which follow OS setting)
* Authentication (backend) and password form (public for password protected entry) have been redesigned
* Add a Cancel button wherever relevant in backend
* PHP files can now be edited in Theme editor
* Plugins may now use SVG icon rather than JPG/PNG
* Black/White list names become Block/Allow list (antispam)
* Wiki: subscript syntax changed from _subscript_ to ,,subscript,,
* Wiki: add ;;span-content;; syntax
* Wiki: add §§attributes[|list attributes]§§ for blocks (at end of the 1st line of block)
* Wiki: add §attributes§ for inline elements (just before closing marker, warning: cannot be nested)
* Tpl: Add {{tpl:BlogNbEntriesFirstPage}} and {{tpl:BlogNbEntriesPerPage}}
* Tpl: Add optional even attribute to <tpl:EntryIfOdd>, <tpl:CommentIfOdd> and <tpl:PingIfOdd>
* Tpl: Add author="…" as attribute of <tpl:EntryIf>
* Sys: Add several behaviors, coreBeforeImageMetaCreate, themeBeforeClone and themeAfterClone
* a11y: Reduce motion if required in provided themes and backend
* Lib: Update jQuery to 3.5.1 (backend and public)
* Lib: Update Codemirror to 5.55.0
* Lib: CKEditor new color palette (configurable)
* Fix: Notification system refactored (now based on db rather than PHP Session)
* Fix: Missing confirmation before closing modified forms / unecessary confirmation asked before closing not modified forms
* i18n: Switch from Transifex to Crowdin for localisation purpose (https://dotclear.crowdin.com/)
* 🐛 → Various bugs, a11y concerns and typos fixed
* 🌼 → Some locales and cosmetic adjustments
Dotclear 2.16.9 - 2020-06-02
===========================================================
* Fix: Check password for export only if necessary
* Fix: Cope with mod_access_compat plugin inactive with Apache 2.4+
* Fix: Fix very large font size value (user prefs) with CKEditor
Dotclear 2.16.8 - 2020-05-27
===========================================================
* Fix: Clearbricks was not up to date in last release
Dotclear 2.16.7 - 2020-05-27
===========================================================
* 🛡 Security: Password is now needed to export blog settings and contents (full/simple)
* Fix: Remove absolute positionning of datepicker icon (media manager)
* Fix: Cope with SURBL DNS query blocked access (if too much requests from same source) - Antispam LinksLookup filter
* Fix: Remove wrapping p around figures (wiki)
* Fix: CKEditor use now same font-size as other UI standard elements
Dotclear 2.16.6 - 2020-05-22
===========================================================
* Fix: Remove executable bit on non-executable files
* Do not trim inside the content, only at the beginning and the end (dcLegacyEditor, XHTML mode only)
* Fix media description management in media-manager (main/popup)
* Fix insertion of figure (wiki / wysiwyg)
* Fix caret position after inserting image in dcLegacyEditor (wiki)
Dotclear 2.16.5 - 2020-05-14
===========================================================
* Fix: tpl:EntryContent and tpl:EntryIfContentCut when using full="1" attribute
* Fix: Take care of iframe content (used by wysiwyg/source dcLegacyEditor) for confirmation before closing modified forms
* Remove all automatic translations in simpleMenu plugin, feature which caused unanticipated behaviours
Dotclear 2.16.4 - 2020-04-24
===========================================================
* Fix: Remove <sub>content</sub> (_<content>_) from authorized element in wiki links. - missing from 2.16.3
Dotclear 2.16.3 - 2020-04-20
===========================================================
* Fix: Remove <sub>content</sub> (_<content>_) from authorized element in wiki links.
* Fix: Cope with default XHTML editor set to dcLegacyEditor and no format selected by default for new entries.
Dotclear 2.16.2 - 2020-04-17
===========================================================
* Fix: Alert missing about existing modification in administration (post edition, …) with CKEditor
* Merge old and new color palette for CKEditor text/background buttons
Dotclear 2.16.1 - 2020-04-15
===========================================================
* Fix: False alert about non existing modification in administration (post edition, …)
* Fix: Test the existence of directory backup before update
* Fix: Do not load "remember me" javascript script when comment are closed
* Fix: Show admin session expired message if necessary rather than wrong user/pwd
* Fix: wiki2xhtml, i, code, del, ins, mark, sup and sub elements are now allowed inside an a (link) element
* Fix: util.js utilities function script is now load on every page (will be improved in further release)
* Fix: In Ductile theme, load jQuery only if required
* Fix: Detection of mandatory input field content to enable submit button
* Add a behavior to setup htmlFilter options (keep aria, keep data, keep js)
* 🐛 → Various bugs, a11y concerns and typos fixed
* 🌼 → Some locales and cosmetic adjustments
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f667d37f147a02c8a5bc914865ac17618ba4cbe0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
php-dotclear/Makefile | 156 ++++---
php-dotclear/PLIST | 448 ++++++++++++++-------
php-dotclear/distinfo | 19 +-
php-dotclear/files/apache22.conf | 21 -
php-dotclear/files/apache24.conf | 41 +-
php-dotclear/files/init-mysql.sh | 16 -
php-dotclear/files/init-pgsql.sh | 10 -
php-dotclear/files/initdb-mysql.sh | 31 ++
php-dotclear/files/initdb-pgsql.sh | 11 +
php-dotclear/files/lighttpd.conf | 33 ++
php-dotclear/files/nginx.conf | 79 ++--
php-dotclear/files/php-fpm.conf | 15 +
php-dotclear/options.mk | 31 +-
php-dotclear/patches/patch-admin_install_index.php | 14 +-
.../patches/patch-admin_install_wizard.php | 45 ++-
php-dotclear/patches/patch-inc_config.php.in | 39 +-
.../patches/patch-inc_core_class.dc.core.php | 22 +-
.../patches/patch-inc_load__plugin__file.php | 15 +
php-dotclear/patches/patch-inc_prepend.php | 14 +-
19 files changed, 645 insertions(+), 415 deletions(-)
diffs:
diff --git a/php-dotclear/Makefile b/php-dotclear/Makefile
index e3b2f1aa30..0abad9d57f 100644
--- a/php-dotclear/Makefile
+++ b/php-dotclear/Makefile
@@ -1,103 +1,95 @@
# $NetBSD$
-DISTNAME= dotclear-2.16
+DISTNAME= dotclear-2.18.1
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
CATEGORIES= www
MASTER_SITES= https://download.dotclear.org/latest/ \
https://download.dotclear.org/attic/
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= triaxx%NetBSD.org@localhost
HOMEPAGE= https://dotclear.org/
COMMENT= Open-source web publising software
LICENSE= gnu-gpl-v2
DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+= ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
+DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
+
+NO_BUILD= yes
+USE_TOOLS+= find pax sed
+WRKSRC= ${WRKDIR}/dotclear
+BUILD_DEFS+= PKG_SYSCONFBASE VARBASE
-.include "options.mk"
.include "../../lang/php/phpversion.mk"
+.include "options.mk"
-NO_BUILD= yes
-USE_TOOLS+= pax
-WRKSRC= ${WRKDIR}/dotclear
-BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP
-
-INSTALLATION_DIRS= ${DCDIR} ${DOCDIR} ${EGDIR}
-
-PKG_SYSCONFSUBDIR?= dotclear
-
-PKG_USERS_VARS= WWW_USER
-PKG_GROUPS_VARS= WWW_GROUP
-
-DCDIR= ${PREFIX}/share/dotclear
-DOCDIR= ${PREFIX}/share/doc/dotclear
-EGDIR= ${PREFIX}/share/examples/dotclear
-
-PAX_DIRS= admin inc locales plugins themes
-DOC_FILES= CHANGELOG CONTRIBUTING.md CREDITS LICENSE README.md
-CONF_FILES= ${EGDIR}/dotclear.conf \
- ${PKG_SYSCONFDIR}/dotclear.conf
-CONF_FILES+= ${EGDIR}/config.php.in \
- ${PKG_SYSCONFDIR}/config.php.in
-OWN_DIRS_PERMS+= ${VARBASE}/cache/dotclear \
- ${WWW_USER} ${WWW_GROUP} 750
-OWN_DIRS_PERMS+= ${VARBASE}/www/dotclear \
- ${WWW_USER} ${WWW_GROUP} 750
-OWN_DIRS_PERMS+= ${VARBASE}/www/dotclear/public \
- ${WWW_USER} ${WWW_GROUP} 750
-
-SUBST_CLASSES+= files
-SUBST_STAGE.files= do-configure
-SUBST_MESSAGE.files= Fixing configuration files.
-SUBST_FILES.files= dotclear.conf inc/config.php.in
-SUBST_FILES.files+= inc/prepend.php inc/core/class.dc.core.php
-SUBST_FILES.files+= admin/install/index.php admin/install/wizard.php
-SUBST_VARS.files= DCDIR
-SUBST_VARS.files+= VARBASE
-SUBST_VARS.files+= PKG_SYSCONFDIR
-SUBST_VARS.files+= WWW_SYSCONFDIR
-SUBST_SED.files+= -e "s|@DC_ROOT@|${PREFIX}/share|g"
-SUBST_SED.files+= -e "s|@DC_CACHE@|${VARBASE}/cache/dotclear|g"
-SUBST_SED.files+= -e "s|@DC_WWW@|${VARBASE}/www/dotclear|g"
-SUBST_SED.files+= -e "s|@DC_DBDIR@|${VARBASE}/db/dotclear|g"
-
-NON_EXEC_FILES= admin/images/grid-off.png admin/images/grid-on.png \
- admin/images/list-off.png admin/images/list-on.png \
- plugins/breadcrumb/_admin.php plugins/breadcrumb/_define.php \
- plugins/breadcrumb/_public.php plugins/dcLegacyEditor/icon.png \
- themes/berlin/_define.php themes/berlin/locales/de/main.po \
- themes/berlin/locales/en/main.po themes/berlin/locales/es/main.po \
- themes/berlin/locales/fr/main.po themes/berlin/scripts/boxsizing.htc \
- themes/berlin/scss/libs/_scut.scss \
- themes/berlin/scss/libs/sass-mq-master/LICENSE.md \
- themes/berlin/scss/libs/sass-mq-master/README.md \
- themes/berlin/scss/libs/sass-mq-master/_mq.scss \
- themes/berlin/scss/libs/zen-grids/_background.scss \
- themes/berlin/scss/libs/zen-grids/_flow.scss \
- themes/berlin/scss/libs/zen-grids/_grids.scss
-
-post-extract:
- ${CP} ${FILESDIR}/${WWW_CONF_FILE} ${WRKSRC}/dotclear.conf
-# XXX in 2.9.1, executable bit is set on non-executable file
-.for f in ${NON_EXEC_FILES}
- ${CHMOD} -x ${WRKSRC}/${f}
-.endfor
+PHP_VERSIONS_ACCEPTED= 74 73 56
+
+PKG_SYSCONFSUBDIR= dotclear
+
+DOTCLEAR_USER?= dotclear
+DOTCLEAR_GROUP?= dotclear
+DOTCLEAR_SHAREDIR?= ${PREFIX}/share/dotclear
+DOTCLEAR_CACHEDIR?= ${VARBASE}/cache/dotclear
+DOTCLEAR_DBDIR?= ${VARBASE}/db/dotclear
+DOTCLEAR_LOGDIR?= ${VARBASE}/log/dotclear
+DOTCLEAR_PUBDIR?= ${DOTCLEAR_DBDIR}/public
+DOTCLEAR_PLUGDIR?= ${DOTCLEAR_DBDIR}/plugins
+
+REQD_FILES_PERMS+= ${EGDIR}/config.php.in ${PKG_SYSCONFDIR}/config.php.in \
+ ${DOTCLEAR_USER} ${DOTCLEAR_GROUP} 644
+OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR} ${DOTCLEAR_USER} ${DOTCLEAR_GROUP} 770
+OWN_DIRS_PERMS+= ${DOTCLEAR_CACHEDIR} ${DOTCLEAR_USER} ${DOTCLEAR_GROUP} 775
+OWN_DIRS_PERMS+= ${DOTCLEAR_DBDIR} ${DOTCLEAR_USER} ${DOTCLEAR_GROUP} 775
+OWN_DIRS_PERMS+= ${DOTCLEAR_PUBDIR} ${DOTCLEAR_USER} ${DOTCLEAR_GROUP} 775
+OWN_DIRS_PERMS+= ${DOTCLEAR_PLUGDIR} ${DOTCLEAR_USER} ${DOTCLEAR_GROUP} 775
+OWN_DIRS_PERMS+= ${DOTCLEAR_LOGDIR} ${DOTCLEAR_USER} ${DOTCLEAR_GROUP} 775
+
+PKG_GROUPS+= ${DOTCLEAR_GROUP}
+PKG_USERS+= ${DOTCLEAR_USER}:${DOTCLEAR_GROUP}
+PKG_GECOS.${DOTCLEAR_USER}= Dotclear user
+
+EGDIR= ${PREFIX}/share/examples/dotclear
+
+INSTALLATION_DIRS= ${DOTCLEAR_SHAREDIR} ${EGDIR}
+
+SUBST_CLASSES+= cfg
+SUBST_STAGE.cfg= do-configure
+SUBST_MESSAGE.cfg= Adapting files to use pkgsrc directories.
+SUBST_FILES.cfg= admin/install/index.php admin/install/wizard.php
+SUBST_FILES.cfg+= inc/config.php.in inc/core/class.dc.core.php
+SUBST_FILES.cfg+= inc/load_plugin_file.php inc/prepend.php
+SUBST_VARS.cfg= PKG_SYSCONFDIR DOTCLEAR_SHAREDIR DOTCLEAR_CACHEDIR DOTCLEAR_DBDIR
+SUBST_VARS.cfg+= DOTCLEAR_PUBDIR DOTCLEAR_PLUGDIR DOTCLEAR_LOGDIR
+
+pre-configure:
+ ${SED} -e 's|@DOTCLEAR_SHAREDIR@|${DOTCLEAR_SHAREDIR}|g' \
+ -e 's|@DOTCLEAR_PUBDIR@|${DOTCLEAR_PUBDIR}|g' ${FILESDIR}/apache.conf > ${WRKSRC}/apache.conf
+ ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/initdb-mysql.sh > ${WRKSRC}/initdb-mysql.sh
+ ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/initdb-pgsql.sh > ${WRKSRC}/initdb-pgsql.sh
+ ${SED} -e 's|@DOTCLEAR_SHAREDIR@|${DOTCLEAR_SHAREDIR}|g' \
+ -e 's|@DOTCLEAR_PUBDIR@|${DOTCLEAR_PUBDIR}|g' \
+ -e 's|@VARBASE@|${VARBASE}|g' ${FILESDIR}/lighttpd.conf > ${WRKSRC}/lighttpd.conf
+ ${SED} -e 's|@DOTCLEAR_SHAREDIR@|${DOTCLEAR_SHAREDIR}|g' \
+ -e 's|@DOTCLEAR_PUBDIR@|${DOTCLEAR_PUBDIR}|g' \
+ -e 's|@VARBASE@|${VARBASE}|g' ${FILESDIR}/nginx.conf > ${WRKSRC}/nginx.conf
+ ${SED} -e 's|@VARBASE@|${VARBASE}|g' ${FILESDIR}/php-fpm.conf > ${WRKSRC}/php-fpm.conf
do-install:
- ${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${DCDIR}
- ${INSTALL_DATA} ${WRKSRC}/inc/config.php.in ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/dotclear.conf ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/init-*.sh ${DESTDIR}${EGDIR}
-.for f in ${DOC_FILES}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
-.endfor
-.for d in ${PAX_DIRS}
- ${INSTALL_DATA_DIR} ${DESTDIR}${DCDIR}/${d}
- cd ${WRKSRC}/${d} && \
- ${FIND} . -type f \! -name "config.php.in" \! -name "*.orig" -print | \
- ${PAX} -rw ${DESTDIR}${DCDIR}/${d}
-.endfor
-.for f in ${DOC_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${DOTCLEAR_SHAREDIR}/index.php
+.for d in admin inc locales plugins themes
+ ${INSTALL_DATA_DIR} ${DESTDIR}${DOTCLEAR_SHAREDIR}/${d}
+ cd ${WRKSRC}/${d} && ${FIND} . -type f \! -name '*.orig' -print | \
+ ${PAX} -rw ${DESTDIR}${DOTCLEAR_SHAREDIR}/${d}
.endfor
+ ${INSTALL_DATA} ${WRKSRC}/inc/config.php.in ${DESTDIR}${EGDIR}/config.php.in
+ ${RM} -f ${DESTDIR}${DOTCLEAR_SHAREDIR}/inc/config.php.in
+ ${INSTALL_DATA} ${WRKSRC}/apache.conf ${DESTDIR}${EGDIR}/apache.conf
+ ${INSTALL_DATA} ${WRKSRC}/initdb-mysql.sh ${DESTDIR}${EGDIR}/initdb-mysql.sh
+ ${INSTALL_DATA} ${WRKSRC}/initdb-pgsql.sh ${DESTDIR}${EGDIR}/initdb-pgsql.sh
+ ${INSTALL_DATA} ${WRKSRC}/lighttpd.conf ${DESTDIR}${EGDIR}/lighttpd.conf
+ ${INSTALL_DATA} ${WRKSRC}/nginx.conf ${DESTDIR}${EGDIR}/nginx.conf
+ ${INSTALL_DATA} ${WRKSRC}/php-fpm.conf ${DESTDIR}${EGDIR}/php-fpm.conf
.include "../../mk/bsd.pkg.mk"
diff --git a/php-dotclear/PLIST b/php-dotclear/PLIST
index e1571fae66..ca0ad62547 100644
--- a/php-dotclear/PLIST
+++ b/php-dotclear/PLIST
@@ -1,9 +1,4 @@
@comment $NetBSD$
-share/doc/dotclear/CHANGELOG
-share/doc/dotclear/CONTRIBUTING.md
-share/doc/dotclear/CREDITS
-share/doc/dotclear/LICENSE
-share/doc/dotclear/README.md
share/dotclear/admin/_charte.php
share/dotclear/admin/auth.php
share/dotclear/admin/blog.php
@@ -16,12 +11,15 @@ share/dotclear/admin/category.php
share/dotclear/admin/comment.php
share/dotclear/admin/comments.php
share/dotclear/admin/comments_actions.php
+share/dotclear/admin/csp_report.php
share/dotclear/admin/help.php
share/dotclear/admin/images/admin.png
share/dotclear/admin/images/attach.png
+share/dotclear/admin/images/attach.svg
share/dotclear/admin/images/check-off.png
share/dotclear/admin/images/check-on.png
share/dotclear/admin/images/check-wrn.png
+share/dotclear/admin/images/close.png
share/dotclear/admin/images/collapser-hide.png
share/dotclear/admin/images/collapser-show.png
share/dotclear/admin/images/comments.png
@@ -30,8 +28,11 @@ share/dotclear/admin/images/disabled_down.png
share/dotclear/admin/images/disabled_up.png
share/dotclear/admin/images/dotclear_pw.png
share/dotclear/admin/images/down.png
+share/dotclear/admin/images/dragndrop.svg
share/dotclear/admin/images/edit-mini.png
share/dotclear/admin/images/expand.png
+share/dotclear/admin/images/fav-off.png
+share/dotclear/admin/images/fav-on.png
share/dotclear/admin/images/favicon.ico
share/dotclear/admin/images/favicon96-login.png
share/dotclear/admin/images/favicon96-logout.png
@@ -94,6 +95,7 @@ share/dotclear/admin/images/minus-theme.png
share/dotclear/admin/images/module.png
share/dotclear/admin/images/noscreenshot.png
share/dotclear/admin/images/outgoing-blue.png
+share/dotclear/admin/images/outgoing-link.svg
share/dotclear/admin/images/outgoing.png
share/dotclear/admin/images/page_help.png
share/dotclear/admin/images/pagination/first.png
@@ -111,6 +113,7 @@ share/dotclear/admin/images/plus.png
share/dotclear/admin/images/scheduled.png
share/dotclear/admin/images/selected.png
share/dotclear/admin/images/superadmin.png
+share/dotclear/admin/images/thanks.mp3
share/dotclear/admin/images/trackbacks.png
share/dotclear/admin/images/trash.png
share/dotclear/admin/images/up.png
@@ -118,18 +121,26 @@ share/dotclear/admin/index.php
share/dotclear/admin/install/check.php
share/dotclear/admin/install/index.php
share/dotclear/admin/install/wizard.php
+share/dotclear/admin/js/_auth.js
share/dotclear/admin/js/_blog_pref.js
+share/dotclear/admin/js/_blog_pref_popup_posts.js
share/dotclear/admin/js/_blog_theme.js
+share/dotclear/admin/js/_blogs.js
+share/dotclear/admin/js/_blogs_actions.js
share/dotclear/admin/js/_categories.js
share/dotclear/admin/js/_category.js
+share/dotclear/admin/js/_charte.js
share/dotclear/admin/js/_comment.js
share/dotclear/admin/js/_comments.js
share/dotclear/admin/js/_comments_actions.js
share/dotclear/admin/js/_index.js
+share/dotclear/admin/js/_install.js
share/dotclear/admin/js/_langs.js
share/dotclear/admin/js/_media.js
share/dotclear/admin/js/_media_item.js
share/dotclear/admin/js/_plugins.js
+share/dotclear/admin/js/_popup_link.js
+share/dotclear/admin/js/_popup_posts.js
share/dotclear/admin/js/_post.js
share/dotclear/admin/js/_posts_actions.js
share/dotclear/admin/js/_posts_list.js
@@ -137,30 +148,100 @@ share/dotclear/admin/js/_preferences-dragdrop.js
share/dotclear/admin/js/_preferences.js
share/dotclear/admin/js/_trackbacks.js
share/dotclear/admin/js/_update.js
+share/dotclear/admin/js/_user.js
share/dotclear/admin/js/_users.js
share/dotclear/admin/js/_users_actions.js
-share/dotclear/admin/js/color-picker.js
+share/dotclear/admin/js/codemirror.js
+share/dotclear/admin/js/codemirror/LICENSE
+share/dotclear/admin/js/codemirror/addon/display/fullscreen.css
+share/dotclear/admin/js/codemirror/addon/display/fullscreen.js
+share/dotclear/admin/js/codemirror/addon/edit/closebrackets.js
+share/dotclear/admin/js/codemirror/addon/edit/matchbrackets.js
+share/dotclear/admin/js/codemirror/addon/mode/multiplex.js
+share/dotclear/admin/js/codemirror/lib/codemirror.css
+share/dotclear/admin/js/codemirror/lib/codemirror.js
+share/dotclear/admin/js/codemirror/mode/clike/clike.js
+share/dotclear/admin/js/codemirror/mode/css/css.js
+share/dotclear/admin/js/codemirror/mode/htmlmixed/htmlmixed.js
+share/dotclear/admin/js/codemirror/mode/javascript/javascript.js
+share/dotclear/admin/js/codemirror/mode/php/php.js
+share/dotclear/admin/js/codemirror/mode/xml/xml.js
+share/dotclear/admin/js/codemirror/theme/3024-day.css
+share/dotclear/admin/js/codemirror/theme/3024-night.css
+share/dotclear/admin/js/codemirror/theme/abcdef.css
+share/dotclear/admin/js/codemirror/theme/ambiance-mobile.css
+share/dotclear/admin/js/codemirror/theme/ambiance.css
+share/dotclear/admin/js/codemirror/theme/ayu-dark.css
+share/dotclear/admin/js/codemirror/theme/ayu-mirage.css
+share/dotclear/admin/js/codemirror/theme/base16-dark.css
+share/dotclear/admin/js/codemirror/theme/base16-light.css
+share/dotclear/admin/js/codemirror/theme/bespin.css
+share/dotclear/admin/js/codemirror/theme/blackboard.css
+share/dotclear/admin/js/codemirror/theme/cobalt.css
+share/dotclear/admin/js/codemirror/theme/colorforth.css
+share/dotclear/admin/js/codemirror/theme/darcula.css
+share/dotclear/admin/js/codemirror/theme/dracula.css
+share/dotclear/admin/js/codemirror/theme/duotone-dark.css
+share/dotclear/admin/js/codemirror/theme/duotone-light.css
+share/dotclear/admin/js/codemirror/theme/eclipse.css
+share/dotclear/admin/js/codemirror/theme/elegant.css
+share/dotclear/admin/js/codemirror/theme/erlang-dark.css
+share/dotclear/admin/js/codemirror/theme/gruvbox-dark.css
+share/dotclear/admin/js/codemirror/theme/hopscotch.css
+share/dotclear/admin/js/codemirror/theme/icecoder.css
+share/dotclear/admin/js/codemirror/theme/idea.css
+share/dotclear/admin/js/codemirror/theme/isotope.css
+share/dotclear/admin/js/codemirror/theme/lesser-dark.css
+share/dotclear/admin/js/codemirror/theme/liquibyte.css
+share/dotclear/admin/js/codemirror/theme/lucario.css
+share/dotclear/admin/js/codemirror/theme/material-darker.css
+share/dotclear/admin/js/codemirror/theme/material-ocean.css
+share/dotclear/admin/js/codemirror/theme/material-palenight.css
+share/dotclear/admin/js/codemirror/theme/material.css
+share/dotclear/admin/js/codemirror/theme/mbo.css
+share/dotclear/admin/js/codemirror/theme/mdn-like.css
+share/dotclear/admin/js/codemirror/theme/midnight.css
+share/dotclear/admin/js/codemirror/theme/monokai.css
+share/dotclear/admin/js/codemirror/theme/moxer.css
+share/dotclear/admin/js/codemirror/theme/neat.css
+share/dotclear/admin/js/codemirror/theme/neo.css
+share/dotclear/admin/js/codemirror/theme/night.css
+share/dotclear/admin/js/codemirror/theme/nord.css
+share/dotclear/admin/js/codemirror/theme/oceanic-next.css
+share/dotclear/admin/js/codemirror/theme/panda-syntax.css
+share/dotclear/admin/js/codemirror/theme/paraiso-dark.css
+share/dotclear/admin/js/codemirror/theme/paraiso-light.css
+share/dotclear/admin/js/codemirror/theme/pastel-on-dark.css
+share/dotclear/admin/js/codemirror/theme/railscasts.css
+share/dotclear/admin/js/codemirror/theme/rubyblue.css
+share/dotclear/admin/js/codemirror/theme/seti.css
+share/dotclear/admin/js/codemirror/theme/shadowfox.css
+share/dotclear/admin/js/codemirror/theme/solarized.css
+share/dotclear/admin/js/codemirror/theme/ssms.css
+share/dotclear/admin/js/codemirror/theme/the-matrix.css
+share/dotclear/admin/js/codemirror/theme/tomorrow-night-bright.css
+share/dotclear/admin/js/codemirror/theme/tomorrow-night-eighties.css
+share/dotclear/admin/js/codemirror/theme/ttcn.css
+share/dotclear/admin/js/codemirror/theme/twilight.css
+share/dotclear/admin/js/codemirror/theme/vibrant-ink.css
+share/dotclear/admin/js/codemirror/theme/xq-dark.css
+share/dotclear/admin/js/codemirror/theme/xq-light.css
+share/dotclear/admin/js/codemirror/theme/yeti.css
+share/dotclear/admin/js/codemirror/theme/yonce.css
+share/dotclear/admin/js/codemirror/theme/zenburn.css
share/dotclear/admin/js/common.js
share/dotclear/admin/js/confirm-close.js
share/dotclear/admin/js/date-picker.js
-share/dotclear/admin/js/dragsort-tablerows.js
+share/dotclear/admin/js/file-upload.js
share/dotclear/admin/js/filter-controls.js
-share/dotclear/admin/js/ie7/IE7.js
-share/dotclear/admin/js/ie7/IE8.js
-share/dotclear/admin/js/ie7/IE9.js
-share/dotclear/admin/js/ie7/blank.gif
-share/dotclear/admin/js/ie7/ie7-hashchange.js
-share/dotclear/admin/js/ie7/ie7-recalc.js
-share/dotclear/admin/js/ie7/ie7-squish.js
+share/dotclear/admin/js/jquery-mute.js
share/dotclear/admin/js/jquery/jquery-migrate.js
share/dotclear/admin/js/jquery/jquery-ui.custom.js
share/dotclear/admin/js/jquery/jquery.autocomplete.js
-share/dotclear/admin/js/jquery/jquery.bgFade.js
share/dotclear/admin/js/jquery/jquery.biscuit.js
-share/dotclear/admin/js/jquery/jquery.farbtastic.js
share/dotclear/admin/js/jquery/jquery.js
+share/dotclear/admin/js/jquery/jquery.magnific-popup.js
share/dotclear/admin/js/jquery/jquery.mjs.nestedSortable.js
-share/dotclear/admin/js/jquery/jquery.modal.js
share/dotclear/admin/js/jquery/jquery.pageTabs.js
share/dotclear/admin/js/jquery/jquery.pwstrength.js
share/dotclear/admin/js/jquery/jquery.ui.touch-punch.js
@@ -173,16 +254,12 @@ share/dotclear/admin/js/jsUpload/load-image.js
share/dotclear/admin/js/jsUpload/template-download.js
share/dotclear/admin/js/jsUpload/template-upload.js
share/dotclear/admin/js/jsUpload/tmpl.js
-share/dotclear/admin/js/jsUpload/vendor/jquery.ui.widget.js
share/dotclear/admin/js/meta-editor.js
+share/dotclear/admin/js/page-tabs.js
share/dotclear/admin/js/prelude.js
-share/dotclear/admin/js/tool-man/cookies.js
-share/dotclear/admin/js/tool-man/coordinates.js
-share/dotclear/admin/js/tool-man/core.js
-share/dotclear/admin/js/tool-man/css.js
-share/dotclear/admin/js/tool-man/drag.js
-share/dotclear/admin/js/tool-man/dragsort.js
-share/dotclear/admin/js/tool-man/events.js
+share/dotclear/admin/js/prepend.js
+share/dotclear/admin/js/services.js
+share/dotclear/admin/js/toggles.js
share/dotclear/admin/langs.php
share/dotclear/admin/media.php
share/dotclear/admin/media_item.php
@@ -197,10 +274,8 @@ share/dotclear/admin/posts_actions.php
share/dotclear/admin/preferences.php
share/dotclear/admin/search.php
share/dotclear/admin/services.php
-share/dotclear/admin/style/bg_h2.png
-share/dotclear/admin/style/bg_menu.png
-share/dotclear/admin/style/bg_wrapper.png
share/dotclear/admin/style/cancel.png
+share/dotclear/admin/style/config.rb
share/dotclear/admin/style/dashboard-alt.png
share/dotclear/admin/style/dashboard.png
share/dotclear/admin/style/date-picker.css
@@ -213,14 +288,9 @@ share/dotclear/admin/style/dc_logos/w-dotclear90.png
share/dotclear/admin/style/default-rtl.css
share/dotclear/admin/style/default.css
share/dotclear/admin/style/drag.png
-share/dotclear/admin/style/farbtastic/farbtastic.css
-share/dotclear/admin/style/farbtastic/marker.png
-share/dotclear/admin/style/farbtastic/mask.png
-share/dotclear/admin/style/farbtastic/wheel.png
share/dotclear/admin/style/grid.png
share/dotclear/admin/style/help-mini.png
share/dotclear/admin/style/help12.png
-share/dotclear/admin/style/iesucks.css
share/dotclear/admin/style/install.css
share/dotclear/admin/style/install/important.png
share/dotclear/admin/style/install/note.png
@@ -228,17 +298,53 @@ share/dotclear/admin/style/install/process_warning.png
share/dotclear/admin/style/install/w-logo.png
share/dotclear/admin/style/loader.gif
share/dotclear/admin/style/loader.png
-share/dotclear/admin/style/modal/close.png
-share/dotclear/admin/style/modal/loader.gif
-share/dotclear/admin/style/modal/modal.css
share/dotclear/admin/style/msg-error.png
share/dotclear/admin/style/msg-info.png
share/dotclear/admin/style/msg-std.png
share/dotclear/admin/style/msg-success.png
share/dotclear/admin/style/msg-warning.png
+share/dotclear/admin/style/scss/default.scss
+share/dotclear/admin/style/scss/init/_config.scss
+share/dotclear/admin/style/scss/init/_mixins-functions.scss
+share/dotclear/admin/style/scss/init/_rebase.scss
+share/dotclear/admin/style/scss/partials/_a11y.scss
+share/dotclear/admin/style/scss/partials/_auth.scss
+share/dotclear/admin/style/scss/partials/_blog_pref.scss
+share/dotclear/admin/style/scss/partials/_blog_theme.scss
+share/dotclear/admin/style/scss/partials/_buttons.scss
+share/dotclear/admin/style/scss/partials/_categories.scss
+share/dotclear/admin/style/scss/partials/_charte.scss
+share/dotclear/admin/style/scss/partials/_classes.scss
+share/dotclear/admin/style/scss/partials/_common.scss
+share/dotclear/admin/style/scss/partials/_content.scss
+share/dotclear/admin/style/scss/partials/_debug.scss
+share/dotclear/admin/style/scss/partials/_editors.scss
+share/dotclear/admin/style/scss/partials/_entry.scss
+share/dotclear/admin/style/scss/partials/_filters.scss
+share/dotclear/admin/style/scss/partials/_footer.scss
+share/dotclear/admin/style/scss/partials/_forms.scss
+share/dotclear/admin/style/scss/partials/_header.scss
+share/dotclear/admin/style/scss/partials/_index.scss
+share/dotclear/admin/style/scss/partials/_layout.scss
+share/dotclear/admin/style/scss/partials/_main-menu.scss
+share/dotclear/admin/style/scss/partials/_markup.scss
+share/dotclear/admin/style/scss/partials/_media.scss
+share/dotclear/admin/style/scss/partials/_media_item.scss
+share/dotclear/admin/style/scss/partials/_mediaqueries.scss
+share/dotclear/admin/style/scss/partials/_messages.scss
+share/dotclear/admin/style/scss/partials/_plugins.scss
+share/dotclear/admin/style/scss/partials/_preferences.scss
+share/dotclear/admin/style/scss/partials/_tables.scss
+share/dotclear/admin/style/scss/partials/_user.scss
+share/dotclear/admin/style/scss/partials/_utils.scss
+share/dotclear/admin/style/scss/themes/_dark.scss
+share/dotclear/admin/style/scss/themes/_default.scss
+share/dotclear/admin/style/scss/themes/_themes.scss
+share/dotclear/admin/style/scss/vendor/_codemirror.scss
+share/dotclear/admin/style/scss/vendor/_magnific-popup.scss
share/dotclear/admin/style/search.png
+share/dotclear/admin/style/search.svg
share/dotclear/admin/style/settings.png
-share/dotclear/admin/style/texture.png
share/dotclear/admin/style/user.png
share/dotclear/admin/update.php
share/dotclear/admin/user.php
@@ -247,12 +353,15 @@ share/dotclear/admin/users_actions.php
share/dotclear/admin/xmlrpc.php
share/dotclear/inc/.htaccess
share/dotclear/inc/admin/actions/class.dcaction.php
+share/dotclear/inc/admin/actions/class.dcactionblogs.php
share/dotclear/inc/admin/actions/class.dcactioncomments.php
share/dotclear/inc/admin/actions/class.dcactionposts.php
+share/dotclear/inc/admin/class.dc.blog_pref.php
share/dotclear/inc/admin/class.dc.favorites.php
share/dotclear/inc/admin/class.dc.menu.php
share/dotclear/inc/admin/lib.admincombos.php
share/dotclear/inc/admin/lib.dc.adminurl.php
+share/dotclear/inc/admin/lib.dc.notices.php
share/dotclear/inc/admin/lib.dc.page.php
share/dotclear/inc/admin/lib.moduleslist.php
share/dotclear/inc/admin/lib.pager.php
@@ -268,12 +377,14 @@ share/dotclear/inc/core/class.dc.media.php
share/dotclear/inc/core/class.dc.meta.php
share/dotclear/inc/core/class.dc.modules.php
share/dotclear/inc/core/class.dc.namespace.php
+share/dotclear/inc/core/class.dc.notices.php
share/dotclear/inc/core/class.dc.plugins.php
share/dotclear/inc/core/class.dc.postmedia.php
share/dotclear/inc/core/class.dc.prefs.php
share/dotclear/inc/core/class.dc.rest.php
share/dotclear/inc/core/class.dc.rs.extensions.php
share/dotclear/inc/core/class.dc.settings.php
+share/dotclear/inc/core/class.dc.sql.statement.php
share/dotclear/inc/core/class.dc.store.parser.php
share/dotclear/inc/core/class.dc.store.php
share/dotclear/inc/core/class.dc.store.reader.php
@@ -289,14 +400,14 @@ share/dotclear/inc/dbschema/db-schema.php
share/dotclear/inc/dbschema/upgrade-cli.php
share/dotclear/inc/dbschema/upgrade.php
share/dotclear/inc/digests
-share/dotclear/inc/js/jquery/1.11.3/jquery.cookie.js
-share/dotclear/inc/js/jquery/1.11.3/jquery.js
-share/dotclear/inc/js/jquery/1.4.2/jquery.cookie.js
-share/dotclear/inc/js/jquery/1.4.2/jquery.js
-share/dotclear/inc/js/jquery/2.2.0/jquery.cookie.js
-share/dotclear/inc/js/jquery/2.2.0/jquery.js
+share/dotclear/inc/js/jquery/3.5.1/jquery.js
+share/dotclear/inc/js/password.js
share/dotclear/inc/js/post.js
-share/dotclear/inc/libs/clearbricks/.hgtags
+share/dotclear/inc/js/util.js
+share/dotclear/inc/libs/clearbricks/.doxygen.conf
+share/dotclear/inc/libs/clearbricks/.editorconfig
+share/dotclear/inc/libs/clearbricks/.php_cs.dist
+share/dotclear/inc/libs/clearbricks/LICENSE
share/dotclear/inc/libs/clearbricks/Makefile
share/dotclear/inc/libs/clearbricks/README.md
share/dotclear/inc/libs/clearbricks/_common.php
@@ -314,6 +425,7 @@ share/dotclear/inc/libs/clearbricks/common/tz.dat
share/dotclear/inc/libs/clearbricks/dblayer/class.cursor.php
share/dotclear/inc/libs/clearbricks/dblayer/class.mysql.php
share/dotclear/inc/libs/clearbricks/dblayer/class.mysqli.php
+share/dotclear/inc/libs/clearbricks/dblayer/class.mysqlimb4.php
share/dotclear/inc/libs/clearbricks/dblayer/class.pgsql.php
share/dotclear/inc/libs/clearbricks/dblayer/class.sqlite.php
share/dotclear/inc/libs/clearbricks/dblayer/dblayer.php
@@ -321,6 +433,7 @@ share/dotclear/inc/libs/clearbricks/dbschema/class.dbschema.php
share/dotclear/inc/libs/clearbricks/dbschema/class.dbstruct.php
share/dotclear/inc/libs/clearbricks/dbschema/class.mysql.dbschema.php
share/dotclear/inc/libs/clearbricks/dbschema/class.mysqli.dbschema.php
+share/dotclear/inc/libs/clearbricks/dbschema/class.mysqlimb4.dbschema.php
share/dotclear/inc/libs/clearbricks/dbschema/class.pgsql.dbschema.php
share/dotclear/inc/libs/clearbricks/dbschema/class.sqlite.dbschema.php
share/dotclear/inc/libs/clearbricks/debian/changelog
@@ -366,6 +479,7 @@ share/dotclear/inc/libs/clearbricks/xmlsql/class.xmlsql.php
share/dotclear/inc/libs/clearbricks/zip/class.unzip.php
share/dotclear/inc/libs/clearbricks/zip/class.zip.php
share/dotclear/inc/load_plugin_file.php
+share/dotclear/inc/load_var_file.php
share/dotclear/inc/prepend.php
share/dotclear/inc/public/class.dc.template.php
share/dotclear/inc/public/default-templates/currywurst/404.html
@@ -398,7 +512,40 @@ share/dotclear/inc/public/default-templates/currywurst/rss2-comments.xml
share/dotclear/inc/public/default-templates/currywurst/rss2.xml
share/dotclear/inc/public/default-templates/currywurst/rss2.xsl
share/dotclear/inc/public/default-templates/currywurst/search.html
+share/dotclear/inc/public/default-templates/currywurst/static.html
share/dotclear/inc/public/default-templates/currywurst/user_head.html
+share/dotclear/inc/public/default-templates/dotty/404.html
+share/dotclear/inc/public/default-templates/dotty/README.md
+share/dotclear/inc/public/default-templates/dotty/__layout.html
+share/dotclear/inc/public/default-templates/dotty/_audio_player.html
+share/dotclear/inc/public/default-templates/dotty/_entry-content.html
+share/dotclear/inc/public/default-templates/dotty/_entry-feedback.html
+share/dotclear/inc/public/default-templates/dotty/_entry-full.html
+share/dotclear/inc/public/default-templates/dotty/_entry-short.html
+share/dotclear/inc/public/default-templates/dotty/_entry-title.html
+share/dotclear/inc/public/default-templates/dotty/_flv_player.html
+share/dotclear/inc/public/default-templates/dotty/_footer.html
+share/dotclear/inc/public/default-templates/dotty/_head.html
+share/dotclear/inc/public/default-templates/dotty/_mp3_player.html
+share/dotclear/inc/public/default-templates/dotty/_pagination.html
+share/dotclear/inc/public/default-templates/dotty/_sidebar.html
+share/dotclear/inc/public/default-templates/dotty/_simple-entry.html
+share/dotclear/inc/public/default-templates/dotty/_top.html
+share/dotclear/inc/public/default-templates/dotty/_video_player.html
+share/dotclear/inc/public/default-templates/dotty/archive.html
+share/dotclear/inc/public/default-templates/dotty/archive_month.html
+share/dotclear/inc/public/default-templates/dotty/atom-comments.xml
+share/dotclear/inc/public/default-templates/dotty/atom.xml
+share/dotclear/inc/public/default-templates/dotty/category.html
+share/dotclear/inc/public/default-templates/dotty/home.html
+share/dotclear/inc/public/default-templates/dotty/password-form.html
+share/dotclear/inc/public/default-templates/dotty/post.html
+share/dotclear/inc/public/default-templates/dotty/rss2-comments.xml
+share/dotclear/inc/public/default-templates/dotty/rss2.xml
+share/dotclear/inc/public/default-templates/dotty/rss2.xsl
+share/dotclear/inc/public/default-templates/dotty/search.html
+share/dotclear/inc/public/default-templates/dotty/static.html
+share/dotclear/inc/public/default-templates/dotty/user_head.html
share/dotclear/inc/public/default-templates/mustek/404.html
share/dotclear/inc/public/default-templates/mustek/__layout.html
share/dotclear/inc/public/default-templates/mustek/_audio_player.html
@@ -420,13 +567,12 @@ share/dotclear/inc/public/default-templates/mustek/rss2-comments.xml
share/dotclear/inc/public/default-templates/mustek/rss2.xml
share/dotclear/inc/public/default-templates/mustek/rss2.xsl
share/dotclear/inc/public/default-templates/mustek/search.html
+share/dotclear/inc/public/default-templates/mustek/static.html
share/dotclear/inc/public/default-templates/mustek/user_head.html
share/dotclear/inc/public/lib.tpl.context.php
share/dotclear/inc/public/lib.urlhandlers.php
share/dotclear/inc/public/prepend.php
share/dotclear/inc/public/rs.extension.php
-share/dotclear/inc/swf/player_flv.swf
-share/dotclear/inc/swf/player_mp3.swf
share/dotclear/index.php
share/dotclear/locales/README
share/dotclear/locales/en/date.lang.php
@@ -495,6 +641,7 @@ share/dotclear/plugins/aboutConfig/_define.php
share/dotclear/plugins/aboutConfig/icon-big.png
share/dotclear/plugins/aboutConfig/icon.png
share/dotclear/plugins/aboutConfig/index.php
+share/dotclear/plugins/aboutConfig/js/index.js
share/dotclear/plugins/aboutConfig/locales/en/help/help.html
share/dotclear/plugins/aboutConfig/locales/en/resources.php
share/dotclear/plugins/aboutConfig/locales/fr/help/help.html
@@ -511,7 +658,7 @@ share/dotclear/plugins/antispam/_define.php
share/dotclear/plugins/antispam/_install.php
share/dotclear/plugins/antispam/_prepend.php
share/dotclear/plugins/antispam/_public.php
-share/dotclear/plugins/antispam/antispam.js
+share/dotclear/plugins/antispam/_services.php
share/dotclear/plugins/antispam/feed.png
share/dotclear/plugins/antispam/filters/class.dc.filter.ip.php
share/dotclear/plugins/antispam/filters/class.dc.filter.iplookup.php
@@ -524,6 +671,8 @@ share/dotclear/plugins/antispam/inc/class.dc.spamfilters.php
share/dotclear/plugins/antispam/inc/lib.dc.antispam.php
share/dotclear/plugins/antispam/inc/lib.dc.antispam.url.php
share/dotclear/plugins/antispam/index.php
+share/dotclear/plugins/antispam/js/antispam.js
+share/dotclear/plugins/antispam/js/dashboard.js
share/dotclear/plugins/antispam/locales/en/help/comments.html
share/dotclear/plugins/antispam/locales/en/help/filters.html
share/dotclear/plugins/antispam/locales/en/help/help.html
@@ -552,15 +701,15 @@ share/dotclear/plugins/blogroll/_define.php
share/dotclear/plugins/blogroll/_install.php
share/dotclear/plugins/blogroll/_prepend.php
share/dotclear/plugins/blogroll/_public.php
-share/dotclear/plugins/blogroll/_users_actions.js
share/dotclear/plugins/blogroll/_widgets.php
-share/dotclear/plugins/blogroll/blogroll.js
share/dotclear/plugins/blogroll/class.dc.blogroll.php
share/dotclear/plugins/blogroll/class.dc.importblogroll.php
share/dotclear/plugins/blogroll/edit.php
share/dotclear/plugins/blogroll/icon-small.png
share/dotclear/plugins/blogroll/icon.png
share/dotclear/plugins/blogroll/index.php
+share/dotclear/plugins/blogroll/js/_users_actions.js
+share/dotclear/plugins/blogroll/js/blogroll.js
share/dotclear/plugins/blogroll/locales/en/help/blogroll.html
share/dotclear/plugins/blogroll/locales/en/resources.php
share/dotclear/plugins/blogroll/locales/fr/help/blogroll.html
@@ -593,13 +742,23 @@ share/dotclear/plugins/blowupConfig/alpha-img/page-t/rabbit.png
share/dotclear/plugins/blowupConfig/alpha-img/page-t/roadrunner-1.png
share/dotclear/plugins/blowupConfig/alpha-img/page-t/roadrunner-2.png
share/dotclear/plugins/blowupConfig/alpha-img/page-t/typo.png
-share/dotclear/plugins/blowupConfig/config.js
share/dotclear/plugins/blowupConfig/index.php
+share/dotclear/plugins/blowupConfig/js/config.js
share/dotclear/plugins/blowupConfig/lib/class.blowup.config.php
+share/dotclear/plugins/blowupConfig/locales/de/help/help.html
+share/dotclear/plugins/blowupConfig/locales/de/resources.php
share/dotclear/plugins/blowupConfig/locales/en/help/help.html
share/dotclear/plugins/blowupConfig/locales/en/resources.php
share/dotclear/plugins/blowupConfig/locales/fr/help/help.html
share/dotclear/plugins/blowupConfig/locales/fr/resources.php
+share/dotclear/plugins/blowupConfig/locales/ja/help/help.html
+share/dotclear/plugins/blowupConfig/locales/ja/resources.php
+share/dotclear/plugins/blowupConfig/locales/ko/help/help.html
+share/dotclear/plugins/blowupConfig/locales/ko/resources.php
+share/dotclear/plugins/blowupConfig/locales/pt/help/help.html
+share/dotclear/plugins/blowupConfig/locales/pt/resources.php
+share/dotclear/plugins/blowupConfig/locales/zh-cn/help/help.html
+share/dotclear/plugins/blowupConfig/locales/zh-cn/resources.php
share/dotclear/plugins/breadcrumb/_admin.php
share/dotclear/plugins/breadcrumb/_define.php
share/dotclear/plugins/breadcrumb/_public.php
@@ -612,6 +771,7 @@ share/dotclear/plugins/dcCKEditor/imgs/icon.png
share/dotclear/plugins/dcCKEditor/inc/_config.php
share/dotclear/plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php
share/dotclear/plugins/dcCKEditor/index.php
+share/dotclear/plugins/dcCKEditor/js/_post_editor.js
share/dotclear/plugins/dcCKEditor/js/ckeditor-plugins/dclink/icons/dclink.png
share/dotclear/plugins/dcCKEditor/js/ckeditor-plugins/dclink/plugin.js
share/dotclear/plugins/dcCKEditor/js/ckeditor-plugins/entrylink/icons/entrylink.png
@@ -621,49 +781,24 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor-plugins/img/icons/img.png
share/dotclear/plugins/dcCKEditor/js/ckeditor-plugins/img/plugin.js
share/dotclear/plugins/dcCKEditor/js/ckeditor-plugins/media/icons/media.png
share/dotclear/plugins/dcCKEditor/js/ckeditor-plugins/media/plugin.js
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/config.rb
share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/dialog.css
share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/editor.css
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_bquote.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_br.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_clean.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_code.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_del.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_em.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_img.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_img_select.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_ins.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_link.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_ol.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_paragraph.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_post.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_pre.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_quote.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_strong.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/bt_ul.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons-sdf4e3af542.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/arrow.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/close.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/hidpi-s58232b66f9.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/hidpi/close.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/hidpi/lock-open.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/hidpi/lock.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/hidpi/refresh.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/lock-open.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/lock.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/icons/refresh.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_colorpanel.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_elementspath.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_mainui.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_menu.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_panel.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_presets.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_reset.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_richcombo.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/_toolbar.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/dialog.scss
-share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/sass/editor.scss
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/icons.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/icons_hidpi.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/anchor.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/arrow.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/close.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/hidpi/anchor.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/hidpi/close.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/hidpi/lock-open.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/hidpi/lock.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/hidpi/refresh.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/lock-open.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/lock.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/refresh.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/images/spinner.gif
share/dotclear/plugins/dcCKEditor/js/ckeditor-skins/dotclear/skin.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/.nvmrc
share/dotclear/plugins/dcCKEditor/js/ckeditor/CHANGES.md
share/dotclear/plugins/dcCKEditor/js/ckeditor/LICENSE.md
share/dotclear/plugins/dcCKEditor/js/ckeditor/adapters/jquery.js
@@ -673,6 +808,7 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/contents.css
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/_translationstatus.txt
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/af.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/ar.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/az.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/bg.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/bn.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/bs.js
@@ -688,6 +824,7 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/en-ca.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/en-gb.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/en.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/eo.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/es-mx.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/es.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/et.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/eu.js
@@ -718,6 +855,7 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/ms.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/nb.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/nl.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/no.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/oc.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/pl.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/pt-br.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/pt.js
@@ -738,10 +876,12 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/uk.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/vi.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/zh-cn.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/lang/zh.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/package-lock.json
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/az.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
@@ -750,9 +890,11 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/da.j
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/en-au.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/es-mx.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
@@ -780,6 +922,7 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/mn.j
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
@@ -805,10 +948,9 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/about/dialogs/hidpi/logo_c
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/clipboard/dialogs/paste.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/dialog/dialogDefinition.js
-share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/dialog/samples/assets/my_dialog.js
-share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/dialog/samples/dialog.html
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/dialog/styles/dialog.css
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/div/dialogs/div.js
-share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/enterkey/samples/enterkey.html
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/footnotes/dialogs/footnotes.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/icons.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/icons_hidpi.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/image/dialogs/image.js
@@ -822,11 +964,16 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/magicline/images/hidpi/ico
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/magicline/images/hidpi/icon.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/magicline/images/icon-rtl.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/magicline/images/icon.png
-share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/magicline/samples/magicline.html
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/pastefromword/filter/default.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/pastetools/filter/common.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/pastetools/filter/image.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/preview/images/pagebreak.gif
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/preview/preview.html
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/preview/styles/screen.css
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/af.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/ar.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/az.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/bg.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/ca.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/cs.js
@@ -835,9 +982,12 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/d
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/de.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/el.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/en-au.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/en-ca.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/en.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/eo.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/es-mx.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/es.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/et.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/eu.js
@@ -860,14 +1010,18 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/l
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/nb.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/nl.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/no.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/oc.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/pl.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/pt.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/ro.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/ru.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/si.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/sk.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/sl.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/sq.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/sr-latn.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/sr.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/sv.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/th.js
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/specialchar/dialogs/lang/tr.js
@@ -886,8 +1040,7 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templates/defaul
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templates/images/template1.gif
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templates/images/template2.gif
share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templates/images/template3.gif
-share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/toolbar/samples/toolbar.html
-share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/wysiwygarea/samples/fullpage.html
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/widget/images/handle.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/dialog.css
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/dialog_ie.css
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/dialog_ie7.css
@@ -901,8 +1054,10 @@ share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/editor_ie8.css
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/editor_iequirks.css
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/icons.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/icons_hidpi.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/images/anchor.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/images/arrow.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/images/close.png
+share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/images/hidpi/anchor.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/images/hidpi/close.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/images/hidpi/lock-open.png
share/dotclear/plugins/dcCKEditor/js/ckeditor/skins/moono/images/hidpi/lock.png
@@ -917,17 +1072,10 @@ share/dotclear/plugins/dcCKEditor/js/popup_link.js
share/dotclear/plugins/dcCKEditor/js/popup_media.js
share/dotclear/plugins/dcCKEditor/js/popup_posts.js
share/dotclear/plugins/dcCKEditor/locales/en/help/config_help.html
-share/dotclear/plugins/dcCKEditor/locales/en/main.lang.php
-share/dotclear/plugins/dcCKEditor/locales/en/main.po
share/dotclear/plugins/dcCKEditor/locales/en/resources.php
-share/dotclear/plugins/dcCKEditor/locales/fi/main.lang.php
-share/dotclear/plugins/dcCKEditor/locales/fi/main.po
share/dotclear/plugins/dcCKEditor/locales/fr/help/config_help.html
-share/dotclear/plugins/dcCKEditor/locales/fr/main.lang.php
-share/dotclear/plugins/dcCKEditor/locales/fr/main.po
share/dotclear/plugins/dcCKEditor/locales/fr/resources.php
-share/dotclear/plugins/dcCKEditor/locales/templates/messages.pot
-share/dotclear/plugins/dcCKEditor/tpl/index.tpl
+share/dotclear/plugins/dcCKEditor/tpl/index.php
share/dotclear/plugins/dcLegacyEditor/_admin.php
share/dotclear/plugins/dcLegacyEditor/_define.php
share/dotclear/plugins/dcLegacyEditor/_install.php
@@ -942,6 +1090,7 @@ share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_img.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_img_select.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ins.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_link.png
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_mark.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ol.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_paragraph.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_post.png
@@ -950,11 +1099,11 @@ share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_quote.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_strong.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ul.png
share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/jsToolBar.css
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/resize.png
share/dotclear/plugins/dcLegacyEditor/icon.png
share/dotclear/plugins/dcLegacyEditor/inc/dc.legacy.editor.behaviors.php
share/dotclear/plugins/dcLegacyEditor/index.php
share/dotclear/plugins/dcLegacyEditor/js/_post_editor.js
+share/dotclear/plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.config.js
share/dotclear/plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.dotclear.js
share/dotclear/plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.js
share/dotclear/plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js
@@ -963,13 +1112,9 @@ share/dotclear/plugins/dcLegacyEditor/js/jsToolBar/popup_media.js
share/dotclear/plugins/dcLegacyEditor/js/jsToolBar/popup_posts.js
share/dotclear/plugins/dcLegacyEditor/locales/en/help/legacy_editor.html
share/dotclear/plugins/dcLegacyEditor/locales/en/resources.php
-share/dotclear/plugins/dcLegacyEditor/locales/fi/main.lang.php
-share/dotclear/plugins/dcLegacyEditor/locales/fi/main.po
share/dotclear/plugins/dcLegacyEditor/locales/fr/help/legacy_editor.html
-share/dotclear/plugins/dcLegacyEditor/locales/fr/main.lang.php
-share/dotclear/plugins/dcLegacyEditor/locales/fr/main.po
share/dotclear/plugins/dcLegacyEditor/locales/fr/resources.php
-share/dotclear/plugins/dcLegacyEditor/tpl/index.tpl
+share/dotclear/plugins/dcLegacyEditor/tpl/index.php
share/dotclear/plugins/dclegacy/_admin.php
share/dotclear/plugins/dclegacy/_define.php
share/dotclear/plugins/fairTrackbacks/_define.php
@@ -993,6 +1138,7 @@ share/dotclear/plugins/importExport/inc/flat/class.flat.import.php
share/dotclear/plugins/importExport/inc/img/progress.png
share/dotclear/plugins/importExport/inc/lib.ie.maintenance.php
share/dotclear/plugins/importExport/index.php
+share/dotclear/plugins/importExport/js/import_flat.js
share/dotclear/plugins/importExport/js/script.js
share/dotclear/plugins/importExport/locales/en/help/import.html
share/dotclear/plugins/importExport/locales/en/resources.php
@@ -1012,6 +1158,7 @@ share/dotclear/plugins/maintenance/inc/class.dc.maintenance.php
share/dotclear/plugins/maintenance/inc/class.dc.maintenance.task.php
share/dotclear/plugins/maintenance/inc/tasks/class.dc.maintenance.cache.php
share/dotclear/plugins/maintenance/inc/tasks/class.dc.maintenance.countcomments.php
+share/dotclear/plugins/maintenance/inc/tasks/class.dc.maintenance.csp.php
share/dotclear/plugins/maintenance/inc/tasks/class.dc.maintenance.indexcomments.php
share/dotclear/plugins/maintenance/inc/tasks/class.dc.maintenance.indexposts.php
share/dotclear/plugins/maintenance/inc/tasks/class.dc.maintenance.logs.php
@@ -1031,18 +1178,20 @@ share/dotclear/plugins/pages/_define.php
share/dotclear/plugins/pages/_install.php
share/dotclear/plugins/pages/_prepend.php
share/dotclear/plugins/pages/_public.php
-share/dotclear/plugins/pages/_users_actions.js
share/dotclear/plugins/pages/_widgets.php
share/dotclear/plugins/pages/class.actionpage.php
share/dotclear/plugins/pages/class.listpage.php
share/dotclear/plugins/pages/default-templates/currywurst/page.html
+share/dotclear/plugins/pages/default-templates/dotty/page.html
share/dotclear/plugins/pages/default-templates/mustek/page.html
share/dotclear/plugins/pages/icon-big.png
share/dotclear/plugins/pages/icon-np-big.png
share/dotclear/plugins/pages/icon-np.png
share/dotclear/plugins/pages/icon.png
share/dotclear/plugins/pages/index.php
-share/dotclear/plugins/pages/list.js
+share/dotclear/plugins/pages/js/_users_actions.js
+share/dotclear/plugins/pages/js/list.js
+share/dotclear/plugins/pages/js/page.js
share/dotclear/plugins/pages/list.php
share/dotclear/plugins/pages/locales/en/help/page.html
share/dotclear/plugins/pages/locales/en/help/pages.html
@@ -1053,9 +1202,12 @@ share/dotclear/plugins/pages/locales/fr/resources.php
share/dotclear/plugins/pages/page.php
share/dotclear/plugins/pings/_admin.php
share/dotclear/plugins/pings/_define.php
+share/dotclear/plugins/pings/_install.php
+share/dotclear/plugins/pings/_prepend.php
share/dotclear/plugins/pings/icon-big.png
share/dotclear/plugins/pings/icon.png
share/dotclear/plugins/pings/index.php
+share/dotclear/plugins/pings/js/post.js
share/dotclear/plugins/pings/lib.pings.php
share/dotclear/plugins/pings/locales/en/help/pings.html
share/dotclear/plugins/pings/locales/en/help/pings_post.html
@@ -1063,7 +1215,6 @@ share/dotclear/plugins/pings/locales/en/resources.php
share/dotclear/plugins/pings/locales/fr/help/pings.html
share/dotclear/plugins/pings/locales/fr/help/pings_post.html
share/dotclear/plugins/pings/locales/fr/resources.php
-share/dotclear/plugins/pings/post.js
share/dotclear/plugins/simpleMenu/_admin.php
share/dotclear/plugins/simpleMenu/_define.php
share/dotclear/plugins/simpleMenu/_install.php
@@ -1072,11 +1223,11 @@ share/dotclear/plugins/simpleMenu/_widgets.php
share/dotclear/plugins/simpleMenu/icon-small.png
share/dotclear/plugins/simpleMenu/icon.png
share/dotclear/plugins/simpleMenu/index.php
+share/dotclear/plugins/simpleMenu/js/simplemenu.js
share/dotclear/plugins/simpleMenu/locales/en/help/help.html
share/dotclear/plugins/simpleMenu/locales/en/resources.php
share/dotclear/plugins/simpleMenu/locales/fr/help/help.html
share/dotclear/plugins/simpleMenu/locales/fr/resources.php
-share/dotclear/plugins/simpleMenu/simplemenu.js
share/dotclear/plugins/tags/_admin.php
share/dotclear/plugins/tags/_define.php
share/dotclear/plugins/tags/_prepend.php
@@ -1085,6 +1236,8 @@ share/dotclear/plugins/tags/_widgets.php
share/dotclear/plugins/tags/_xmlrpc.php
share/dotclear/plugins/tags/default-templates/currywurst/tag.html
share/dotclear/plugins/tags/default-templates/currywurst/tags.html
+share/dotclear/plugins/tags/default-templates/dotty/tag.html
+share/dotclear/plugins/tags/default-templates/dotty/tags.html
share/dotclear/plugins/tags/default-templates/mustek/tag.html
share/dotclear/plugins/tags/default-templates/mustek/tags.html
share/dotclear/plugins/tags/icon-big.png
@@ -1094,9 +1247,9 @@ share/dotclear/plugins/tags/img/tag-add.png
share/dotclear/plugins/tags/inc/tags.behaviors.php
share/dotclear/plugins/tags/index.php
share/dotclear/plugins/tags/js/ckeditor-tags-plugin.js
-share/dotclear/plugins/tags/js/jquery.autocomplete.js
share/dotclear/plugins/tags/js/legacy-post.js
share/dotclear/plugins/tags/js/post.js
+share/dotclear/plugins/tags/js/posts.js
share/dotclear/plugins/tags/js/posts_actions.js
share/dotclear/plugins/tags/js/tag.png
share/dotclear/plugins/tags/locales/en/help/tag_post.html
@@ -1113,28 +1266,33 @@ share/dotclear/plugins/tags/tags.php
share/dotclear/plugins/themeEditor/_admin.php
share/dotclear/plugins/themeEditor/_define.php
share/dotclear/plugins/themeEditor/class.themeEditor.php
-share/dotclear/plugins/themeEditor/codemirror.css
-share/dotclear/plugins/themeEditor/codemirror/LICENSE
-share/dotclear/plugins/themeEditor/codemirror/codemirror.css
-share/dotclear/plugins/themeEditor/codemirror/codemirror.js
-share/dotclear/plugins/themeEditor/codemirror/css.js
-share/dotclear/plugins/themeEditor/codemirror/htmlmixed.js
-share/dotclear/plugins/themeEditor/codemirror/javascript.js
-share/dotclear/plugins/themeEditor/codemirror/multiplex.js
-share/dotclear/plugins/themeEditor/codemirror/php.js
-share/dotclear/plugins/themeEditor/codemirror/xml.js
share/dotclear/plugins/themeEditor/index.php
+share/dotclear/plugins/themeEditor/js/mode.js
+share/dotclear/plugins/themeEditor/js/script.js
+share/dotclear/plugins/themeEditor/js/theme.js
+share/dotclear/plugins/themeEditor/locales/de/help/help.html
+share/dotclear/plugins/themeEditor/locales/de/resources.php
share/dotclear/plugins/themeEditor/locales/en/help/help.html
share/dotclear/plugins/themeEditor/locales/en/resources.php
+share/dotclear/plugins/themeEditor/locales/es/help/help.html
+share/dotclear/plugins/themeEditor/locales/es/resources.php
share/dotclear/plugins/themeEditor/locales/fr/help/help.html
share/dotclear/plugins/themeEditor/locales/fr/resources.php
-share/dotclear/plugins/themeEditor/script.js
+share/dotclear/plugins/themeEditor/locales/ja/help/help.html
+share/dotclear/plugins/themeEditor/locales/ja/resources.php
+share/dotclear/plugins/themeEditor/locales/ko/help/help.html
+share/dotclear/plugins/themeEditor/locales/ko/resources.php
+share/dotclear/plugins/themeEditor/locales/pt/help/help.html
+share/dotclear/plugins/themeEditor/locales/pt/resources.php
+share/dotclear/plugins/themeEditor/locales/zh-cn/help/help.html
+share/dotclear/plugins/themeEditor/locales/zh-cn/resources.php
share/dotclear/plugins/themeEditor/style.css
share/dotclear/plugins/userPref/_admin.php
share/dotclear/plugins/userPref/_define.php
share/dotclear/plugins/userPref/icon-big.png
share/dotclear/plugins/userPref/icon.png
share/dotclear/plugins/userPref/index.php
+share/dotclear/plugins/userPref/js/index.js
share/dotclear/plugins/userPref/locales/en/help/help.html
share/dotclear/plugins/userPref/locales/en/resources.php
share/dotclear/plugins/userPref/locales/fr/help/help.html
@@ -1146,19 +1304,19 @@ share/dotclear/plugins/widgets/_install.php
share/dotclear/plugins/widgets/_public.php
share/dotclear/plugins/widgets/_widgets_functions.php
share/dotclear/plugins/widgets/class.widgets.php
-share/dotclear/plugins/widgets/dragdrop.js
share/dotclear/plugins/widgets/icon-big.png
share/dotclear/plugins/widgets/icon.png
share/dotclear/plugins/widgets/index.php
+share/dotclear/plugins/widgets/js/dragdrop.js
+share/dotclear/plugins/widgets/js/widgets.js
share/dotclear/plugins/widgets/locales/en/help/help.html
share/dotclear/plugins/widgets/locales/en/resources.php
share/dotclear/plugins/widgets/locales/fr/help/help.html
share/dotclear/plugins/widgets/locales/fr/resources.php
share/dotclear/plugins/widgets/style.css
-share/dotclear/plugins/widgets/widgets.js
share/dotclear/themes/berlin/_define.php
+share/dotclear/themes/berlin/_public.php
share/dotclear/themes/berlin/config.rb
-share/dotclear/themes/berlin/ie.css
share/dotclear/themes/berlin/img/bg_dark.png
share/dotclear/themes/berlin/img/bg_light.png
share/dotclear/themes/berlin/img/hline.png
@@ -1184,18 +1342,16 @@ share/dotclear/themes/berlin/img/icon_tags.png
share/dotclear/themes/berlin/img/icon_trackbacks.png
share/dotclear/themes/berlin/img/last-hline.png
share/dotclear/themes/berlin/img/vline.png
+share/dotclear/themes/berlin/js/berlin.js
+share/dotclear/themes/berlin/locales/_pot/main.pot
share/dotclear/themes/berlin/locales/de/main.lang.php
share/dotclear/themes/berlin/locales/de/main.po
-share/dotclear/themes/berlin/locales/en/main.lang.php
-share/dotclear/themes/berlin/locales/en/main.po
share/dotclear/themes/berlin/locales/es/main.lang.php
share/dotclear/themes/berlin/locales/es/main.po
share/dotclear/themes/berlin/locales/fr/main.lang.php
share/dotclear/themes/berlin/locales/fr/main.po
-share/dotclear/themes/berlin/print.css
share/dotclear/themes/berlin/screenshot.jpg
share/dotclear/themes/berlin/scripts/boxsizing.htc
-share/dotclear/themes/berlin/scss/ie.scss
share/dotclear/themes/berlin/scss/init/_config.scss
share/dotclear/themes/berlin/scss/init/_mixins-functions.scss
share/dotclear/themes/berlin/scss/init/_rebase.scss
@@ -1258,6 +1414,7 @@ share/dotclear/themes/berlin/scss/libs/zen-grids/_background.scss
share/dotclear/themes/berlin/scss/libs/zen-grids/_flow.scss
share/dotclear/themes/berlin/scss/libs/zen-grids/_grids.scss
share/dotclear/themes/berlin/scss/modules/_off-canvas.scss
+share/dotclear/themes/berlin/scss/partials/_a11y.scss
share/dotclear/themes/berlin/scss/partials/_archive.scss
share/dotclear/themes/berlin/scss/partials/_common.scss
share/dotclear/themes/berlin/scss/partials/_content.scss
@@ -1268,7 +1425,6 @@ share/dotclear/themes/berlin/scss/partials/_header.scss
share/dotclear/themes/berlin/scss/partials/_icons.scss
share/dotclear/themes/berlin/scss/partials/_post.scss
share/dotclear/themes/berlin/scss/partials/_sidebar.scss
-share/dotclear/themes/berlin/scss/print.scss
share/dotclear/themes/berlin/scss/style.scss
share/dotclear/themes/berlin/style.css
share/dotclear/themes/berlin/tpl/user_footer.html
@@ -1291,8 +1447,9 @@ share/dotclear/themes/blueSilence/style.css
share/dotclear/themes/customCSS/_config.php
share/dotclear/themes/customCSS/_define.php
share/dotclear/themes/customCSS/_public.php
-share/dotclear/themes/customCSS/locales/fr/main.lang.php
-share/dotclear/themes/customCSS/locales/fr/main.po
+share/dotclear/themes/customCSS/locales/_pot/admin.pot
+share/dotclear/themes/customCSS/locales/fr/admin.lang.php
+share/dotclear/themes/customCSS/locales/fr/admin.po
share/dotclear/themes/customCSS/style.css
share/dotclear/themes/default/_define.php
share/dotclear/themes/default/img/attach.png
@@ -1308,9 +1465,6 @@ share/dotclear/themes/default/img/page-bg.png
share/dotclear/themes/default/img/page-t.png
share/dotclear/themes/default/img/tag.png
share/dotclear/themes/default/img/trackback.png
-share/dotclear/themes/default/js/jquery.cookie.js
-share/dotclear/themes/default/js/jquery.js
-share/dotclear/themes/default/js/post.js
share/dotclear/themes/default/print.css
share/dotclear/themes/default/screenshot.jpg
share/dotclear/themes/default/smilies/alien.png
@@ -1343,7 +1497,6 @@ share/dotclear/themes/ductile/_define.php
share/dotclear/themes/ductile/_prepend.php
share/dotclear/themes/ductile/_public.php
share/dotclear/themes/ductile/ductile.js
-share/dotclear/themes/ductile/ie.css
share/dotclear/themes/ductile/img/404.png
share/dotclear/themes/ductile/img/download.png
share/dotclear/themes/ductile/img/feed.png
@@ -1361,10 +1514,16 @@ share/dotclear/themes/ductile/img/sticker-about.png
share/dotclear/themes/ductile/img/sticker-contact.png
share/dotclear/themes/ductile/img/sticker-feed.png
share/dotclear/themes/ductile/img/vline.png
+share/dotclear/themes/ductile/locales/_pot/admin.pot
+share/dotclear/themes/ductile/locales/_pot/main.pot
+share/dotclear/themes/ductile/locales/en/admin.lang.php
+share/dotclear/themes/ductile/locales/en/admin.po
share/dotclear/themes/ductile/locales/en/help/help.html
share/dotclear/themes/ductile/locales/en/main.lang.php
share/dotclear/themes/ductile/locales/en/main.po
share/dotclear/themes/ductile/locales/en/resources.php
+share/dotclear/themes/ductile/locales/es/admin.lang.php
+share/dotclear/themes/ductile/locales/es/admin.po
share/dotclear/themes/ductile/locales/es/main.lang.php
share/dotclear/themes/ductile/locales/es/main.po
share/dotclear/themes/ductile/locales/fr/admin.lang.php
@@ -1396,7 +1555,10 @@ share/dotclear/themes/ductile/tpl/post.html
share/dotclear/themes/ductile/tpl/search.html
share/dotclear/themes/ductile/tpl/tag.html
share/dotclear/themes/ductile/tpl/tags.html
+share/examples/dotclear/apache.conf
share/examples/dotclear/config.php.in
-share/examples/dotclear/dotclear.conf
-share/examples/dotclear/init-mysql.sh
-share/examples/dotclear/init-pgsql.sh
+share/examples/dotclear/initdb-mysql.sh
+share/examples/dotclear/initdb-pgsql.sh
+share/examples/dotclear/lighttpd.conf
+share/examples/dotclear/nginx.conf
+share/examples/dotclear/php-fpm.conf
diff --git a/php-dotclear/distinfo b/php-dotclear/distinfo
index 82ad12018e..a2dce82984 100644
--- a/php-dotclear/distinfo
+++ b/php-dotclear/distinfo
@@ -1,11 +1,12 @@
$NetBSD$
-SHA1 (dotclear-2.16.tar.gz) = cabff2922b11dd2f486148cce5716b075874a39f
-RMD160 (dotclear-2.16.tar.gz) = 86c6c701b71a7823f49688e8283ec4010a651946
-SHA512 (dotclear-2.16.tar.gz) = 604e28c20a59d381c243fe89e41872f2a94a32aa7af95a954e95bef6a935b65e88f7731182a4f510db96142665468c61061022b055bfd65fd7e6e209acc6fbf8
-Size (dotclear-2.16.tar.gz) = 3759792 bytes
-SHA1 (patch-admin_install_index.php) = 7abbb34e307f2eb17a243feaca7d1cdee5948afa
-SHA1 (patch-admin_install_wizard.php) = dedc2135305ea8dd6e7282ee0957ca43917abf17
-SHA1 (patch-inc_config.php.in) = cd5b8f5693089c3c319c4755f7b86f7e80970bd1
-SHA1 (patch-inc_core_class.dc.core.php) = 3d7d612713de3359a6aedba51dff8d3cb800d2db
-SHA1 (patch-inc_prepend.php) = f2cabe1fa1efefa312cd60d82c889c87d287fee7
+SHA1 (dotclear-2.18.1.tar.gz) = 3c87b3abf756fe22c9ee91a1d744dfd784576b47
+RMD160 (dotclear-2.18.1.tar.gz) = c02d7591b10173f180c0d7f0747b077ebdda0b26
+SHA512 (dotclear-2.18.1.tar.gz) = 517755808873eababe8c2c441008c98519573adc648cadfec1d82d24dccccacf38857f088ecd9f8e42c26f5a858496383f918ad77eb4fabde620609814f90a58
+Size (dotclear-2.18.1.tar.gz) = 3017421 bytes
+SHA1 (patch-admin_install_index.php) = b93ea9add67007e720319b1ff8e3d8d95bb95fa7
+SHA1 (patch-admin_install_wizard.php) = 301358bb95cd9f6f04ef891b5fcc8e3562baf712
+SHA1 (patch-inc_config.php.in) = 6c0c8e9cd394ee80afe8587c71ffdfff128d77f9
+SHA1 (patch-inc_core_class.dc.core.php) = ae0b34f88f566c50d90059a74f89d8013650378f
+SHA1 (patch-inc_load__plugin__file.php) = a75463a2ba1fd9cd140dc3cdcd1a1ea6d52ad8ec
+SHA1 (patch-inc_prepend.php) = 97f72277f2f2aba592ad1dad487e7d6187e47c9f
diff --git a/php-dotclear/files/apache22.conf b/php-dotclear/files/apache22.conf
deleted file mode 100644
index 573d0907ae..0000000000
--- a/php-dotclear/files/apache22.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD$
-#
-# Dotclear configuration file fragment for Apache 2.2
-
-<IfModule mod_alias.c>
- Alias /dotclear/public "@DC_WWW@/public"
- Alias /dotclear "@DCDIR@/"
-</IfModule>
-
-<Directory "@DCDIR@">
- AllowOverride All
- DirectoryIndex index.php
- Order allow,deny
- Allow from all
-</Directory>
-
-<Directory "@DC_WWW@/public">
- AllowOverride All
- Order allow,deny
- Allow from all
-</Directory>
diff --git a/php-dotclear/files/apache24.conf b/php-dotclear/files/apache24.conf
index 0d5915e714..a2e1776d0f 100644
--- a/php-dotclear/files/apache24.conf
+++ b/php-dotclear/files/apache24.conf
@@ -1,19 +1,40 @@
# $NetBSD$
#
-# Dotclear configuration file fragment for Apache 2.4
+# Configuration example fragment for www/apache24
+#
+# To permit Apache to access Dotclear's files and directories, you could add it
+# to the dotclear group:
+# > usermod -G dotclear www
<IfModule mod_alias.c>
- Alias /dotclear/public "@DC_WWW@/public"
- Alias /dotclear "@DCDIR@/"
+ Alias /dotclear/public "@DOTCLEAR_PUBDIR@"
+ Alias /dotclear "@DOTCLEAR_SHAREDIR@"
</IfModule>
-<Directory "@DCDIR@">
- AllowOverride All
- DirectoryIndex index.php
- Require all granted
+<Directory "@DOTCLEAR_SHAREDIR@">
+ DirectoryIndex index.php
+ Require all granted
</Directory>
-<Directory "@DC_WWW@/public">
- AllowOverride All
- Require all granted
+<Directory "@DOTCLEAR_PUBDIR@">
+ Require all granted
</Directory>
+
+# Example fragment for virtual hosting
+#<VirtualHost *:80>
+# DocumentRoot "@DOTCLEAR_SHAREDIR@"
+# ServerName dotclear.example.org
+#
+# <IfModule mod_alias.c>
+# Alias /public "@DOTCLEAR_PUBDIR@"
+# </IfModule>
+#
+# <Directory "@DOTCLEAR_SHAREDIR@">
+# DirectoryIndex index.php
+# Require all granted
+# </Directory>
+#
+# <Directory "@DOTCLEAR_PUBDIR@">
+# Require all granted
+# </Directory>
+#</VirtualHost>
diff --git a/php-dotclear/files/init-mysql.sh b/php-dotclear/files/init-mysql.sh
deleted file mode 100644
index b4b711f79f..0000000000
--- a/php-dotclear/files/init-mysql.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# Create role and database for MySQL.
-
-dbuser=dotclear
-dbname=dotclear
-
-echo -n "Enter administrator password: "
-read -s admpasswd
-echo ""
-echo -n "Enter ${dbuser} user password: "
-read -s dcpasswd
-echo ""
-echo "CREATE USER '${dbuser}'@'localhost' IDENTIFIED BY '${dcpasswd}';" | mysql --password=${admpasswd}
-echo "CREATE DATABASE ${dbname};" | mysql --password=${admpasswd}
-echo "GRANT ALL ON ${dbname}.* TO '${dbuser}'@'localhost';" | mysql --password=${admpasswd}
diff --git a/php-dotclear/files/init-pgsql.sh b/php-dotclear/files/init-pgsql.sh
deleted file mode 100644
index 0f3ca9b3da..0000000000
--- a/php-dotclear/files/init-pgsql.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Create role and database for PostgreSQL.
-
-dbuser=dotclear
-dbname=dotclear
-
-createuser --no-createdb --encrypted --no-superuser --pwprompt \
- --username=pgsql ${dbuser}
-createdb --owner==${dbuser} --username=pgsql ${dbname}
diff --git a/php-dotclear/files/initdb-mysql.sh b/php-dotclear/files/initdb-mysql.sh
new file mode 100644
index 0000000000..b44a8e1caa
--- /dev/null
+++ b/php-dotclear/files/initdb-mysql.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Create role and database for the MySQL backend.
+#
+# sh @PREFIX@/share/examples/dotclear/initdb-mysql.sh
+
+dcuser=dotclear
+dcdbname=dotclear
+
+read -p "Enter MySQL admin username [$(whoami)]: " admuser
+if [ ! ${admuser} ] ; then admuser=$(whoami) ; fi
+stty -echo
+printf "Enter MySQL admin password: "
+read admpasswd
+stty echo
+printf "\n"
+read -p "Enter dotclear user name [${dcuser}]: " tmp
+if [ ${tmp} ] ; then dcuser=${tmp} ; fi
+stty -echo
+printf "Enter dotclear user password: "
+read dcpasswd
+stty echo
+printf "\n"
+read -p "Enter dotclear database name [${dcdbname}]: " tmp
+if [ ${tmp} ] ; then dcdbname=${tmp} ; fi
+
+cat << EOF | @PREFIX@/bin/mysql --user=${admuser} --password=${admpasswd}
+CREATE USER '${dcuser}'@'localhost' IDENTIFIED BY '${dcpasswd}';
+CREATE DATABASE ${dcdbname};
+GRANT ALL ON ${dcdbname}.* TO '${dcuser}'@'localhost';
+EOF
diff --git a/php-dotclear/files/initdb-pgsql.sh b/php-dotclear/files/initdb-pgsql.sh
new file mode 100644
index 0000000000..1877ee97ed
--- /dev/null
+++ b/php-dotclear/files/initdb-pgsql.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Create role and database for PostgreSQL backend.
+#
+# sh @PREFIX@/share/examples/dotclear/init-pgsql.sh
+
+dbuser=dotclear
+dbname=dotclear
+
+@PREFIX@/bin/createuser --no-createdb --encrypted --no-superuser --pwprompt --username=pgsql ${dbuser}
+@PREFIX@/bin/createdb --owner=${dbuser} --username=pgsql ${dbname}
diff --git a/php-dotclear/files/lighttpd.conf b/php-dotclear/files/lighttpd.conf
new file mode 100644
index 0000000000..101a1b9d30
--- /dev/null
+++ b/php-dotclear/files/lighttpd.conf
@@ -0,0 +1,33 @@
+# $NetBSD$
+#
+# Configuration example fragment for www/lighttpd
+
+server.modules += (
+ "mod_alias",
+ "mod_fastcgi",
+)
+
+$HTTP["url"] =~ "^/dotclear" {
+ alias.url = ( "/dotclear" => "@DOTCLEAR_SHAREDIR@" )
+ $HTTP["url"] =~ "^/dotclear/public" {
+ alias.url = ( "/dotclear/public" => "@DOTCLEAR_PUBDIR@" )
+ }
+ fastcgi.server = (
+ ".php" =>
+ (( "socket" => "@VARBASE@/run/dotclear.sock",
+ )),
+ )
+}
+
+# Example fragment for virtual hosting
+#$HTTP["host"] =~ "^dotclear\.example\.org" {
+# server.document-root = "@DOTCLEAR_SHAREDIR@"
+# $HTTP["url"] =~ "^/public" {
+# alias.url = ( "/public" => "@DOTCLEAR_PUBDIR@" )
+# }
+# fastcgi.server = (
+# ".php" =>
+# (( "socket" => "@VARBASE@/run/dotclear.sock",
+# )),
+# )
+#}
diff --git a/php-dotclear/files/nginx.conf b/php-dotclear/files/nginx.conf
index 7230c6f6fb..b4203d01aa 100644
--- a/php-dotclear/files/nginx.conf
+++ b/php-dotclear/files/nginx.conf
@@ -1,52 +1,49 @@
# $NetBSD$
#
-# Dotclear configuration file fragment for nginx
+# Configuration example fragment for www/nginx
-location /dotclear {
- root @DC_ROOT@;
- index index.php;
-}
+location /dotclear/ {
+ index index.php;
+ alias @DOTCLEAR_SHAREDIR@/;
+ access_log syslog:server=unix:/var/run/log,tag=dotclear;
+ error_log syslog:server=unix:/var/run/log,tag=dotclear;
-location /dotclear/public {
- root @VARBASE@/www;
-}
+ location ~* /public(?:/(.*))?$ {
+ alias @DOTCLEAR_PUBDIR@/$1;
+ }
-location ~ \.php$ {
- root @DC_ROOT@;
- include @WWW_SYSCONFDIR@/fastcgi_params;
- fastcgi_keep_conn on;
- fastcgi_pass unix:@VARBASE@/run/php-fpm.sock;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_index index.php;
+ location ~ \.php$ {
+ try_files $uri =404;
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $request_filename;
+ fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_pass unix:@VARBASE@/run/dotclear.sock;
+ fastcgi_index index.php;
+ }
}
+# Example fragment for virtual hosting
#server {
-# listen 80;
-# server_name dotclear.example.org;
-# rewrite ^ https://$http_host$request_uri permanent;
-#}
-#
-#server {
-# listen 443 ssl;
-# server_name dotclear.example.org;
-# root @DC_ROOT@/dotclear;
-# index index.php;
-# ssl on;
-# ssl_certificate /etc/openssl/certs/dotclear.pem;
-# ssl_certificate_key /etc/openssl/private/dotclear.key;
-# ssl_trusted_certificate /etc/openssl/certs/ca.pem;
-# ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-# ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH';
+# listen 80;
+# listen [::]:80;
+# server_name dotclear.example.org;
+# index index.php;
+# root @DOTCLEAR_SHAREDIR@;
+# access_log syslog:server=unix:/var/run/log,tag=dotclear;
+# error_log syslog:server=unix:/var/run/log,tag=dotclear;
#
-# location /public {
-# root @VARBASE@/www;
-# }
+# location ~* /public(?:/(.*))?$ {
+# alias @DOTCLEAR_PUBDIR@/$1;
+# }
#
-# location ~ \.php$ {
-# include @WWW_SYSCONFDIR@/fastcgi_params;
-# fastcgi_keep_conn on;
-# fastcgi_pass unix:@VARBASE@/run/php-fpm.sock;
-# fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-# fastcgi_index index.php;
-# }
+# location ~ \.php$ {
+# try_files $uri =404;
+# include fastcgi_params;
+# fastcgi_param SCRIPT_FILENAME $request_filename;
+# fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+# fastcgi_param PATH_INFO $fastcgi_path_info;
+# fastcgi_pass unix:@VARBASE@/run/dotclear.sock;
+# fastcgi_index index.php;
+# }
#}
diff --git a/php-dotclear/files/php-fpm.conf b/php-dotclear/files/php-fpm.conf
new file mode 100644
index 0000000000..205201a8f7
--- /dev/null
+++ b/php-dotclear/files/php-fpm.conf
@@ -0,0 +1,15 @@
+; $NetBSD$
+
+[dotclear]
+user = dotclear
+group = dotclear
+listen = @VARBASE@/run/dotclear.sock
+listen.owner = nginx
+;listen.owner = lighttpd
+listen.group = nginx
+;listen.group = lighttpd
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
diff --git a/php-dotclear/options.mk b/php-dotclear/options.mk
index 8a63cd9b37..26d56c924c 100644
--- a/php-dotclear/options.mk
+++ b/php-dotclear/options.mk
@@ -2,38 +2,13 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.dotclear
-PKG_OPTIONS_REQUIRED_GROUPS= db webserver
+PKG_OPTIONS_REQUIRED_GROUPS= db
PKG_OPTIONS_GROUP.db= mysql pgsql sqlite
-PKG_OPTIONS_GROUP.webserver= apache nginx
-PKG_SUGGESTED_OPTIONS= apache mysql
+PKG_SUGGESTED_OPTIONS= mysql
.include "../../mk/bsd.options.mk"
-###
-### Use apache web server
-###
-.if !empty(PKG_OPTIONS:Mapache)
-WWW_USER?= ${APACHE_USER}
-WWW_GROUP?= ${APACHE_GROUP}
-BUILD_DEFS+= APACHE_USER APACHE_GROUP
-.include "../../mk/apache.mk"
-DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.5:../../www/ap-php
-WWW_CONF_FILE= apache24.conf
-WWW_SYSCONFDIR= ${PREFIX}/etc/httpd
-.endif
-
-###
-### Use nginx web server
-###
-.if !empty(PKG_OPTIONS:Mnginx)
-DEPENDS+= nginx-[0-9]*:../../www/nginx
-DEPENDS+= ${PHP_PKG_PREFIX}-fpm>=5.5:../../www/php-fpm
-WWW_USER?= nginx
-WWW_GROUP?= nginx
-WWW_CONF_FILE= nginx.conf
-WWW_SYSCONFDIR= ${PREFIX}/etc/nginx
-.endif
###
### Use mysql backend.
###
@@ -53,6 +28,4 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql
###
.if !empty(PKG_OPTIONS:Msqlite)
DEPENDS+= ${PHP_PKG_PREFIX}-pdo_sqlite-[0-9]*:../../databases/php-pdo_sqlite
-OWN_DIRS_PERMS+= ${VARBASE}/db/dotclear \
- ${WWW_USER} ${WWW_GROUP} 750
.endif
diff --git a/php-dotclear/patches/patch-admin_install_index.php b/php-dotclear/patches/patch-admin_install_index.php
index 4fd66d7187..cfa388f8bc 100644
--- a/php-dotclear/patches/patch-admin_install_index.php
+++ b/php-dotclear/patches/patch-admin_install_index.php
@@ -1,15 +1,15 @@
$NetBSD$
-Get the config out of the share directory.
+Honor PKG_SYSCONFDIR.
---- admin/install/index.php.orig 2016-03-27 09:27:58.000000000 +0000
+--- admin/install/index.php.orig 2021-02-13 10:31:06.000000000 +0000
+++ admin/install/index.php
-@@ -15,7 +15,7 @@ if (isset($_SERVER['DC_RC_PATH'])) {
+@@ -12,7 +12,7 @@ if (isset($_SERVER['DC_RC_PATH'])) {
} elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) {
- $rc_path = $_SERVER['REDIRECT_DC_RC_PATH'];
+ $rc_path = $_SERVER['REDIRECT_DC_RC_PATH'];
} else {
-- $rc_path = dirname(__FILE__).'/../../inc/config.php';
-+ $rc_path = '@DC_WWW@/config.php';
+- $rc_path = dirname(__FILE__) . '/../../inc/config.php';
++ $rc_path = '@PKG_SYSCONFDIR@/config.php';
}
- require dirname(__FILE__).'/../../inc/prepend.php';
+ require dirname(__FILE__) . '/../../inc/prepend.php';
diff --git a/php-dotclear/patches/patch-admin_install_wizard.php b/php-dotclear/patches/patch-admin_install_wizard.php
index 6a1e264adb..212f9f16b9 100644
--- a/php-dotclear/patches/patch-admin_install_wizard.php
+++ b/php-dotclear/patches/patch-admin_install_wizard.php
@@ -1,33 +1,34 @@
$NetBSD$
-Get the config out of the share directory.
+Honor PKG_SYSCONFDIR.
+Set pkgsrc compliant directories for SQLite database.
---- admin/install/wizard.php.orig 2016-03-27 09:27:58.000000000 +0000
+--- admin/install/wizard.php.orig 2021-02-13 10:31:06.000000000 +0000
+++ admin/install/wizard.php
-@@ -15,7 +15,7 @@ if (isset($_SERVER['DC_RC_PATH'])) {
+@@ -12,7 +12,7 @@ if (isset($_SERVER['DC_RC_PATH'])) {
} elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) {
- define('DC_RC_PATH',$_SERVER['REDIRECT_DC_RC_PATH']);
+ define('DC_RC_PATH', $_SERVER['REDIRECT_DC_RC_PATH']);
} else {
-- define('DC_RC_PATH',dirname(__FILE__).'/../../inc/config.php');
-+ define('DC_RC_PATH','@DC_WWW@/config.php');
+- define('DC_RC_PATH', dirname(__FILE__) . '/../../inc/config.php');
++ define('DC_RC_PATH', '@PKG_SYSCONFDIR@/config.php');
}
# ClearBricks and DotClear classes auto-loader
-@@ -67,7 +67,7 @@ if (!empty($_POST))
- {
- if ($DBDRIVER == 'sqlite') {
- if (strpos($DBNAME, '/') === false) {
-- $sqlite_db_directory = dirname(DC_RC_PATH).'/../db/';
-+ $sqlite_db_directory = '@DC_DBDIR@';
- files::makeDir($sqlite_db_directory,true);
+@@ -63,7 +63,7 @@ if (!empty($_POST)) {
+ {
+ if ($DBDRIVER == 'sqlite') {
+ if (strpos($DBNAME, '/') === false) {
+- $sqlite_db_directory = dirname(DC_RC_PATH) . '/../db/';
++ $sqlite_db_directory = '@DOTCLEAR_DBDIR@';
+ files::makeDir($sqlite_db_directory, true);
- # Can we write sqlite_db_directory ?
-@@ -99,7 +99,7 @@ if (!empty($_POST))
- }
+ # Can we write sqlite_db_directory ?
+@@ -99,7 +99,7 @@ if (!empty($_POST)) {
+ }
- # Does config.php.in exist?
-- $config_in = dirname(__FILE__).'/../../inc/config.php.in';
-+ $config_in = '@PKG_SYSCONFDIR@/config.php.in';
- if (!is_file($config_in)) {
- throw new Exception(sprintf(__('File %s does not exist.'),$config_in));
- }
+ # Does config.php.in exist?
+- $config_in = dirname(__FILE__) . '/../../inc/config.php.in';
++ $config_in = '@PKG_SYSCONFDIR@/config.php.in';
+ if (!is_file($config_in)) {
+ throw new Exception(sprintf(__('File %s does not exist.'), $config_in));
+ }
diff --git a/php-dotclear/patches/patch-inc_config.php.in b/php-dotclear/patches/patch-inc_config.php.in
index bafd56b5ec..28683b547c 100644
--- a/php-dotclear/patches/patch-inc_config.php.in
+++ b/php-dotclear/patches/patch-inc_config.php.in
@@ -1,15 +1,40 @@
$NetBSD$
-Set the cache directory as a macro for substitution
+Set pkgsrc compliant directories for plugins, cache, var and logs.
+Disable update checking.
---- inc/config.php.in.orig 2016-03-27 09:27:59.000000000 +0000
+--- inc/config.php.in.orig 2021-02-13 10:31:06.000000000 +0000
+++ inc/config.php.in
-@@ -49,7 +49,7 @@ define('DC_SESSION_NAME','dcxd');
- define('DC_PLUGINS_ROOT',dirname(__FILE__).'/../plugins');
+@@ -45,13 +45,13 @@ define('DC_SESSION_NAME', 'dcxd');
+ //define('DC_SESSION_TTL','120 seconds');
+
+ // Plugins root
+-define('DC_PLUGINS_ROOT', dirname(__FILE__) . '/../plugins');
++define('DC_PLUGINS_ROOT', '@DOTCLEAR_SHAREDIR@/plugins' . PATH_SEPARATOR . '@DOTCLEAR_PLUGDIR@');
// Template cache directory
--define('DC_TPL_CACHE',path::real(dirname(__FILE__).'/..').'/cache');
-+define('DC_TPL_CACHE','@DC_CACHE@');
+-define('DC_TPL_CACHE', path::real(dirname(__FILE__) . '/..') . '/cache');
++define('DC_TPL_CACHE', '@DOTCLEAR_CACHEDIR@');
+
+ // Var directory
+-define('DC_VAR', path::real(dirname(__FILE__) . '/..') . '/var');
++define('DC_VAR', '@DOTCLEAR_DBDIR@');
+
+ // Cryptographic algorithm
+ define('DC_CRYPT_ALGO', 'sha512');
+@@ -60,7 +60,7 @@ define('DC_CRYPT_ALGO', 'sha512');
+ //define('DC_VENDOR_NAME', 'Dotclear');
+ // Do not check for update
+-//define('DC_NOT_UPDATE', false);
++define('DC_NOT_UPDATE', true);
- // If you have PATH_INFO issue, uncomment following lines
+ // Update URL
+ //define('DC_UPDATE_URL','https://download.dotclear.org/versions.xml');
+@@ -91,3 +91,6 @@ define('DC_CRYPT_ALGO', 'sha512');
+ // socketMail::$smtp_relay = 'my.smtp.relay.org';
+ // socketMail::mail($to, $subject, $message, $headers);
+ //}
++
++// CSP report
++define('LOGFILE', '@DOTCLEAR_LOGDIR@/csp/csp_report.json');
diff --git a/php-dotclear/patches/patch-inc_core_class.dc.core.php b/php-dotclear/patches/patch-inc_core_class.dc.core.php
index 432cc8fac3..2b6cdb04e0 100644
--- a/php-dotclear/patches/patch-inc_core_class.dc.core.php
+++ b/php-dotclear/patches/patch-inc_core_class.dc.core.php
@@ -1,15 +1,15 @@
$NetBSD$
-Change location of public directory to /var.
+Set pkgsrc compliant directory for /public.
---- inc/core/class.dc.core.php.orig 2016-03-27 09:27:59.000000000 +0000
+--- inc/core/class.dc.core.php.orig 2021-02-13 10:31:06.000000000 +0000
+++ inc/core/class.dc.core.php
-@@ -1414,7 +1414,7 @@ class dcCore
- 'Number of comments on feeds'),
- array('post_url_format','string','{y}/{m}/{d}/{t}',
- 'Post URL format. {y}: year, {m}: month, {d}: day, {id}: post id, {t}: entry title'),
-- array('public_path','string','public',
-+ array('public_path','string','@DC_WWW@/public',
- 'Path to public directory, begins with a / for a full system path'),
- array('public_url','string','/public',
- 'URL to public directory'),
+@@ -1445,7 +1445,7 @@ class dcCore
+ 'Number of comments on feeds'],
+ ['post_url_format', 'string', '{y}/{m}/{d}/{t}',
+ 'Post URL format. {y}: year, {m}: month, {d}: day, {id}: post id, {t}: entry title'],
+- ['public_path', 'string', 'public',
++ ['public_path', 'string', '@DOTCLEAR_PUBDIR@',
+ 'Path to public directory, begins with a / for a full system path'],
+ ['public_url', 'string', '/public',
+ 'URL to public directory'],
diff --git a/php-dotclear/patches/patch-inc_load__plugin__file.php b/php-dotclear/patches/patch-inc_load__plugin__file.php
new file mode 100644
index 0000000000..4958bbfa6b
--- /dev/null
+++ b/php-dotclear/patches/patch-inc_load__plugin__file.php
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Honor PKG_SYSCONFDIR.
+
+--- inc/load_plugin_file.php.orig 2021-02-13 10:31:06.000000000 +0000
++++ inc/load_plugin_file.php
+@@ -26,7 +26,7 @@ if (isset($_SERVER['DC_RC_PATH'])) {
+ } elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) {
+ define('DC_RC_PATH', $_SERVER['REDIRECT_DC_RC_PATH']);
+ } else {
+- define('DC_RC_PATH', dirname(__FILE__) . '/config.php');
++ define('DC_RC_PATH', '@PKG_SYSCONFDIR@/config.php');
+ }
+
+ if (!is_file(DC_RC_PATH)) {
diff --git a/php-dotclear/patches/patch-inc_prepend.php b/php-dotclear/patches/patch-inc_prepend.php
index 38dc5d1dec..a4dbbe84cd 100644
--- a/php-dotclear/patches/patch-inc_prepend.php
+++ b/php-dotclear/patches/patch-inc_prepend.php
@@ -1,15 +1,15 @@
$NetBSD$
-Get the config out of the share directory.
+Honor PKG_SYSCONFDIR.
---- inc/prepend.php.orig 2016-03-27 09:29:11.000000000 +0000
+--- inc/prepend.php.orig 2021-02-13 10:32:13.000000000 +0000
+++ inc/prepend.php
-@@ -110,7 +110,7 @@ if (isset($_SERVER['DC_RC_PATH'])) {
+@@ -117,7 +117,7 @@ if (isset($_SERVER['DC_RC_PATH'])) {
} elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) {
- define('DC_RC_PATH',$_SERVER['REDIRECT_DC_RC_PATH']);
+ define('DC_RC_PATH', $_SERVER['REDIRECT_DC_RC_PATH']);
} else {
-- define('DC_RC_PATH',dirname(__FILE__).'/config.php');
-+ define('DC_RC_PATH','@DC_WWW@/config.php');
+- define('DC_RC_PATH', dirname(__FILE__) . '/config.php');
++ define('DC_RC_PATH', '@PKG_SYSCONFDIR@/config.php');
}
- if (!is_file(DC_RC_PATH))
+ if (!is_file(DC_RC_PATH)) {
Home |
Main Index |
Thread Index |
Old Index