- Update to 3 rc1

PR:		ports/144255
Submitted by:	Bo-Yi Wu <appleboy.tw@gmail.com> (maintainer)

5 files changed, 249 insertions, 174 deletions

diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index 6452b04a31a0..434cc35c0fd2 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	gallery3
 PORTVERSION=	3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
-MASTER_SITES=	SF/gallery/${PORTNAME}/${PORTVERSION}-beta-3
-DISTNAME=	gallery-${PORTVERSION}-beta-3
+MASTER_SITES=	SF/gallery/${PORTNAME}/${PORTVERSION}-rc-1
+DISTNAME=	gallery-${PORTVERSION}-rc-1-p1
 
 MAINTAINER=	appleboy.tw@gmail.com
 COMMENT=	Web based photo album organizer written in PHP
diff --git a/www/gallery3/distinfo b/www/gallery3/distinfo
index dd82d98dc153..e3cf2db78496 100644
--- a/www/gallery3/distinfo
+++ b/www/gallery3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gallery-3.0-beta-3.zip) = 87127c04dac9d6cac373b57b12810bd3
-SHA256 (gallery-3.0-beta-3.zip) = 6ef9b25a5cee33d3e9000187864654645a1c7a528985dd8c66ffdd9b895340cd
-SIZE (gallery-3.0-beta-3.zip) = 1271583
+MD5 (gallery-3.0-rc-1-p1.zip) = 73d1e679383002f313dbcba2283956f3
+SHA256 (gallery-3.0-rc-1-p1.zip) = fdcb580e790ad3b5d0cd5bebe717d6efa94efc5f54bf3b556fbe2325a366f056
+SIZE (gallery-3.0-rc-1-p1.zip) = 1522688
diff --git a/www/gallery3/files/pkg-message.in b/www/gallery3/files/pkg-message.in
index de819cef3f49..3ffa63239ea6 100644
--- a/www/gallery3/files/pkg-message.in
+++ b/www/gallery3/files/pkg-message.in
@@ -27,4 +27,20 @@ Then restart Apache: 'apachectl graceful'
 
 Please visit 'http://localhost/gallery3/' in a
 web-browser and follow the configuration instructions.
+
+*****************************************************************
+
+Upgrading: http://codex.gallery2.org/Gallery3:Upgrading
+
+Note: You can upgrade from Beta 1, 2 or 3 (but not from earlier releases -- sorry!) 
+
+Upgrading is really easy! Unpack the new version on top of the old one to replace the existing files 
+and then either browse to:
+
+	http://example.com/gallery3/index.php/upgrader
+
+(except use your real domain name) or if you have shell access, run:
+
+	php index.php upgrade
+
 *****************************************************************
diff --git a/www/gallery3/pkg-descr b/www/gallery3/pkg-descr
index f809791ed6f8..8b3e23b31613 100644
--- a/www/gallery3/pkg-descr
+++ b/www/gallery3/pkg-descr
@@ -1,12 +1,20 @@
-Gallery is a web based software product that lets you manage your
-photos on your own website. You must have your own website with PHP
-support in order to install and use it. With Gallery you can easily
-create and maintain albums of photos via an intuitive interface. Photo
-management includes automatic thumbnail creation, image resizing,
-rotation, ordering, captioning, searching and more. Albums can have
-read, write and caption permissions per individual authenticated user
-for an additional level of privacy. Give accounts to your friends and
-family and let them upload and manage their own photos on your
-website!
-
-WWW: http://gallery.sourceforge.net/
+Project and Organization
+
+Gallery is an open source project with the goal to develop and support leading
+photo sharing web application solutions.
+
+The Gallery project develops open source software licensed under the GPL, and
+is maintained and developed by a community of users and developers. The
+development is a distributed effort, with collaboration from around the globe.
+The team is well organized, with weekly meetings, and constant communication.
+Serving millions worldwide, the Gallery project is the most widely used system
+of its kind. Gallery is free to download and use.
+
+Products
+
+Gallery is also the name of the main product, an online photo album organizer.
+Gallery gives you an intuitive way to blend photo management seamlessly into
+your own website whether you're running a small personal site or a large
+community site.
+
+WWW: http://gallery.menalto.com/
diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist
index 0678759c78c3..0b230137b3f4 100644
--- a/www/gallery3/pkg-plist
+++ b/www/gallery3/pkg-plist
@@ -1,6 +1,7 @@
 %%WWWDIR%%/.htaccess
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/README
+%%WWWDIR%%/application/Bootstrap.php
 %%WWWDIR%%/application/config/config.php
 %%WWWDIR%%/index.php
 %%WWWDIR%%/installer/cli.php
@@ -29,10 +30,22 @@
 %%WWWDIR%%/lib/gallery.common.css
 %%WWWDIR%%/lib/gallery.common.js
 %%WWWDIR%%/lib/gallery.dialog.js
-%%WWWDIR%%/lib/gallery.form.js
+%%WWWDIR%%/lib/gallery.in_place_edit.js
 %%WWWDIR%%/lib/gallery.panel.js
 %%WWWDIR%%/lib/gallery.show_full_size.js
 %%WWWDIR%%/lib/images/favicon.ico
+%%WWWDIR%%/lib/images/ico-denied-inactive.png
+%%WWWDIR%%/lib/images/ico-denied-passive.png
+%%WWWDIR%%/lib/images/ico-denied.png
+%%WWWDIR%%/lib/images/ico-error.png
+%%WWWDIR%%/lib/images/ico-info.png
+%%WWWDIR%%/lib/images/ico-lock.png
+%%WWWDIR%%/lib/images/ico-separator-rtl.gif
+%%WWWDIR%%/lib/images/ico-separator.gif
+%%WWWDIR%%/lib/images/ico-success-inactive.png
+%%WWWDIR%%/lib/images/ico-success-passive.png
+%%WWWDIR%%/lib/images/ico-success.png
+%%WWWDIR%%/lib/images/ico-warning.png
 %%WWWDIR%%/lib/images/loading-large.gif
 %%WWWDIR%%/lib/images/loading-small.gif
 %%WWWDIR%%/lib/images/logo.png
@@ -47,9 +60,11 @@
 %%WWWDIR%%/lib/jquery.localscroll.js
 %%WWWDIR%%/lib/jquery.scrollTo.js
 %%WWWDIR%%/lib/superfish/css/superfish.css
+%%WWWDIR%%/lib/superfish/images/arrows-ffffff-rtl.png
 %%WWWDIR%%/lib/superfish/images/arrows-ffffff.png
 %%WWWDIR%%/lib/superfish/images/shadow.png
 %%WWWDIR%%/lib/superfish/js/superfish.js
+%%WWWDIR%%/lib/swfobject.js
 %%WWWDIR%%/lib/swfupload/swfupload.js
 %%WWWDIR%%/lib/swfupload/swfupload.queue.js
 %%WWWDIR%%/lib/swfupload/swfupload.swf
