diff --git a/classes/CalendarTags.php b/classes/CalendarTags.php
index c410cbf..ab6eb0f 100644
--- a/classes/CalendarTags.php
+++ b/classes/CalendarTags.php
@@ -1,44 +1,13 @@
 <?php
 
-/**
- * Contao Open Source CMS
- * Copyright (C) 2005-2011 Leo Feyer
- *
- * Formerly known as TYPOlight Open Source CMS.
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at <http://www.gnu.org/licenses/>.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2011
- * @author     Helmut Schottmüller <http://www.aurealis.de>
- * @package    Calendar
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class CalendarTags
+ * Contao Open Source CMS - tags extension
  *
- * Provide methods regarding calendars.
- * @copyright  Helmut Schottmüller 2011
- * @author     Helmut Schottmüller <http://www.aurealis.de>
- * @package    Controller
+ * Copyright (c) 2009-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
 class CalendarTags extends \Calendar
 {
@@ -106,5 +75,3 @@ private function getTagsForTableAndId($table, $id, $url = false)
 		return $res;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/classes/ContentHeadlineTags.php b/classes/ContentHeadlineTags.php
index f54a7bc..874b719 100644
--- a/classes/ContentHeadlineTags.php
+++ b/classes/ContentHeadlineTags.php
@@ -1,25 +1,15 @@
 <?php
 
 /**
- * @copyright  Helmut Schottmüller <contao@aurealis.de>
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Frontend
- * @license    LGPL
- * @filesource
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2009-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
 
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
-/**
- * Class ContentHeadline
- *
- * Front end content element "headline".
- * @copyright  Helmut Schottmüller <contao@aurealis.de>
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Controller
- */
 class ContentHeadlineTags extends \ContentHeadline
 {
 	/**
@@ -33,4 +23,3 @@ public function generate()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/classes/NewsTags.php b/classes/NewsTags.php
index daa11b1..f40c06f 100644
--- a/classes/NewsTags.php
+++ b/classes/NewsTags.php
@@ -1,46 +1,15 @@
 <?php
 
 /**
- * Contao Open Source CMS
- * Copyright (C) 2005-2011 Leo Feyer
+ * Contao Open Source CMS - tags extension
  *
- * Formerly known as TYPOlight Open Source CMS.
+ * Copyright (c) 2009-2016 Helmut Schottmüller
  *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at <http://www.gnu.org/licenses/>.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2011
- * @author     Helmut Schottmüller <http://www.aurealis.de>
- * @package    News
- * @license    LGPL
- * @filesource
+ * @license LGPL-3.0+
  */
 
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
-
-/**
- * Class CalendarTags
- *
- * Provide methods regarding news archives.
- * @copyright  Helmut Schottmüller 2011
- * @author     Helmut Schottmüller <http://www.aurealis.de>
- * @package    Controller
- */
 class NewsTags extends \News
 {
 	private $savedArticleId;
@@ -116,4 +85,3 @@ private function getTagsForTableAndId($table, $id, $url = false)
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/classes/TagField.php b/classes/TagField.php
index 1359341..b6dff42 100644
--- a/classes/TagField.php
+++ b/classes/TagField.php
@@ -1,41 +1,15 @@
 <?php
 
-/**
- * TYPOlight webCMS
- * Copyright (C) 2005 Leo Feyer
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2008
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Backend
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
 /**
- * Class TagField
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2009-2016 Helmut Schottmüller
  *
- * Provide methods to handle tag input fields.
- * @copyright  Helmut Schottmüller 2008
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class TagField extends \TextField
 {
 	protected $blnSubmitInput = FALSE;
@@ -176,4 +150,3 @@ public function validate()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/classes/TagHelper.php b/classes/TagHelper.php
index e14cce4..8ebbbfc 100644
--- a/classes/TagHelper.php
+++ b/classes/TagHelper.php
@@ -1,42 +1,15 @@
 <?php
 
-/**
- * TYPOlight webCMS
- * Copyright (C) 2005 Leo Feyer
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2008-2010
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    memberextensions
- * @license    LGPL
- * @filesource
- */
+namespace Contao;
 
 /**
- * Class TagHelper
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Helper class for tags
- * @copyright  Helmut Schottmüller 2008-2010
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
 
-namespace Contao;
-
 class TagHelper extends \Backend
 {
 	/**
@@ -48,6 +21,11 @@ public function __construct()
 		$this->import('Database');
 	}
 
+	public function getAllEvents($arrEvents, $arrCalendars, $intStart, $intEnd, $caller)
+	{
+		return $arrEvents;
+	}
+
 	/*
 	* Cleanup all tags that are associated to no longer existing TYPOlight objects
 	*/
@@ -334,6 +312,7 @@ public function getTagsAndTaglistForIdAndTable($id, $table, $jumpto)
 		foreach ($tags as $id => $tag)
 		{
 			$strUrl = ampersand($this->generateFrontendUrl($pageArr, $items . '/tag/' . \System::urlencode($tag)));
+			if (strlen(\Environment::get('queryString'))) $strUrl .= "?" . \Environment::get('queryString');
 			$tags[$id] = '<a href="' . $strUrl . '">' . specialchars($tag) . '</a>';
 			$taglist[$id] = array(
 				'url' => $tags[$id],
@@ -392,4 +371,3 @@ public function generateNewsFeed()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/classes/TagList.php b/classes/TagList.php
index 9c8855c..2f91773 100644
--- a/classes/TagList.php
+++ b/classes/TagList.php
@@ -1,44 +1,15 @@
 <?php
 
-/**
- * TYPOlight webCMS
- * Copyright (C) 2005 Leo Feyer
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2008
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Backend
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
-
 /**
- * Class TagList
+ * Contao Open Source CMS - tags extension
  *
- * Provide methods to handle tag input fields.
- * @copyright  Helmut Schottmüller 2008
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class TagList extends \System
 {
 	protected $forTable = "";
@@ -527,5 +498,3 @@ public function __get($strKey)
 		}
 	}
 }
-
-?>
diff --git a/config/config.php b/config/config.php
index e047961..ed65bfc 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,32 +1,13 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
- * TYPOlight webCMS
- * Copyright (C) 2005 Leo Feyer
+ * Contao Open Source CMS - tags extension
  *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2008
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Backend
- * @license    LGPL
- * @filesource
+ * @license LGPL-3.0+
  */
 
-
 /**
  * Form fields
  */
@@ -59,7 +40,6 @@
 $GLOBALS['FE_MOD']['news']['newslist'] = 'ModuleNewsListTags';
 $GLOBALS['FE_MOD']['news']['newsarchive'] = 'ModuleNewsArchiveTags';
 $GLOBALS['FE_MOD']['news']['newsreader'] = 'ModuleNewsReaderTags';
-$GLOBALS['FE_MOD']['events']['calendar'] = 'ModuleCalendarTags';
 $GLOBALS['FE_MOD']['events']['eventlist'] = 'ModuleEventlistTags';
 $GLOBALS['FE_MOD']['events']['eventreader'] = 'ModuleEventReaderTags';
 $GLOBALS['FE_MOD']['faq']['faqlist'] = 'ModuleFaqListTags';
@@ -144,4 +124,3 @@
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/dca/tl_article.php b/dca/tl_article.php
index 8a59e56..112f18a 100644
--- a/dca/tl_article.php
+++ b/dca/tl_article.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 class tl_article_tags extends tl_article
 {
 	public function removeArticle($dc)
diff --git a/dca/tl_calendar.php b/dca/tl_calendar.php
index 150bc5e..78d6029 100644
--- a/dca/tl_calendar.php
+++ b/dca/tl_calendar.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 if (@class_exists("tl_calendar"))
 {
 
@@ -16,4 +24,3 @@
 
 }
 
-?>
\ No newline at end of file
diff --git a/dca/tl_calendar_events.php b/dca/tl_calendar_events.php
index 00238bf..5aaaa09 100644
--- a/dca/tl_calendar_events.php
+++ b/dca/tl_calendar_events.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 if (@class_exists("tl_calendar_events"))
 {
 
diff --git a/dca/tl_content.php b/dca/tl_content.php
index b8512c7..85d030a 100644
--- a/dca/tl_content.php
+++ b/dca/tl_content.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 $disabledObjects = deserialize($GLOBALS['TL_CONFIG']['disabledTagObjects'], true);
 if (!in_array('tl_content', $disabledObjects))
 {
diff --git a/dca/tl_faq.php b/dca/tl_faq.php
index 68ab158..69696ad 100644
--- a/dca/tl_faq.php
+++ b/dca/tl_faq.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 if (@class_exists("tl_faq"))
 {
 	/**
diff --git a/dca/tl_files.php b/dca/tl_files.php
index 3cce667..3a12aad 100644
--- a/dca/tl_files.php
+++ b/dca/tl_files.php
@@ -1,16 +1,11 @@
 <?php
 
 /**
- * @copyright  Helmut Schottmüller <contao@aurealis.de>
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Backend
- * @license    LGPL
- * @filesource
- */
-
-
-/**
- * Table tl_files
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
 
 $disabledObjects = deserialize($GLOBALS['TL_CONFIG']['disabledTagObjects'], true);
diff --git a/dca/tl_module.php b/dca/tl_module.php
index 78a02d4..413a186 100644
--- a/dca/tl_module.php
+++ b/dca/tl_module.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * Class tl_module_tags
+ * Contao Open Source CMS - tags extension
  *
- * Provide miscellaneous methods that are used by the data configuration array.
- * @copyright  Helmut Schottmüller 2008-2013
- * @author     Helmut Schottmüller <http://www.github.com/hschottm>
- * @package    Controller
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class tl_module_tags extends tl_module
 {
 	/**
@@ -91,6 +91,7 @@ public function getTagScopeTemplates(DataContainer $dc)
 $GLOBALS['TL_DCA']['tl_module']['palettes']['newsarchive']  = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newsarchive']);
 $GLOBALS['TL_DCA']['tl_module']['palettes']['newslist']  = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newslist']);
 $GLOBALS['TL_DCA']['tl_module']['palettes']['eventlist']  = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,event_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['eventlist']);
+$GLOBALS['TL_DCA']['tl_module']['palettes']['calendar']  = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['calendar']);
 $GLOBALS['TL_DCA']['tl_module']['palettes']['eventreader'] = str_replace('{template_legend', '{showtags_legend},event_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['eventreader']);
 $GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'tag_topten';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'news_showtags';
diff --git a/dca/tl_news.php b/dca/tl_news.php
index 286b02a..bbb3e86 100644
--- a/dca/tl_news.php
+++ b/dca/tl_news.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 if (@class_exists("tl_news"))
 {
 
diff --git a/dca/tl_news_archive.php b/dca/tl_news_archive.php
index fb1417a..842055d 100644
--- a/dca/tl_news_archive.php
+++ b/dca/tl_news_archive.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 if (@class_exists("tl_news_archive"))
 {
 	if (is_array($GLOBALS['TL_DCA']['tl_news_archive']['config']['onload_callback']))
diff --git a/dca/tl_settings.php b/dca/tl_settings.php
index 644a305..d0baf83 100644
--- a/dca/tl_settings.php
+++ b/dca/tl_settings.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
+ */
+
 $GLOBALS['TL_DCA']['tl_settings']['palettes']['default'] .= ';{tags_legend},disabledTagObjects'; 
 
 /**
diff --git a/dca/tl_tag.php b/dca/tl_tag.php
index fef6132..b75d5b5 100644
--- a/dca/tl_tag.php
+++ b/dca/tl_tag.php
@@ -1,8 +1,13 @@
 <?php
 
 /**
- * Table tl_tag
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 $GLOBALS['TL_DCA']['tl_tag'] = array
 (
 
diff --git a/elements/ContentGalleryTags.php b/elements/ContentGalleryTags.php
index a779aba..638145a 100644
--- a/elements/ContentGalleryTags.php
+++ b/elements/ContentGalleryTags.php
@@ -3,13 +3,13 @@
 namespace Contao;
 
 /**
- * Class ContentGalleryTags
+ * Contao Open Source CMS - tags extension
  *
- * Provide methods to handle tag input fields.
- * @copyright  Helmut Schottmüller 2013
- * @author     Helmut Schottmüller <https://github.com/hschottm/>
- * @package    Controller
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class ContentGalleryTags extends ContentGallery
 {
 	/**
diff --git a/models/TagModel.php b/models/TagModel.php
index c527bcd..f0d5dba 100644
--- a/models/TagModel.php
+++ b/models/TagModel.php
@@ -1,29 +1,15 @@
 <?php
 
 /**
- * Contao Open Source CMS
- * 
- * Copyright (C) 2005-2012 Leo Feyer
- * 
- * @package tags
- * @link    http://contao.org
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
 
-
-/**
- * Run in a custom namespace, so the class can be replaced
- */
 namespace Contao;
 
-
-/**
- * Reads and writes calendars
- * 
- * @package   Models
- * @author    Helmut Schottmüller <https://github.com/hschottm>
- * @copyright Helmut Schottmüller 2012
- */
 class TagModel extends \Model
 {
 
diff --git a/models/TagsFaqModel.php b/models/TagsFaqModel.php
index 79288d2..56edb46 100644
--- a/models/TagsFaqModel.php
+++ b/models/TagsFaqModel.php
@@ -1,29 +1,15 @@
 <?php
 
 /**
- * Contao Open Source CMS
- * 
- * Copyright (C) 2005-2012 Leo Feyer
- * 
- * @package News
- * @link    http://contao.org
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
 
-
-/**
- * Run in a custom namespace, so the class can be replaced
- */
 namespace Contao;
 
-
-/**
- * Reads and writes news
- * 
- * @package   Models
- * @author    Leo Feyer <https://github.com/leofeyer>
- * @copyright Leo Feyer 2011-2012
- */
 class TagsFaqModel extends \FaqModel
 {
 	/**
diff --git a/models/TagsNewsModel.php b/models/TagsNewsModel.php
index 46b2b38..d166e0c 100644
--- a/models/TagsNewsModel.php
+++ b/models/TagsNewsModel.php
@@ -1,29 +1,15 @@
 <?php
 
 /**
- * Contao Open Source CMS
- * 
- * Copyright (C) 2005-2012 Leo Feyer
- * 
- * @package News
- * @link    http://contao.org
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
 
-
-/**
- * Run in a custom namespace, so the class can be replaced
- */
 namespace Contao;
 
-
-/**
- * Reads and writes news
- * 
- * @package   Models
- * @author    Leo Feyer <https://github.com/leofeyer>
- * @copyright Leo Feyer 2011-2012
- */
 class TagsNewsModel extends \NewsModel
 {
 	/**
diff --git a/modules/ModuleArticle.php b/modules/ModuleArticle.php
index 26d65aa..85fcc3d 100644
--- a/modules/ModuleArticle.php
+++ b/modules/ModuleArticle.php
@@ -1,30 +1,15 @@
 <?php
 
-/**
- * Contao Open Source CMS
- * 
- * Copyright (C) 2005-2012 Leo Feyer
- * 
- * @package Core
- * @link    http://contao.org
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
- */
-
-
-/**
- * Run in a custom namespace, so the class can be replaced
- */
 namespace Aurealis;
 
-
 /**
- * Class ModuleArticle
+ * Contao Open Source CMS - tags extension
  *
- * Provides methodes to handle articles.
- * @copyright  Helmut Schottmüller 2012
- * @author     Helmut Schottmüller <https://github.com/hschottm>
- * @package    Tags
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class ModuleArticle extends \Contao\ModuleArticle
 {
 	/**
diff --git a/modules/ModuleCalendarTags.php b/modules/ModuleCalendarTags.php
index b4428a4..6c278f4 100644
--- a/modules/ModuleCalendarTags.php
+++ b/modules/ModuleCalendarTags.php
@@ -1,24 +1,85 @@
 <?php
 
+namespace Contao;
+
 /**
- * Contao Open Source CMS
+ * Contao Open Source CMS - tags extension
  *
- * Copyright (c) 2005-2015 Leo Feyer
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
  * @license LGPL-3.0+
  */
 
-namespace Contao;
-
-
-/**
- * Front end module "calendar".
- *
- * @author Leo Feyer <https://github.com/leofeyer>
- */
 class ModuleCalendarTags extends \ModuleCalendar
 {
 
+	/**
+	 * Get all events of a certain period
+	 *
+	 * @param array   $arrCalendars
+	 * @param integer $intStart
+	 * @param integer $intEnd
+	 *
+	 * @return array
+	 */
+	protected function getAllEvents($arrCalendars, $intStart, $intEnd)
+	{
+		$arrAllEvents = parent::getAllEvents($arrCalendars, $intStart, $intEnd);
+		if (($this->tag_ignore) && !strlen($this->tag_filter)) return $arrAllEvents;
+		if (strlen(\Input::get('tag')) || strlen($this->tag_filter))
+		{
+			$limit = null;
+			$offset = 0;
+			$tagids = array();
+			if (strlen($this->tag_filter)) $tagids = $this->getFilterTags();
+			$relatedlist = (strlen(\Input::get('related'))) ? preg_split("/,/", \Input::get('related')) : array();
+			$tagArray = (strlen(\Input::get('tag'))) ? array(\Input::get('tag')) : array();
+			$alltags = array_merge($tagArray, $relatedlist);
+			foreach ($alltags as $tag)
+			{
+				if (count($tagids))
+				{
+					$tagids = $this->Database->prepare("SELECT tid FROM tl_tag WHERE from_table = ? AND tag = ? AND tid IN (" . join($tagids, ",") . ")")
+						->execute('tl_calendar_events', $tag)
+						->fetchEach('tid');
+				}
+				else
+				{
+					$tagids = $this->Database->prepare("SELECT tid FROM tl_tag WHERE from_table = ? AND tag = ?")
+						->execute('tl_calendar_events', $tag)
+						->fetchEach('tid');
+				}
+			}
+			if (count($tagids))
+			{
+				foreach ($arrAllEvents as $allEventsIdx => $days)
+				{
+					foreach ($days as $daysIdx => $day)
+					{
+						foreach ($day as $dayIdx => $event)
+						{
+							if (!in_array($event['id'], $tagids)) {
+								unset($arrAllEvents[$allEventsIdx][$daysIdx][$dayIdx]);
+								if (is_array($arrAllEvents[$allEventsIdx][$daysIdx]) && count($arrAllEvents[$allEventsIdx][$daysIdx]) == 0)
+								{
+									unset($arrAllEvents[$allEventsIdx][$daysIdx]);
+								}
+								if (is_array($arrAllEvents[$allEventsIdx]) && count($arrAllEvents[$allEventsIdx]) == 0)
+								{
+									unset($arrAllEvents[$allEventsIdx]);
+								}
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				$arrAllEvents = array();
+			}
+		}
+		return $arrAllEvents;
+	}
 	/**
 	 * Return all weeks of the current month as array
 	 *
@@ -43,4 +104,29 @@ protected function compileWeeks()
 		}
 		return $arrDays;
 	}
+
+	/**
+	 * Read tags from database
+	 * @return string
+	 */
+	protected function getFilterTags()
+	{
+		if (strlen($this->tag_filter))
+		{
+			$tags = preg_split("/,/", $this->tag_filter);
+			$placeholders = array();
+			foreach ($tags as $tag)
+			{
+				array_push($placeholders, '?');
+			}
+			array_push($tags, 'tl_calendar_events');
+			return $this->Database->prepare("SELECT tid FROM tl_tag WHERE tag IN (" . join($placeholders, ',') . ") AND from_table = ? ORDER BY tag ASC")
+				->execute($tags)
+				->fetchEach('tid');
+		}
+		else
+		{
+			return array();
+		}
+	}
 }
\ No newline at end of file
diff --git a/modules/ModuleEventReaderTags.php b/modules/ModuleEventReaderTags.php
index 8ae7c9e..b09ac73 100644
--- a/modules/ModuleEventReaderTags.php
+++ b/modules/ModuleEventReaderTags.php
@@ -1,27 +1,15 @@
 <?php
 
-/**
- * @package Calendar
- * @copyright  Helmut Schottmüller 2009-2013
- * @author     Helmut Schottmüller <https://github.com/hschottm>
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
- */
-
-
-/**
- * Run in a custom namespace, so the class can be replaced
- */
 namespace Contao;
 
-
 /**
- * Class ModuleEventReaderTags
+ * Contao Open Source CMS - tags extension
  *
- * Front end module "event reader".
- * @copyright  Helmut Schottmüller 2009-2013
- * @author     Helmut Schottmüller <https://github.com/hschottm>
- * @package    Calendar
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class ModuleEventReaderTags extends \ModuleEventReader
 {
 
diff --git a/modules/ModuleEventlistTags.php b/modules/ModuleEventlistTags.php
index 89b1f81..5b75735 100644
--- a/modules/ModuleEventlistTags.php
+++ b/modules/ModuleEventlistTags.php
@@ -1,38 +1,15 @@
 <?php
 
-/**
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2009-2013
- * @author     Helmut Schottmüller <https://github.com/hschottm>
- * @package    tags
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
 /**
- * Class ModuleEventlistTags
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Front end module "event list with tags support".
- * @copyright  Helmut Schottmüller 2009-2013
- * @author     Helmut Schottmüller <https://github.com/hschottm>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleEventlistTags extends \ModuleEventlist
 {
 	/**
@@ -76,7 +53,17 @@ protected function getAllEvents($arrCalendars, $intStart, $intEnd)
 					{
 						foreach ($day as $dayIdx => $event)
 						{
-							if (!in_array($event['id'], $tagids)) unset($arrAllEvents[$allEventsIdx][$daysIdx][$dayIdx]);
+							if (!in_array($event['id'], $tagids)) {
+								unset($arrAllEvents[$allEventsIdx][$daysIdx][$dayIdx]);
+								if (is_array($arrAllEvents[$allEventsIdx][$daysIdx]) && count($arrAllEvents[$allEventsIdx][$daysIdx]) == 0)
+								{
+									unset($arrAllEvents[$allEventsIdx][$daysIdx]);
+								}
+								if (is_array($arrAllEvents[$allEventsIdx]) && count($arrAllEvents[$allEventsIdx]) == 0)
+								{
+									unset($arrAllEvents[$allEventsIdx]);
+								}
+							}
 						}
 					}
 				}
@@ -442,4 +429,3 @@ protected function getFilterTags()
 
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleFaqListTags.php b/modules/ModuleFaqListTags.php
index 9560f07..28c8ba4 100644
--- a/modules/ModuleFaqListTags.php
+++ b/modules/ModuleFaqListTags.php
@@ -1,44 +1,15 @@
 <?php
 
-/**
- * Contao Open Source CMS
- * Copyright (C) 2005-2011 Leo Feyer
- *
- * Formerly known as TYPOlight Open Source CMS.
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at <http://www.gnu.org/licenses/>.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2012
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Faq
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleFaqListTags
+ * Contao Open Source CMS - tags extension
  *
- * @copyright  Helmut Schottmüller 2012
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Controller
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class ModuleFaqListTags extends \ModuleFaqList
 {
 
@@ -129,4 +100,3 @@ protected function compile()
 
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleGlobalArticlelist.php b/modules/ModuleGlobalArticlelist.php
index de899a1..bbca7e7 100644
--- a/modules/ModuleGlobalArticlelist.php
+++ b/modules/ModuleGlobalArticlelist.php
@@ -2,16 +2,14 @@
 
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleGlobalArticlelist
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Front end module "article list".
- * @copyright  Helmut Schottmüller 2009
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleGlobalArticlelist extends \Module
 {
 
@@ -129,4 +127,3 @@ protected function compile()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleLastEventsTags.php b/modules/ModuleLastEventsTags.php
index 6da29dd..c43708d 100644
--- a/modules/ModuleLastEventsTags.php
+++ b/modules/ModuleLastEventsTags.php
@@ -1,40 +1,15 @@
 <?php
 
-/**
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2009
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    tags
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleLastEventsTags
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Front end module "last events with tags support".
- * @copyright  Helmut Schottmüller 2009
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleLastEventsTags extends \ModuleLastEvents
 {
 	/**
@@ -106,4 +81,3 @@ protected function compile()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleNewsArchiveTags.php b/modules/ModuleNewsArchiveTags.php
index c584f55..303e50a 100644
--- a/modules/ModuleNewsArchiveTags.php
+++ b/modules/ModuleNewsArchiveTags.php
@@ -1,44 +1,15 @@
 <?php
 
-/**
- * TYPOlight webCMS
- * Copyright (C) 2005 Leo Feyer
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2008
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    tags
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
-
 /**
- * Class ModuleNewsArchiveTags
+ * Contao Open Source CMS - tags extension
  *
- * Front end module "news archive with tags support".
- * @copyright  Helmut Schottmüller 2008
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class ModuleNewsArchiveTags extends \ModuleNewsArchive
 {
 	/**
@@ -273,4 +244,3 @@ protected function compile()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleNewsListTags.php b/modules/ModuleNewsListTags.php
index 82c913f..6256a68 100644
--- a/modules/ModuleNewsListTags.php
+++ b/modules/ModuleNewsListTags.php
@@ -1,25 +1,15 @@
 <?php
 
-/**
- * @copyright  Helmut Schottmüller 2009
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    News
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleNewsListTags
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Front end module "news list".
- * @copyright  Helmut Schottmüller 2009
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleNewsListTags extends \ModuleNewsList
 {
 	/**
@@ -232,4 +222,3 @@ protected function compile()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleNewsReaderTags.php b/modules/ModuleNewsReaderTags.php
index 8cb421b..7623a81 100644
--- a/modules/ModuleNewsReaderTags.php
+++ b/modules/ModuleNewsReaderTags.php
@@ -1,25 +1,15 @@
 <?php
 
-/**
- * @copyright  Helmut Schottmüller 2009
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    News
- * @license    LGPL
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleNewsReaderTags
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Front end module "news reader".
- * @copyright  Helmut Schottmüller 2009
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleNewsReaderTags extends \ModuleNewsReader
 {
 	/**
@@ -40,4 +30,3 @@ protected function compile()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleTagCloud.php b/modules/ModuleTagCloud.php
index c232767..e2820c6 100644
--- a/modules/ModuleTagCloud.php
+++ b/modules/ModuleTagCloud.php
@@ -1,42 +1,15 @@
 <?php
 
-/**
- * TYPOlight webCMS
- * Copyright (C) 2005 Leo Feyer
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2008 
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    tags 
- * @license    LGPL 
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleTagCloud
+ * Contao Open Source CMS - tags extension
  *
- * @copyright  Helmut Schottmüller 2008 
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * Copyright (c) 2008-2016 Helmut Schottmüller
+ *
+ * @license LGPL-3.0+
  */
+
 class ModuleTagCloud extends \Module
 {
 	/**
@@ -300,4 +273,3 @@ public function __get($strKey)
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleTagContentList.php b/modules/ModuleTagContentList.php
index e476988..c746dac 100644
--- a/modules/ModuleTagContentList.php
+++ b/modules/ModuleTagContentList.php
@@ -2,16 +2,14 @@
 
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleGlobalArticlelist
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Front end module "article list".
- * @copyright  Helmut Schottmüller 2010
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleTagContentList extends \Module
 {
 
@@ -309,4 +307,3 @@ protected function compile()
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleTagListByCategory.php b/modules/ModuleTagListByCategory.php
index d23097d..93ce935 100644
--- a/modules/ModuleTagListByCategory.php
+++ b/modules/ModuleTagListByCategory.php
@@ -2,16 +2,14 @@
 
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleTagListByCategory
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * Front end module "tag list by category".
- * @copyright  Helmut Schottmüller 2011
- * @author     Helmut Schottmüller <contao@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleTagListByCategory extends \Module
 {
 
@@ -224,4 +222,3 @@ protected function getPagesForContentTags($tags)
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/modules/ModuleTagScope.php b/modules/ModuleTagScope.php
index 7cb82ce..5334b52 100644
--- a/modules/ModuleTagScope.php
+++ b/modules/ModuleTagScope.php
@@ -1,42 +1,15 @@
 <?php
 
-/**
- * TYPOlight webCMS
- * Copyright (C) 2005 Leo Feyer
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, please visit the Free
- * Software Foundation website at http://www.gnu.org/licenses/.
- *
- * PHP version 5
- * @copyright  Helmut Schottmüller 2008 
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    tags 
- * @license    LGPL 
- * @filesource
- */
-
 namespace Contao;
 
-if (!defined('TL_ROOT')) die('You can not access this file directly!');
-
 /**
- * Class ModuleTagScope
+ * Contao Open Source CMS - tags extension
+ *
+ * Copyright (c) 2008-2016 Helmut Schottmüller
  *
- * @copyright  Helmut Schottmüller 2008 
- * @author     Helmut Schottmüller <typolight@aurealis.de>
- * @package    Controller
+ * @license LGPL-3.0+
  */
+
 class ModuleTagScope extends \Module
 {
 	/**
@@ -176,5 +149,3 @@ protected function compile()
 		$this->Template->delete_urls = $deleteUrls;
 	}
 }
-
-?>
\ No newline at end of file