4 files changed, 90 insertions, 126 deletions

diff --git a/ftp/net2ftp/Makefile b/ftp/net2ftp/Makefile
index 83be7b4e113d..61263fd9bbe5 100644
--- a/ftp/net2ftp/Makefile
+++ b/ftp/net2ftp/Makefile
@@ -2,28 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	net2ftp
-PORTVERSION=	1.1
+PORTVERSION=	1.3
 CATEGORIES=	ftp
-MASTER_SITES=	http://www.net2ftp.com/download/
+MASTER_SITES=	https://www.net2ftp.com/download/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Web-based FTP client written in PHP
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/files_to_upload/LICENSE.txt
 
 USES=		php zip
-NO_BUILD=	YES
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	ftp mysqli pcre session zlib
 .endif
 
-SUB_FILES+=	pkg-message
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	pkg-message
+
+post-patch:
+	@${FIND} ${WRKSRC}/files_to_upload -name 'settings*.inc.php' | ${XARGS} -I % ${MV} % %.sample
 
 do-install:
-	@(for samplefile in $$( ${FIND} ${WRKSRC}/files_to_upload -name "settings*.inc.php" ) ; do \
-		${MV} $$samplefile $$samplefile.sample ; \
-	done)
-	@(cd ${WRKSRC}/files_to_upload && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
+	cd ${WRKSRC}/files_to_upload && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/ftp/net2ftp/distinfo b/ftp/net2ftp/distinfo
index 3b2efad01db5..994d40784b33 100644
--- a/ftp/net2ftp/distinfo
+++ b/ftp/net2ftp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504983980
-SHA256 (net2ftp_v1.1.zip) = 25b5655dc3df7fa86b5973f88d0e9b14996d0c239ab9d689bd9612997a87c770
-SIZE (net2ftp_v1.1.zip) = 6302110
+TIMESTAMP = 1563016091
+SHA256 (net2ftp_v1.3.zip) = 88e9f2324e82cb83334ed8d754e5a58e28cba4c2c3b20983ad50489ba1fff5b4
+SIZE (net2ftp_v1.3.zip) = 6271303
diff --git a/ftp/net2ftp/pkg-descr b/ftp/net2ftp/pkg-descr
index 56f8de3707f4..f678f45e702b 100644
--- a/ftp/net2ftp/pkg-descr
+++ b/ftp/net2ftp/pkg-descr
@@ -1,6 +1,6 @@
-net2ftp is a web-based FTP client written in PHP
+net2ftp is a web-based FTP client written in PHP.
 
-Features
+Features:
  - Navigate the FTP server
  - Upload and download files
  - Edit files (WYSIWYG and syntax highlighting)
@@ -12,4 +12,4 @@ Features
  - Search for words or phrases
  - Calculate the size of directories and files
 
-WWW: http://www.net2ftp.com/
+WWW: https://www.net2ftp.com/
diff --git a/ftp/net2ftp/pkg-plist b/ftp/net2ftp/pkg-plist
index d7a1277e810b..cf8e3ab11018 100644
--- a/ftp/net2ftp/pkg-plist
+++ b/ftp/net2ftp/pkg-plist
@@ -1,11 +1,6 @@
-@sample %%WWWDIR%%/settings.inc.php.sample
-@sample %%WWWDIR%%/settings_authorizations.inc.php.sample
-@sample %%WWWDIR%%/settings_screens.inc.php.sample
-%%WWWDIR%%/LICENSE.txt
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/favicon.png
 %%WWWDIR%%/help.html
-%%WWWDIR%%/htaccess.txt
 %%WWWDIR%%/includes/authorizations.inc.php
 %%WWWDIR%%/includes/before430.inc.php
 %%WWWDIR%%/includes/browse.inc.php
@@ -26,13 +21,11 @@
 %%WWWDIR%%/index.php
 %%WWWDIR%%/index.xml.php
 %%WWWDIR%%/languages/ar-utf.inc.php
-%%WWWDIR%%/languages/ar.inc.php
-%%WWWDIR%%/languages/cs.inc.php
+%%WWWDIR%%/languages/cs-utf.inc.php
 %%WWWDIR%%/languages/da-utf.inc.php
 %%WWWDIR%%/languages/de.inc.php
 %%WWWDIR%%/languages/en-utf.inc.php
 %%WWWDIR%%/languages/en.inc.php
-%%WWWDIR%%/languages/en_raw.inc.php
 %%WWWDIR%%/languages/es.inc.php
 %%WWWDIR%%/languages/fi.inc.php
 %%WWWDIR%%/languages/fr.inc.php
@@ -50,27 +43,24 @@
 %%WWWDIR%%/languages/tc.inc.php
 %%WWWDIR%%/languages/tr.inc.php
 %%WWWDIR%%/languages/ua.inc.php
-%%WWWDIR%%/languages/vi.inc.php
-%%WWWDIR%%/languages/zh.inc.php
-%%WWWDIR%%/modules/admin/admin.inc.php
-%%WWWDIR%%/modules/admin_createtables/admin_createtables.inc.php
-%%WWWDIR%%/modules/admin_createtables/create_tables.sql
-%%WWWDIR%%/modules/admin_emptylogs/admin_emptylogs.inc.php
-%%WWWDIR%%/modules/admin_viewlogs/admin_viewlogs.inc.php
+%%WWWDIR%%/languages/vi-utf.inc.php
+%%WWWDIR%%/languages/zh-utf.inc.php
+%%WWWDIR%%/LICENSE.txt
 %%WWWDIR%%/modules/advanced/advanced.inc.php
 %%WWWDIR%%/modules/advanced_ftpserver/advanced_ftpserver.inc.php
 %%WWWDIR%%/modules/advanced_parsing/advanced_parsing.inc.php
 %%WWWDIR%%/modules/advanced_parsing/list_samples.inc.php
 %%WWWDIR%%/modules/advanced_webserver/advanced_webserver.inc.php
 %%WWWDIR%%/modules/bookmark/bookmark.inc.php
-%%WWWDIR%%/modules/browse/browse.inc.php
-%%WWWDIR%%/modules/browse/browse_main.js
 %%WWWDIR%%/modules/browse/browse_main_mobile.js
+%%WWWDIR%%/modules/browse/browse_main.js
 %%WWWDIR%%/modules/browse/browse_popup.js
+%%WWWDIR%%/modules/browse/browse.inc.php
 %%WWWDIR%%/modules/calculatesize/calculatesize.inc.php
 %%WWWDIR%%/modules/chmod/chmod.inc.php
 %%WWWDIR%%/modules/chmod/chmod.js
 %%WWWDIR%%/modules/clearcookies/clearcookies.inc.php
+%%WWWDIR%%/modules/consent/consent.inc.php
 %%WWWDIR%%/modules/copymovedelete/copymovedelete.inc.php
 %%WWWDIR%%/modules/downloadfile/downloadfile.inc.php
 %%WWWDIR%%/modules/downloadzip/downloadzip.inc.php
@@ -81,6 +71,7 @@
 %%WWWDIR%%/modules/findstring/findstring.js
 %%WWWDIR%%/modules/followsymlink/followsymlink.inc.php
 %%WWWDIR%%/modules/getcookies/getcookies.inc.php
+%%WWWDIR%%/modules/gotopartner/gotopartner.inc.php
 %%WWWDIR%%/modules/help/help-user.html
 %%WWWDIR%%/modules/install/install.inc.php
 %%WWWDIR%%/modules/install/net2ftp_installer.txt
@@ -131,8 +122,8 @@
 %%WWWDIR%%/plugins/ace/mode-assembly_x86.js
 %%WWWDIR%%/plugins/ace/mode-autohotkey.js
 %%WWWDIR%%/plugins/ace/mode-batchfile.js
-%%WWWDIR%%/plugins/ace/mode-c9search.js
 %%WWWDIR%%/plugins/ace/mode-c_cpp.js
+%%WWWDIR%%/plugins/ace/mode-c9search.js
 %%WWWDIR%%/plugins/ace/mode-cirru.js
 %%WWWDIR%%/plugins/ace/mode-clojure.js
 %%WWWDIR%%/plugins/ace/mode-cobol.js
@@ -164,8 +155,8 @@
 %%WWWDIR%%/plugins/ace/mode-handlebars.js
 %%WWWDIR%%/plugins/ace/mode-haskell.js
 %%WWWDIR%%/plugins/ace/mode-haxe.js
-%%WWWDIR%%/plugins/ace/mode-html.js
 %%WWWDIR%%/plugins/ace/mode-html_ruby.js
+%%WWWDIR%%/plugins/ace/mode-html.js
 %%WWWDIR%%/plugins/ace/mode-ini.js
 %%WWWDIR%%/plugins/ace/mode-io.js
 %%WWWDIR%%/plugins/ace/mode-jack.js
@@ -256,8 +247,8 @@
 %%WWWDIR%%/plugins/ace/snippets/assembly_x86.js
 %%WWWDIR%%/plugins/ace/snippets/autohotkey.js
 %%WWWDIR%%/plugins/ace/snippets/batchfile.js
-%%WWWDIR%%/plugins/ace/snippets/c9search.js
 %%WWWDIR%%/plugins/ace/snippets/c_cpp.js
+%%WWWDIR%%/plugins/ace/snippets/c9search.js
 %%WWWDIR%%/plugins/ace/snippets/cirru.js
 %%WWWDIR%%/plugins/ace/snippets/clojure.js
 %%WWWDIR%%/plugins/ace/snippets/cobol.js
@@ -289,8 +280,8 @@
 %%WWWDIR%%/plugins/ace/snippets/handlebars.js
 %%WWWDIR%%/plugins/ace/snippets/haskell.js
 %%WWWDIR%%/plugins/ace/snippets/haxe.js
-%%WWWDIR%%/plugins/ace/snippets/html.js
 %%WWWDIR%%/plugins/ace/snippets/html_ruby.js
+%%WWWDIR%%/plugins/ace/snippets/html.js
 %%WWWDIR%%/plugins/ace/snippets/ini.js
 %%WWWDIR%%/plugins/ace/snippets/io.js
 %%WWWDIR%%/plugins/ace/snippets/jack.js
@@ -374,8 +365,8 @@
 %%WWWDIR%%/plugins/ace/theme-ambiance.js
 %%WWWDIR%%/plugins/ace/theme-chaos.js
 %%WWWDIR%%/plugins/ace/theme-chrome.js
-%%WWWDIR%%/plugins/ace/theme-clouds.js
 %%WWWDIR%%/plugins/ace/theme-clouds_midnight.js
+%%WWWDIR%%/plugins/ace/theme-clouds.js
 %%WWWDIR%%/plugins/ace/theme-cobalt.js
 %%WWWDIR%%/plugins/ace/theme-crimson_editor.js
 %%WWWDIR%%/plugins/ace/theme-dawn.js
@@ -386,8 +377,8 @@
 %%WWWDIR%%/plugins/ace/theme-katzenmilch.js
 %%WWWDIR%%/plugins/ace/theme-kr_theme.js
 %%WWWDIR%%/plugins/ace/theme-kuroir.js
-%%WWWDIR%%/plugins/ace/theme-merbivore.js
 %%WWWDIR%%/plugins/ace/theme-merbivore_soft.js
+%%WWWDIR%%/plugins/ace/theme-merbivore.js
 %%WWWDIR%%/plugins/ace/theme-mono_industrial.js
 %%WWWDIR%%/plugins/ace/theme-monokai.js
 %%WWWDIR%%/plugins/ace/theme-pastel_on_dark.js
@@ -395,11 +386,11 @@
 %%WWWDIR%%/plugins/ace/theme-solarized_light.js
 %%WWWDIR%%/plugins/ace/theme-terminal.js
 %%WWWDIR%%/plugins/ace/theme-textmate.js
-%%WWWDIR%%/plugins/ace/theme-tomorrow.js
-%%WWWDIR%%/plugins/ace/theme-tomorrow_night.js
 %%WWWDIR%%/plugins/ace/theme-tomorrow_night_blue.js
 %%WWWDIR%%/plugins/ace/theme-tomorrow_night_bright.js
 %%WWWDIR%%/plugins/ace/theme-tomorrow_night_eighties.js
+%%WWWDIR%%/plugins/ace/theme-tomorrow_night.js
+%%WWWDIR%%/plugins/ace/theme-tomorrow.js
 %%WWWDIR%%/plugins/ace/theme-twilight.js
 %%WWWDIR%%/plugins/ace/theme-vibrant_ink.js
 %%WWWDIR%%/plugins/ace/theme-xcode.js
@@ -412,11 +403,9 @@
 %%WWWDIR%%/plugins/ace/worker-php.js
 %%WWWDIR%%/plugins/ace/worker-xml.js
 %%WWWDIR%%/plugins/ace/worker-xquery.js
-%%WWWDIR%%/plugins/ckeditor/CHANGES.md
-%%WWWDIR%%/plugins/ckeditor/LICENSE.md
-%%WWWDIR%%/plugins/ckeditor/README.md
 %%WWWDIR%%/plugins/ckeditor/adapters/jquery.js
 %%WWWDIR%%/plugins/ckeditor/build-config.js
+%%WWWDIR%%/plugins/ckeditor/CHANGES.md
 %%WWWDIR%%/plugins/ckeditor/ckeditor.js
 %%WWWDIR%%/plugins/ckeditor/config.js
 %%WWWDIR%%/plugins/ckeditor/contents.css
@@ -487,6 +476,7 @@
 %%WWWDIR%%/plugins/ckeditor/lang/vi.js
 %%WWWDIR%%/plugins/ckeditor/lang/zh-cn.js
 %%WWWDIR%%/plugins/ckeditor/lang/zh.js
+%%WWWDIR%%/plugins/ckeditor/LICENSE.md
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
@@ -554,8 +544,8 @@
 %%WWWDIR%%/plugins/ckeditor/plugins/about/dialogs/logo_ckeditor.png
 %%WWWDIR%%/plugins/ckeditor/plugins/clipboard/dialogs/paste.js
 %%WWWDIR%%/plugins/ckeditor/plugins/dialog/dialogDefinition.js
-%%WWWDIR%%/plugins/ckeditor/plugins/icons.png
 %%WWWDIR%%/plugins/ckeditor/plugins/icons_hidpi.png
+%%WWWDIR%%/plugins/ckeditor/plugins/icons.png
 %%WWWDIR%%/plugins/ckeditor/plugins/image/dialogs/image.js
 %%WWWDIR%%/plugins/ckeditor/plugins/image/images/noimage.png
 %%WWWDIR%%/plugins/ckeditor/plugins/link/dialogs/anchor.js
@@ -568,10 +558,10 @@
 %%WWWDIR%%/plugins/ckeditor/plugins/magicline/images/icon.png
 %%WWWDIR%%/plugins/ckeditor/plugins/pastefromword/filter/default.js
 %%WWWDIR%%/plugins/ckeditor/plugins/scayt/CHANGELOG.md
-%%WWWDIR%%/plugins/ckeditor/plugins/scayt/LICENSE.md
-%%WWWDIR%%/plugins/ckeditor/plugins/scayt/README.md
 %%WWWDIR%%/plugins/ckeditor/plugins/scayt/dialogs/options.js
 %%WWWDIR%%/plugins/ckeditor/plugins/scayt/dialogs/toolbar.css
+%%WWWDIR%%/plugins/ckeditor/plugins/scayt/LICENSE.md
+%%WWWDIR%%/plugins/ckeditor/plugins/scayt/README.md
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/af.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ar.js
@@ -628,13 +618,14 @@
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/specialchar.js
 %%WWWDIR%%/plugins/ckeditor/plugins/table/dialogs/table.js
 %%WWWDIR%%/plugins/ckeditor/plugins/tabletools/dialogs/tableCell.js
-%%WWWDIR%%/plugins/ckeditor/plugins/wsc/LICENSE.md
-%%WWWDIR%%/plugins/ckeditor/plugins/wsc/README.md
 %%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/ciframe.html
 %%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+%%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/wsc_ie.js
 %%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/wsc.css
 %%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/wsc.js
-%%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/wsc_ie.js
+%%WWWDIR%%/plugins/ckeditor/plugins/wsc/LICENSE.md
+%%WWWDIR%%/plugins/ckeditor/plugins/wsc/README.md
+%%WWWDIR%%/plugins/ckeditor/README.md
 %%WWWDIR%%/plugins/ckeditor/samples/css/samples.css
 %%WWWDIR%%/plugins/ckeditor/samples/img/github-top.png
 %%WWWDIR%%/plugins/ckeditor/samples/img/header-bg.png
@@ -671,9 +662,9 @@
 %%WWWDIR%%/plugins/ckeditor/samples/old/readonly.html
 %%WWWDIR%%/plugins/ckeditor/samples/old/replacebyclass.html
 %%WWWDIR%%/plugins/ckeditor/samples/old/replacebycode.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/sample_posteddata.php
 %%WWWDIR%%/plugins/ckeditor/samples/old/sample.css
 %%WWWDIR%%/plugins/ckeditor/samples/old/sample.js
-%%WWWDIR%%/plugins/ckeditor/samples/old/sample_posteddata.php
 %%WWWDIR%%/plugins/ckeditor/samples/old/tabindex.html
 %%WWWDIR%%/plugins/ckeditor/samples/old/toolbar/toolbar.html
 %%WWWDIR%%/plugins/ckeditor/samples/old/uicolor.html
@@ -681,37 +672,37 @@
 %%WWWDIR%%/plugins/ckeditor/samples/old/wysiwygarea/fullpage.html
 %%WWWDIR%%/plugins/ckeditor/samples/old/xhtmlstyle.html
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/css/fontello.css
-%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/config.json
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.eot
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.svg
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.woff
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/index.html
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
-%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
 %%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
-%%WWWDIR%%/plugins/ckeditor/skins/moono/dialog.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_ie.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_ie7.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_ie8.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_iequirks.css
-%%WWWDIR%%/plugins/ckeditor/skins/moono/editor.css
+%%WWWDIR%%/plugins/ckeditor/skins/moono/dialog.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_gecko.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_ie.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_ie7.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_ie8.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_iequirks.css
-%%WWWDIR%%/plugins/ckeditor/skins/moono/icons.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/editor.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/icons_hidpi.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/icons.png
 %%WWWDIR%%/plugins/ckeditor/skins/moono/images/arrow.png
 %%WWWDIR%%/plugins/ckeditor/skins/moono/images/close.png
 %%WWWDIR%%/plugins/ckeditor/skins/moono/images/hidpi/close.png
@@ -724,14 +715,13 @@
 %%WWWDIR%%/plugins/ckeditor/skins/moono/images/spinner.gif
 %%WWWDIR%%/plugins/ckeditor/skins/moono/readme.md
 %%WWWDIR%%/plugins/ckeditor/styles.js
-%%WWWDIR%%/plugins/jscalendar/ChangeLog
-%%WWWDIR%%/plugins/jscalendar/README
+%%WWWDIR%%/plugins/jscalendar/calendar_stripped.js
 %%WWWDIR%%/plugins/jscalendar/calendar-blue.css
 %%WWWDIR%%/plugins/jscalendar/calendar-blue2.css
 %%WWWDIR%%/plugins/jscalendar/calendar-brown.css
 %%WWWDIR%%/plugins/jscalendar/calendar-green.css
-%%WWWDIR%%/plugins/jscalendar/calendar-setup.js
 %%WWWDIR%%/plugins/jscalendar/calendar-setup_stripped.js
+%%WWWDIR%%/plugins/jscalendar/calendar-setup.js
 %%WWWDIR%%/plugins/jscalendar/calendar-system.css
 %%WWWDIR%%/plugins/jscalendar/calendar-tas.css
 %%WWWDIR%%/plugins/jscalendar/calendar-win2k-1.css
@@ -740,7 +730,7 @@
 %%WWWDIR%%/plugins/jscalendar/calendar-win2k-cold-2.css
 %%WWWDIR%%/plugins/jscalendar/calendar.js
 %%WWWDIR%%/plugins/jscalendar/calendar.php
-%%WWWDIR%%/plugins/jscalendar/calendar_stripped.js
+%%WWWDIR%%/plugins/jscalendar/ChangeLog
 %%WWWDIR%%/plugins/jscalendar/img.gif
 %%WWWDIR%%/plugins/jscalendar/lang/calendar-big5.js
 %%WWWDIR%%/plugins/jscalendar/lang/calendar-cs-win.js
@@ -764,6 +754,7 @@
 %%WWWDIR%%/plugins/jscalendar/menuarrow.gif
 %%WWWDIR%%/plugins/jscalendar/menuarrow2.gif
 %%WWWDIR%%/plugins/jscalendar/multiple-dates.html
+%%WWWDIR%%/plugins/jscalendar/README
 %%WWWDIR%%/plugins/jscalendar/skins/aqua/active-bg.gif
 %%WWWDIR%%/plugins/jscalendar/skins/aqua/dark-bg.gif
 %%WWWDIR%%/plugins/jscalendar/skins/aqua/hover-bg.gif
@@ -777,7 +768,6 @@
 %%WWWDIR%%/plugins/jupload/readme.txt
 %%WWWDIR%%/plugins/jupload/wjhk.jupload.jar
 %%WWWDIR%%/plugins/luminous/.htaccess
-%%WWWDIR%%/plugins/luminous/LICENSE
 %%WWWDIR%%/plugins/luminous/client/.htaccess
 %%WWWDIR%%/plugins/luminous/client/jquery-1.6.4.min.js
 %%WWWDIR%%/plugins/luminous/client/luminous.js
@@ -825,6 +815,7 @@
 %%WWWDIR%%/plugins/luminous/languages/vb.php
 %%WWWDIR%%/plugins/luminous/languages/vim.php
 %%WWWDIR%%/plugins/luminous/languages/xml.php
+%%WWWDIR%%/plugins/luminous/LICENSE
 %%WWWDIR%%/plugins/luminous/luminous.php
 %%WWWDIR%%/plugins/luminous/src/.htaccess
 %%WWWDIR%%/plugins/luminous/src/cache/cache.class.php
@@ -854,26 +845,27 @@
 %%WWWDIR%%/plugins/luminous/style/icons/chevron-left.png
 %%WWWDIR%%/plugins/luminous/style/icons/chevron-right.png
 %%WWWDIR%%/plugins/luminous/style/kimono.css
-%%WWWDIR%%/plugins/luminous/style/luminous.css
-%%WWWDIR%%/plugins/luminous/style/luminous.scss
 %%WWWDIR%%/plugins/luminous/style/luminous_dark.css
 %%WWWDIR%%/plugins/luminous/style/luminous_light.css
 %%WWWDIR%%/plugins/luminous/style/luminous_print.css
+%%WWWDIR%%/plugins/luminous/style/luminous.css
+%%WWWDIR%%/plugins/luminous/style/luminous.scss
 %%WWWDIR%%/plugins/luminous/style/paradise.css
 %%WWWDIR%%/plugins/luminous/style/soft.css
 %%WWWDIR%%/plugins/luminous/style/zenophilia.css
 %%WWWDIR%%/plugins/luminous/supported.php
 %%WWWDIR%%/plugins/luminous/versioncheck.php
+%%WWWDIR%%/plugins/phpseclib/bootstrap.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/AES.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/Base.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/Blowfish.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/DES.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/Hash.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/Random.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/RC2.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/RC4.php
-%%WWWDIR%%/plugins/phpseclib/Crypt/RSA.php
-%%WWWDIR%%/plugins/phpseclib/Crypt/Random.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/Rijndael.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/RSA.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/TripleDES.php
 %%WWWDIR%%/plugins/phpseclib/Crypt/Twofish.php
 %%WWWDIR%%/plugins/phpseclib/File/ANSI.php
@@ -881,14 +873,13 @@
 %%WWWDIR%%/plugins/phpseclib/File/X509.php
 %%WWWDIR%%/plugins/phpseclib/Math/BigInteger.php
 %%WWWDIR%%/plugins/phpseclib/Net/SCP.php
-%%WWWDIR%%/plugins/phpseclib/Net/SFTP.php
 %%WWWDIR%%/plugins/phpseclib/Net/SFTP/Stream.php
+%%WWWDIR%%/plugins/phpseclib/Net/SFTP.php
 %%WWWDIR%%/plugins/phpseclib/Net/SSH1.php
 %%WWWDIR%%/plugins/phpseclib/Net/SSH2.php
+%%WWWDIR%%/plugins/phpseclib/openssl.cnf
 %%WWWDIR%%/plugins/phpseclib/System/SSH/Agent.php
 %%WWWDIR%%/plugins/phpseclib/System/SSH_Agent.php
-%%WWWDIR%%/plugins/phpseclib/bootstrap.php
-%%WWWDIR%%/plugins/phpseclib/openssl.cnf
 %%WWWDIR%%/plugins/plugins.inc.php
 %%WWWDIR%%/plugins/tinymce/jquery.tinymce.min.js
 %%WWWDIR%%/plugins/tinymce/langs/readme.md
@@ -976,86 +967,58 @@
 %%WWWDIR%%/plugins/tinymce/themes/inlite/theme.min.js
 %%WWWDIR%%/plugins/tinymce/themes/modern/theme.min.js
 %%WWWDIR%%/plugins/tinymce/tinymce.min.js
+@dir %%WWWDIR%%/plugins/versioncheck
 %%WWWDIR%%/robots.txt
-%%WWWDIR%%/skins/iphone/advanced1.template.php
-%%WWWDIR%%/skins/iphone/advanced_ftpserver1.template.php
-%%WWWDIR%%/skins/iphone/advanced_ftpserver2.template.php
-%%WWWDIR%%/skins/iphone/advanced_parsing1.template.php
-%%WWWDIR%%/skins/iphone/advanced_webserver1.template.php
-%%WWWDIR%%/skins/iphone/browse_main.template.php
-%%WWWDIR%%/skins/iphone/calculatesize1.template.php
-%%WWWDIR%%/skins/iphone/chmod1.template.php
-%%WWWDIR%%/skins/iphone/chmod2.template.php
-%%WWWDIR%%/skins/iphone/copymovedelete1.template.php
-%%WWWDIR%%/skins/iphone/copymovedelete2.template.php
-%%WWWDIR%%/skins/iphone/css/main.css.php
-%%WWWDIR%%/skins/iphone/edit.template.php
-%%WWWDIR%%/skins/iphone/error.template.php
-%%WWWDIR%%/skins/iphone/findstring1.template.php
-%%WWWDIR%%/skins/iphone/findstring2.template.php
-%%WWWDIR%%/skins/iphone/footer.template.php
-%%WWWDIR%%/skins/iphone/footer_versioncheck.template.php
-%%WWWDIR%%/skins/iphone/google_ad.template.php
-%%WWWDIR%%/skins/iphone/header.template.php
-%%WWWDIR%%/skins/iphone/images/footer.png
-%%WWWDIR%%/skins/iphone/images/header.png
-%%WWWDIR%%/skins/iphone/images/license.txt
-%%WWWDIR%%/skins/iphone/install1.template.php
-%%WWWDIR%%/skins/iphone/install2.template.php
-%%WWWDIR%%/skins/iphone/login.template.php
-%%WWWDIR%%/skins/iphone/logout.template.php
-%%WWWDIR%%/skins/iphone/manage.template.php
-%%WWWDIR%%/skins/iphone/newdir1.template.php
-%%WWWDIR%%/skins/iphone/newdir2.template.php
-%%WWWDIR%%/skins/iphone/raw1.template.php
-%%WWWDIR%%/skins/iphone/rename1.template.php
-%%WWWDIR%%/skins/iphone/rename2.template.php
-%%WWWDIR%%/skins/iphone/status/license.txt
-%%WWWDIR%%/skins/iphone/status/status.inc.php
-%%WWWDIR%%/skins/iphone/status/status.js
-%%WWWDIR%%/skins/iphone/status/status.template.php
-%%WWWDIR%%/skins/iphone/unzip1.template.php
-%%WWWDIR%%/skins/iphone/unzip2.template.php
-%%WWWDIR%%/skins/iphone/view1.template.php
-%%WWWDIR%%/skins/iphone/zip1.template.php
-%%WWWDIR%%/skins/iphone/zip2.template.php
-%%WWWDIR%%/skins/shinra/admin1.template.php
+@sample %%WWWDIR%%/settings_authorizations.inc.php.sample
+@sample %%WWWDIR%%/settings_screens.inc.php.sample
+@sample %%WWWDIR%%/settings.inc.php.sample
+%%WWWDIR%%/skins/ads/ad_browse_header.template.php
+%%WWWDIR%%/skins/ads/ad_browse_list.template.php
+%%WWWDIR%%/skins/ads/ad_login_bottom.template.php
+%%WWWDIR%%/skins/ads/ad_login_corner.template.php
+%%WWWDIR%%/skins/ads/ad_logout.template.php
+%%WWWDIR%%/skins/ads/adblocker_detect.js
+%%WWWDIR%%/skins/ads/infomaniak_300x600.template.php
+%%WWWDIR%%/skins/ads/infomaniak_336x280.template.php
+%%WWWDIR%%/skins/ads/infomaniak_728x90.template.php
 %%WWWDIR%%/skins/shinra/admin_createtables1.template.php
 %%WWWDIR%%/skins/shinra/admin_createtables2.template.php
 %%WWWDIR%%/skins/shinra/admin_emptylogs1.template.php
 %%WWWDIR%%/skins/shinra/admin_viewlogs1.template.php
-%%WWWDIR%%/skins/shinra/advanced1.template.php
+%%WWWDIR%%/skins/shinra/admin1.template.php
 %%WWWDIR%%/skins/shinra/advanced_ftpserver1.template.php
 %%WWWDIR%%/skins/shinra/advanced_ftpserver2.template.php
 %%WWWDIR%%/skins/shinra/advanced_parsing1.template.php
 %%WWWDIR%%/skins/shinra/advanced_webserver1.template.php
+%%WWWDIR%%/skins/shinra/advanced1.template.php
 %%WWWDIR%%/skins/shinra/bookmark1.template.php
-%%WWWDIR%%/skins/shinra/browse_main.template.php
 %%WWWDIR%%/skins/shinra/browse_main_details.template.php
-%%WWWDIR%%/skins/shinra/browse_main_icons.template.php
+%%WWWDIR%%/skins/shinra/browse_main.template.php
 %%WWWDIR%%/skins/shinra/browse_popup.template.php
 %%WWWDIR%%/skins/shinra/calculatesize1.template.php
 %%WWWDIR%%/skins/shinra/chmod1.template.php
 %%WWWDIR%%/skins/shinra/chmod2.template.php
+%%WWWDIR%%/skins/shinra/consent.template.php
 %%WWWDIR%%/skins/shinra/copymovedelete1.template.php
 %%WWWDIR%%/skins/shinra/copymovedelete2.template.php
 %%WWWDIR%%/skins/shinra/css/ie8-hacks.css
+%%WWWDIR%%/skins/shinra/css/main_desktop.ltr.css
+%%WWWDIR%%/skins/shinra/css/main_desktop.rtl.css
+%%WWWDIR%%/skins/shinra/css/main_mobile.ltr.css
+%%WWWDIR%%/skins/shinra/css/main_mobile.rtl.css
 %%WWWDIR%%/skins/shinra/css/reset.css
 %%WWWDIR%%/skins/shinra/css/social-icons.css
-%%WWWDIR%%/skins/shinra/css/style.css.php
 %%WWWDIR%%/skins/shinra/css/styled-elements.css
 %%WWWDIR%%/skins/shinra/css/superfish.css
 %%WWWDIR%%/skins/shinra/css/tabs.css
 %%WWWDIR%%/skins/shinra/edit.template.php
-%%WWWDIR%%/skins/shinra/error.template.php
 %%WWWDIR%%/skins/shinra/error_wrapped.template.php
+%%WWWDIR%%/skins/shinra/error.template.php
 %%WWWDIR%%/skins/shinra/findstring1.template.php
 %%WWWDIR%%/skins/shinra/findstring2.template.php
 %%WWWDIR%%/skins/shinra/footer.template.php
-%%WWWDIR%%/skins/shinra/footer_versioncheck.template.php
-%%WWWDIR%%/skins/shinra/google_ad_bottom.template.php
-%%WWWDIR%%/skins/shinra/google_ad_top.template.php
 %%WWWDIR%%/skins/shinra/header.template.php
+%%WWWDIR%%/skins/shinra/homepage.template.php
 %%WWWDIR%%/skins/shinra/images/actions/back.png
 %%WWWDIR%%/skins/shinra/images/actions/bookmark.png
 %%WWWDIR%%/skins/shinra/images/actions/button_cancel.png
@@ -1082,13 +1045,13 @@
 %%WWWDIR%%/skins/shinra/images/mime/descend.png
 %%WWWDIR%%/skins/shinra/images/mime/document.png
 %%WWWDIR%%/skins/shinra/images/mime/exec.png
-%%WWWDIR%%/skins/shinra/images/mime/folder.png
 %%WWWDIR%%/skins/shinra/images/mime/folder_grey.png
+%%WWWDIR%%/skins/shinra/images/mime/folder.png
 %%WWWDIR%%/skins/shinra/images/mime/fonts.png
 %%WWWDIR%%/skins/shinra/images/mime/gimp.png
 %%WWWDIR%%/skins/shinra/images/mime/html.png
-%%WWWDIR%%/skins/shinra/images/mime/java.png
 %%WWWDIR%%/skins/shinra/images/mime/java_jar.png
+%%WWWDIR%%/skins/shinra/images/mime/java.png
 %%WWWDIR%%/skins/shinra/images/mime/kservices.png
 %%WWWDIR%%/skins/shinra/images/mime/mime.png
 %%WWWDIR%%/skins/shinra/images/mime/ooo_gulls.png
@@ -1315,8 +1278,8 @@
 %%WWWDIR%%/skins/shinra/img/twitter-border.png
 %%WWWDIR%%/skins/shinra/install1.template.php
 %%WWWDIR%%/skins/shinra/install2.template.php
-%%WWWDIR%%/skins/shinra/js/DD_belatedPNG.js
 %%WWWDIR%%/skins/shinra/js/custom.js
+%%WWWDIR%%/skins/shinra/js/DD_belatedPNG.js
 %%WWWDIR%%/skins/shinra/js/easing.js
 %%WWWDIR%%/skins/shinra/js/form-validation-sc.js
 %%WWWDIR%%/skins/shinra/js/form-validation.js
@@ -1329,10 +1292,10 @@
 %%WWWDIR%%/skins/shinra/js/poshytip-1.0/MIT-LICENSE.txt
 %%WWWDIR%%/skins/shinra/js/poshytip-1.0/README.txt
 %%WWWDIR%%/skins/shinra/js/poshytip-1.0/src/jquery.poshytip.min.js
-%%WWWDIR%%/skins/shinra/js/poshytip-1.0/src/tip-twitter/tip-twitter.css
 %%WWWDIR%%/skins/shinra/js/poshytip-1.0/src/tip-twitter/tip-twitter_arrows.gif
-%%WWWDIR%%/skins/shinra/js/poshytip-1.0/src/tip-yellowsimple/tip-yellowsimple.css
+%%WWWDIR%%/skins/shinra/js/poshytip-1.0/src/tip-twitter/tip-twitter.css
 %%WWWDIR%%/skins/shinra/js/poshytip-1.0/src/tip-yellowsimple/tip-yellowsimple_arrows.gif
+%%WWWDIR%%/skins/shinra/js/poshytip-1.0/src/tip-yellowsimple/tip-yellowsimple.css
 %%WWWDIR%%/skins/shinra/js/quicksand.js
 %%WWWDIR%%/skins/shinra/js/superfish-1.4.8/changelog.txt
 %%WWWDIR%%/skins/shinra/js/superfish-1.4.8/css/superfish-navbar.css
@@ -1348,9 +1311,9 @@
 %%WWWDIR%%/skins/shinra/js/tabs.js
 %%WWWDIR%%/skins/shinra/jupload1.template.php
 %%WWWDIR%%/skins/shinra/jupload2.template.php
-%%WWWDIR%%/skins/shinra/login.template.php
 %%WWWDIR%%/skins/shinra/login_other.template.php
 %%WWWDIR%%/skins/shinra/login_small.template.php
+%%WWWDIR%%/skins/shinra/login.template.php
 %%WWWDIR%%/skins/shinra/loginform.template.php
 %%WWWDIR%%/skins/shinra/logout.template.php
 %%WWWDIR%%/skins/shinra/manage.template.php
@@ -1380,5 +1343,3 @@
 %%WWWDIR%%/temp/.htaccess
 %%WWWDIR%%/temp/chmod_this_dir_to_777.txt
 %%WWWDIR%%/temp/index.php
-%%WWWDIR%%/version.js
-@dir %%WWWDIR%%/plugins/versioncheck