@@ -76,6 +91,12 @@
 %%WWWDIR%%/lib/themeroller/ui.resizable.css
 %%WWWDIR%%/lib/themeroller/ui.tabs.css
 %%WWWDIR%%/lib/themeroller/ui.theme.css
+%%WWWDIR%%/lib/uploadify/cancel.png
+%%WWWDIR%%/lib/uploadify/jquery.uploadify.min.js
+%%WWWDIR%%/lib/uploadify/uploadify.allglyphs.swf
+%%WWWDIR%%/lib/uploadify/uploadify.css
+%%WWWDIR%%/lib/uploadify/uploadify.fla
+%%WWWDIR%%/lib/uploadify/uploadify.swf
 %%WWWDIR%%/lib/yui/base-min.css
 %%WWWDIR%%/lib/yui/reset-fonts-grids.css
 %%WWWDIR%%/modules/akismet/controllers/admin_akismet.php
@@ -87,6 +108,7 @@
 %%WWWDIR%%/modules/akismet/views/admin_akismet_stats.html.php
 %%WWWDIR%%/modules/comment/controllers/admin_comments.php
 %%WWWDIR%%/modules/comment/controllers/comments.php
+%%WWWDIR%%/modules/comment/css/comment.css
 %%WWWDIR%%/modules/comment/helpers/comment.php
 %%WWWDIR%%/modules/comment/helpers/comment_block.php
 %%WWWDIR%%/modules/comment/helpers/comment_event.php
@@ -101,6 +123,7 @@
 %%WWWDIR%%/modules/comment/views/comment.html.php
 %%WWWDIR%%/modules/comment/views/comment.mrss.php
 %%WWWDIR%%/modules/comment/views/comments.html.php
+%%WWWDIR%%/modules/comment/views/user_profile_comments.html.php
 %%WWWDIR%%/modules/digibug/config/digibug.php
 %%WWWDIR%%/modules/digibug/controllers/admin_digibug.php
 %%WWWDIR%%/modules/digibug/controllers/digibug.php
@@ -147,11 +170,14 @@
 %%WWWDIR%%/modules/forge/libraries/Form_Textarea.php
 %%WWWDIR%%/modules/forge/libraries/Form_Upload.php
 %%WWWDIR%%/modules/g2_import/controllers/admin_g2_import.php
+%%WWWDIR%%/modules/g2_import/controllers/g2.php
+%%WWWDIR%%/modules/g2_import/css/g2_import.css
 %%WWWDIR%%/modules/g2_import/data/broken-image.gif
 %%WWWDIR%%/modules/g2_import/helpers/g2_import.php
 %%WWWDIR%%/modules/g2_import/helpers/g2_import_event.php
 %%WWWDIR%%/modules/g2_import/helpers/g2_import_installer.php
 %%WWWDIR%%/modules/g2_import/helpers/g2_import_task.php
+%%WWWDIR%%/modules/g2_import/helpers/g2_import_theme.php
 %%WWWDIR%%/modules/g2_import/models/g2_map.php
 %%WWWDIR%%/modules/g2_import/module.info
 %%WWWDIR%%/modules/g2_import/views/admin_g2_import.html.php
@@ -159,6 +185,7 @@
 %%WWWDIR%%/modules/gallery/config/cookie.php
 %%WWWDIR%%/modules/gallery/config/database.php
 %%WWWDIR%%/modules/gallery/config/locale.php
+%%WWWDIR%%/modules/gallery/config/log_file.php
 %%WWWDIR%%/modules/gallery/config/routes.php
 %%WWWDIR%%/modules/gallery/config/sendmail.php
 %%WWWDIR%%/modules/gallery/config/session.php
@@ -170,6 +197,7 @@
 %%WWWDIR%%/modules/gallery/controllers/admin_languages.php
 %%WWWDIR%%/modules/gallery/controllers/admin_maintenance.php
 %%WWWDIR%%/modules/gallery/controllers/admin_modules.php
+%%WWWDIR%%/modules/gallery/controllers/admin_sidebar.php
 %%WWWDIR%%/modules/gallery/controllers/admin_theme_options.php
 %%WWWDIR%%/modules/gallery/controllers/admin_themes.php
 %%WWWDIR%%/modules/gallery/controllers/albums.php
@@ -177,6 +205,8 @@
 %%WWWDIR%%/modules/gallery/controllers/file_proxy.php
 %%WWWDIR%%/modules/gallery/controllers/items.php
 %%WWWDIR%%/modules/gallery/controllers/l10n_client.php
+%%WWWDIR%%/modules/gallery/controllers/login.php
+%%WWWDIR%%/modules/gallery/controllers/logout.php
 %%WWWDIR%%/modules/gallery/controllers/maintenance.php
 %%WWWDIR%%/modules/gallery/controllers/move.php
 %%WWWDIR%%/modules/gallery/controllers/movies.php
@@ -184,11 +214,13 @@
 %%WWWDIR%%/modules/gallery/controllers/permissions.php
 %%WWWDIR%%/modules/gallery/controllers/photos.php
 %%WWWDIR%%/modules/gallery/controllers/quick.php
-%%WWWDIR%%/modules/gallery/controllers/rest.php
+%%WWWDIR%%/modules/gallery/controllers/reauthenticate.php
 %%WWWDIR%%/modules/gallery/controllers/simple_uploader.php
 %%WWWDIR%%/modules/gallery/controllers/upgrader.php
+%%WWWDIR%%/modules/gallery/controllers/user_profile.php
 %%WWWDIR%%/modules/gallery/controllers/welcome_message.php
 %%WWWDIR%%/modules/gallery/css/debug.css
+%%WWWDIR%%/modules/gallery/css/gallery.css
 %%WWWDIR%%/modules/gallery/css/l10n_client.css
 %%WWWDIR%%/modules/gallery/css/upgrader.css
 %%WWWDIR%%/modules/gallery/helpers/MY_html.php
@@ -197,18 +229,24 @@
 %%WWWDIR%%/modules/gallery/helpers/MY_url.php
 %%WWWDIR%%/modules/gallery/helpers/access.php
 %%WWWDIR%%/modules/gallery/helpers/album.php
+%%WWWDIR%%/modules/gallery/helpers/auth.php
 %%WWWDIR%%/modules/gallery/helpers/batch.php
 %%WWWDIR%%/modules/gallery/helpers/block_manager.php
 %%WWWDIR%%/modules/gallery/helpers/dir.php
 %%WWWDIR%%/modules/gallery/helpers/gallery.php
 %%WWWDIR%%/modules/gallery/helpers/gallery_block.php
+%%WWWDIR%%/modules/gallery/helpers/gallery_error.php
 %%WWWDIR%%/modules/gallery/helpers/gallery_event.php
