Update contao30 to 3.0.4.

This relase contains fix for CVE-2012-6112(TinyMCE), too.

Version 3.0.4 (2013-02-14)
--------------------------

### Fixed
Correctly split the words when adding to the search index (see #5363).

### Fixed
If an eagerly loaded relation does not exist, return `null` instead of an empty
model in `Model::getRelated()` (see #5356).

### Fixed
Throw an exception if the file system and the database are out of sync and
show a meaningful error message (see #5101).

### Fixed
Return an associative array in `Model_Collection::fetchEach()` if the requested
field is **not** `id` (see #5134).

### Fixed
Make eagerly loaded "pageTree" fields mandatory again (see #4866).

### Fixed
Do not use forward pages as upper page in the book navigation (see #5074).

### Fixed
Correctly show the "empty news list" note (see #5304).

### Fixed
Correctly sort values by an external order field (see #5322).

### Fixed
Define the login status constants in the back end (see #4099, #5279).

### Fixed
Make sure the drag'n'drop hints do not overlay the field labels (see #5338).

### Fixed
Apply the color picker to single fields as well (see #5240).

### Fixed
Correctly close the SimpleModal overlay with the escape key (see #5297).

### Updated
Update TinyMCE to version 3.5.8 (see #5273).

### Fixed
Correctly check for nested arrays in `Widget::isValidOption()` (see #5328).

### Fixed
Preserve the order of multi source fields when exporting a theme (see #5237).

### Fixed
Also check whether the target exists when creating new folders (see #5260).

### Fixed
Load the core `autoload.php` files first (see #5261).

### Fixed
Support `null` as column default value in the DCA (see #5252).

### New
Added the `$blnDoNotCreate` option to the `Files` class, which makes the class
write to a temporary file first and then move it to its destination in one
atomic operation. This fixes some cache issues (see #5307).

### Fixed
Handle `@` blocks when importing style sheets (see #5250).

### Fixed
Show the newsletter list even if there is no jumpTo page configured in the
channel and show the enclosures in the newsletter reader (see #5233).

### Fixed
Added an option to load model relations uncached (see #5248, #5102). Also fixed
the `array_merge()` order so the default options can be overriden.

### Updated
Updated SimplePie to version 1.3.1 (see #5207).

### Updated
Updated SwiftMailer to version 4.3.0 (see #5263).

### Fixed
The jQuery accordion script did not work with minified markup (see #5245).

### Fixed
Removed the "spaceToUnderscore" option from all alias fields (see #5266).

### Fixed
The media content element now supports .ogg files (see #5282).

### Fixed
Do not rewrite requests for .mp3, .mp4, .webm or .ogv files (see #5258, #5284).

### Fixed
Correctly determin the last run of the command scheduler (see #5278).

### Fixed
Make the jQuery accordion behave like the MooTools version (see #5251).

### Fixed
Added support for more advanced media queries (see #5236).

### Fixed
Added the missing `UserGroupModel` class (see #5218).

### Fixed
Handle the case that `glob()` returns `false` (see #5226).

### Fixed
The table sorter did not work if jQuery and MooTools were active (see #5228).

### Fixed
Copy all content elements if pages are duplicated with childs (see #5241).

### Fixed
Added lazy template loading for newsletter mail templates.

4 files changed, 22 insertions, 11 deletions

diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common
index 39316d875ce..ef09422804d 100644
--- a/www/contao/Makefile.common
+++ b/www/contao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2013/02/07 00:47:17 taca Exp $
+# $NetBSD: Makefile.common,v 1.29 2013/02/15 15:42:15 taca Exp $
 #
 # used by www/contao/Makefile.example"
 # used by www/contao211/Makefile
@@ -7,7 +7,7 @@
 
 # current release
 CT211_VERSION=	2.11.9
-CT300_VERSION=	3.0.3
+CT300_VERSION=	3.0.4
 
 CT_VERS?=	211
 
diff --git a/www/contao30/Makefile b/www/contao30/Makefile
index 1825dfa27f1..5e69d5c9323 100644
--- a/www/contao30/Makefile
+++ b/www/contao30/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2013/01/09 03:21:48 taca Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/15 15:42:16 taca Exp $
 #
 
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-${CT_PKGVER}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=contao/}
 DIST_SUBDIR=	${CT_DIST_SUBDIR}
diff --git a/www/contao30/PLIST b/www/contao30/PLIST
index 57f496d7593..fba4c9f4776 100644
--- a/www/contao30/PLIST
+++ b/www/contao30/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/01/07 14:41:10 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/02/15 15:42:16 taca Exp $
 ${CT_WEBDIR}/.gitignore
 ${CT_WEBDIR}/README.md
 ${CT_WEBDIR}/assets/codemirror/2.32/codemirror.css
@@ -336,7 +336,6 @@ ${CT_WEBDIR}/assets/tinymce/plugins/advimage/langs/vi_dlg.js
 ${CT_WEBDIR}/assets/tinymce/plugins/advimage/langs/zh_dlg.js
 ${CT_WEBDIR}/assets/tinymce/plugins/autosave/editor_plugin.js
 ${CT_WEBDIR}/assets/tinymce/plugins/autosave/editor_plugin_src.js
-${CT_WEBDIR}/assets/tinymce/plugins/autosave/langs/en.js
 ${CT_WEBDIR}/assets/tinymce/plugins/directionality/editor_plugin.js
 ${CT_WEBDIR}/assets/tinymce/plugins/directionality/editor_plugin_src.js
 ${CT_WEBDIR}/assets/tinymce/plugins/emotions/editor_plugin.js
@@ -966,6 +965,7 @@ ${CT_WEBDIR}/system/cron/cron.php
 ${CT_WEBDIR}/system/docs/CHANGELOG.md
 ${CT_WEBDIR}/system/docs/GPL.txt
 ${CT_WEBDIR}/system/docs/LGPL.txt
+${CT_WEBDIR}/system/helper/exception.php
 ${CT_WEBDIR}/system/helper/functions.php
 ${CT_WEBDIR}/system/helper/ide_compat.php
 ${CT_WEBDIR}/system/helper/interface.php
@@ -1965,6 +1965,7 @@ ${CT_WEBDIR}/system/modules/core/models/SessionModel.php
 ${CT_WEBDIR}/system/modules/core/models/StyleModel.php
 ${CT_WEBDIR}/system/modules/core/models/StyleSheetModel.php
 ${CT_WEBDIR}/system/modules/core/models/ThemeModel.php
+${CT_WEBDIR}/system/modules/core/models/UserGroupModel.php
 ${CT_WEBDIR}/system/modules/core/models/UserModel.php
 ${CT_WEBDIR}/system/modules/core/modules/Module.php
 ${CT_WEBDIR}/system/modules/core/modules/ModuleArticle.php
@@ -3228,6 +3229,7 @@ ${CT_WEBDIR}/system/themes/default/images/rss.gif
 ${CT_WEBDIR}/system/themes/default/images/select.gif
 ${CT_WEBDIR}/system/themes/default/images/settings.gif
 ${CT_WEBDIR}/system/themes/default/images/show.gif
+${CT_WEBDIR}/system/themes/default/images/store.gif
 ${CT_WEBDIR}/system/themes/default/images/su.gif
 ${CT_WEBDIR}/system/themes/default/images/sync.gif
 ${CT_WEBDIR}/system/themes/default/images/tablewizard.gif
@@ -3293,6 +3295,7 @@ ${CT_WEBDIR}/system/vendor/simplepie/SimplePie/Core.php
 ${CT_WEBDIR}/system/vendor/simplepie/SimplePie/Credit.php
 ${CT_WEBDIR}/system/vendor/simplepie/SimplePie/Decode/HTML/Entities.php
 ${CT_WEBDIR}/system/vendor/simplepie/SimplePie/Enclosure.php
+${CT_WEBDIR}/system/vendor/simplepie/SimplePie/Exception.php
 ${CT_WEBDIR}/system/vendor/simplepie/SimplePie/File.php
 ${CT_WEBDIR}/system/vendor/simplepie/SimplePie/HTTP/Parser.php
 ${CT_WEBDIR}/system/vendor/simplepie/SimplePie/IRI.php
@@ -3317,6 +3320,7 @@ ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Attachment.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/ByteStream/FileByteStream.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/ByteStream/TemporaryFileByteStream.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/CharacterReader.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -3360,7 +3364,6 @@ ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/IoException.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/KeyCache.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php
-${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/KeyCache/DummyKeyCache.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -3378,6 +3381,7 @@ ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64C
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/EmbeddedFile.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/EncodingObserver.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Mime/Grammar.php
@@ -3430,6 +3434,14 @@ ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Preferences.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/ReplacementFilterFactory.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/RfcComplianceException.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/SendmailTransport.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/SignedMessage.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Signer.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Signers/BodySigner.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Signers/DKIMSigner.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Signers/DomainKeySigner.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Signers/HeaderSigner.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Signers/PeclDKIMSigner.php
+${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Signers/SMimeSigner.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/SmtpTransport.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/Spool.php
 ${CT_WEBDIR}/system/vendor/swiftmailer/classes/Swift/SpoolTransport.php
diff --git a/www/contao30/distinfo b/www/contao30/distinfo
index a059273372e..af278a9c7d6 100644
--- a/www/contao30/distinfo
+++ b/www/contao30/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/01/09 03:21:48 taca Exp $
+$NetBSD: distinfo,v 1.6 2013/02/15 15:42:16 taca Exp $
 
-SHA1 (contao-20120109/contao-3.0.3.tar.gz) = 3c9e348563f06a6061ec866ee07724387076b4e1
-RMD160 (contao-20120109/contao-3.0.3.tar.gz) = c87dff11ff1ed7a54755b13159bba4e80d293d71
-Size (contao-20120109/contao-3.0.3.tar.gz) = 7688504 bytes
+SHA1 (contao-20120109/contao-3.0.4.tar.gz) = 4224ee2765cfbeda23a89c88447533256ce786c2
+RMD160 (contao-20120109/contao-3.0.4.tar.gz) = e6f6894d6d1754b466555e4d42ec319f5622895a
+Size (contao-20120109/contao-3.0.4.tar.gz) = 7711799 bytes