- Update to 1.4.4.1b

- Update maintainer section
- Reformat pkg-descr

Changes:	http://www.zenphoto.org/news/category/changelog

4 files changed, 89 insertions, 82 deletions

diff --git a/www/zenphoto/Makefile b/www/zenphoto/Makefile
index 0bf97d29b5a4..0b074630a6c8 100644
--- a/www/zenphoto/Makefile
+++ b/www/zenphoto/Makefile
@@ -2,35 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	zenphoto
-PORTVERSION=	1.4.3.3
+PORTVERSION=	1.4.4.1b
 CATEGORIES=	www
-MASTER_SITES=	GOOGLE_CODE \
-		http://www.zenphoto.org/files/
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/archive/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A simpler web photo gallery
 
 LICENSE=	GPLv2
 
+FETCH_ARGS=	-Fpr
 NO_BUILD=	yes
 USE_PHP=	gd gettext json mbstring mysql pcre session
 WANT_PHP_WEB=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	PORTNAME=${PORTNAME}
 
-EMPTYDIRS=	albums cache cache_html/rss plugins/flag_thumbnail plugins/flvplayer plugins/gd_fonts plugins/imagick_fonts plugins/watermarks uploaded
-
 post-extract:
-	@${RM} ${WRKSRC}/doc_files/License.txt ${WRKSRC}/doc_files/README.html ${WRKSRC}/zp-core/Zenphoto.package
+	@${RM} ${WRKSRC}/doc_files/Zenphoto\ license.txt ${WRKSRC}/doc_files/README.html ${WRKSRC}/zp-core/Zenphoto.package
 
 do-install:
-.for dir in ${EMPTYDIRS}
-	${TOUCH} ${WRKSRC}/${dir}/.keepme
-.endfor
 	${MKDIR} ${WWWDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${WWWDIR}/
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
@@ -41,13 +36,10 @@ post-install:
 # maintainer section:
 
 MS_DIRRMTRY=	albums cache themes zp-core
-MS_EMPTYDIRS=	${WRKDIR}/.ms-empty-directories
 MS_PLIST=	${WRKDIR}/.ms-pkg-plist
 
 genplist: do-clean extract
 	cd ${WRKSRC}/ && \
-		${FIND} -s * -type d -empty | ${XARGS} > ${MS_EMPTYDIRS} && \
-		${SED} 's|[^ ]*|&/.keepme|g' ${MS_EMPTYDIRS} | ${XARGS} -J % ${TOUCH} % && \
 		${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' > ${MS_PLIST} && \
 		${FIND} -s * -type d | ${TAIL} -r | ${SED} 's|^|@dirrm %%WWWDIR%%/|' >> ${MS_PLIST} && \
 		${ECHO} '@dirrmtry %%WWWDIR%%' >> ${MS_PLIST}
@@ -55,6 +47,5 @@ genplist: do-clean extract
 	${REINPLACE_CMD} '/^@dirrm %%WWWDIR%%\/${dir:C/\//\\\//g}$$/ s|@dirrm|&try|' ${MS_PLIST}
 .endfor
 	${INSTALL} -m 600 ${MS_PLIST} ${PLIST}
-	${REINPLACE_CMD} -e "/^EMPTYDIRS=/ s|	.*$$|	`${CAT} ${MS_EMPTYDIRS}`|" ${.CURDIR}/Makefile
-	
+
 .include <bsd.port.mk>
diff --git a/www/zenphoto/distinfo b/www/zenphoto/distinfo
index f2846c62f660..4b319d0dd3b3 100644
--- a/www/zenphoto/distinfo
+++ b/www/zenphoto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zenphoto-1.4.3.3.tar.gz) = 39472752ed48b68499203ab2fab2b6e18e4fa65ae9356c0dbeafa3c43222be97
-SIZE (zenphoto-1.4.3.3.tar.gz) = 8563744
+SHA256 (zenphoto-1.4.4.1b.tar.gz) = be99b50c9b4bda563c5045dc31ca387854da32751dcf09b3a46a0efa24755338
+SIZE (zenphoto-1.4.4.1b.tar.gz) = 8876113
diff --git a/www/zenphoto/pkg-descr b/www/zenphoto/pkg-descr
index 8e91cdb44a84..e781d7cbf476 100644
--- a/www/zenphoto/pkg-descr
+++ b/www/zenphoto/pkg-descr
@@ -1,5 +1,5 @@
-Zenphoto is an answer to lots of calls for an online gallery solution
-that just makes sense. After years of bloated software that does
-everything and your dishes, zenphoto just shows your photos, simply.
+Zenphoto is an answer to lots of calls for an online gallery solution that just
+makes sense. After years of bloated software that does everything and your
+dishes, zenphoto just shows your photos, simply.
 
 WWW: http://www.zenphoto.org/
diff --git a/www/zenphoto/pkg-plist b/www/zenphoto/pkg-plist
index bb4e171ef96d..92bbef5bb82c 100644
--- a/www/zenphoto/pkg-plist
+++ b/www/zenphoto/pkg-plist
@@ -1,18 +1,19 @@
-%%WWWDIR%%/albums/.keepme
-%%WWWDIR%%/cache/.keepme
-%%WWWDIR%%/cache_html/rss/.keepme
+%%WWWDIR%%/CHANGELOG.md
+%%WWWDIR%%/README.md
+%%WWWDIR%%/albums/.gitignore
+%%WWWDIR%%/cache/.gitignore
 %%WWWDIR%%/doc_files/zenphoto_database_quick_reference.pdf
 %%WWWDIR%%/index.php
-%%WWWDIR%%/plugins/flag_thumbnail/.keepme
-%%WWWDIR%%/plugins/flvplayer/.keepme
-%%WWWDIR%%/plugins/gd_fonts/.keepme
-%%WWWDIR%%/plugins/imagick_fonts/.keepme
-%%WWWDIR%%/plugins/watermarks/.keepme
+%%WWWDIR%%/plugins/gd_fonts/.gitignore
+%%WWWDIR%%/plugins/imagick_fonts/.gitignore
+%%WWWDIR%%/plugins/watermarks/.gitignore
 %%WWWDIR%%/themes/default/404.php
 %%WWWDIR%%/themes/default/album.php
 %%WWWDIR%%/themes/default/archive.php
 %%WWWDIR%%/themes/default/common.css
 %%WWWDIR%%/themes/default/contact.php
+%%WWWDIR%%/themes/default/favorites.php
+%%WWWDIR%%/themes/default/functions.php
 %%WWWDIR%%/themes/default/image.php
 %%WWWDIR%%/themes/default/images/50percent.png
 %%WWWDIR%%/themes/default/images/admin-buttonback.jpg
@@ -38,6 +39,7 @@
 %%WWWDIR%%/themes/effervescence_plus/colorbox/functions.php
 %%WWWDIR%%/themes/effervescence_plus/common.css
 %%WWWDIR%%/themes/effervescence_plus/contact.php
+%%WWWDIR%%/themes/effervescence_plus/favorites.php
 %%WWWDIR%%/themes/effervescence_plus/functions.php
 %%WWWDIR%%/themes/effervescence_plus/gallery.php
 %%WWWDIR%%/themes/effervescence_plus/image.php
@@ -95,6 +97,7 @@
 %%WWWDIR%%/themes/garland/colorbox/functions.php
 %%WWWDIR%%/themes/garland/contact.php
 %%WWWDIR%%/themes/garland/contact_form/form.php
+%%WWWDIR%%/themes/garland/favorites.php
 %%WWWDIR%%/themes/garland/functions.php
 %%WWWDIR%%/themes/garland/gallery.php
 %%WWWDIR%%/themes/garland/image.php
@@ -145,6 +148,7 @@
 %%WWWDIR%%/themes/stopdesign/css/custom.css
 %%WWWDIR%%/themes/stopdesign/css/master.css
 %%WWWDIR%%/themes/stopdesign/css/photos.css
+%%WWWDIR%%/themes/stopdesign/favorites.php
 %%WWWDIR%%/themes/stopdesign/functions.php
 %%WWWDIR%%/themes/stopdesign/gallery.php
 %%WWWDIR%%/themes/stopdesign/image.php
@@ -204,6 +208,7 @@
 %%WWWDIR%%/themes/zenpage/album.php
 %%WWWDIR%%/themes/zenpage/archive.php
 %%WWWDIR%%/themes/zenpage/contact.php
+%%WWWDIR%%/themes/zenpage/favorites.php
 %%WWWDIR%%/themes/zenpage/footer.php
 %%WWWDIR%%/themes/zenpage/functions.php
 %%WWWDIR%%/themes/zenpage/gallery.php
@@ -239,6 +244,7 @@
 %%WWWDIR%%/themes/zpmobile/album.php
 %%WWWDIR%%/themes/zpmobile/archive.php
 %%WWWDIR%%/themes/zpmobile/comment_form/comment_form.php
+%%WWWDIR%%/themes/zpmobile/favorites.php
 %%WWWDIR%%/themes/zpmobile/functions.php
 %%WWWDIR%%/themes/zpmobile/gallery.php
 %%WWWDIR%%/themes/zpmobile/image.php
@@ -252,10 +258,8 @@
 %%WWWDIR%%/themes/zpmobile/jquerymobile/images/icons-18-white.png
 %%WWWDIR%%/themes/zpmobile/jquerymobile/images/icons-36-black.png
 %%WWWDIR%%/themes/zpmobile/jquerymobile/images/icons-36-white.png
-%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.1.0.min.css
-%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.1.0.min.js
-%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile.structure-1.1.0.min.css
-%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile.theme-1.1.0.min.css
+%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.2.0.min.css
+%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.2.0.min.js
 %%WWWDIR%%/themes/zpmobile/news.php
 %%WWWDIR%%/themes/zpmobile/pages.php
 %%WWWDIR%%/themes/zpmobile/password.php
@@ -265,7 +269,7 @@
 %%WWWDIR%%/themes/zpmobile/theme.png
 %%WWWDIR%%/themes/zpmobile/theme_description.php
 %%WWWDIR%%/themes/zpmobile/themeoptions.php
-%%WWWDIR%%/uploaded/.keepme
+%%WWWDIR%%/uploaded/.gitignore
 %%WWWDIR%%/zp-core/404.php
 %%WWWDIR%%/zp-core/admin-albumsort.php
 %%WWWDIR%%/zp-core/admin-comments.php
@@ -289,16 +293,13 @@
 %%WWWDIR%%/zp-core/admin.css
 %%WWWDIR%%/zp-core/admin.php
 %%WWWDIR%%/zp-core/auth_zp.php
-%%WWWDIR%%/zp-core/c.php
 %%WWWDIR%%/zp-core/cacheprotect
 %%WWWDIR%%/zp-core/class-album.php
 %%WWWDIR%%/zp-core/class-comment.php
 %%WWWDIR%%/zp-core/class-gallery.php
 %%WWWDIR%%/zp-core/class-image.php
-%%WWWDIR%%/zp-core/class-load.php
 %%WWWDIR%%/zp-core/class-rss.php
 %%WWWDIR%%/zp-core/class-search.php
-%%WWWDIR%%/zp-core/class-transientimage.php
 %%WWWDIR%%/zp-core/classes.php
 %%WWWDIR%%/zp-core/controller.php
 %%WWWDIR%%/zp-core/cron_runner.php
@@ -312,12 +313,16 @@
 %%WWWDIR%%/zp-core/exif/makers/olympus.php
 %%WWWDIR%%/zp-core/exif/makers/panasonic.php
 %%WWWDIR%%/zp-core/exif/makers/sanyo.php
+%%WWWDIR%%/zp-core/external_auth.php
 %%WWWDIR%%/zp-core/full-image.php
-%%WWWDIR%%/zp-core/functions-PDO.php
 %%WWWDIR%%/zp-core/functions-basic.php
+%%WWWDIR%%/zp-core/functions-common.php
 %%WWWDIR%%/zp-core/functions-controller.php
 %%WWWDIR%%/zp-core/functions-db-MySQL.php
+%%WWWDIR%%/zp-core/functions-db-MySQLi.php
 %%WWWDIR%%/zp-core/functions-db-PDO_MySQL.php
+%%WWWDIR%%/zp-core/functions-db_NULL.php
+%%WWWDIR%%/zp-core/functions-db_PDO.php
 %%WWWDIR%%/zp-core/functions-filter.php
 %%WWWDIR%%/zp-core/functions-i18n.php
 %%WWWDIR%%/zp-core/functions-image.php
@@ -328,6 +333,7 @@
 %%WWWDIR%%/zp-core/gd_fonts/azimov.gdf
 %%WWWDIR%%/zp-core/gd_fonts/bubblebath.gdf
 %%WWWDIR%%/zp-core/gd_fonts/cry.gdf
+%%WWWDIR%%/zp-core/githead
 %%WWWDIR%%/zp-core/global-definitions.php
 %%WWWDIR%%/zp-core/gpl-2.0-standalone.htm
 %%WWWDIR%%/zp-core/htaccess
@@ -434,7 +440,6 @@
 %%WWWDIR%%/zp-core/images/view.png
 %%WWWDIR%%/zp-core/images/warn.png
 %%WWWDIR%%/zp-core/images/wheel.png
-%%WWWDIR%%/zp-core/images/wpmini-blue.png
 %%WWWDIR%%/zp-core/images/zen-logo.png
 %%WWWDIR%%/zp-core/images/zp_gold.png
 %%WWWDIR%%/zp-core/index.php
@@ -452,8 +457,6 @@
 %%WWWDIR%%/zp-core/js/jquery.masonry.min.js
 %%WWWDIR%%/zp-core/js/jquery.pagination.js
 %%WWWDIR%%/zp-core/js/jquery.scrollTo.js
-%%WWWDIR%%/zp-core/js/jquery.tabs.js
-%%WWWDIR%%/zp-core/js/jquery.toggleElements.js
 %%WWWDIR%%/zp-core/js/jquery.tooltip.js
 %%WWWDIR%%/zp-core/js/jquery.ui.nestedSortable.js
 %%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-de.js
@@ -469,6 +472,7 @@
 %%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-ja.js
 %%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-nl.js
 %%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-pl.js
+%%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-ru.js
 %%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-sk.js
 %%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-sv.js
 %%WWWDIR%%/zp-core/js/jqueryui/i18n/jquery.ui.datepicker-zh-CN.js
@@ -487,8 +491,8 @@
 %%WWWDIR%%/zp-core/js/jqueryui/images/ui-icons_454545_256x240.png
 %%WWWDIR%%/zp-core/js/jqueryui/images/ui-icons_888888_256x240.png
 %%WWWDIR%%/zp-core/js/jqueryui/images/ui-icons_cd0a0a_256x240.png
-%%WWWDIR%%/zp-core/js/jqueryui/jquery_ui_zenphoto.css
-%%WWWDIR%%/zp-core/js/jqueryui/jquery_ui_zenphoto.js
+%%WWWDIR%%/zp-core/js/jqueryui/jquery-ui-zenphoto.css
+%%WWWDIR%%/zp-core/js/jqueryui/jquery-ui-zenphoto.js
 %%WWWDIR%%/zp-core/js/jqueryui/readme.txt
 %%WWWDIR%%/zp-core/js/sprintf.js
 %%WWWDIR%%/zp-core/js/tag.js
@@ -507,7 +511,12 @@
 %%WWWDIR%%/zp-core/lib-utf8.php
 %%WWWDIR%%/zp-core/lib-zipStream.php
 %%WWWDIR%%/zp-core/license.php
+%%WWWDIR%%/zp-core/load_objectClasses.php
 %%WWWDIR%%/zp-core/locale/auto.png
+%%WWWDIR%%/zp-core/locale/da_DK/LC_MESSAGES/zenphoto.mo
+%%WWWDIR%%/zp-core/locale/da_DK/LC_MESSAGES/zenphoto.po
+%%WWWDIR%%/zp-core/locale/da_DK/flag.png
+%%WWWDIR%%/zp-core/locale/da_DK/select_files_button.png
 %%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/de_DE/flag.png
@@ -568,12 +577,14 @@
 %%WWWDIR%%/zp-core/password.php
 %%WWWDIR%%/zp-core/pluginDoc.php
 %%WWWDIR%%/zp-core/reconfigure.php
+%%WWWDIR%%/zp-core/setup/index.php
 %%WWWDIR%%/zp-core/setup/setup-functions.php
 %%WWWDIR%%/zp-core/setup/setup-option-defaults.php
 %%WWWDIR%%/zp-core/setup/setup-primitive.php
 %%WWWDIR%%/zp-core/setup/setup-sqlform.php
 %%WWWDIR%%/zp-core/setup/setup.css
 %%WWWDIR%%/zp-core/setup/setup_permissions_changer.php
+%%WWWDIR%%/zp-core/setup/setup_pluginOptions.php
 %%WWWDIR%%/zp-core/setup/setup_set-mod_rewrite.php
 %%WWWDIR%%/zp-core/setup/setup_themeOptions.php
 %%WWWDIR%%/zp-core/setup.php
@@ -604,9 +615,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/auto_backup.php
 %%WWWDIR%%/zp-core/zp-extensions/cacheManager/cacheImages.php
 %%WWWDIR%%/zp-core/zp-extensions/cacheManager.php
-%%WWWDIR%%/zp-core/zp-extensions/captcha/reCaptcha/recaptchalib.php
-%%WWWDIR%%/zp-core/zp-extensions/captcha/reCaptcha.php
-%%WWWDIR%%/zp-core/zp-extensions/captcha/zenphoto.php
 %%WWWDIR%%/zp-core/zp-extensions/check_for_update.php
 %%WWWDIR%%/zp-core/zp-extensions/class-AnyFile/anyFileDefault.png
 %%WWWDIR%%/zp-core/zp-extensions/class-AnyFile.php
@@ -707,6 +715,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/dynamic-locale.php
 %%WWWDIR%%/zp-core/zp-extensions/email-newuser.php
 %%WWWDIR%%/zp-core/zp-extensions/failed_access_blocker.php
+%%WWWDIR%%/zp-core/zp-extensions/favoritesHandler.php
 %%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Janrain Readme.txt
 %%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/AX.php
 %%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Association.php
@@ -773,15 +782,14 @@
 %%WWWDIR%%/zp-core/zp-extensions/flag_thumbnail.php
 %%WWWDIR%%/zp-core/zp-extensions/flowplayer3/LICENSE.txt
 %%WWWDIR%%/zp-core/zp-extensions/flowplayer3/controls.css
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer-3.2.10.min.js
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer-3.2.11.swf
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.audio-3.2.9.swf
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.content-3.2.8.swf
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.controls-3.2.11.swf
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.embed-3.2.9.min.js
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.ipad-3.2.9.min.js
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.playlist-3.2.9.min.js
-%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.sharing-3.2.8.swf
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer-3.2.11.min.js
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer-3.2.15.swf
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.audio-3.2.10.swf
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.controls-3.2.14.swf
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.embed-3.2.10.min.js
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.ipad-3.2.12.min.js
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.playlist-3.2.10.min.js
+%%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer.sharing-3.2.10.swf
 %%WWWDIR%%/zp-core/zp-extensions/flowplayer3/flowplayer3_playlist.css
 %%WWWDIR%%/zp-core/zp-extensions/flowplayer3/images/arrow_bottom_blue.png
 %%WWWDIR%%/zp-core/zp-extensions/flowplayer3/images/arrow_bottom_gray.png
@@ -825,6 +833,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/image_effects/sphere.txt
 %%WWWDIR%%/zp-core/zp-extensions/image_effects.php
 %%WWWDIR%%/zp-core/zp-extensions/image_upload_limiter.php
+%%WWWDIR%%/zp-core/zp-extensions/ipBlocker.php
 %%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel.css
 %%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel.js
 %%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel_ajax.php
@@ -867,6 +876,8 @@
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotolight/jplayer.zenphoto.seeking.gif
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotolight/jplayer.zenphotolight.css
 %%WWWDIR%%/zp-core/zp-extensions/jplayer.php
+%%WWWDIR%%/zp-core/zp-extensions/legacySpam.php
+%%WWWDIR%%/zp-core/zp-extensions/markRelease.php
 %%WWWDIR%%/zp-core/zp-extensions/menu_manager/menu_manager-admin-functions.php
 %%WWWDIR%%/zp-core/zp-extensions/menu_manager/menu_tab.php
 %%WWWDIR%%/zp-core/zp-extensions/menu_manager/menu_tab_edit.php
@@ -888,6 +899,8 @@
 %%WWWDIR%%/zp-core/zp-extensions/rating/jquery.rating.js
 %%WWWDIR%%/zp-core/zp-extensions/rating/update.php
 %%WWWDIR%%/zp-core/zp-extensions/rating.php
+%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/recaptchalib.php
+%%WWWDIR%%/zp-core/zp-extensions/reCaptcha.php
 %%WWWDIR%%/zp-core/zp-extensions/register_user/register_user_form.php
 %%WWWDIR%%/zp-core/zp-extensions/register_user.php
 %%WWWDIR%%/zp-core/zp-extensions/related_items.php
@@ -899,8 +912,10 @@
 %%WWWDIR%%/zp-core/zp-extensions/seo_null.php
 %%WWWDIR%%/zp-core/zp-extensions/seo_zenphoto.php
 %%WWWDIR%%/zp-core/zp-extensions/show_not_logged-in.php
-%%WWWDIR%%/zp-core/zp-extensions/site_upgrade/closed.html
+%%WWWDIR%%/zp-core/zp-extensions/simpleSpam.php
+%%WWWDIR%%/zp-core/zp-extensions/site_upgrade/closed.php
 %%WWWDIR%%/zp-core/zp-extensions/site_upgrade/closed.png
+%%WWWDIR%%/zp-core/zp-extensions/site_upgrade/site_upgrade.php
 %%WWWDIR%%/zp-core/zp-extensions/site_upgrade.php
 %%WWWDIR%%/zp-core/zp-extensions/sitemap-extended/sitemap-extended-admin.php
 %%WWWDIR%%/zp-core/zp-extensions/sitemap-extended.php
@@ -909,19 +924,17 @@
 %%WWWDIR%%/zp-core/zp-extensions/slideshow/jquery.cycle.all.js
 %%WWWDIR%%/zp-core/zp-extensions/slideshow/slideshow-counter.php
 %%WWWDIR%%/zp-core/zp-extensions/slideshow.php
-%%WWWDIR%%/zp-core/zp-extensions/spamfilters/none.php
-%%WWWDIR%%/zp-core/zp-extensions/spamfilters/simple.php
 %%WWWDIR%%/zp-core/zp-extensions/static_html_cache.php
 %%WWWDIR%%/zp-core/zp-extensions/tag_extras.php
 %%WWWDIR%%/zp-core/zp-extensions/tag_suggest/tag.css
 %%WWWDIR%%/zp-core/zp-extensions/tag_suggest.php
 %%WWWDIR%%/zp-core/zp-extensions/themeSwitcher.php
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/config/comment_form-default.js.php
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/config/content.css
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/config/zenpage-default-full.js.php
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/config/zenpage-default-light.js.php
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/config/zenphoto-default-with-customdatafield.js.php
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/config/zenphoto-default.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/cn.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/de.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/en.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/es.js
@@ -933,12 +946,12 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/pl.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/sk.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/sv.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/zh-cn.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/langs/zh-tw.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/css/advhr.css
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/js/rule.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/es_dlg.js
@@ -950,6 +963,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advhr/rule.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/css/advimage.css
@@ -958,7 +972,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/image.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/img/sample.gif
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/js/image.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/es_dlg.js
@@ -970,12 +983,12 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advimage/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/css/advlink.css
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/js/advlink.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/es_dlg.js
@@ -987,6 +1000,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlink/link.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/advlist/editor_plugin.js
@@ -1191,7 +1205,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autoresize/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autosave/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autosave/editor_plugin_src.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autosave/langs/en.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/bbcode/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/bbcode/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/contextmenu/editor_plugin.js
@@ -1218,7 +1231,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/img/smiley-wink.gif
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/img/smiley-yell.gif
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/js/emotions.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/es_dlg.js
@@ -1230,6 +1242,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/emotions/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/example/dialog.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/example/editor_plugin.js
@@ -1245,7 +1258,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/fullpage.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/js/fullpage.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/es_dlg.js
@@ -1257,6 +1269,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullpage/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullscreen/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -1287,7 +1300,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/js/embed.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/js/media.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/es_dlg.js
@@ -1299,6 +1311,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/media.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/media/moxieplayer.swf
@@ -1312,7 +1325,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/js/pastetext.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/js/pasteword.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/es_dlg.js
@@ -1324,6 +1336,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/pastetext.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/paste/pasteword.htm
@@ -1340,7 +1353,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/js/searchreplace.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/es_dlg.js
@@ -1352,6 +1364,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/searchreplace/searchreplace.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/spellchecker/css/content.css
@@ -1362,7 +1375,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/js/props.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/es_dlg.js
@@ -1374,6 +1386,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/props.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/style/readme.txt
@@ -1389,7 +1402,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/js/merge_cells.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/js/row.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/js/table.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/es_dlg.js
@@ -1401,6 +1413,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/merge_cells.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/table/row.htm
@@ -1410,7 +1423,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/editor_plugin.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/editor_plugin_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/js/template.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/es_dlg.js
@@ -1422,6 +1434,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/template/template.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/tinyzenpage/License.txt
@@ -1463,7 +1476,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/js/del.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/js/element_common.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/js/ins.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/es_dlg.js
@@ -1475,6 +1487,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/pl_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/xhtmlxtras/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/about.htm
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/anchor.htm
@@ -1501,8 +1514,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/js/image.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/js/link.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/js/source_editor.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/cn.js
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/de.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/de_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/en.js
@@ -1525,6 +1536,8 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/sk_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/sv.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/sv_dlg.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/zh-cn.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/zh-cn_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/zh-tw.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/langs/zh-tw_dlg.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/advanced/link.htm
@@ -1553,7 +1566,6 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/editor_template.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/editor_template_src.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/img/icons.gif
-%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/cn.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/de.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/en.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/es.js
@@ -1565,6 +1577,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/pl.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/sk.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/sv.js
+%%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/zh-cn.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/langs/zh-tw.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/skins/default/content.css
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/themes/simple/skins/default/ui.css
@@ -1579,6 +1592,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/utils/mctabs.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/utils/validate.js
 %%WWWDIR%%/zp-core/zp-extensions/tiny_mce.php
+%%WWWDIR%%/zp-core/zp-extensions/trivialSpam.php
 %%WWWDIR%%/zp-core/zp-extensions/tweet_news/OAuth.php
 %%WWWDIR%%/zp-core/zp-extensions/tweet_news/twitter_newbird_blue.png
 %%WWWDIR%%/zp-core/zp-extensions/tweet_news/twitteroauth.php
@@ -1616,6 +1630,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/user_login-out.php
 %%WWWDIR%%/zp-core/zp-extensions/user_mailing_list.php
 %%WWWDIR%%/zp-core/zp-extensions/viewer_size_image.php
+%%WWWDIR%%/zp-core/zp-extensions/wordpress_import/wpmini-blue.png
 %%WWWDIR%%/zp-core/zp-extensions/wordpress_import.php
 %%WWWDIR%%/zp-core/zp-extensions/xmpMetadata.php
 %%WWWDIR%%/zp-core/zp-extensions/zenpage/admin-categories.php
@@ -1643,9 +1658,15 @@
 %%WWWDIR%%/zp-core/zp-extensions/zenphoto_news/rsslib.php
 %%WWWDIR%%/zp-core/zp-extensions/zenphoto_news.php
 %%WWWDIR%%/zp-core/zp-extensions/zenphoto_sendmail.php
+%%WWWDIR%%/zp-core/zp-extensions/zpCaptcha/c.php
+%%WWWDIR%%/zp-core/zp-extensions/zpCaptcha.php
+%%WWWDIR%%/zp-data/.gitignore
+@dirrm %%WWWDIR%%/zp-data
+@dirrm %%WWWDIR%%/zp-core/zp-extensions/zpCaptcha
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/zenphoto_news
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/zenpage/images
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/zenpage
+@dirrm %%WWWDIR%%/zp-core/zp-extensions/wordpress_import
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/user_groups
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/user-expiry
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/uploader_jQuery
@@ -1743,7 +1764,6 @@
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/directionality
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/contextmenu
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/bbcode
-@dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autosave/langs
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autosave
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autoresize
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/plugins/autolink
@@ -1784,12 +1804,12 @@
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce/config
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tiny_mce
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/tag_suggest
-@dirrm %%WWWDIR%%/zp-core/zp-extensions/spamfilters
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/slideshow
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/sitemap-extended
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/site_upgrade
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/search_statistics
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/register_user
+@dirrm %%WWWDIR%%/zp-core/zp-extensions/reCaptcha
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/rating
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/publishContent
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/mobileTheme
@@ -1837,8 +1857,6 @@
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/class-textobject
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/class-WEBdocs
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/class-AnyFile
-@dirrm %%WWWDIR%%/zp-core/zp-extensions/captcha/reCaptcha
-@dirrm %%WWWDIR%%/zp-core/zp-extensions/captcha
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/cacheManager
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/PHPMailer
 @dirrm %%WWWDIR%%/zp-core/zp-extensions/GoogleMap
@@ -1873,6 +1891,8 @@
 @dirrm %%WWWDIR%%/zp-core/locale/en_US
 @dirrm %%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES
 @dirrm %%WWWDIR%%/zp-core/locale/de_DE
+@dirrm %%WWWDIR%%/zp-core/locale/da_DK/LC_MESSAGES
+@dirrm %%WWWDIR%%/zp-core/locale/da_DK
 @dirrm %%WWWDIR%%/zp-core/locale
 @dirrm %%WWWDIR%%/zp-core/lib-gettext
 @dirrm %%WWWDIR%%/zp-core/js/jqueryui/images
@@ -1919,12 +1939,8 @@
 @dirrm %%WWWDIR%%/plugins/watermarks
 @dirrm %%WWWDIR%%/plugins/imagick_fonts
 @dirrm %%WWWDIR%%/plugins/gd_fonts
-@dirrm %%WWWDIR%%/plugins/flvplayer
-@dirrm %%WWWDIR%%/plugins/flag_thumbnail
 @dirrm %%WWWDIR%%/plugins
 @dirrm %%WWWDIR%%/doc_files
-@dirrm %%WWWDIR%%/cache_html/rss
-@dirrm %%WWWDIR%%/cache_html
 @dirrmtry %%WWWDIR%%/cache
 @dirrmtry %%WWWDIR%%/albums
 @dirrmtry %%WWWDIR%%