+%%WWWDIR%%/modules/gallery/helpers/gallery_graphics.php
 %%WWWDIR%%/modules/gallery/helpers/gallery_installer.php
 %%WWWDIR%%/modules/gallery/helpers/gallery_rss.php
 %%WWWDIR%%/modules/gallery/helpers/gallery_task.php
 %%WWWDIR%%/modules/gallery/helpers/gallery_theme.php
 %%WWWDIR%%/modules/gallery/helpers/graphics.php
+%%WWWDIR%%/modules/gallery/helpers/identity.php
 %%WWWDIR%%/modules/gallery/helpers/item.php
+%%WWWDIR%%/modules/gallery/helpers/item_rest.php
+%%WWWDIR%%/modules/gallery/helpers/items_rest.php
 %%WWWDIR%%/modules/gallery/helpers/l10n_client.php
 %%WWWDIR%%/modules/gallery/helpers/l10n_scanner.php
 %%WWWDIR%%/modules/gallery/helpers/locales.php
@@ -218,10 +256,10 @@
 %%WWWDIR%%/modules/gallery/helpers/module.php
 %%WWWDIR%%/modules/gallery/helpers/movie.php
 %%WWWDIR%%/modules/gallery/helpers/photo.php
-%%WWWDIR%%/modules/gallery/helpers/rest.php
 %%WWWDIR%%/modules/gallery/helpers/site_status.php
 %%WWWDIR%%/modules/gallery/helpers/task.php
 %%WWWDIR%%/modules/gallery/helpers/theme.php
+%%WWWDIR%%/modules/gallery/helpers/user_profile.php
 %%WWWDIR%%/modules/gallery/helpers/xml.php
 %%WWWDIR%%/modules/gallery/hooks/init_gallery.php
 %%WWWDIR%%/modules/gallery/images/gallery.png
@@ -234,10 +272,16 @@
 %%WWWDIR%%/modules/gallery/libraries/Admin_View.php
 %%WWWDIR%%/modules/gallery/libraries/Block.php
 %%WWWDIR%%/modules/gallery/libraries/Form_Script.php
+%%WWWDIR%%/modules/gallery/libraries/Form_Uploadify.php
+%%WWWDIR%%/modules/gallery/libraries/Form_Uploadify_buttons.php
+%%WWWDIR%%/modules/gallery/libraries/Gallery_I18n.php
 %%WWWDIR%%/modules/gallery/libraries/Gallery_View.php
-%%WWWDIR%%/modules/gallery/libraries/I18n.php
+%%WWWDIR%%/modules/gallery/libraries/IdentityProvider.php
+%%WWWDIR%%/modules/gallery/libraries/InPlaceEdit.php
 %%WWWDIR%%/modules/gallery/libraries/MY_Database.php
 %%WWWDIR%%/modules/gallery/libraries/MY_Forge.php
+%%WWWDIR%%/modules/gallery/libraries/MY_Input.php
+%%WWWDIR%%/modules/gallery/libraries/MY_Kohana_Exception.php
 %%WWWDIR%%/modules/gallery/libraries/MY_ORM.php
 %%WWWDIR%%/modules/gallery/libraries/MY_Pagination.php
 %%WWWDIR%%/modules/gallery/libraries/MY_View.php
@@ -248,9 +292,11 @@
 %%WWWDIR%%/modules/gallery/libraries/Task_Definition.php
 %%WWWDIR%%/modules/gallery/libraries/Theme_View.php
 %%WWWDIR%%/modules/gallery/libraries/drivers/Cache/Database.php
+%%WWWDIR%%/modules/gallery/libraries/drivers/IdentityProvider.php
 %%WWWDIR%%/modules/gallery/models/access_cache.php
 %%WWWDIR%%/modules/gallery/models/access_intent.php
 %%WWWDIR%%/modules/gallery/models/cache.php
+%%WWWDIR%%/modules/gallery/models/failed_auth.php
 %%WWWDIR%%/modules/gallery/models/graphics_rule.php
 %%WWWDIR%%/modules/gallery/models/incoming_translation.php
 %%WWWDIR%%/modules/gallery/models/item.php
@@ -281,29 +327,50 @@
 %%WWWDIR%%/modules/gallery/views/admin_maintenance_show_log.html.php
 %%WWWDIR%%/modules/gallery/views/admin_maintenance_task.html.php
 %%WWWDIR%%/modules/gallery/views/admin_modules.html.php
+%%WWWDIR%%/modules/gallery/views/admin_modules_confirm.html.php
+%%WWWDIR%%/modules/gallery/views/admin_sidebar.html.php
+%%WWWDIR%%/modules/gallery/views/admin_sidebar_blocks.html.php
 %%WWWDIR%%/modules/gallery/views/admin_theme_options.html.php
 %%WWWDIR%%/modules/gallery/views/admin_themes.html.php
 %%WWWDIR%%/modules/gallery/views/admin_themes_preview.html.php
+%%WWWDIR%%/modules/gallery/views/error.html.php
+%%WWWDIR%%/modules/gallery/views/error_404.html.php
 %%WWWDIR%%/modules/gallery/views/form.html.php
-%%WWWDIR%%/modules/gallery/views/kohana_error_page.php
+%%WWWDIR%%/modules/gallery/views/form_uploadify.html.php
+%%WWWDIR%%/modules/gallery/views/form_uploadify_buttons.html.php
+%%WWWDIR%%/modules/gallery/views/in_place_edit.html.php
+%%WWWDIR%%/modules/gallery/views/kohana/error.php
 %%WWWDIR%%/modules/gallery/views/kohana_profiler.php
 %%WWWDIR%%/modules/gallery/views/l10n_client.html.php
+%%WWWDIR%%/modules/gallery/views/login_ajax.html.php
+%%WWWDIR%%/modules/gallery/views/login_current_user.html.php
 %%WWWDIR%%/modules/gallery/views/maintenance.html.php
+%%WWWDIR%%/modules/gallery/views/menu.html.php
+%%WWWDIR%%/modules/gallery/views/menu_ajax_link.html.php
+%%WWWDIR%%/modules/gallery/views/menu_dialog.html.php
+%%WWWDIR%%/modules/gallery/views/menu_link.html.php
 %%WWWDIR%%/modules/gallery/views/move_browse.html.php
 %%WWWDIR%%/modules/gallery/views/move_tree.html.php
 %%WWWDIR%%/modules/gallery/views/movieplayer.html.php
 %%WWWDIR%%/modules/gallery/views/permissions_browse.html.php
 %%WWWDIR%%/modules/gallery/views/permissions_form.html.php
-%%WWWDIR%%/modules/gallery/views/simple_uploader.html.php
+%%WWWDIR%%/modules/gallery/views/reauthenticate.html.php
 %%WWWDIR%%/modules/gallery/views/upgrader.html.php
+%%WWWDIR%%/modules/gallery/views/user_languages_block.html.php
+%%WWWDIR%%/modules/gallery/views/user_profile.html.php
+%%WWWDIR%%/modules/gallery/views/user_profile_info.html.php
 %%WWWDIR%%/modules/gallery/views/welcome_message.html.php
 %%WWWDIR%%/modules/gallery/views/welcome_message_loader.html.php
-%%WWWDIR%%/modules/image_block/helpers/image_block_theme.php
+%%WWWDIR%%/modules/image_block/helpers/image_block_block.php
 %%WWWDIR%%/modules/image_block/module.info
 %%WWWDIR%%/modules/image_block/views/image_block_block.html.php
+%%WWWDIR%%/modules/info/helpers/info_block.php
 %%WWWDIR%%/modules/info/helpers/info_theme.php
 %%WWWDIR%%/modules/info/module.info
 %%WWWDIR%%/modules/info/views/info_block.html.php
+%%WWWDIR%%/modules/kohana23_compat/config/pagination.php
+%%WWWDIR%%/modules/kohana23_compat/libraries/MY_Database_Builder.php
+%%WWWDIR%%/modules/kohana23_compat/libraries/Pagination.php
 %%WWWDIR%%/modules/notification/controllers/notification.php
 %%WWWDIR%%/modules/notification/helpers/notification.php
 %%WWWDIR%%/modules/notification/helpers/notification_event.php
@@ -315,8 +382,10 @@
 %%WWWDIR%%/modules/notification/views/item_added.html.php
 %%WWWDIR%%/modules/notification/views/item_deleted.html.php
 %%WWWDIR%%/modules/notification/views/item_updated.html.php
+%%WWWDIR%%/modules/notification/views/user_profile_notification.html.php
 %%WWWDIR%%/modules/organize/controllers/organize.php
 %%WWWDIR%%/modules/organize/css/organize.css
+%%WWWDIR%%/modules/organize/css/organize_theme.css
 %%WWWDIR%%/modules/organize/helpers/organize_event.php
 %%WWWDIR%%/modules/organize/helpers/organize_theme.php
 %%WWWDIR%%/modules/organize/js/organize.js
@@ -325,16 +394,26 @@
 %%WWWDIR%%/modules/organize/views/organize_thumb_grid.html.php
 %%WWWDIR%%/modules/organize/views/organize_tree.html.php
 %%WWWDIR%%/modules/recaptcha/controllers/admin_recaptcha.php
+%%WWWDIR%%/modules/recaptcha/css/recaptcha.css
 %%WWWDIR%%/modules/recaptcha/helpers/recaptcha.php
 %%WWWDIR%%/modules/recaptcha/helpers/recaptcha_event.php
 %%WWWDIR%%/modules/recaptcha/helpers/recaptcha_installer.php
+%%WWWDIR%%/modules/recaptcha/helpers/recaptcha_theme.php
 %%WWWDIR%%/modules/recaptcha/libraries/Form_Recaptcha.php
 %%WWWDIR%%/modules/recaptcha/module.info
 %%WWWDIR%%/modules/recaptcha/views/admin_recaptcha.html.php
 %%WWWDIR%%/modules/recaptcha/views/form_recaptcha.html.php
+%%WWWDIR%%/modules/rest/controllers/rest.php
+%%WWWDIR%%/modules/rest/helpers/rest.php
+%%WWWDIR%%/modules/rest/helpers/rest_event.php
+%%WWWDIR%%/modules/rest/helpers/rest_installer.php
+%%WWWDIR%%/modules/rest/libraries/Rest_Exception.php
+%%WWWDIR%%/modules/rest/models/user_access_token.php
+%%WWWDIR%%/modules/rest/module.info
+%%WWWDIR%%/modules/rest/views/user_profile_rest.html.php
 %%WWWDIR%%/modules/rss/controllers/rss.php
 %%WWWDIR%%/modules/rss/helpers/rss.php
-%%WWWDIR%%/modules/rss/helpers/rss_theme.php
+%%WWWDIR%%/modules/rss/helpers/rss_block.php
 %%WWWDIR%%/modules/rss/module.info
 %%WWWDIR%%/modules/rss/views/feed.mrss.php
 %%WWWDIR%%/modules/rss/views/rss_block.html.php
@@ -350,6 +429,7 @@
 %%WWWDIR%%/modules/search/views/search_link.html.php
 %%WWWDIR%%/modules/server_add/controllers/admin_server_add.php
 %%WWWDIR%%/modules/server_add/controllers/server_add.php
+%%WWWDIR%%/modules/server_add/css/server_add.css
 %%WWWDIR%%/modules/server_add/helpers/server_add.php
 %%WWWDIR%%/modules/server_add/helpers/server_add_event.php
 %%WWWDIR%%/modules/server_add/helpers/server_add_installer.php
@@ -367,59 +447,62 @@
 %%WWWDIR%%/modules/slideshow/module.info
 %%WWWDIR%%/modules/tag/controllers/admin_tags.php
 %%WWWDIR%%/modules/tag/controllers/tags.php
+%%WWWDIR%%/modules/tag/css/tag.css
+%%WWWDIR%%/modules/tag/helpers/item_tags_rest.php
 %%WWWDIR%%/modules/tag/helpers/tag.php
+%%WWWDIR%%/modules/tag/helpers/tag_block.php
 %%WWWDIR%%/modules/tag/helpers/tag_event.php
 %%WWWDIR%%/modules/tag/helpers/tag_installer.php
+%%WWWDIR%%/modules/tag/helpers/tag_item_rest.php
+%%WWWDIR%%/modules/tag/helpers/tag_items_rest.php
+%%WWWDIR%%/modules/tag/helpers/tag_rest.php
 %%WWWDIR%%/modules/tag/helpers/tag_rss.php
 %%WWWDIR%%/modules/tag/helpers/tag_theme.php
-%%WWWDIR%%/modules/tag/js/tag.js
+%%WWWDIR%%/modules/tag/helpers/tags_rest.php
 %%WWWDIR%%/modules/tag/models/tag.php
 %%WWWDIR%%/modules/tag/module.info
 %%WWWDIR%%/modules/tag/views/admin_tags.html.php
 %%WWWDIR%%/modules/tag/views/tag_block.html.php
 %%WWWDIR%%/modules/tag/views/tag_cloud.html.php
+%%WWWDIR%%/modules/user/config/identity.php
 %%WWWDIR%%/modules/user/controllers/admin_users.php
-%%WWWDIR%%/modules/user/controllers/login.php
-%%WWWDIR%%/modules/user/controllers/logout.php
 %%WWWDIR%%/modules/user/controllers/password.php
 %%WWWDIR%%/modules/user/controllers/users.php
+%%WWWDIR%%/modules/user/css/user.css
 %%WWWDIR%%/modules/user/helpers/group.php
 %%WWWDIR%%/modules/user/helpers/user.php
 %%WWWDIR%%/modules/user/helpers/user_event.php
 %%WWWDIR%%/modules/user/helpers/user_installer.php
 %%WWWDIR%%/modules/user/helpers/user_theme.php
+%%WWWDIR%%/modules/user/images/progressImg1.png
+%%WWWDIR%%/modules/user/js/password_strength.js
 %%WWWDIR%%/modules/user/lib/PasswordHash.php
+%%WWWDIR%%/modules/user/libraries/drivers/IdentityProvider/Gallery.php
 %%WWWDIR%%/modules/user/models/group.php
 %%WWWDIR%%/modules/user/models/user.php
 %%WWWDIR%%/modules/user/module.info
 %%WWWDIR%%/modules/user/views/admin_users.html.php
 %%WWWDIR%%/modules/user/views/admin_users_group.html.php
-%%WWWDIR%%/modules/user/views/login.html.php
-%%WWWDIR%%/modules/user/views/login_ajax.html.php
 %%WWWDIR%%/modules/user/views/reset_password.html.php
-%%WWWDIR%%/modules/user/views/user_languages_block.html.php
 %%WWWDIR%%/modules/watermark/controllers/admin_watermarks.php
 %%WWWDIR%%/modules/watermark/helpers/watermark.php
 %%WWWDIR%%/modules/watermark/helpers/watermark_event.php
 %%WWWDIR%%/modules/watermark/helpers/watermark_installer.php
 %%WWWDIR%%/modules/watermark/module.info
 %%WWWDIR%%/modules/watermark/views/admin_watermarks.html.php
+%%WWWDIR%%/robots.txt
 %%WWWDIR%%/system/KohanaLicense.html
 %%WWWDIR%%/system/config/cache.php
-%%WWWDIR%%/system/config/cache_memcache.php
-%%WWWDIR%%/system/config/cache_sqlite.php
-%%WWWDIR%%/system/config/cache_xcache.php
 %%WWWDIR%%/system/config/cookie.php
 %%WWWDIR%%/system/config/credit_cards.php
 %%WWWDIR%%/system/config/database.php
-%%WWWDIR%%/system/config/email.php
 %%WWWDIR%%/system/config/encryption.php
 %%WWWDIR%%/system/config/http.php
 %%WWWDIR%%/system/config/image.php
 %%WWWDIR%%/system/config/inflector.php
 %%WWWDIR%%/system/config/locale.php
+%%WWWDIR%%/system/config/log.php
 %%WWWDIR%%/system/config/mimes.php
-%%WWWDIR%%/system/config/pagination.php
 %%WWWDIR%%/system/config/profiler.php
 %%WWWDIR%%/system/config/routes.php
 %%WWWDIR%%/system/config/session.php
@@ -429,39 +512,15 @@
 %%WWWDIR%%/system/config/view.php
 %%WWWDIR%%/system/controllers/template.php
 %%WWWDIR%%/system/core/Benchmark.php
-%%WWWDIR%%/system/core/Bootstrap.php
 %%WWWDIR%%/system/core/Event.php
 %%WWWDIR%%/system/core/Kohana.php
-%%WWWDIR%%/system/core/utf8.php
-%%WWWDIR%%/system/core/utf8/from_unicode.php
-%%WWWDIR%%/system/core/utf8/ltrim.php
-%%WWWDIR%%/system/core/utf8/ord.php
-%%WWWDIR%%/system/core/utf8/rtrim.php
-%%WWWDIR%%/system/core/utf8/str_ireplace.php
-%%WWWDIR%%/system/core/utf8/str_pad.php
-%%WWWDIR%%/system/core/utf8/str_split.php
-%%WWWDIR%%/system/core/utf8/strcasecmp.php
-%%WWWDIR%%/system/core/utf8/strcspn.php
-%%WWWDIR%%/system/core/utf8/stristr.php
-%%WWWDIR%%/system/core/utf8/strlen.php
-%%WWWDIR%%/system/core/utf8/strpos.php
-%%WWWDIR%%/system/core/utf8/strrev.php
-%%WWWDIR%%/system/core/utf8/strrpos.php
-%%WWWDIR%%/system/core/utf8/strspn.php
-%%WWWDIR%%/system/core/utf8/strtolower.php
-%%WWWDIR%%/system/core/utf8/strtoupper.php
-%%WWWDIR%%/system/core/utf8/substr.php
-%%WWWDIR%%/system/core/utf8/substr_replace.php
-%%WWWDIR%%/system/core/utf8/to_unicode.php
-%%WWWDIR%%/system/core/utf8/transliterate_to_ascii.php
-%%WWWDIR%%/system/core/utf8/trim.php
-%%WWWDIR%%/system/core/utf8/ucfirst.php
-%%WWWDIR%%/system/core/utf8/ucwords.php
+%%WWWDIR%%/system/core/Kohana_Config.php
+%%WWWDIR%%/system/core/Kohana_Exception.php
 %%WWWDIR%%/system/helpers/arr.php
 %%WWWDIR%%/system/helpers/cookie.php
 %%WWWDIR%%/system/helpers/date.php
+%%WWWDIR%%/system/helpers/db.php
 %%WWWDIR%%/system/helpers/download.php
-%%WWWDIR%%/system/helpers/email.php
 %%WWWDIR%%/system/helpers/expires.php
 %%WWWDIR%%/system/helpers/feed.php
 %%WWWDIR%%/system/helpers/file.php
@@ -476,35 +535,34 @@
 %%WWWDIR%%/system/helpers/text.php
 %%WWWDIR%%/system/helpers/upload.php
 %%WWWDIR%%/system/helpers/url.php
+%%WWWDIR%%/system/helpers/utf8.php
 %%WWWDIR%%/system/helpers/valid.php
-%%WWWDIR%%/system/i18n/en_US/cache.php
-%%WWWDIR%%/system/i18n/en_US/calendar.php
-%%WWWDIR%%/system/i18n/en_US/core.php
-%%WWWDIR%%/system/i18n/en_US/database.php
-%%WWWDIR%%/system/i18n/en_US/encrypt.php
-%%WWWDIR%%/system/i18n/en_US/errors.php
-%%WWWDIR%%/system/i18n/en_US/event.php
-%%WWWDIR%%/system/i18n/en_US/image.php
-%%WWWDIR%%/system/i18n/en_US/orm.php
-%%WWWDIR%%/system/i18n/en_US/profiler.php
-%%WWWDIR%%/system/i18n/en_US/session.php
-%%WWWDIR%%/system/i18n/en_US/upload.php
-%%WWWDIR%%/system/i18n/en_US/validation.php
 %%WWWDIR%%/system/libraries/Cache.php
+%%WWWDIR%%/system/libraries/Cache_Exception.php
 %%WWWDIR%%/system/libraries/Controller.php
 %%WWWDIR%%/system/libraries/Database.php
+%%WWWDIR%%/system/libraries/Database_Builder.php
+%%WWWDIR%%/system/libraries/Database_Cache_Result.php
+%%WWWDIR%%/system/libraries/Database_Exception.php
 %%WWWDIR%%/system/libraries/Database_Expression.php
+%%WWWDIR%%/system/libraries/Database_Mysql.php
+%%WWWDIR%%/system/libraries/Database_Mysql_Result.php
+%%WWWDIR%%/system/libraries/Database_Mysqli.php
+%%WWWDIR%%/system/libraries/Database_Mysqli_Result.php
+%%WWWDIR%%/system/libraries/Database_Query.php
+%%WWWDIR%%/system/libraries/Database_Result.php
 %%WWWDIR%%/system/libraries/Encrypt.php
-%%WWWDIR%%/system/libraries/Event_Observer.php
-%%WWWDIR%%/system/libraries/Event_Subject.php
+%%WWWDIR%%/system/libraries/I18n.php
 %%WWWDIR%%/system/libraries/Image.php
 %%WWWDIR%%/system/libraries/Input.php
+%%WWWDIR%%/system/libraries/Kohana_404_Exception.php
+%%WWWDIR%%/system/libraries/Kohana_Log.php
+%%WWWDIR%%/system/libraries/Kohana_PHP_Exception.php
+%%WWWDIR%%/system/libraries/Kohana_User_Exception.php
 %%WWWDIR%%/system/libraries/Model.php
 %%WWWDIR%%/system/libraries/ORM.php
 %%WWWDIR%%/system/libraries/ORM_Iterator.php
-%%WWWDIR%%/system/libraries/ORM_Tree.php
-%%WWWDIR%%/system/libraries/ORM_Versioned.php
-%%WWWDIR%%/system/libraries/Pagination.php
+%%WWWDIR%%/system/libraries/ORM_Validation_Exception.php
 %%WWWDIR%%/system/libraries/Profiler.php
 %%WWWDIR%%/system/libraries/Profiler_Table.php
 %%WWWDIR%%/system/libraries/Router.php
@@ -513,117 +571,88 @@
 %%WWWDIR%%/system/libraries/Validation.php
 %%WWWDIR%%/system/libraries/View.php
 %%WWWDIR%%/system/libraries/drivers/Cache.php
-%%WWWDIR%%/system/libraries/drivers/Cache/Apc.php
-%%WWWDIR%%/system/libraries/drivers/Cache/Eaccelerator.php
 %%WWWDIR%%/system/libraries/drivers/Cache/File.php
 %%WWWDIR%%/system/libraries/drivers/Cache/Memcache.php
-%%WWWDIR%%/system/libraries/drivers/Cache/Sqlite.php
 %%WWWDIR%%/system/libraries/drivers/Cache/Xcache.php
-%%WWWDIR%%/system/libraries/drivers/Captcha.php
-%%WWWDIR%%/system/libraries/drivers/Captcha/Alpha.php
-%%WWWDIR%%/system/libraries/drivers/Captcha/Basic.php
-%%WWWDIR%%/system/libraries/drivers/Captcha/Black.php
-%%WWWDIR%%/system/libraries/drivers/Captcha/Math.php
-%%WWWDIR%%/system/libraries/drivers/Captcha/Riddle.php
-%%WWWDIR%%/system/libraries/drivers/Captcha/Word.php
-%%WWWDIR%%/system/libraries/drivers/Database.php
-%%WWWDIR%%/system/libraries/drivers/Database/Mssql.php
-%%WWWDIR%%/system/libraries/drivers/Database/Mysql.php
-%%WWWDIR%%/system/libraries/drivers/Database/Mysqli.php
-%%WWWDIR%%/system/libraries/drivers/Database/Pdosqlite.php
-%%WWWDIR%%/system/libraries/drivers/Database/Pgsql.php
+%%WWWDIR%%/system/libraries/drivers/Config.php
+%%WWWDIR%%/system/libraries/drivers/Config/Array.php
 %%WWWDIR%%/system/libraries/drivers/Image.php
 %%WWWDIR%%/system/libraries/drivers/Image/GD.php
 %%WWWDIR%%/system/libraries/drivers/Image/GraphicsMagick.php
 %%WWWDIR%%/system/libraries/drivers/Image/ImageMagick.php
+%%WWWDIR%%/system/libraries/drivers/Log.php
+%%WWWDIR%%/system/libraries/drivers/Log/Database.php
+%%WWWDIR%%/system/libraries/drivers/Log/File.php
+%%WWWDIR%%/system/libraries/drivers/Log/Syslog.php
 %%WWWDIR%%/system/libraries/drivers/Session.php
 %%WWWDIR%%/system/libraries/drivers/Session/Cache.php
 %%WWWDIR%%/system/libraries/drivers/Session/Cookie.php
 %%WWWDIR%%/system/libraries/drivers/Session/Database.php
+%%WWWDIR%%/system/messages/kohana/core.php
+%%WWWDIR%%/system/messages/validation/default.php
+%%WWWDIR%%/system/views/kohana/error.php
+%%WWWDIR%%/system/views/kohana/error_disabled.php
 %%WWWDIR%%/system/views/kohana/template.php
-%%WWWDIR%%/system/views/kohana_error_disabled.php
-%%WWWDIR%%/system/views/kohana_error_page.php
-%%WWWDIR%%/system/views/kohana_errors.css
-%%WWWDIR%%/system/views/kohana_profiler.php
-%%WWWDIR%%/system/views/kohana_profiler_table.css
-%%WWWDIR%%/system/views/kohana_profiler_table.php
-%%WWWDIR%%/themes/admin_default/css/fix-ie.css
-%%WWWDIR%%/themes/admin_default/css/screen.css
-%%WWWDIR%%/themes/admin_default/images/avatar.jpg
-%%WWWDIR%%/themes/admin_default/images/ico-album.png
-%%WWWDIR%%/themes/admin_default/images/ico-error.png
-%%WWWDIR%%/themes/admin_default/images/ico-info.png
-%%WWWDIR%%/themes/admin_default/images/ico-print.png
-%%WWWDIR%%/themes/admin_default/images/ico-separator.gif
-%%WWWDIR%%/themes/admin_default/images/ico-success.png
-%%WWWDIR%%/themes/admin_default/images/ico-view-comments.png
-%%WWWDIR%%/themes/admin_default/images/ico-view-fullsize.png
-%%WWWDIR%%/themes/admin_default/images/ico-view-hybrid.png
-%%WWWDIR%%/themes/admin_default/images/ico-view-slideshow.png
-%%WWWDIR%%/themes/admin_default/images/ico-warning.png
-%%WWWDIR%%/themes/admin_default/js/ui.init.js
-%%WWWDIR%%/themes/admin_default/theme.info
-%%WWWDIR%%/themes/admin_default/thumbnail.png
-%%WWWDIR%%/themes/admin_default/views/admin.html.php
-%%WWWDIR%%/themes/admin_default/views/block.html.php
-%%WWWDIR%%/themes/admin_default/views/pager.html.php
-%%WWWDIR%%/themes/default/css/fix-ie.css
-%%WWWDIR%%/themes/default/css/screen.css
-%%WWWDIR%%/themes/default/images/avatar.jpg
-%%WWWDIR%%/themes/default/images/ico-album.png
-%%WWWDIR%%/themes/default/images/ico-denied-gray.png
-%%WWWDIR%%/themes/default/images/ico-denied-pale.png
-%%WWWDIR%%/themes/default/images/ico-denied.png
-%%WWWDIR%%/themes/default/images/ico-error.png
-%%WWWDIR%%/themes/default/images/ico-help.png
-%%WWWDIR%%/themes/default/images/ico-info.png
-%%WWWDIR%%/themes/default/images/ico-lock.png
-%%WWWDIR%%/themes/default/images/ico-print.png
-%%WWWDIR%%/themes/default/images/ico-separator.gif
-%%WWWDIR%%/themes/default/images/ico-success-gray.png
-%%WWWDIR%%/themes/default/images/ico-success-pale.png
-%%WWWDIR%%/themes/default/images/ico-success.png
-%%WWWDIR%%/themes/default/images/ico-view-comments.png
-%%WWWDIR%%/themes/default/images/ico-view-fullsize.png
-%%WWWDIR%%/themes/default/images/ico-view-hybrid.png
-%%WWWDIR%%/themes/default/images/ico-view-slideshow.png
-%%WWWDIR%%/themes/default/images/ico-warning.png
-%%WWWDIR%%/themes/default/images/select-photos-backg.png
-%%WWWDIR%%/themes/default/js/ui.init.js
-%%WWWDIR%%/themes/default/theme.info
-%%WWWDIR%%/themes/default/thumbnail.png
-%%WWWDIR%%/themes/default/views/album.html.php
-%%WWWDIR%%/themes/default/views/block.html.php
-%%WWWDIR%%/themes/default/views/dynamic.html.php
-%%WWWDIR%%/themes/default/views/movie.html.php
-%%WWWDIR%%/themes/default/views/page.html.php
-%%WWWDIR%%/themes/default/views/pager.html.php
-%%WWWDIR%%/themes/default/views/photo.html.php
-%%WWWDIR%%/themes/default/views/sidebar.html.php
-@dirrm %%WWWDIR%%/themes/default/views
-@dirrm %%WWWDIR%%/themes/default/js
-@dirrm %%WWWDIR%%/themes/default/images
-@dirrm %%WWWDIR%%/themes/default/css
-@dirrm %%WWWDIR%%/themes/default
-@dirrm %%WWWDIR%%/themes/admin_default/views
-@dirrm %%WWWDIR%%/themes/admin_default/js
-@dirrm %%WWWDIR%%/themes/admin_default/images
-@dirrm %%WWWDIR%%/themes/admin_default/css
-@dirrm %%WWWDIR%%/themes/admin_default
+%%WWWDIR%%/system/views/profiler/profiler.php
+%%WWWDIR%%/system/views/profiler/table.css
+%%WWWDIR%%/system/views/profiler/table.php
+%%WWWDIR%%/themes/admin_wind/css/fix-ie.css
+%%WWWDIR%%/themes/admin_wind/css/screen.css
+%%WWWDIR%%/themes/admin_wind/images/avatar.jpg
+%%WWWDIR%%/themes/admin_wind/js/ui.init.js
+%%WWWDIR%%/themes/admin_wind/theme.info
+%%WWWDIR%%/themes/admin_wind/thumbnail.png
+%%WWWDIR%%/themes/admin_wind/views/admin.html.php
+%%WWWDIR%%/themes/admin_wind/views/block.html.php
+%%WWWDIR%%/themes/admin_wind/views/pager.html.php
+%%WWWDIR%%/themes/wind/css/fix-ie.css
+%%WWWDIR%%/themes/wind/css/screen.css
+%%WWWDIR%%/themes/wind/images/avatar.jpg
+%%WWWDIR%%/themes/wind/images/ico-album.png
+%%WWWDIR%%/themes/wind/images/ico-help.png
+%%WWWDIR%%/themes/wind/images/ico-print.png
+%%WWWDIR%%/themes/wind/images/ico-view-comments.png
+%%WWWDIR%%/themes/wind/images/ico-view-fullsize.png
+%%WWWDIR%%/themes/wind/images/ico-view-slideshow-rtl.png
+%%WWWDIR%%/themes/wind/images/ico-view-slideshow.png
+%%WWWDIR%%/themes/wind/images/select-photos-backg.png
+%%WWWDIR%%/themes/wind/js/ui.init.js
+%%WWWDIR%%/themes/wind/theme.info
+%%WWWDIR%%/themes/wind/thumbnail.png
+%%WWWDIR%%/themes/wind/views/album.html.php
+%%WWWDIR%%/themes/wind/views/block.html.php
+%%WWWDIR%%/themes/wind/views/dynamic.html.php
+%%WWWDIR%%/themes/wind/views/movie.html.php
+%%WWWDIR%%/themes/wind/views/no_sidebar.html.php
+%%WWWDIR%%/themes/wind/views/page.html.php
+%%WWWDIR%%/themes/wind/views/paginator.html.php
+%%WWWDIR%%/themes/wind/views/photo.html.php
+%%WWWDIR%%/themes/wind/views/sidebar.html.php
+@dirrm %%WWWDIR%%/themes/wind/views
+@dirrm %%WWWDIR%%/themes/wind/js
+@dirrm %%WWWDIR%%/themes/wind/images
+@dirrm %%WWWDIR%%/themes/wind/css
+@dirrm %%WWWDIR%%/themes/wind
+@dirrm %%WWWDIR%%/themes/admin_wind/views
+@dirrm %%WWWDIR%%/themes/admin_wind/js
+@dirrm %%WWWDIR%%/themes/admin_wind/images
+@dirrm %%WWWDIR%%/themes/admin_wind/css
+@dirrm %%WWWDIR%%/themes/admin_wind
 @dirrm %%WWWDIR%%/themes
+@dirrm %%WWWDIR%%/system/views/profiler
 @dirrm %%WWWDIR%%/system/views/kohana
 @dirrm %%WWWDIR%%/system/views
+@dirrm %%WWWDIR%%/system/messages/validation
+@dirrm %%WWWDIR%%/system/messages/kohana
+@dirrm %%WWWDIR%%/system/messages
 @dirrm %%WWWDIR%%/system/libraries/drivers/Session
+@dirrm %%WWWDIR%%/system/libraries/drivers/Log
 @dirrm %%WWWDIR%%/system/libraries/drivers/Image
-@dirrm %%WWWDIR%%/system/libraries/drivers/Database
-@dirrm %%WWWDIR%%/system/libraries/drivers/Captcha
+@dirrm %%WWWDIR%%/system/libraries/drivers/Config
 @dirrm %%WWWDIR%%/system/libraries/drivers/Cache
 @dirrm %%WWWDIR%%/system/libraries/drivers
 @dirrm %%WWWDIR%%/system/libraries
-@dirrm %%WWWDIR%%/system/i18n/en_US
-@dirrm %%WWWDIR%%/system/i18n
 @dirrm %%WWWDIR%%/system/helpers
-@dirrm %%WWWDIR%%/system/core/utf8
 @dirrm %%WWWDIR%%/system/core
 @dirrm %%WWWDIR%%/system/controllers
 @dirrm %%WWWDIR%%/system/config
@@ -634,14 +663,21 @@
 @dirrm %%WWWDIR%%/modules/watermark
 @dirrm %%WWWDIR%%/modules/user/views
 @dirrm %%WWWDIR%%/modules/user/models
+@dirrm %%WWWDIR%%/modules/user/libraries/drivers/IdentityProvider
+@dirrm %%WWWDIR%%/modules/user/libraries/drivers
+@dirrm %%WWWDIR%%/modules/user/libraries
 @dirrm %%WWWDIR%%/modules/user/lib
+@dirrm %%WWWDIR%%/modules/user/js
+@dirrm %%WWWDIR%%/modules/user/images
 @dirrm %%WWWDIR%%/modules/user/helpers
+@dirrm %%WWWDIR%%/modules/user/css
 @dirrm %%WWWDIR%%/modules/user/controllers
+@dirrm %%WWWDIR%%/modules/user/config
 @dirrm %%WWWDIR%%/modules/user
 @dirrm %%WWWDIR%%/modules/tag/views
 @dirrm %%WWWDIR%%/modules/tag/models
-@dirrm %%WWWDIR%%/modules/tag/js
 @dirrm %%WWWDIR%%/modules/tag/helpers
+@dirrm %%WWWDIR%%/modules/tag/css
 @dirrm %%WWWDIR%%/modules/tag/controllers
 @dirrm %%WWWDIR%%/modules/tag
 @dirrm %%WWWDIR%%/modules/slideshow/helpers
@@ -650,6 +686,7 @@
 @dirrm %%WWWDIR%%/modules/server_add/models
 @dirrm %%WWWDIR%%/modules/server_add/js
 @dirrm %%WWWDIR%%/modules/server_add/helpers
+@dirrm %%WWWDIR%%/modules/server_add/css
 @dirrm %%WWWDIR%%/modules/server_add/controllers
 @dirrm %%WWWDIR%%/modules/server_add
 @dirrm %%WWWDIR%%/modules/search/views
@@ -661,9 +698,16 @@
 @dirrm %%WWWDIR%%/modules/rss/helpers
 @dirrm %%WWWDIR%%/modules/rss/controllers
 @dirrm %%WWWDIR%%/modules/rss
+@dirrm %%WWWDIR%%/modules/rest/views
+@dirrm %%WWWDIR%%/modules/rest/models
+@dirrm %%WWWDIR%%/modules/rest/libraries
+@dirrm %%WWWDIR%%/modules/rest/helpers
+@dirrm %%WWWDIR%%/modules/rest/controllers
+@dirrm %%WWWDIR%%/modules/rest
 @dirrm %%WWWDIR%%/modules/recaptcha/views
 @dirrm %%WWWDIR%%/modules/recaptcha/libraries
 @dirrm %%WWWDIR%%/modules/recaptcha/helpers
+@dirrm %%WWWDIR%%/modules/recaptcha/css
 @dirrm %%WWWDIR%%/modules/recaptcha/controllers
 @dirrm %%WWWDIR%%/modules/recaptcha
 @dirrm %%WWWDIR%%/modules/organize/views
@@ -677,12 +721,16 @@
 @dirrm %%WWWDIR%%/modules/notification/helpers
 @dirrm %%WWWDIR%%/modules/notification/controllers
 @dirrm %%WWWDIR%%/modules/notification
+@dirrm %%WWWDIR%%/modules/kohana23_compat/libraries
+@dirrm %%WWWDIR%%/modules/kohana23_compat/config
+@dirrm %%WWWDIR%%/modules/kohana23_compat
 @dirrm %%WWWDIR%%/modules/info/views
 @dirrm %%WWWDIR%%/modules/info/helpers
 @dirrm %%WWWDIR%%/modules/info
 @dirrm %%WWWDIR%%/modules/image_block/views
 @dirrm %%WWWDIR%%/modules/image_block/helpers
 @dirrm %%WWWDIR%%/modules/image_block
+@dirrm %%WWWDIR%%/modules/gallery/views/kohana
 @dirrm %%WWWDIR%%/modules/gallery/views
 @dirrm %%WWWDIR%%/modules/gallery/models
 @dirrm %%WWWDIR%%/modules/gallery/libraries/drivers/Cache
@@ -700,6 +748,7 @@
 @dirrm %%WWWDIR%%/modules/g2_import/models
 @dirrm %%WWWDIR%%/modules/g2_import/helpers
 @dirrm %%WWWDIR%%/modules/g2_import/data
+@dirrm %%WWWDIR%%/modules/g2_import/css
 @dirrm %%WWWDIR%%/modules/g2_import/controllers
 @dirrm %%WWWDIR%%/modules/g2_import
 @dirrm %%WWWDIR%%/modules/forge/libraries
@@ -723,6 +772,7 @@
 @dirrm %%WWWDIR%%/modules/comment/models
 @dirrm %%WWWDIR%%/modules/comment/js
 @dirrm %%WWWDIR%%/modules/comment/helpers
+@dirrm %%WWWDIR%%/modules/comment/css
 @dirrm %%WWWDIR%%/modules/comment/controllers
 @dirrm %%WWWDIR%%/modules/comment
 @dirrm %%WWWDIR%%/modules/akismet/views
@@ -731,6 +781,7 @@
 @dirrm %%WWWDIR%%/modules/akismet
 @dirrm %%WWWDIR%%/modules
 @dirrm %%WWWDIR%%/lib/yui
+@dirrm %%WWWDIR%%/lib/uploadify
 @dirrm %%WWWDIR%%/lib/themeroller/images
 @dirrm %%WWWDIR%%/lib/themeroller
 @dirrm %%WWWDIR%%/lib/swfupload
@@ -744,4 +795,4 @@
 @dirrm %%WWWDIR%%/installer
 @dirrm %%WWWDIR%%/application/config
 @dirrm %%WWWDIR%%/application
-@dirrm %%WWWDIR%%
+@dirrmtry %%WWWDIR%%